Changeset 7837

Show
Ignore:
Timestamp:
06/20/09 09:44:27 (1 year ago)
Author:
p_lindheimer
Message:

changed some defaults and verbiage

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r7836 r7837  
    258258 
    259259  $sip_settings['checkmwi']          = ''; 
    260   $sip_settings['notifyringing']     = 'no'; 
    261   $sip_settings['notifyhold']        = 'no'; 
     260  $sip_settings['notifyringing']     = 'yes'; 
     261  $sip_settings['notifyhold']        = 'yes'; 
    262262 
    263263  $sip_settings['registertimeout']   = '20'; 
    …… 
    275275 
    276276  $sip_settings['sip_language']      = ''; 
    277   $sip_settings['context']           = 'from-sip-external'; 
    278   $sip_settings['bindaddr']          = '0.0.0.0'; 
    279   $sip_settings['bindport']          = '5060'; 
     277  $sip_settings['context']           = ''; 
     278  $sip_settings['bindaddr']          = ''; 
     279  $sip_settings['bindport']          = ''; 
    280280  $sip_settings['allowguest']        = 'yes'; 
    281281  $sip_settings['srvlookup']         = 'no'; 
    …… 
    373373      break; 
    374374 
     375      case 'externip_val': 
     376        if (trim($val) == '' && $sip_settings['nat_mode'] == 'externip') { 
     377          $msg = _("External IP can not be blank"); 
     378          $vd->log_error($val, $key, $msg); 
     379         } 
     380        $save_settings[] = array($key,$val,'0',NORMAL); 
     381      break; 
     382 
     383      case 'externhost_val': 
     384        if (trim($val) == '' && $sip_settings['nat_mode'] == 'externhost') { 
     385          $msg = _("Dynamic Host can not be blank"); 
     386          $vd->log_error($val, $key, $msg); 
     387         } 
     388        $save_settings[] = array($key,$val,'0',NORMAL); 
     389      break; 
     390 
     391      case 'nat_mode': 
    375392      case 'nat': 
    376       case 'nat_mode': 
    377       case 'externip_val': 
    378       case 'externhost_val': 
    379393      case 'g726nonstandard': 
    380394      case 't38pt_udptl': 

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

    r7836 r7837  
    8888 
    8989  $sip_settings['checkmwi']          = isset($_POST['checkmwi']) ? htmlspecialchars($_POST['checkmwi']) : ''; 
    90   $sip_settings['notifyringing']     = isset($_POST['notifyringing']) ? $_POST['notifyringing'] : 'no'; 
    91   $sip_settings['notifyhold']        = isset($_POST['notifyhold']) ? $_POST['notifyhold'] : 'no'; 
     90  $sip_settings['notifyringing']     = isset($_POST['notifyringing']) ? $_POST['notifyringing'] : 'yes'; 
     91  $sip_settings['notifyhold']        = isset($_POST['notifyhold']) ? $_POST['notifyhold'] : 'yes'; 
    9292 
    9393  $sip_settings['registertimeout']   = isset($_POST['registertimeout']) ? htmlspecialchars($_POST['registertimeout']) : '20'; 
    …… 
    105105 
    106106  $sip_settings['sip_language']      = isset($_POST['sip-language']) ? htmlspecialchars($_POST['sip-language']) : ''; 
    107   $sip_settings['context']           = isset($_POST['context']) ? htmlspecialchars($_POST['context']) : 'from-sip-external'; 
    108   $sip_settings['bindaddr']          = isset($_POST['bindaddr']) ? htmlspecialchars($_POST['bindaddr']) : '0.0.0.0'; 
    109   $sip_settings['bindport']          = isset($_POST['bindport']) ? htmlspecialchars($_POST['bindport']) : '5060'; 
     107  $sip_settings['context']           = isset($_POST['context']) ? htmlspecialchars($_POST['context']) : ''; 
     108  $sip_settings['bindaddr']          = isset($_POST['bindaddr']) ? htmlspecialchars($_POST['bindaddr']) : ''; 
     109  $sip_settings['bindport']          = isset($_POST['bindport']) ? htmlspecialchars($_POST['bindport']) : ''; 
    110110  $sip_settings['allowguest']        = isset($_POST['allowguest']) ? $_POST['allowguest'] : 'yes'; 
    111111  $sip_settings['srvlookup']         = isset($_POST['srvlookup']) ? $_POST['srvlookup'] : 'no'; 
    …… 
    532532  <tr> 
    533533    <td> 
    534       <a href="#" class="info"><?php echo _("Registration Attempts")?><span><?php echo _("Asterisk: registertimeout. Retry registration attempts every registertimeout seconds until successful or until registrationattempts tries have been made.<br /> Asterisk: registrationattempts. Number of times to try and register before giving up. A value of 0 means keep trying forever. Normally this should be set to 0 so that Asterisk will continue to register until successful in the case of network or gateway outagages.")?></span></a> 
     534      <a href="#" class="info"><?php echo _("Registrations")?><span><?php echo _("Asterisk: registertimeout. Retry registration attempts every registertimeout seconds until successful or until registrationattempts tries have been made.<br /> Asterisk: registrationattempts. Number of times to try and register before giving up. A value of 0 means keep trying forever. Normally this should be set to 0 so that Asterisk will continue to register until successful in the case of network or gateway outagages.")?></span></a> 
    535535    </td> 
    536536    <td> 
    …… 
    662662  <tr> 
    663663    <td> 
    664       <a href="#" class="info"><?php echo _("Default Context")?><span><?php echo _("Asterisk: context. Default context for incoming calls if not specified. FreePBX sets this to from-sip-extenral which is used in conjunction with the Allow Anonymous SIP calls. If you change this you will effect that behavior.")?></span></a> 
     664      <a href="#" class="info"><?php echo _("Default Context")?><span><?php echo _("Asterisk: context. Default context for incoming calls if not specified. FreePBX sets this to from-sip-extenral which is used in conjunction with the Allow Anonymous SIP calls. If you change this you will effect that behavior. It is recommended to leave this blank.")?></span></a> 
    665665    </td> 
    666666    <td> 
    …… 
    671671  <tr> 
    672672    <td> 
    673       <a href="#" class="info"><?php echo _("Bind Address")?><span><?php echo _("Asterisk: bindaddr. The IP adderss to bind to and listen for calls on the Bind Port. If set to 0.0.0.0 Asterisk will listen on all addresses.")?></span></a> 
     673      <a href="#" class="info"><?php echo _("Bind Address")?><span><?php echo _("Asterisk: bindaddr. The IP adderss to bind to and listen for calls on the Bind Port. If set to 0.0.0.0 Asterisk will listen on all addresses. It is recommended to leave this blank.")?></span></a> 
    674674    </td> 
    675675    <td> 
    …… 
    680680  <tr> 
    681681    <td> 
    682       <a href="#" class="info"><?php echo _("Bind Port")?><span><?php echo _("Asterisk: bindport. Local incoming UDP Port that Asterisk will bind to and listen for SIP messages. The SIP standard is 5060 and in most cases this is what you want.")?></span></a> 
     682      <a href="#" class="info"><?php echo _("Bind Port")?><span><?php echo _("Asterisk: bindport. Local incoming UDP Port that Asterisk will bind to and listen for SIP messages. The SIP standard is 5060 and in most cases this is what you want. It is recommended to leave this blank.")?></span></a> 
    683683    </td> 
    684684    <td>