[Phpgroupware-cvs] CVS: preferences index.php,1.22,1.23 preferences.php,1.12,1.13

[Miles Lott <address@hidden>]

Update of /cvsroot/phpgroupware/preferences
In directory subversions:/tmp/cvs-serv13201

Modified Files:
        index.php preferences.php 
Log Message:
add some langs, move some to api



Index: index.php
===================================================================
RCS file: /cvsroot/phpgroupware/preferences/index.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** index.php   2 Jan 2002 14:33:05 -0000       1.22
--- index.php   11 Jan 2002 14:04:08 -0000      1.23
***************
*** 13,17 ****
        /* $Id$ */
  
!       $phpgw_info['flags']['currentapp'] = 'preferences';
        include('../header.inc.php');
  
--- 13,18 ----
        /* $Id$ */
  
!       $phpgw_info = array();
!       $GLOBALS['phpgw_info']['flags']['currentapp'] = 'preferences';
        include('../header.inc.php');
  
***************
*** 20,24 ****
                'pref' => 'index.tpl'
        );
!       
        $pref_tpl->set_file($templates);
  
--- 21,25 ----
                'pref' => 'index.tpl'
        );
! 
        $pref_tpl->set_file($templates);
  
***************
*** 31,35 ****
        if ($GLOBALS['phpgw']->acl->check('run',1,'admin'))
        {
!               // This is where we will keep track of our postion.
                // Developers won't have to pass around a variable then
                $session_data = 
$GLOBALS['phpgw']->session->appsession('session_data','preferences');
--- 32,36 ----
        if ($GLOBALS['phpgw']->acl->check('run',1,'admin'))
        {
!               // This is where we will keep track of our position.
                // Developers won't have to pass around a variable then
                $session_data = 
$GLOBALS['phpgw']->session->appsession('session_data','preferences');
***************
*** 37,43 ****
                if (! is_array($session_data))
                {
!                       $session_data = array(
!                               'type' => 'user'
!                       );
                        
$GLOBALS['phpgw']->session->appsession('session_data','preferences',$session_data);
                }
--- 38,42 ----
                if (! is_array($session_data))
                {
!                       $session_data = array('type' => 'user');
                        
$GLOBALS['phpgw']->session->appsession('session_data','preferences',$session_data);
                }
***************
*** 50,69 ****
                {
                        $type = $GLOBALS['HTTP_GET_VARS']['type'];
!                       $session_data = array(
!                               'type' => $type
!                       );
                        
$GLOBALS['phpgw']->session->appsession('session_data','preferences',$session_data);
                }
  
                $tabs[] = array(
!                       'label' => 'Your preferences',
                        'link'  => 
$GLOBALS['phpgw']->link('/preferences/index.php','type=user')
                );
                $tabs[] = array(
!                       'label' => 'Default preferences',
                        'link'  => 
$GLOBALS['phpgw']->link('/preferences/index.php','type=default')
                );
                $tabs[] = array(
!                       'label' => 'Forced preferences',
                        'link'  => 
$GLOBALS['phpgw']->link('/preferences/index.php','type=forced')
                );
--- 49,66 ----
                {
                        $type = $GLOBALS['HTTP_GET_VARS']['type'];
!                       $session_data = array('type' => $type);
                        
$GLOBALS['phpgw']->session->appsession('session_data','preferences',$session_data);
                }
  
                $tabs[] = array(
!                       'label' => lang('Your preferences'),
                        'link'  => 
$GLOBALS['phpgw']->link('/preferences/index.php','type=user')
                );
                $tabs[] = array(
!                       'label' => lang('Default preferences'),
                        'link'  => 
$GLOBALS['phpgw']->link('/preferences/index.php','type=default')
                );
                $tabs[] = array(
!                       'label' => lang('Forced preferences'),
                        'link'  => 
$GLOBALS['phpgw']->link('/preferences/index.php','type=forced')
                );
***************
*** 71,77 ****
                switch($type)
                {
!                       case 'user':            $selected = 0; break;
!                       case 'default': $selected = 1; break;
!                       case 'forced':          $selected = 2; break;
                }
                
$pref_tpl->set_var('tabs',$GLOBALS['phpgw']->common->create_tabs($tabs,$selected));
--- 68,74 ----
                switch($type)
                {
!                       case 'user':    $selected = 0; break;
!                       case 'default': $selected = 1; break;
!                       case 'forced':  $selected = 2; break;
                }
                
$pref_tpl->set_var('tabs',$GLOBALS['phpgw']->common->create_tabs($tabs,$selected));
***************
*** 81,88 ****
        function section_start($name='',$icon='',$appname='')
        {
!               global $phpgw_info, $pref_tpl;
  
!               
$pref_tpl->set_var('icon_backcolor',$phpgw_info['theme']['row_off']);
! //            
$pref_tpl->set_var('link_backcolor',$phpgw_info['theme']['row_off']);
                $pref_tpl->set_var('a_name',$appname);
                $pref_tpl->set_var('app_name',lang($name));
--- 78,85 ----
        function section_start($name='',$icon='',$appname='')
        {
!               global $pref_tpl;
  
!               
$pref_tpl->set_var('icon_backcolor',$GLOBALS['phpgw_info']['theme']['row_off']);
! //            
$pref_tpl->set_var('link_backcolor',$GLOBALS['phpgw_info']['theme']['row_off']);
                $pref_tpl->set_var('a_name',$appname);
                $pref_tpl->set_var('app_name',lang($name));
***************
*** 134,139 ****
        }
  
!       $phpgw->hooks->process('preferences',array('preferences'));
        $pref_tpl->pfp('out','list');
!       $phpgw->common->phpgw_footer();
  ?>
--- 131,136 ----
        }
  
!       $GLOBALS['phpgw']->hooks->process('preferences',array('preferences'));
        $pref_tpl->pfp('out','list');
!       $GLOBALS['phpgw']->common->phpgw_footer();
  ?>

Index: preferences.php
===================================================================
RCS file: /cvsroot/phpgroupware/preferences/preferences.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** preferences.php     2 Jan 2002 14:33:05 -0000       1.12
--- preferences.php     11 Jan 2002 14:04:08 -0000      1.13
***************
*** 63,67 ****
                else
                {
!                       return False;           
                }
        }
--- 63,67 ----
                else
                {
!                       return False;
                }
        }
