Changeset 7836

Timestamp:

06/20/09 11:09:39 (3 years ago)

Author:

p_lindheimer

Message:

make validation messages less verbose, add display of error box and new styling

Files:

• modules/branches/2.6/sipsettings/functions.inc.php (modified) (5 diffs)
• modules/branches/2.6/sipsettings/page.sipsettings.php (modified) (4 diffs)
• modules/branches/2.6/sipsettings/sipsettings.css (added)

modules/branches/2.6/sipsettings/functions.inc.php

@@ -328 +328 @@
-    switch ($key) {
-      case 'bindaddr':
- properly formatted
+n
-        $save_settings[] = array($key,$db->escapeSimple($vd->is_ip($val,$key,$msg)),'0',NORMAL);
-      break;
-
-      case 'bindport':
-a proper IP port from 1024 to 65535, typically 5060.
+between 1024..65535, default 5060
-        $save_settings[] = array($key,$db->escapeSimple($vd->is_ip_port($val, $key, $msg)),'0',NORMAL);
-      break;
@@ -341 +341 @@
-        //$vd->log_error();
-        if ($val < $sip_settings['rtptimeout']) {
-The rtpholdtimeout must be bigger than the
+rtpholdtimeout must be higher than
-          $vd->log_error($val, $key, $msg);
-        }
-The rtptimeout settng must be a non-negative interger value of seconds
+rtptimeout must be a non-negative interger
-        $save_settings[] = array($key,$db->escapeSimple($vd->is_int($val, $key, $msg)),'0',NORMAL);
-      break;
@@ -356 +356 @@
-      case 'maxexpiry':
-      case 'defaultexpiry':
-The Asterisk setting: %s must be a non-negative interger value in seconds.
+%s must be a non-negative interger
-        $save_settings[] = array($key,$db->escapeSimple($vd->is_int($val,$key,$msg)),'0',NORMAL);
-      break;
@@ -364 +364 @@
-      case 'jbmaxsize':
-      case 'jbresyncthreshold':
-The Asterisk setting: %s must be a non-negative interger value.
+%s must be a non-negative interger
-        $save_settings[] = array($key,$db->escapeSimple($vd->is_int($val,$key,$msg)),'0',NORMAL);
-      break;
-
-      case 'sip_language':
-The language value must be alphanumeric and should be a supported and installed language.
+Language must be alphanumeric and installed
-        $save_settings[] = array($key,$db->escapeSimple($vd->is_alphanumeric($val,$key,$msg)),'0',NORMAL);
-      break;
@@ -396 +396 @@
-        // ip validate this and store
-        $seq = substr($key,9);
- valid IP address format.
+n IP address
-        $save_settings[] = array($key,$db->escapeSimple($vd->is_ip($val,$key,$msg)),$seq,NORMAL); 
-      } else if (substr($key,0,8) == "netmask_") {
-        // ip validate this and store
-        $seq = substr($key,8);
-mask must be in a proper netmask format such as 255.255.255.0 or 24.
+netmask must be formated properly (e.g. 255.255.255.0 or 24)
-        $save_settings[] = array($key,$db->escapeSimple($vd->is_netmask($val,$key,$msg)),$seq,NORMAL); 
-      } else if (substr($key,0,15) == "sip_custom_key_") {

modules/branches/2.6/sipsettings/page.sipsettings.php

@@ -138 +138 @@
-
-</div>
-
-<div class="content">
-  <h2><?php echo _("Edit Settings"); ?></h2>
+
-<?php
-  if (!empty($error_displays)) {
-?>
-    <div class="sip-errors">
-<?php
-    foreach ($error_displays as $div_disp) {
-      echo "<p>".$div_disp['div']."</p>";
-    }
-?>
-    </div>
-<?php
-  }
-
-  /* We massaged these above or they came from sipsettings_get() if this is not
@@ -167 +156 @@
-
-?>
- onsubmit="return checkConf();"
+
-  <input type="hidden" name="action" value="edit">
-  <table width="570px">
+
+<?php
+  /* if there were erros on the submit then create error box */
+  if (!empty($error_displays)) {
+?>
+  <tr>
+    <td colspan="2">
+      <div class="sip-errors">
+        <p><?php echo _("ERRORS") ?></p>
+        <ul>
+<?php
+    foreach ($error_displays as $div_disp) {
+      echo "<li>".$div_disp['div']."</li>";
+    }
+?>
+        </ul>
+      </div>
+    </td>
+  </tr>
+<?php
+  }
+?>
-
-  <tr>
@@ -281 +292 @@
-    <td><br \>
-      <input type="button" id="nat-auto-configure"  value="<?php echo _("Auto Configure")?>" class="nat-settings" />
-
+ Field
-    </td>
-  </tr>
@@ -909 +920 @@
-  ');
-}
-
-/* TODO: All The ERROR Checking client side */
-
-/* Validation classes: (blanks all ok)
-  *
-  * validate-int
-  * is integer only, can be 0
-  *
-  * validate-ip
-  * is proper ip format: \d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}
-  *
-  * validate-ip-port
-  * warning if is integer between 0-1023 TODO: or do we just error this out?
-  * error if not integer or > 65535
-  *
-  * validate-netmask
-  * is integer 8-24 or is proper ip format 255\.\d{1,3}\.\d{1,3}\.\d{1,3}
-  *
-  * validate-alphanumeric
-  * valid alphanumerics that asterisk is ok with (probably no punctuations)
-  *
- */
-function checkConf()
-{
-
-  /*
-     TODO: look at jquery validate and/or finish below
-
-  $('validation-error').removeClass('validation-error');
-
-  $('validate-int').each(function(){
-    // regex this.value for integer
-    if (!is_integer(this.value)) {
-      $('#'+this.id).addClass('validation-error');
-    }
-  });
-  $('validate-ip').each(function(){
-    // regex this.value for ip
-    $('#'+this.id).addClass('validation-error');
-  });
-  $('validate-ip-port').each(function(){
-    // number 1024 <= this.value < 65536
-    $('#'+this.id).addClass('validation-error');
-  });
-  $('validate-netmask').each(function(){
-    // number 8 <= this.value <= 24
-    // or regex ip format 255\.\d{1,3}\.\d{1,3}\.\d{1,3}
-    $('#'+this.id).addClass('validation-error');
-  });
-  $('validate-alphanumeric').each(function(){
-    // regex this.value for alphanumeric
-    $('#'+this.id).addClass('validation-error');
-  });
-   */
-
-  return true;
-}
-
-
-//-->
-</script>
-</form>
-<?php   
-
+
+
+
-function process_errors($errors) {
-  foreach($errors as $error) {