Changeset 3871

Timestamp:

03/16/07 13:06:43 (6 years ago)

Author:

p_lindheimer

Message:

Merged revisions 3870 via svnmerge from
https://amportal.svn.sourceforge.net/svnroot/amportal/freepbx/branches/2.2

........

r3870 | p_lindheimer | 2007-03-16 10:03:22 -0700 (Fri, 16 Mar 2007) | 1 line

warn users when setting the 'r' option in the outbound dial command options. We should probably do something atupgrade time to detect past systems but for now this is a step in the right direction

........

Files:

• freepbx/trunk (modified) (1 prop)
• freepbx/trunk/amp_conf/htdocs/admin/modules/core/page.general.php (modified) (3 diffs)

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

@@ -95 +95 @@
-<?php echo _("t: Allow the called user to transfer the call by hitting #")?><br>
-<?php echo _("T: Allow the calling user to transfer the call by hitting #")?><br>
-<?php echo _("r: Generate a ringing tone for the calling party")?><br>
-<?php echo _("w: Allow the called user to start recording after pressing *1 (Asterisk v1.2)")?><br>
-<?php echo _("W: Allow the calling user to start recording after pressing *1 (Asterisk v1.2)")?><br>
+<?php echo _("r: You SHOULD NOT use this option on outbound trunks")?><br>
-  </span></a>
-  <input type="text" size="2" name="TRUNK_OPTIONS" value="<?php  echo htmlspecialchars($TRUNK_OPTIONS)?>"/>
@@ -330 +330 @@
-var theForm = document.general;
-
+function hasRing (s) {
+  if (s.indexOf('r') >= 0) {
+    return true;
+  } else {
+    return false;
+  }
+}
+
+function warnConfirm (theField, s) {
+    theField.focus();
+    theField.select();
+    return confirm(s);
+}
+
-function general_onsubmit() {
-  var msgInvalidSeconds = "<?php echo _('Please enter a valid Number of Seconds'); ?>";
-  var msgInvalidDefaultFaxEmail = "<?php echo _('Please enter a valid Fax Email'); ?>";
+  var msgRingOptionOutboundTrunk = "<?php echo _('You have selected the \'r\' option for your trunks. This is highly discouraged and will create problems with calls on many PRI, VoIP, ISDN and other trunks that are capable of signalling. Asterisk will generate a ringing tone until the signalling indicates the line is answered. This will result in some external IVRs being inaccessible and other strange problems.'); ?>";
-
-  defaultEmptyOK = false;
@@ -346 +361 @@
-  if (!isEmail(theForm.FAX_RX_EMAIL.value))
-    return warnInvalid(theForm.FAX_RX_EMAIL, msgInvalidDefaultFaxEmail);
+
+  if (hasRing(theForm.TRUNK_OPTIONS.value))
+    return warnConfirm(theForm.TRUNK_OPTIONS, msgRingOptionOutboundTrunk);
-  
-  return true;