Changeset 7833

Timestamp:

06/20/09 09:26:09 (3 years ago)

Author:

p_lindheimer

Message:

added some validations, not done, need to create error div for display and test

Files:

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

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

@@ -29 +29 @@
-define('VIDEO_CODEC','2');
-define('CUSTOM','9');
+
+class sipsettings_validate {
+  var $errors = array();
+
+  /* checks if value is an integer */
+  function is_int($value, $item, $message) {
+    $value = trim($value);
+    if ($value != '' && !ctype_digit($value) || $value < 0) {
+      $this->errors[] = array('id' => $item, 'value' => $value, 'message' => $message);
+    }
+    return $value;
+  }
+
+  /* checks if value is valid port between 1024 - 6 65535 */
+  function is_ip_port($value, $item, $message) {
+    $value = trim($value);
+    if ($value != '' && ($value < 1024 || $value > 65535)) {
+      $this->errors[] = array('id' => $item, 'value' => $value, 'message' => $message);
+    }
+    return $value;
+  }
+
+  /* checks if value is valid ip format */
+  function is_ip($value, $item, $message) {
+    $value = trim($value);
+    if ($value != '' && !preg_match('|^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$|',$value,$matches)) {
+      $this->errors[] = array('id' => $item, 'value' => $value, 'message' => $message);
+    }
+    return $value;
+  }
+
+  /* checks if value is valid ip netmask format */
+  function is_netmask($value, $item, $message) {
+    $value = trim($value);
+    if ($value != '' && !(preg_match('|^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$|',$value,$matches) || ($value >= 0 && $value <= 24))) {
+      $this->errors[] = array('id' => $item, 'value' => $value, 'message' => $message);
+    }
+    return $value;
+  }
+
+  /* checks if value is valid alpha numeric format */
+  function is_alphanumeric($value, $item, $message) {
+    $value = trim($value);
+    if ($value != '' && !preg_match("/^\s*([a-zA-Z0-9 .&-@=_!<>!\"\']+)\s*$/",$value,$matches)) {
+      $this->errors[] = array('id' => $item, 'value' => $value, 'message' => $message);
+    }
+    return $value;
+  }
+
+  /* trigger a validation error to be appended to this class */
+  function log_error($value, $item, $message) {
+    $this->errors[] = array('id' => $item, 'value' => $value, 'message' => $message);
+    return $value;
+  }
+}
-
-function sipsettings_hookGet_config($engine) {
@@ -261 +316 @@
-  global $db;
-  $save_settings = array();
+  $vd = new  sipsettings_validate();
-
-  $codecs = $sip_settings['codecs'];
@@ -272 +328 @@
-    switch ($key) {
-      case 'bindaddr':
-// ip validate this and store
-al
+$msg = _("Bind Address (bindaddr) must be a properly formated IP address.");
+d->is_ip($val,$key,$msg)
-      break;
-
-      case 'bindport':
-// validate-ip-port
-al
+$msg = _("Bind Port (bindport) must be a proper IP port between 1024 and 65536 inclusive, typically 5060.");
+d->is_ip_port($val, $key, $msg)
-      break;
-
-      case 'rtpholdtimeout':
-        // validation: must be > $sip_settings['rtptimeout'] (and of course a proper number)
-
+
+
+
+
+
+
+
-      break;
-
-      case 'externrefresh':
-      case 'maxcallbitrate':
-      case 'rtptimeout':
-      case 'rtpkeepalive':
-      case 'checkmwi':
-      case 'registertimeout':
-      case 'registerattempts':
-      case 'minexpiry':
-      case 'maxexpiry':
-      case 'defaultexpiry':
+        $msg = sprintf(_("The Asterisk setting: %s must be a non-negative interger value in seconds."),$key);
+        $save_settings[] = array($key,$db->escapeSimple($vd->is_int($val,$key,$msg)),'0',NORMAL);
+      break;
+
+      case 'maxcallbitrate':
+      case 'registerattempts':
-      case 'jbmaxsize':
-      case 'jbresyncthreshold':
-// validate-int:
-al
+$msg = sprintf(_("The Asterisk setting: %s must be a non-negative interger value."),$key);
+d->is_int($val,$key,$msg)
-      break;
-
-      case 'sip_language':
-// validate-alphanumeric
-al
+$msg = sprintf(_("The language value must be alphanumeric and should be a supported and installed language."),$key);
+d->is_alphanumeric($val,$key,$msg)
-      break;
-
@@ -330 +396 @@
-        // ip validate this and store
-        $seq = substr($key,9);
-
+
+
-      } else if (substr($key,0,8) == "netmask_") {
-        // ip validate this and store
-        $seq = substr($key,8);
-
+
+
-      } else if (substr($key,0,15) == "sip_custom_key_") {
-        $seq = substr($key,15);
@@ -345 +413 @@
-    }
-  }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-

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

