Changeset 12212
- Timestamp:
- 06/06/11 09:11:58 (2 years ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
freepbx/trunk/amp_conf/htdocs/admin/libraries/components.class.php
r12167 r12212 607 607 $tabindex = guielement::gettabindex(); 608 608 $disable_state = $disable ? 'disabled="true"':''; 609 $this->html_input = "<input type=\"text\" name=\"$this->_elemname\" id=\"$this->_elemname\" size=\"35\" $disable_state $maxlength tabindex= $tabindexvalue=\"" . htmlentities($this->currentvalue) . "\">";609 $this->html_input = "<input type=\"text\" name=\"$this->_elemname\" id=\"$this->_elemname\" size=\"35\" $disable_state $maxlength tabindex=\"$tabindex\" value=\"" . htmlentities($this->currentvalue) . "\">"; 610 610 } 611 611 } modules/branches/2.10/directory/functions.inc.php
r11829 r12212 2 2 3 3 function directory_configpageload() { 4 global $currentcomponent, $display;4 global $currentcomponent, $display; 5 5 if ($display == 'directory' && (isset($_REQUEST['action']) && $_REQUEST['action']=='add'|| isset($_REQUEST['id']) && $_REQUEST['id']!='')) { 6 6 if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'add') { … … 29 29 } else { 30 30 $dir = directory_get_dir_details($_REQUEST['id']); 31 32 31 $label = sprintf(_("Edit Directory: %s"), $dir['dirname'] ? $dir['dirname'] : 'ID '.$dir['id']); 33 32 $def_dir = directory_get_default_dir(); … … 51 50 //delete link, dont show if we dont have an id (i.e. directory wasnt created yet) 52 51 $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.'))); 57 56 58 57 $section = _('Directory Options (DTMF)'); … … 267 266 268 267 //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){ 271 269 $newuser .= '<option value="'.$user[0].'|'.$user[1].'">('.$user[0].') '.$user[1]."</option>\n"; 272 270 }
