Show
Ignore:
Timestamp:
06/06/11 09:11:58 (2 years ago)
Author:
mbrevda
Message:

closes #5140 - remove slashes before showing excaped fileds

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r11829 r12212  
    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  }