[Phpgroupware-cvs] CVS: sitemgr/inc class.module.inc.php,1.6,1.7

[Michael Totschnig <address@hidden>]

Update of /cvsroot/phpgroupware/sitemgr/inc
In directory subversions:/tmp/cvs-serv13998

Modified Files:
        class.module.inc.php 
Log Message:
add support for multiple choices in select boxes


Index: class.module.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.module.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.module.inc.php        4 Mar 2003 17:26:43 -0000       1.6
--- class.module.inc.php        10 Mar 2003 06:31:55 -0000      1.7
***************
*** 240,250 ****
        }
  
!       function build_input_element($input,$default,$elementname)
        {
                $trans = array('{' => '{', '}' => '}');
!               if ($default)
                {
                        $default = 
strtr($GLOBALS['phpgw']->strip_html($default),$trans);
                }
                $paramstring = '';
                while (list($param,$value) = @each($input['params']))
--- 240,268 ----
        }
  
!       //this function strips html and curly braces from the default values of 
the input elements
!       //the former is necessary for valid input forms, the latter would hurt 
phpgw's template
!       function escape_default(&$default)
        {
                $trans = array('{' => '{', '}' => '}');
!               if (is_array($default))
!               {
!                       reset($default);
!                       while (list($key,$val) = each($default))
!                       {
!                               $this->escape_default($data[$key]);
!                       }
!               }
!               else
                {
                        $default = 
strtr($GLOBALS['phpgw']->strip_html($default),$trans);
                }
+       }
+ 
+       function build_input_element($input,$default,$elementname)
+       {
+               if ($default)
+               {
+                       $this->escape_default($default);
+               }
                $paramstring = '';
                while (list($param,$value) = @each($input['params']))
***************
*** 252,256 ****
                        $paramstring .= $param . '="' . $value . '" ';
                }
!               $inputdef = $paramstring . ' name="' . $elementname . '"';
                switch($input['type'])
                {
--- 270,274 ----
                        $paramstring .= $param . '="' . $value . '" ';
                }
!               $inputdef = $paramstring . ' name="' . $elementname . 
($input['multiple'] ? '[]' : '') . '"';
                switch($input['type'])
                {
***************
*** 262,274 ****
                                return '<input type="checkbox" ' . $inputdef . 
($default ? 'checked="checked"' :'') . '" />';
                        case 'select':
!                               $select = '<select name="' . $elementname . 
'">';
                                foreach ($input['options'] as $value => 
$display)
                                {
                                        $selected='';
!                                       if ($default == $value)
                                        {
                                                $selected = 
'selected="selected"';
                                        }
!                                               $select .= '<option value="'. 
$value . '" ' . $selected . '>' . $display . '</option>';
                                }
                                $select .= '</select>';
--- 280,292 ----
                                return '<input type="checkbox" ' . $inputdef . 
($default ? 'checked="checked"' :'') . '" />';
                        case 'select':
!                               $select = '<select ' .($input['multiple'] ? 
'multiple="multiple"' : '') . $inputdef . '>';
                                foreach ($input['options'] as $value => 
$display)
                                {
                                        $selected='';
!                                       if (($input['multiple'] && 
in_array($value,$default)) || (!$input['multiple'] && ($default == $value)))
                                        {
                                                $selected = 
'selected="selected"';
                                        }
!                                       $select .= '<option value="'. $value . 
'" ' . $selected . '>' . $display . '</option>';
                                }
                                $select .= '</select>';