Changeset 2457

Timestamp:

09/15/06 03:53:55 (2 years ago)

Author:

qldrob

Message:

Fix for #1056 - Can't add a did with a /, as we use it for a delimeter internally.

Files:

• freepbx/trunk/amp_conf/htdocs/admin/common/script.js.php (modified) (1 diff)
• freepbx/trunk/amp_conf/htdocs/admin/modules/core/page.did.php (modified) (2 diffs)

freepbx/trunk/amp_conf/htdocs/admin/common/script.js.php

@@ -573 +573 @@
-
-// ***************************************************
+// ** Check if string s contains char c             **
+// ***************************************************
+
+function isInside(s, c)
+{
+    var i;
+
+    if (isEmpty(s)) {
+        return false;
+    }
+    for (i = 0; i < s.length; i++)
+    {   
+        var t = s.charAt(i);
+        if (t == c)  return true;
+    }
+    return false;
+}
+
+// ***************************************************
-// ** HELPER FUNCTIONS FOR ABOVE VALIDATIONS        **
-// ***************************************************

freepbx/trunk/amp_conf/htdocs/admin/modules/core/page.did.php

@@ -232 +232 @@
-        var msgConfirmDIDCIDBlank = "<?php echo _('Leaving the DID Number AND the Caller ID Number empty will match all incoming calls received not routed using any other defined Incoming Route.\n\nAre you sure?'); ?>";
-        var msgConfirmDIDNonStd = "<?php echo _('DID information is normally just an incoming telephone number or for advanced users, a valid Asterisk Dial Pattern\n\nYou have entered a non standard DID pattern.\n\nAre you sure this is correct?'); ?>";
+        var msgConfirmDIDNoSlash = "<?php echo _('A Slash (\'/\') is never a valid DID. Please remove it and try again'); ?>";
-        
-        setDestinations(theForm,1);
@@ -242 +243 @@
-        }
-        
+        if (isInside(theForm.extension.value, "/")) {
+                warnInvalid(theForm.extension, msgConfirmDIDNoSlash);
+                return false;
+        }
-        if (!isDialpattern(theForm.cidnum.value))
-                return warnInvalid(theForm.cidnum, msgInvalidCIDNum);