Changeset 5197 for modules/branches/2.4/blacklist/page.blacklist.php

Timestamp:

11/03/07 13:14:12 (6 years ago)

Author:

p_lindheimer

Message:

Merged revisions 5186-5188,5192,5194-5196 via svnmerge from
http://svn.freepbx.org/modules/branches/2.3

........

r5186 | p_lindheimer | 2007-11-02 15:35:24 -0700 (Fri, 02 Nov 2007) | 1 line

#2411, #2402 - fix bug so editing a device does not logout the user, and add default_user field along with fix to macro-user-logoff so that default user information is retained when a user logs off, and fix issue that was allowing a blank extension to be created when javascript was disabled or bugs existed which would make extensions stop working on a system

........

r5187 | p_lindheimer | 2007-11-02 15:47:03 -0700 (Fri, 02 Nov 2007) | 1 line

#2359 deal with other special characters in fax did during fax processing

........

r5188 | p_lindheimer | 2007-11-02 15:57:34 -0700 (Fri, 02 Nov 2007) | 1 line

move Macro(user-callerid) to be called with each conf to accomodate future language settings

........

r5192 | p_lindheimer | 2007-11-02 18:04:40 -0700 (Fri, 02 Nov 2007) | 1 line

#2455 allow + and other valid dial digits

........

r5196 | p_lindheimer | 2007-11-03 09:33:45 -0700 (Sat, 03 Nov 2007) | 1 line

fix to r5186 (#2411, #2402): when editing device into a fixed device, reset user. When changing a device from a fixed to adhoc, reset user

........

Files:

• modules/branches/2.4 (modified) (1 prop)
• modules/branches/2.4/blacklist/page.blacklist.php (modified) (2 diffs)

modules/branches/2.4/blacklist/page.blacklist.php

@@ -106 +106 @@
-  </tr>
-  </table>
-
-<script language="javascript">
-<!--
@@ -113 +112 @@
-theForm.number.focus();
-
+function isDialDigitsPlus(s)
+{
+  var i;
+
+  if (isEmpty(s)) {
+    return false;
+  }
+
+  for (i = 0; i < s.length; i++) {
+    var c = s.charAt(i);
+
+    if (!isDialDigitChar(c) && (c != "+")) return false;
+  }
+  return true;
+}
+
+
-function edit_onsubmit() {
-  defaultEmptyOK = false;
-Integer
+DialDigitsPlus
-                return warnInvalid(theForm.number, "Please enter a valid Number");
-  return true;