Changeset 12270
- Timestamp:
- 06/26/11 07:35:00 (2 years ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
freepbx/trunk/amp_conf/htdocs/admin/libraries/components.class.php
r12269 r12270 675 675 $itemvalue = (isset($item['value']) ? $item['value'] : ''); 676 676 $itemtext = (isset($item['text']) ? $item['text'] : ''); 677 $itemselected = ( $currentvalue ===$itemvalue) ? ' selected' : '';677 $itemselected = ((string) $currentvalue == (string) $itemvalue) ? ' selected' : ''; 678 678 679 679 $output .= "\t\t\t\t<option value=\"$itemvalue\"$itemselected>$itemtext</option>\n"; … … 720 720 $itemvalue = (isset($item['value']) ? $item['value'] : ''); 721 721 $itemtext = (isset($item['text']) ? $item['text'] : ''); 722 $itemchecked = ( $currentvalue ===$itemvalue) ? ' checked=checked' : '';722 $itemchecked = ((string) $currentvalue == (string) $itemvalue) ? ' checked=checked' : ''; 723 723 724 724 $tabindex = guielement::gettabindex(); … … 733 733 734 734 class gui_drawselects extends guiinput { 735 function gui_drawselects($elemname, $index, $dest, $prompttext = '', $helptext = '', $canbeempty = true, $failvalidationmsg='', $nodest_msg='' ) {735 function gui_drawselects($elemname, $index, $dest, $prompttext = '', $helptext = '', $canbeempty = true, $failvalidationmsg='', $nodest_msg='', $required = true) { 736 736 global $currentcomponent; 737 737 $parent_class = get_parent_class($this); 738 if(!$canbeempty){ 739 $jsvalidation ='()'; 740 $jsvalidationtest ='!$("[name=goto'.$index.']").val()'; 741 if (!$failvalidationmsg) $failvalidationmsg = _('Please select a valid destination.'); 742 } 743 $jsvalidation = isset($jsvalidation) ? $jsvalidation : ''; 744 $jsvalidationtest = isset($jsvalidationtest) ? $jsvalidationtest : ''; 738 $jsvalidation = isset($jsvalidation) ? $jsvalidation : ''; 739 $jsvalidationtest = isset($jsvalidationtest) ? $jsvalidationtest : ''; 745 740 parent::$parent_class($elemname, '', $prompttext, $helptext, $jsvalidation, $failvalidationmsg, '', $jsvalidationtest); 746 741 747 $this->html_input=drawselects($dest, $index, false, false, $nodest_msg );742 $this->html_input=drawselects($dest, $index, false, false, $nodest_msg, $required); 748 743 749 744 //adttach a value to this element, so that we can find its value