@@ -20 +20 @@
-
-  /* Determines how many columns per row for the codecs and formats the table */
-
-
-
-
+
+
+
+
+
-
-  $action                            = isset($_POST['action'])?$_POST['action']:'';
@@ -35 +36 @@
-  $p_idx = 0;
-  $n_idx = 0;
--
--
--
--
+_
+_
+_
+_
-      $n_idx++;
-    } 
@@ -112 +113 @@
-  $p_idx = 0;
-  $n_idx = 0;
--custom-key-
--custom-key-
--custom-key-
--custom-val-
+_custom_key_
+_custom_key_
+_custom_key_
+_custom_val_
-      $n_idx++;
-    } 
@@ -124 +125 @@
-  case "edit":  //just delete and re-add
-    if (($errors = sipsettings_edit($sip_settings)) !== true) {
-sippsettings_
+$error_displays = 
-    } else {
-      needreload();
@@ -131 +132 @@
-  break;
-  default:
+    /* only get them if first time load, if they pressed submit, use values from POST */
-    $sip_settings = sipsettings_get();
-}
@@ -140 +142 @@
-  <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['message']."</p>";
+    }
+?>
+    </div>
+<?php
+  }
-
-  /* We massaged these above or they came from sipsettings_get() if this is not
@@ -232 +245 @@
-    </td>
-    <td>
--0" name="localnet-
--0" name="netmask-
+_0" name="localnet_
+_0" name="netmask_
-    </td>
-  </tr>
@@ -249 +262 @@
-    </td>
-    <td>
--$idx" name="localnet-
+_$idx" name="localnet_
-END;
-      $tabindex++;
-      echo <<< END
--$idx" name="netmask-
+_$idx" name="netmask_
-    </td>
-  </tr>
@@ -712 +725 @@
-    </td>
-    <td>
--custom-key-0" name="sip-custom-key-
--custom-val-0" name="sip-custom-val-
+_custom_key_0" name="sip_custom_key_
+_custom_val_0" name="sip_custom_val_
-    </td>
-  </tr>
@@ -729 +742 @@
-    </td>
-    <td>
--custom-key-$idx" name="sip-custom-key-
+_custom_key_$idx" name="sip_custom_key_
-END;
-      $tabindex++;
-      echo <<< END
--custom-val-$idx" name="sip-custom-val-
+_custom_val_$idx" name="sip_custom_val_
-    </td>
-  </tr>
@@ -777 +790 @@
-          $.each(data.localnet, function(loc,mask){
-            if (cnt < fields) {
--
--
+_
+_
-            } else {
-              addLocalnet(loc,mask);
@@ -846 +859 @@
-    $(".jitter-buffer").hide();
-  });
+<?php
+  /* this will insert the addClass jquery calls to all id's in error */
+  if (!empty($error_displays)) {
+    foreach ($error_displays as $js_disp) {
+      echo "  ".$js_disp['js'];
+    }
+  }
+?>
-});
-
@@ -854 +875 @@
-  var idx = $(".localnet").size();
-  var idxp = idx - 1;
--
+_
-  var tabindexp = tabindex + 1;
-
@@ -862 +883 @@
-    </td>\
-    <td>\
--'+idx+'" name="localnet-
--'+idx+'" name="netmask-
+_'+idx+'" name="localnet_
+_'+idx+'" name="netmask_
-    </td>\
-  </tr>\
@@ -873 +894 @@
-  var idx = $(".sip-custom").size();
-  var idxp = idx - 1;
--custom-val-
+_custom_val_
-  var tabindexp = tabindex + 1;
-
@@ -881 +902 @@
-    </td>\
-    <td>\
--custom-key-'+idx+'" name="sip-custom-key-
--custom-val-'+idx+'" name="sip-custom-val-
+_custom_key_'+idx+'" name="sip_custom_key_
+_custom_val_'+idx+'" name="sip_custom_val_
-    </td>\
-  </tr>\
@@ -951 +972 @@
-<?php   
-    
-
-
+
+
+
+
+
+
+
+
-}
-?>