[Phpgroupware-cvs] filemanager preferences.php, 1.6.2.2.2.2, 1.6.2.2.2.3

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/filemanager
In directory subversions:/tmp/cvs-serv9303

Modified Files:
      Tag: Version-0_9_16-branch
        preferences.php 
Log Message:
bug #5128

Index: preferences.php
===================================================================
RCS file: /cvsroot/phpgroupware/filemanager/preferences.php,v
retrieving revision 1.6.2.2.2.2
retrieving revision 1.6.2.2.2.3
diff -C2 -d -r1.6.2.2.2.2 -r1.6.2.2.2.3
*** preferences.php     13 Nov 2003 16:18:22 -0000      1.6.2.2.2.2
--- preferences.php     13 Nov 2003 16:27:54 -0000      1.6.2.2.2.3
***************
*** 33,37 ****
        $other_dropdown = array ("show_upload_boxes" => array (lang("Default 
number of upload fields to show"), "5", "10", "20", "30"));
  
!       if ($submit)
        {
                $GLOBALS['phpgw']->preferences->read_repository ();
--- 33,37 ----
        $other_dropdown = array ("show_upload_boxes" => array (lang("Default 
number of upload fields to show"), "5", "10", "20", "30"));
  
!       if ($_POST['save'])
        {
                $GLOBALS['phpgw']->preferences->read_repository ();
***************
*** 57,65 ****
                $GLOBALS['phpgw']->preferences->save_repository (True);
       
!               Header('Location: 
'.$GLOBALS['phpgw']->link('/preferences/index.php'));
                $GLOBALS['phpgw']->common->phpgw_exit();
        }
  
!       function display_item ($field,$data,$tpl='normal')
        {
                $tr_color = $GLOBALS['phpgw']->nextmatchs->alternate_row_color 
($tr_color);
--- 57,71 ----
                $GLOBALS['phpgw']->preferences->save_repository (True);
       
!               $GLOBALS['phpgw']->redirect_link('/preferences/index.php');
                $GLOBALS['phpgw']->common->phpgw_exit();
        }
  
!       if ($_POST['cancel'])
!       {
!               $GLOBALS['phpgw']->redirect_link('/preferences/index.php');
!               $GLOBALS['phpgw']->common->phpgw_exit();
!       }
! 
!       function display_item($field,$data)
        {
                $tr_color = $GLOBALS['phpgw']->nextmatchs->alternate_row_color 
($tr_color);
***************
*** 69,74 ****
                        'data'          =>      $data
                );
!               $GLOBALS['phpgw']->template->set_var ($var);
!               $GLOBALS['phpgw']->template->fp('row',$tpl,True);
        }
  
--- 75,80 ----
                        'data'          =>      $data
                );
!               $GLOBALS['phpgw']->template->set_var($var);
!               $GLOBALS['phpgw']->template->fp('row','normal',True);
        }
  
***************
*** 79,83 ****
        $GLOBALS['phpgw']->template->set_block('prefs','normal');
  
!       $var = array (
                'title'                 => lang ('FileManager preferences'),
                'action_url'    => $GLOBALS['phpgw']->link ('/' . 
$GLOBALS['phpgw_info']['flags']['currentapp'] . '/preferences.php'),
--- 85,89 ----
        $GLOBALS['phpgw']->template->set_block('prefs','normal');
  
!       $var = array(
                'title'                 => lang ('FileManager preferences'),
                'action_url'    => $GLOBALS['phpgw']->link ('/' . 
$GLOBALS['phpgw_info']['flags']['currentapp'] . '/preferences.php'),
***************
*** 96,100 ****
        display_item('<b>' . lang('Display attributes') . '</b>','&nbsp;');
  
!       while (list($internal, $displayed) = each ($file_attributes))
        {
                unset ($checked);
--- 102,106 ----
        display_item('<b>' . lang('Display attributes') . '</b>','&nbsp;');
  
!       while (list($internal, $displayed) = each($file_attributes))
        {
                unset ($checked);
***************
*** 104,110 ****
                }
  
!               $str = html_form_input ("checkbox", $internal, NULL, NULL, 
NULL, $checked, NULL, 1);
                display_item ($displayed, $str);
!               //$str .= html_form_input ("checkbox", $internal, NULL, NULL, 
NULL, $checked, NULL, 1) . " $displayed" . html_break (1, NULL, 1);
        }
  
--- 110,116 ----
                }
  
!               $str = html_form_input("checkbox", $internal, NULL, NULL, NULL, 
$checked, NULL, 1);
                display_item ($displayed, $str);
!               //$str .= html_form_input("checkbox", $internal, NULL, NULL, 
NULL, $checked, NULL, 1) . " $displayed" . html_break (1, NULL, 1);
        }
  
***************
*** 125,133 ****
  
        reset ($other_dropdown);
!       while (list ($internal, $value_array) = each ($other_dropdown))
        {
!               reset ($value_array);
!               unset ($options);
!               while (list ($num, $value) = each ($value_array))
                {
                        if ($num == 0)
--- 131,139 ----
  
        reset ($other_dropdown);
!       while (list($internal, $value_array) = each($other_dropdown))
        {
!               reset($value_array);
!               unset($options);
!               while (list($num, $value) = each($value_array))
                {
                        if ($num == 0)
***************
*** 137,152 ****
                        }
  
!                       $options .= html_form_option ($value, 
$value,$GLOBALS['phpgw_info']["user"]["preferences"]["filemanager"][$internal] 
== $value, True);
                }
  
!               $output = html_form_select_begin ($internal, True);
                $output .= $options;
!               $output .= html_form_select_end (True);
  
!               display_item ($displayed, $output);
        }
  
        $GLOBALS['phpgw']->template->set_var('normal','');
        $GLOBALS['phpgw']->template->pfp('out','prefs');
!       $GLOBALS['phpgw']->common->phpgw_footer ();
  ?>
--- 143,158 ----
                        }
  
!                       $options .= html_form_option($value, 
$value,$GLOBALS['phpgw_info']["user"]["preferences"]["filemanager"][$internal] 
== $value, True);
                }
  
!               $output = html_form_select_begin($internal, True);
                $output .= $options;
!               $output .= html_form_select_end(True);
  
!               display_item($displayed, $output);
        }
  
        $GLOBALS['phpgw']->template->set_var('normal','');
        $GLOBALS['phpgw']->template->pfp('out','prefs');
!       $GLOBALS['phpgw']->common->phpgw_footer();
  ?>