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

[Bettina Gille <address@hidden>]

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

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.1
retrieving revision 1.6.2.2.2.2
diff -C2 -d -r1.6.2.2.2.1 -r1.6.2.2.2.2
*** preferences.php     21 Apr 2003 15:58:10 -0000      1.6.2.2.2.1
--- preferences.php     13 Nov 2003 16:18:22 -0000      1.6.2.2.2.2
***************
*** 12,16 ****
        /* $Id$ */
  
!       $phpgw_info["flags"] = array
        (
                "currentapp" => "filemanager",
--- 12,16 ----
        /* $Id$ */
  
!       $GLOBALS['phpgw_info']["flags"] = array
        (
                "currentapp" => "filemanager",
***************
*** 35,44 ****
        if ($submit)
        {
!               $phpgw->preferences->read_repository ();
  
                reset ($file_attributes);
                while (list ($internal, $displayed) = each ($file_attributes))
                {
!                       $phpgw->preferences->add 
($phpgw_info["flags"]["currentapp"], $internal, $$internal);
                }
  
--- 35,44 ----
        if ($submit)
        {
!               $GLOBALS['phpgw']->preferences->read_repository ();
  
                reset ($file_attributes);
                while (list ($internal, $displayed) = each ($file_attributes))
                {
!                       $GLOBALS['phpgw']->preferences->add 
($phpgw_info["flags"]["currentapp"], $internal, $$internal);
                }
  
***************
*** 46,50 ****
                while (list ($internal, $displayed) = each ($other_checkboxes))
                {
!                       $phpgw->preferences->add 
($phpgw_info["flags"]["currentapp"], $internal, $$internal);
                }
  
--- 46,50 ----
                while (list ($internal, $displayed) = each ($other_checkboxes))
                {
!                       $GLOBALS['phpgw']->preferences->add 
($phpgw_info["flags"]["currentapp"], $internal, $$internal);
                }
  
***************
*** 52,69 ****
                while (list ($internal, $displayed) = each ($other_dropdown))
                {
!                       $phpgw->preferences->add 
($phpgw_info["flags"]["currentapp"], $internal, $$internal);
                }
  
!               $phpgw->preferences->save_repository (True);
       
!               Header('Location: '.$phpgw->link('/preferences/index.php'));
!               $phpgw->common->phpgw_exit();
        }
  
!       function display_item ($field,$data)
        {
!               global $phpgw, $p, $tr_color;
! 
!               $tr_color = $phpgw->nextmatchs->alternate_row_color ($tr_color);
                $var = array (
                        'bg_color'      =>      $tr_color,
--- 52,67 ----
                while (list ($internal, $displayed) = each ($other_dropdown))
                {
!                       $GLOBALS['phpgw']->preferences->add 
($phpgw_info["flags"]["currentapp"], $internal, $$internal);
                }
  
!               $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);
                $var = array (
                        'bg_color'      =>      $tr_color,
***************
*** 71,117 ****
                        'data'          =>      $data
                );
!               $p->set_var ($var);
!               $p->parse ('row', 'pref_list', True);
        }
  
!       $phpgw->common->phpgw_header ();
        echo parse_navbar ();
  
!       $p = CreateObject ('phpgwapi.Template', $phpgw->common->get_tpl_dir 
('filemanager'));
!       $templates = array (
!               'pref'                  => 'pref.tpl',
!               'pref_colspan'  => 'pref_colspan.tpl',
!               'pref_list'             =>      'pref_list.tpl'
!       );
!       $p->set_file ($templates);
  
        $var = array (
!               'title'                 =>      lang ('FileManager 
preferences'),
!               'action_url'    =>      $phpgw->link ('/' . 
$phpgw_info['flags']['currentapp'] . '/preferences.php'),
!               'bg_color'              =>      $phpgw_info['theme']['th_bg'],
!               'submit_lang'   =>      lang ('submit')
        );
        
!       $p->set_var ($var);
!       $p->set_var ('text', ' ');
!       $p->parse ('row', 'pref_colspan', True);
  
        if ($totalerrors)
        {
!               echo '<p><center>' . $phpgw->common->error_list($errors) . 
'</center>';
        }
  
!       while (list ($internal, $displayed) = each ($file_attributes))
        {
                unset ($checked);
!               if 
($phpgw_info["user"]["preferences"]["filemanager"][$internal])
                {
                        $checked = 1;
                }
  
!               $str .= html_form_input ("checkbox", $internal, NULL, NULL, 
NULL, $checked, NULL, 1) . " $displayed" . html_break (1, NULL, 1);
        }
  
!       display_item (lang ('Display attributes'), $str);
  
        reset ($other_checkboxes);
--- 69,113 ----
                        'data'          =>      $data
                );
!               $GLOBALS['phpgw']->template->set_var ($var);
!               $GLOBALS['phpgw']->template->fp('row',$tpl,True);
        }
  
!       $GLOBALS['phpgw']->common->phpgw_header ();
        echo parse_navbar ();
  
!       $GLOBALS['phpgw']->template->set_file(array('prefs' => 'pref.tpl'));
!       $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'),
!               'bg_color'              => 
$GLOBALS['phpgw_info']['theme']['th_bg'],
!               'lang_save'             => lang ('save'),
!               'lang_cancel'   => lang('cancel')               
        );
        
!       $GLOBALS['phpgw']->template->set_var ($var);
  
        if ($totalerrors)
        {
!               echo '<p><center>' . 
$GLOBALS['phpgw']->common->error_list($errors) . '</center>';
        }
  
!       display_item('<b>' . lang('Display attributes') . '</b>','&nbsp;');
! 
!       while (list($internal, $displayed) = each ($file_attributes))
        {
                unset ($checked);
!               if 
($GLOBALS['phpgw_info']["user"]["preferences"]["filemanager"][$internal])
                {
                        $checked = 1;
                }
  
!               $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);
        }
  
!       display_item ('<b>' . lang('other settings') . '</b>','&nbsp;');
  
        reset ($other_checkboxes);
***************
*** 119,123 ****
        {
                unset ($checked);
!               if 
($phpgw_info["user"]["preferences"]["filemanager"][$internal])
                {
                        $checked = 1;
--- 115,119 ----
        {
                unset ($checked);
!               if 
($GLOBALS['phpgw_info']["user"]["preferences"]["filemanager"][$internal])
                {
                        $checked = 1;
***************
*** 141,145 ****
                        }
  
!                       $options .= html_form_option ($value, $value, 
$phpgw_info["user"]["preferences"]["filemanager"][$internal] == $value, True);
                }
  
--- 137,141 ----
                        }
  
!                       $options .= html_form_option ($value, 
$value,$GLOBALS['phpgw_info']["user"]["preferences"]["filemanager"][$internal] 
== $value, True);
                }
  
***************
*** 151,155 ****
        }
  
!       $p->pparse ('out', 'pref');
!       $phpgw->common->phpgw_footer ();
  ?>
--- 147,152 ----
        }
  
!       $GLOBALS['phpgw']->template->set_var('normal','');
!       $GLOBALS['phpgw']->template->pfp('out','prefs');
!       $GLOBALS['phpgw']->common->phpgw_footer ();
  ?>