Changeset 7843

Show
Ignore:
Timestamp:
06/20/09 11:12:40 (1 year ago)
Author:
p_lindheimer
Message:

added some sequences to group some of the settings, most important to get bindport prior to bindaddr as I think it may need to come before (at least for iax it does)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r7840 r7843  
    348348  // TODO: this is where I will build validation before saving 
    349349        // 
     350  $integer_msg = _("%s must be a non-negative integer"); 
    350351  foreach ($sip_settings as $key => $val) { 
    351352    switch ($key) { 
    352353      case 'bindaddr': 
    353354        $msg = _("Bind Address (bindaddr) must be an IP address."); 
    354         $save_settings[] = array($key,$db->escapeSimple($vd->is_ip($val,$key,$msg)),'0',NORMAL); 
     355        $save_settings[] = array($key,$db->escapeSimple($vd->is_ip($val,$key,$msg)),'2',NORMAL); 
    355356      break; 
    356357 
    357358      case 'bindport': 
    358359        $msg = _("Bind Port (bindport) must be between 1024..65535, default 5060"); 
    359         $save_settings[] = array($key,$db->escapeSimple($vd->is_ip_port($val, $key, $msg)),'0',NORMAL); 
     360        $save_settings[] = array($key,$db->escapeSimple($vd->is_ip_port($val, $key, $msg)),'1',NORMAL); 
    360361      break; 
    361362 
    …… 
    367368          $vd->log_error($val, $key, $msg); 
    368369        } 
    369         $msg = _("rtptimeout must be a non-negative interger"); 
    370         $save_settings[] = array($key,$db->escapeSimple($vd->is_int($val, $key, $msg)),'0',NORMAL); 
    371       break; 
    372  
    373       case 'externrefresh': 
     370        $msg = sprintf($integer_msg,$key); 
     371        $save_settings[] = array($key,$db->escapeSimple($vd->is_int($val, $key, $msg)),'10',NORMAL); 
     372      break; 
     373 
    374374      case 'rtptimeout': 
    375375      case 'rtpkeepalive': 
    …… 
    379379      case 'maxexpiry': 
    380380      case 'defaultexpiry': 
    381         $msg = sprintf(_("%s must be a non-negative interger"),$key); 
    382         $save_settings[] = array($key,$db->escapeSimple($vd->is_int($val,$key,$msg)),'0',NORMAL); 
     381        $msg = sprintf($integer_msg,$key); 
     382        $save_settings[] = array($key,$db->escapeSimple($vd->is_int($val,$key,$msg)),'10',NORMAL); 
    383383      break; 
    384384 
    385385      case 'maxcallbitrate': 
    386386      case 'registerattempts': 
    387       case 'jbmaxsize': 
    388       case 'jbresyncthreshold': 
    389         $msg = sprintf(_("%s must be a non-negative interger"),$key); 
    390         $save_settings[] = array($key,$db->escapeSimple($vd->is_int($val,$key,$msg)),'0',NORMAL); 
    391       break; 
     387        $msg = sprintf($integer_msg,$key); 
     388        $save_settings[] = array($key,$db->escapeSimple($vd->is_int($val,$key,$msg)),'10',NORMAL); 
     389      break; 
     390 
    392391 
    393392      case 'sip_language': 
    394393        $msg = sprintf(_("Language must be alphanumeric and installed"),$key); 
    395394        $save_settings[] = array($key,$db->escapeSimple($vd->is_alphanumeric($val,$key,$msg)),'0',NORMAL); 
     395      break; 
     396 
     397      case 'externrefresh': 
     398        $msg = sprintf($integer_msg,$key); 
     399        $save_settings[] = array($key,$db->escapeSimple($vd->is_int($val,$key,$msg)),'41',NORMAL); 
     400      break; 
     401 
     402      case 'nat': 
     403        $save_settings[] = array($key,$val,'39',NORMAL); 
    396404      break; 
    397405 
    …… 
    401409          $vd->log_error($val, $key, $msg); 
    402410         } 
    403         $save_settings[] = array($key,$val,'0',NORMAL); 
     411        $save_settings[] = array($key,$val,'40',NORMAL); 
    404412      break; 
    405413 
    …… 
    409417          $vd->log_error($val, $key, $msg); 
    410418         } 
    411         $save_settings[] = array($key,$val,'0',NORMAL); 
     419        $save_settings[] = array($key,$val,'40',NORMAL); 
     420      break; 
     421 
     422      case 'jbenable': 
     423        $save_settings[] = array($key,$val,'4',NORMAL); 
     424      break; 
     425 
     426      case 'jbforce': 
     427      case 'jpimpl': 
     428      case 'jblog': 
     429        $save_settings[] = array($key,$val,'5',NORMAL); 
     430      break; 
     431 
     432      case 'jbmaxsize': 
     433      case 'jbresyncthreshold': 
     434        $msg = sprintf($integer_msg,$key); 
     435        $save_settings[] = array($key,$db->escapeSimple($vd->is_int($val,$key,$msg)),'5',NORMAL); 
    412436      break; 
    413437 
    414438      case 'nat_mode': 
    415       case 'nat': 
    416439      case 'g726nonstandard': 
    417440      case 't38pt_udptl': 
    …… 
    420443      case 'notifyringing': 
    421444      case 'notifyhold': 
    422       case 'jbenable': 
    423       case 'jbforce': 
    424       case 'jpimpl': 
    425       case 'jblog': 
    426445      case 'allowguest': 
    427446      case 'srvlookup': 
    428         $save_settings[] = array($key,$val,'0',NORMAL); 
     447        $save_settings[] = array($key,$val,'10',NORMAL); 
    429448      break; 
    430449 
    …… 
    434453        $seq = substr($key,9); 
    435454        $msg = _("Localnet setting must be an IP address"); 
    436         $save_settings[] = array($key,$db->escapeSimple($vd->is_ip($val,$key,$msg)),$seq,NORMAL);  
     455        $save_settings[] = array($key,$db->escapeSimple($vd->is_ip($val,$key,$msg)),(42+$seq),NORMAL);  
    437456      } else if (substr($key,0,8) == "netmask_") { 
    438457        // ip validate this and store 
    …… 
    442461      } else if (substr($key,0,15) == "sip_custom_key_") { 
    443462        $seq = substr($key,15); 
    444         $save_settings[] = array($db->escapeSimple($val),$db->escapeSimple($sip_settings["sip_custom_val_$seq"]),$seq,CUSTOM);  
     463        $save_settings[] = array($db->escapeSimple($val),$db->escapeSimple($sip_settings["sip_custom_val_$seq"]),($seq),CUSTOM);  
    445464      } else if (substr($key,0,15) == "sip_custom_val_") { 
    446465        // skip it, we will seek it out when we see the sip_custom_key