[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] phpgwapi/inc class.preferences.inc.php, 1.43.2.2.2.12
|
From: |
Dave Hall <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] phpgwapi/inc class.preferences.inc.php, 1.43.2.2.2.12, 1.43.2.2.2.13 |
|
Date: |
Fri, 17 Oct 2003 02:55:37 +0000 |
Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv11071
Modified Files:
Tag: Version-0_9_16-branch
class.preferences.inc.php
Log Message:
fix for losing prefs
Index: class.preferences.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.preferences.inc.php,v
retrieving revision 1.43.2.2.2.12
retrieving revision 1.43.2.2.2.13
diff -C2 -d -r1.43.2.2.2.12 -r1.43.2.2.2.13
*** class.preferences.inc.php 24 Sep 2003 04:05:19 -0000 1.43.2.2.2.12
--- class.preferences.inc.php 17 Oct 2003 02:55:34 -0000 1.43.2.2.2.13
***************
*** 629,696 ****
}
/* This takes care of new users who dont have proper
default prefs setup */
! if
(!isset($GLOBALS['phpgw_info']['flags']['nocommon_preferences']) ||
!
!$GLOBALS['phpgw_info']['flags']['nocommon_preferences'])
{
! if
(!isset($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'])
||
!
!$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'])
! {
! $this->add('common','maxmatchs',15);
! $preferences_update = True;
! }
! if
(!isset($GLOBALS['phpgw_info']['user']['preferences']['common']['theme']) ||
!
!$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'])
! {
! $this->add('common','theme','default');
! $preferences_update = True;
! }
! if
(!isset($GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'])
||
!
!$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'])
! {
!
$this->add('common','template_set','verdilak');
! $preferences_update = True;
! }
! if
(!isset($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'])
||
!
!$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'])
! {
!
$this->add('common','dateformat','d-M-Y');
! $preferences_update = True;
! }
! if
(!isset($GLOBALS['phpgw_info']['user']['preferences']['common']['timeformat'])
||
!
!$GLOBALS['phpgw_info']['user']['preferences']['common']['timeformat'])
! {
! $this->add('common','timeformat',12);
! $preferences_update = True;
! }
! if
(!isset($GLOBALS['phpgw_info']['user']['preferences']['common']['lang']) ||
!
!$GLOBALS['phpgw_info']['user']['preferences']['common']['lang'])
! {
!
$this->add('common','lang',$GLOBALS['phpgw']->common->getPreferredLanguage());
! $preferences_update = True;
! }
! if ($preferences_update)
! {
! $user_id = $this->account_id;
! $user_prefs =
$GLOBALS['phpgw_info']['preferences'];
! $this->account_id = -1;
! $df_prefs = $this->read_repository();
! if(is_array($df_prefs))
! {
! foreach($df_prefs as $app_name
=> $app_prefs)
! {
! if(is_array($app_prefs))
! {
!
foreach($app_prefs as $pref => $ignore)
! {
!
unset($user_prefs[$app_name][$pref]);
! }
! }
! }
! }
! $this->account_id = $user_id;
! $this->update_data($user_prefs);
! $this->save_repository();
! $GLOBALS['phpgw_info']['preferences'] =
$this->read_repository();
! }
! unset($preferences_update);
}
}
--- 629,673 ----
}
/* This takes care of new users who dont have proper
default prefs setup */
! if
(!isset($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'])
||
!
!$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'])
{
! $this->add('common','maxmatchs',15);
! $preferences_update = True;
! }
! if
(!isset($GLOBALS['phpgw_info']['user']['preferences']['common']['theme']) ||
!
!$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'])
! {
! $this->add('common','theme','default');
! $preferences_update = True;
! }
! if
(!isset($GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'])
||
!
!$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'])
! {
! $this->add('common','template_set','verdilak');
! $preferences_update = True;
! }
! if
(!isset($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'])
||
!
!$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'])
! {
! $this->add('common','dateformat','d-M-Y');
! $preferences_update = True;
! }
! if
(!isset($GLOBALS['phpgw_info']['user']['preferences']['common']['timeformat'])
||
!
!$GLOBALS['phpgw_info']['user']['preferences']['common']['timeformat'])
! {
! $this->add('common','timeformat',12);
! $preferences_update = True;
! }
! if
(!isset($GLOBALS['phpgw_info']['user']['preferences']['common']['lang']) ||
!
!$GLOBALS['phpgw_info']['user']['preferences']['common']['lang'])
! {
!
$this->add('common','lang',$GLOBALS['phpgw']->common->getPreferredLanguage());
! $preferences_update = True;
! }
! if ($preferences_update)
! {
! $this->update_data($user_prefs);
! $this->save_repository();
! $GLOBALS['phpgw_info']['preferences'] =
$this->read_repository();
}
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] phpgwapi/inc class.preferences.inc.php, 1.43.2.2.2.12, 1.43.2.2.2.13,
Dave Hall <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] calendar/phpgroupware.org holidays.AT.txt, NONE, 1.1.2.1 holidays.AU.txt, NONE, 1.1.2.1 holidays.BE.txt, NONE, 1.1.2.1 holidays.BR.txt, NONE, 1.1.2.1 holidays.BW.txt, NONE, 1.1.2.1 holidays.CA.txt, NONE, 1.1.2.1 holidays.CH.txt, NONE, 1.1.2.1 holidays.CL.txt, NONE, 1.1.2.1 holidays.CO.txt, NONE, 1.1.2.1 holidays.CS.txt, NONE, 1.1.2.1 holidays.CZ.txt, NONE, 1.1.2.1 holidays.DE.txt, NONE, 1.1.2.1 holidays.EC.txt, NONE, 1.1.2.1 holidays.EE.txt, NONE, 1.1.2.1 holidays.ES.txt, NONE, 1.1.2.1 holidays.FI.txt, NONE, 1.1.2.1 holidays.FR.txt, NONE, 1.1.2.1 holidays.GE.txt, NONE, 1.1.2.1 holidays.HK.txt, NONE, 1.1.2.1 holidays.HU.txt, NONE, 1.1.2.1 holidays.ID.txt, NONE, 1.1.2.1 holidays.IE.txt, NONE, 1.1.2.1 holidays.IN.txt, NONE, 1.1.2.1 holidays.IT.txt, NONE, 1.1.2.1 holidays.JA.txt, NONE, 1.1.2.1 holidays.JM.txt, NONE, 1.1.2.1 holidays.JP.txt, NONE, 1.1.2.1 holidays.KO.txt, NONE, 1.1.2.1 holidays.KR.txt, NONE, 1.1.2.1 holidays.LT.txt, NONE, 1.1.2.1 holidays.MS.txt, NONE, 1.1.2.1 holidays.MT.txt, NONE, 1.1.2.1 holidays.MU.txt, NONE, 1.1.2.1 holidays.MX.txt, NONE, 1.1.2.1 holidays.MY.txt, NONE, 1.1.2.1 holidays.NL.txt, NONE, 1.1.2.1 holidays.NO.txt, NONE, 1.1.2.1 holidays.NZ.txt, NONE, 1.1.2.1 holidays.PH.txt, NONE, 1.1.2.1 holidays.PL.txt, NONE, 1.1.2.1 holidays.PT.txt, NONE, 1.1.2.1 holidays.RE.txt, NONE, 1.1.2.1 holidays.RF.txt, NONE, 1.1.2.1 holidays.RJ.txt, NONE, 1.1.2.1 holidays.RU.txt, NONE, 1.1.2.1 holidays.SA.txt, NONE, 1.1.2.1 holidays.SE.txt, NONE, 1.1.2.1 holidays.SG.txt, NONE, 1.1.2.1 holidays.SK.txt, NONE, 1.1.2.1 holidays.SP.txt, NONE, 1.1.2.1 holidays.TH.txt, NONE, 1.1.2.1 holidays.TR.txt, NONE, 1.1.2.1 holidays.TW.txt, NONE, 1.1.2.1 holidays.UK.txt, NONE, 1.1.2.1 holidays.US.txt, NONE, 1.1.2.1 holidays.XC.txt, NONE, 1.1.2.1 holidays.ZA.txt, NONE, 1.1.2.1 holidays.ZH.txt, NONE, 1.1.2.1 secure-holidays.sh, NONE, 1.1.2.1
- Next by Date:
[Phpgroupware-cvs] phpgwapi/templates/default login.tpl, 1.12, 1.12.2.1
- Previous by thread:
[Phpgroupware-cvs] calendar/phpgroupware.org holidays.AT.txt, NONE, 1.1.2.1 holidays.AU.txt, NONE, 1.1.2.1 holidays.BE.txt, NONE, 1.1.2.1 holidays.BR.txt, NONE, 1.1.2.1 holidays.BW.txt, NONE, 1.1.2.1 holidays.CA.txt, NONE, 1.1.2.1 holidays.CH.txt, NONE, 1.1.2.1 holidays.CL.txt, NONE, 1.1.2.1 holidays.CO.txt, NONE, 1.1.2.1 holidays.CS.txt, NONE, 1.1.2.1 holidays.CZ.txt, NONE, 1.1.2.1 holidays.DE.txt, NONE, 1.1.2.1 holidays.EC.txt, NONE, 1.1.2.1 holidays.EE.txt, NONE, 1.1.2.1 holidays.ES.txt, NONE, 1.1.2.1 holidays.FI.txt, NONE, 1.1.2.1 holidays.FR.txt, NONE, 1.1.2.1 holidays.GE.txt, NONE, 1.1.2.1 holidays.HK.txt, NONE, 1.1.2.1 holidays.HU.txt, NONE, 1.1.2.1 holidays.ID.txt, NONE, 1.1.2.1 holidays.IE.txt, NONE, 1.1.2.1 holidays.IN.txt, NONE, 1.1.2.1 holidays.IT.txt, NONE, 1.1.2.1 holidays.JA.txt, NONE, 1.1.2.1 holidays.JM.txt, NONE, 1.1.2.1 holidays.JP.txt, NONE, 1.1.2.1 holidays.KO.txt, NONE, 1.1.2.1 holidays.KR.txt, NONE, 1.1.2.1 holidays.LT.txt, NONE, 1.1.2.1 holidays.MS.txt, NONE, 1.1.2.1 holidays.MT.txt, NONE, 1.1.2.1 holidays.MU.txt, NONE, 1.1.2.1 holidays.MX.txt, NONE, 1.1.2.1 holidays.MY.txt, NONE, 1.1.2.1 holidays.NL.txt, NONE, 1.1.2.1 holidays.NO.txt, NONE, 1.1.2.1 holidays.NZ.txt, NONE, 1.1.2.1 holidays.PH.txt, NONE, 1.1.2.1 holidays.PL.txt, NONE, 1.1.2.1 holidays.PT.txt, NONE, 1.1.2.1 holidays.RE.txt, NONE, 1.1.2.1 holidays.RF.txt, NONE, 1.1.2.1 holidays.RJ.txt, NONE, 1.1.2.1 holidays.RU.txt, NONE, 1.1.2.1 holidays.SA.txt, NONE, 1.1.2.1 holidays.SE.txt, NONE, 1.1.2.1 holidays.SG.txt, NONE, 1.1.2.1 holidays.SK.txt, NONE, 1.1.2.1 holidays.SP.txt, NONE, 1.1.2.1 holidays.TH.txt, NONE, 1.1.2.1 holidays.TR.txt, NONE, 1.1.2.1 holidays.TW.txt, NONE, 1.1.2.1 holidays.UK.txt, NONE, 1.1.2.1 holidays.US.txt, NONE, 1.1.2.1 holidays.XC.txt, NONE, 1.1.2.1 holidays.ZA.txt, NONE, 1.1.2.1 holidays.ZH.txt, NONE, 1.1.2.1 secure-holidays.sh, NONE, 1.1.2.1
- Next by thread:
[Phpgroupware-cvs] phpgwapi/templates/default login.tpl, 1.12, 1.12.2.1
- Index(es):