Changeset 12218 for modules

Show
Ignore:
Timestamp:
06/06/11 11:16:19 (2 years ago)
Author:
mbrevda
Message:

unervert the unrevert re #5127, #5054, #5049, #5140, #5142

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.9/directory

    • Property lastpublish changed from 12216 to 12031

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

    r12215 r12218  
    9999        break; 
    100100      } 
    101     } 
     101           
     102    } 
     103 
    102104    //wait for a responce before restarting loop 
    103     if (!isset($ret) || !$ret) { 
     105    if (!isset($ret) || !$ret || $ret['result'] == '0') { 
    104106      $ret = $dir->agi->wait_for_digit(10000); 
    105107      if (trim($ret['result'])) { 
    …… 
    108110    }  
    109111 
    110  
    111     debug("got result: ".$ret['result']); 
    112112    if(trim($ret['result'])){ 
    113113      call($matches[$ret['result']-1]); 
    …… 
    136136  if($dir->dir['callid_prefix'] != ''){ 
    137137    $callid_name = $dir->agi->get_variable('CALLERID(name)'); 
    138     $dir->agi->set_variable('CALLERID(name)',$dir->dir['callid_prefix'].$callid_name); 
     138    $dir->agi->set_variable('CALLERID(name)',$dir->dir['callid_prefix'].$callid_name['data']); 
    139139  } 
    140140  $dir->agi->set_variable('DIR_DIAL',$contact['dial']); 

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

    r12215 r12218  
    22 
    33function directory_configpageload() { 
    4   global $currentcomponent,$display; 
     4  global $currentcomponent, $display; 
    55  if ($display == 'directory' && (isset($_REQUEST['action']) && $_REQUEST['action']=='add'|| isset($_REQUEST['id']) && $_REQUEST['id']!='')) {  
    66    if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'add') { 
    …… 
    2929    } else { 
    3030      $dir        = directory_get_dir_details($_REQUEST['id']); 
    31  
    3231      $label        = sprintf(_("Edit Directory: %s"), $dir['dirname'] ? $dir['dirname'] : 'ID '.$dir['id']); 
    3332      $def_dir = directory_get_default_dir(); 
    …… 
    5150    //delete link, dont show if we dont have an id (i.e. directory wasnt created yet) 
    5251    $gen_section = _('Directory General Options'); 
    53     $currentcomponent->addguielem($gen_section, new gui_textbox('dirname', $dir['dirname'], _('Directory Name'), _('Name of this directory.'))); 
    54     $currentcomponent->addguielem($gen_section, new gui_textbox('description', $dir['description'], _('Directory Description'), _('Description of this directory.'))); 
    55     $currentcomponent->addguielem($gen_section, new gui_textbox('callid_prefix', $dir['callid_prefix'], _('CallerID Name Prefix'), _('Prefix to be appended to current CallerID Name.'))); 
    56     $currentcomponent->addguielem($gen_section, new gui_textbox('alert_info', $dir['alert_info'], _('Alert Info'), _('ALERT_INFO to be sent when called from this Directory. Can be used for distinctive ring for SIP devices.'))); 
     52    $currentcomponent->addguielem($gen_section, new gui_textbox('dirname', stripslashes($dir['dirname']), _('Directory Name'), _('Name of this directory.'))); 
     53    $currentcomponent->addguielem($gen_section, new gui_textbox('description', stripslashes($dir['description']), _('Directory Description'), _('Description of this directory.'))); 
     54    $currentcomponent->addguielem($gen_section, new gui_textbox('callid_prefix', stripslashes($dir['callid_prefix']), _('CallerID Name Prefix'), _('Prefix to be appended to current CallerID Name.'))); 
     55    $currentcomponent->addguielem($gen_section, new gui_textbox('alert_info', stripslashes($dir['alert_info']), _('Alert Info'), _('ALERT_INFO to be sent when called from this Directory. Can be used for distinctive ring for SIP devices.'))); 
    5756     
    5857    $section = _('Directory Options (DTMF)'); 
    …… 
    267266 
    268267  //TODO: could this cause a problem with the '|' separator if a name has a '|' in it? (probably not check for comment where parsed 
    269   // 
    270   foreach(core_users_list() as $user){ 
     268  foreach((array) core_users_list() as $user){ 
    271269    $newuser .= '<option value="'.$user[0].'|'.$user[1].'">('.$user[0].') '.$user[1]."</option>\n"; 
    272270  } 

  • modules/branches/2.9/directory/module.xml

    r12217 r12218  
    33  <repo>standard</repo> 
    44  <name>Directory</name> 
    5   <version>2.9.0.8</version> 
     5  <version>2.9.0.9</version> 
    66  <publisher>Schmoozecom.com</publisher> 
    77  <license>GPLv2+</license> 
    …… 
    1616  </depends> 
    1717  <changelog> 
    18   *2.9.0.8* #5127, #5054, #5049, #5140, #5142 
     18  *2.9.0.9* #5127, #5054, #5049, #5140, #5142 
    1919  *2.9.0.7* #5088 
    2020  *2.9.0.6* #4973, #4974 
    …… 
    4141  *2.8.0.0alpha0.2* Initial release 
    4242  </changelog> 
    43   <location>release/2.9/directory-2.9.0.8.tgz</location> 
    44   <md5sum>96a73f74b11133b37e5908aaf1f9b11f</md5sum> 
     43  <location>release/2.9/directory-2.9.0.7.tgz</location> 
     44  <md5sum>ae8ccc441fd78cf63f9b992e02691155</md5sum> 
    4545</module>