Show
Ignore:
Timestamp:
01/21/11 14:12:46 (2 years ago)
Author:
p_lindheimer
Message:

merge back functional changes from r10655 to 2.8 re #4591, needs testing

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • modules/branches/2.8/directory/agi-bin/directory.agi

    r10266 r11049  
    6767    //draw up variable of valid key presses 
    6868    $validkeys=''; 
    69     for($i=1;$i<$matches+1;$i++){$validkeys.=$i;} 
     69    for ($i=1; $i < $matches+1; $i++) { 
     70      $validkeys .= $i; 
     71    } 
    7072    debug("valid keys for entries are: $validkeys"); 
    7173     
     
    7375    $matches=$dir->search($search); 
    7476    foreach($matches as $idx => $match){ 
    75       $ret=$dir->getKeypress('for',$validkeys,0);if(trim($ret['result'])){break;} 
    76       $ret=$dir->readContact($matches[$idx],$validkeys,0);if(trim($ret['result'])){break;} 
    77       $ret=$dir->getKeypress('press',$validkeys,0);if(trim($ret['result'])){;break;} 
    78       $ret=$dir->agi->say_digits($idx+1,$validkeys);if(trim($ret['result'])){$ret['result']=chr($ret['result']);break;} 
     77      $ret = $dir->getKeypress('for',$validkeys,0); 
     78      if (trim($ret['result'])) { 
     79        break; 
     80      } 
     81      $ret = $dir->readContact($matches[$idx],$validkeys,0); 
     82      if (trim($ret['result'])) { 
     83        break; 
     84      } 
     85      $ret = $dir->getKeypress('press',$validkeys,0); 
     86      if (trim($ret['result'])) { 
     87        break; 
     88      } 
     89      $ret = $dir->agi->say_digits($idx+1,$validkeys); 
     90      if (trim($ret['result'])) { 
     91        $ret['result'] = chr($ret['result']); 
     92        break; 
     93      } 
    7994    } 
    80     debug("got result: ".$ret['result']); 
     95    //wait for a responce before restarting loop 
     96    $ret = $dir->agi->wait_for_digit(10000); 
     97    if (trim($ret['result'])) { 
     98      $ret['result'] = chr($ret['result']); 
     99    } 
     100     
     101    debug("got result: ".$ret['result']); 
    81102    if(trim($ret['result'])){ 
    82103      call($matches[$ret['result']-1]); 
    83104    } 
    84     $dir->agi->wait_for_digit(10000); 
    85105  }elseif($matches==1){ 
    86106    //call person $macthes[0];