Changeset 13956

Show
Ignore:
Timestamp:
04/10/12 10:44:57 (1 year ago)
Author:
mbrevda
Message:

upstream bug fixes, restart updates for asterisk 1.8

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.10/directory/agi-bin/directory.agi

    r13467 r13956  
    5555    } 
    5656    $press=$dir->getKeypress($compound, $validdigits, 3000); 
    57     if(!empty($press['result']) || $press==0){ 
     57    if(!empty($press['result']) || $press === 0){ 
    5858      $search.=$press['result']; 
    5959      $matches=$dir->search($search,1); 

  • modules/branches/2.10/directory/agi-bin/directory.lib.php

    r13467 r13956  
    297297    dbug("User pressed zero, passing back recording of {$this->dir['invalid_recording']}"); 
    298298    $this->agi->set_variable('DIR_INVALID_RECORDING',$this->dir['invalid_recording']); 
    299     if($this->agi_get_var('IVR_CONTEXT')){ 
     299    if($this->agi->retivr == 'true' && $this->agi_get_var('IVR_CONTEXT')){ 
    300300      $this->agi->set_extension('retivr'); 
    301301    }else{ 

  • modules/branches/2.10/directory/functions.inc.php

    r13160 r13956  
    182182          $ext->add($c, $row['id'], '', new ext_answer('')); 
    183183          $ext->add($c, $row['id'], '', new ext_wait('1')); 
    184           $ext->add($c, $row['id'], '', new ext_agi('directory.agi,dir=' . $row['id'] . ',keypress=${keypress}')); 
     184          $ext->add($c, $row['id'], '', new ext_agi('directory.agi,dir=' . $row['id']  
     185                      . ',keypress=' . $keypress 
     186                      . ',retivr=' . ($row['retivr'] ? 'true' : 'false')  
     187                      )); 
    185188          if ($row['say_extension']) { 
    186189            $ext->add($c, $row['id'], '', new ext_playback('pls-hold-while-try&to-extension')); 

  • modules/branches/2.10/fax/functions.inc.php

    r13919 r13956  
    424424   
    425425  //if were editing, get save parms. Get parms 
    426   if ($type != 'setup'){ 
    427     if(!$extension && !$cidnum){//set $extension,$cidnum if we dont already have them 
    428       if ($extdisplay) { 
    429         $opts=explode('/', $extdisplay); 
    430         $extension=$opts['0']; 
    431         $cidnum=$opts['1']; 
    432       } else { 
    433         $extension = $cidnum = ''; 
    434       } 
    435        
    436     } 
    437     $fax=fax_get_incoming($extension,$cidnum); 
    438   }else{ 
    439     $fax=null; 
    440   } 
     426 
     427  if(!$extension && !$cidnum){//set $extension,$cidnum if we dont already have them 
     428    if ($extdisplay) { 
     429      $opts=explode('/', $extdisplay); 
     430      $extension=$opts['0']; 
     431      $cidnum=$opts['1']; 
     432    } else { 
     433      $extension = $cidnum = ''; 
     434    } 
     435     
     436  } 
     437 
     438  $fax=fax_get_incoming($extension,$cidnum); 
    441439  $html=''; 
    442440  if($target_menuid == 'did'){ 

  • modules/branches/2.10/restart/functions.inc.php

    r13091 r13956  
    2222    case "asterisk": 
    2323      if (isset($core_conf) && is_a($core_conf, "core_conf")) { 
    24       $core_conf->addSipNotify('polycom-check-cfg',array('Event' => 'check-sync','Content-Length' => '0')); 
    25       $core_conf->addSipNotify('sipura-check-cfg',array('Event' => 'resync','Content-Length' => '0')); 
    26       $core_conf->addSipNotify('grandstream-check-cfg',array('Event' => 'sys-control')); 
    27       $core_conf->addSipNotify('cisco-check-cfg',array('Event' => 'check-sync','Content-Length' => '0')); 
    28       $core_conf->addSipNotify('reboot-snom',array('Event' => 'reboot','Content-Length' => '0')); 
    29       $core_conf->addSipNotify('aastra-check-cfg',array('Event' => 'check-sync','Content-Length' => '0')); 
    30       $core_conf->addSipNotify('aastra-xml',array('Event' => 'aastra-xml','Content-Length' => '0')); 
    31       $core_conf->addSipNotify('reboot-yealink',array('Event' => 'check-sync\;reboot=true','Content-Length' => '0')); 
     24                        $core_conf->addSipNotify('polycom-check-cfg',array('Event' => 'check-sync')); 
     25                        $core_conf->addSipNotify('sipura-check-cfg',array('Event' => 'resync')); 
     26                        $core_conf->addSipNotify('grandstream-check-cfg',array('Event' => 'sys-control')); 
     27                        $core_conf->addSipNotify('cisco-check-cfg',array('Event' => 'check-sync')); 
     28                        $core_conf->addSipNotify('reboot-snom',array('Event' => 'reboot')); 
     29                        $core_conf->addSipNotify('aastra-check-cfg',array('Event' => 'check-sync')); 
     30                        $core_conf->addSipNotify('aastra-xml',array('Event' => 'aastra-xml')); 
     31                        $core_conf->addSipNotify('spa-reboot',array('Event' => 'reboot')); 
     32                        $core_conf->addSipNotify('linksys-cold-restart',array('Event' => 'reboot_now')); 
     33                        $core_conf->addSipNotify('linksys-warm-restart',array('Event' => 'restart_now')); 
     34                        $core_conf->addSipNotify('reboot-yealink',array('Event' => 'check-sync\;reboot=true')); 
     35 
    3236        } 
    3337