***************
*** 82,90 ****
                switch ($GLOBALS['type'])
                {
!                       case 'user':            $s = '<input name="user[' . 
$preference_name . ']" value="' . 
$GLOBALS['phpgw_info']['user']['preferences'][$_appname][$preference_name] . 
'">';
                                break;
!                       case 'default': $s = '<input name="default[' . 
$preference_name . ']" value="' . 
$GLOBALS['dp']->data[$_appname][$preference_name] . '">';
                                break;
!                       case 'forced':          $s = '<input name="forced[' . 
$preference_name . ']" value="' . 
$GLOBALS['gp']->data[$_appname][$preference_name] . '">';
                                break;
                }
--- 82,93 ----
                switch ($GLOBALS['type'])
                {
!                       case 'user':
!                               $s = '<input name="user[' . $preference_name . 
']" value="' . 
$GLOBALS['phpgw_info']['user']['preferences'][$_appname][$preference_name] . 
'">';
                                break;
!                       case 'default':
!                               $s = '<input name="default[' . $preference_name 
. ']" value="' . $GLOBALS['dp']->data[$_appname][$preference_name] . '">';
                                break;
!                       case 'forced':
!                               $s = '<input name="forced[' . $preference_name 
. ']" value="' . $GLOBALS['gp']->data[$_appname][$preference_name] . '">';
                                break;
                }
***************
*** 219,231 ****
  
                $tabs[] = array(
!                       'label' => 'Your preferences',
                        'link'  => 
$GLOBALS['phpgw']->link('/preferences/preferences.php','appname=' . 
$GLOBALS['HTTP_GET_VARS']['appname'] . '&type=user')
                );
                $tabs[] = array(
!                       'label' => 'Default preferences',
                        'link'  => 
$GLOBALS['phpgw']->link('/preferences/preferences.php','appname=' . 
$GLOBALS['HTTP_GET_VARS']['appname'] . '&type=default')
                );
                $tabs[] = array(
!                       'label' => 'Forced preferences',
                        'link'  => 
$GLOBALS['phpgw']->link('/preferences/preferences.php','appname=' . 
$GLOBALS['HTTP_GET_VARS']['appname'] . '&type=forced')
                );
--- 222,234 ----
  
                $tabs[] = array(
!                       'label' => lang('Your preferences'),
                        'link'  => 
$GLOBALS['phpgw']->link('/preferences/preferences.php','appname=' . 
$GLOBALS['HTTP_GET_VARS']['appname'] . '&type=user')
                );
                $tabs[] = array(
!                       'label' => lang('Default preferences'),
                        'link'  => 
$GLOBALS['phpgw']->link('/preferences/preferences.php','appname=' . 
$GLOBALS['HTTP_GET_VARS']['appname'] . '&type=default')
                );
                $tabs[] = array(
!                       'label' => lang('Forced preferences'),
                        'link'  => 
$GLOBALS['phpgw']->link('/preferences/preferences.php','appname=' . 
$GLOBALS['HTTP_GET_VARS']['appname'] . '&type=forced')
                );
***************
*** 233,239 ****
                switch($GLOBALS['type'])
                {
!                       case 'user':            $selected = 0; break;
!                       case 'default': $selected = 1; break;
!                       case 'forced':          $selected = 2; break;
                }
                
$t->set_var('tabs',$GLOBALS['phpgw']->common->create_tabs($tabs,$selected));
--- 236,242 ----
                switch($GLOBALS['type'])
                {
!                       case 'user':    $selected = 0; break;
!                       case 'default': $selected = 1; break;
!                       case 'forced':  $selected = 2; break;
                }
                
$t->set_var('tabs',$GLOBALS['phpgw']->common->create_tabs($tabs,$selected));
***************
*** 261,265 ****
                if ($GLOBALS['type'] == 'default' && is_admin())
                {
!                       process_array($GLOBALS['dp'], $default);                
                }
  
--- 264,268 ----
                if ($GLOBALS['type'] == 'default' && is_admin())
                {
!                       process_array($GLOBALS['dp'], $default);
                }
  
***************
*** 303,307 ****
                {
                        $error = True;
!               }       
        }
  
--- 306,310 ----
                {
                        $error = True;
!               }
        }