[Phpgroupware-cvs] CVS: preferences preferences.php,1.13.2.8.2.3,1.13.2.8.2.4

[Ralf Becker <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_16-branch
        preferences.php 
Log Message:
new preference page, support now helptexts


Index: preferences.php
===================================================================
RCS file: /cvsroot/phpgroupware/preferences/preferences.php,v
retrieving revision 1.13.2.8.2.3
retrieving revision 1.13.2.8.2.4
diff -C2 -r1.13.2.8.2.3 -r1.13.2.8.2.4
*** preferences.php     31 Mar 2003 00:30:54 -0000      1.13.2.8.2.3
--- preferences.php     31 Mar 2003 00:37:26 -0000      1.13.2.8.2.4
***************
*** 115,123 ****
                }
  
!               if ($GLOBALS['type'] != 'user')
!               {
!                       $default = '';          // no defaults for default or 
forced prefs
!               }
!               elseif (isset($prefs[$name]))   // preference set, use it as 
default
                {
                        $default = $prefs[$name];
--- 115,119 ----
                }
  
!               if (isset($prefs[$name]) || $GLOBALS['type'] != 'user')
                {
                        $default = $prefs[$name];
***************
*** 193,201 ****
                }
                
!               if ($GLOBALS['type'] != 'user')
!               {
!                       $default = '';          // no defaults for default or 
forced prefs
!               }
!               elseif (isset($prefs[$name]))   // preference set, use it as 
default
                {
                        $default = $prefs[$name];
--- 189,193 ----
                }
                
!               if (isset($prefs[$name]) || $GLOBALS['type'] != 'user')
                {
                        $default = $prefs[$name];
***************
*** 232,236 ****
                }
                
!               if (isset($prefs[$name]))
                {
                        $default = $prefs[$name];
--- 224,228 ----
                }
                
!               if (isset($prefs[$name]) || $GLOBALS['type'] != 'user')
                {
                        $default = $prefs[$name];