Ticket #3053: cidfix.patch

page.did.php

@@ -333 +333 @@
-    warnInvalid(theForm.extension, msgConfirmDIDNoSlash);
-    return false;
-  }
-
+ && theForm.cidnum.value != "Private" && theForm.cidnum.value != "Blocked" && theForm.cidnum.value != "Unknown" && theForm.cidnum.value != "Restricted" && theForm.cidnum.value != "Unavailable"
-    return warnInvalid(theForm.cidnum, msgInvalidCIDNum);
-  
-  if (!isEmail(theForm.faxemail.value))

functions.inc.php

@@ -2514 +2514 @@
-  $newdid_name = isset($newdid_name) ? addslashes($newdid_name) : '';
-  $newdid = isset($newdid) ? $newdid : '';
-  $newdid = preg_replace("/[^0-9._XxNnZz\[\]\-\+]/" ,"", trim($newdid));
+
-  $newdidcid = isset($newdidcid) ? $newdidcid : '';
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-  // Well more ugliness since the javascripts are already in here
-  if ($newdid != '' || $newdidcid != '') {
@@ -2750 +2762 @@
-  $newdid_name = isset($newdid_name) ? addslashes($newdid_name) : '';
-  $newdid = isset($vars['newdid']) ? $vars['newdid'] : '';
-  $newdid = preg_replace("/[^0-9._XxNnZz\[\]\-\+]/" ,"", trim($newdid));
+
-  $newdidcid = isset($vars['newdidcid']) ? $vars['newdidcid'] : '';
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-  // Well more ugliness since the javascripts are already in here
-  if ($newdid != '' || $newdidcid != '') {
@@ -4041 +4065 @@
-    }
-    $currentcomponent->setoptlistopts('ringtime', 'sort', false);
-
+    // Special CID handling to deal with Private, etc.
+    //
+    $js = 'if (isDialpattern(mycid) || mycid == "Private" || mycid == "Blocked" || mycid == "Unknown" || mycid == "Restricted" || mycid == "Unavailable") { return true } else { return false };';
+    $currentcomponent->addjsfunc('isValidCID(mycid)', $js);
+
-    // Add the 'proces' functions
-    $currentcomponent->addguifunc('core_users_configpageload');
-    // Ensure users is called in middle order ($sortorder = 5), this is to allow
@@ -4134 +4163 @@
-    $msgInvalidDispName = _("Please enter a valid Display Name");
-    $msgInvalidOutboundCID = _("Please enter a valid Outbound CID");
-    $msgInvalidPause = _("Please enter a valid pause time in seconds, using digits only");
- 
+
-    $msgInvalidCIDNum = _("Please enter a valid Caller ID Number or leave it blank for your Assigned DID/CID pair");
-
-    // This is the actual gui stuff
@@ -4204 +4233 @@
-    $section = _("Assigned DID/CID");
-    $currentcomponent->addguielem($section, new gui_textbox('newdid_name', $newdid_name, _("DID Description"), _("A description for this DID, such as \"Fax\"")), 4);
-    $currentcomponent->addguielem($section, new gui_textbox('newdid', $newdid, _("Add Inbound DID"), _("A direct DID that is associated with this extension. The DID should be in the same format as provided by the provider (e.g. full number, 4 digits for 10x4, etc).<br><br>Format should be: <b>XXXXXXXXXX</b><br><br>.An optional CID can also be associated with this DID by setting the next box"),'!isDialpattern()',$msgInvalidDIDNum,true), 4);
-
+
+
-
-    $dids = core_did_list('extension');
-    $did_count = 0;