[Phpgroupware-cvs] CVS: phpgwapi/inc functions.inc.php,1.147,1.148

[Mark A Peters <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv2965/phpgwapi/inc

Modified Files:
        functions.inc.php 
Log Message:
Small change letting the system warnings to use user preference of template set 
for images.

Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/functions.inc.php,v
retrieving revision 1.147
retrieving revision 1.148
diff -C2 -r1.147 -r1.148
*** functions.inc.php   3 Jun 2002 22:17:56 -0000       1.147
--- functions.inc.php   20 Jul 2002 13:16:33 -0000      1.148
***************
*** 310,329 ****
                $GLOBALS['phpgw']->datetime = CreateObject('phpgwapi.datetime');
  
-               /* Make sure user is keeping his password in order */
-               /* Maybe we should create a common function in the 
phpgw_accounts_shared.inc.php file */
-               /* to get rid of duplicate code. */
-               if ($GLOBALS['phpgw_info']['user']['lastpasswd_change'] == 0)
-               {
-                       $message = lang('You are required to change your 
password during your first login')
-                               . '<br> Click this image on the navbar: <img 
src="'
-                               . 
$GLOBALS['phpgw']->common->image('preferences','navbar.gif').'">';
-                       
$GLOBALS['phpgw_info']['flags']['msgbox_data'][$message]=False;
-               }
-               elseif ($GLOBALS['phpgw_info']['user']['lastpasswd_change'] < 
time() - (86400*30))
-               {
-                       $message = lang('it has been more then x days since you 
changed your password',30);
-                       
$GLOBALS['phpgw_info']['flags']['msgbox_data'][$message]=False;
-               }
- 
                
/*************************************************************************\
                * A few hacker resistant constants that will be used throught 
the program *
--- 310,313 ----
***************
*** 599,602 ****
--- 583,602 ----
                                {
                                        
$GLOBALS['phpgw']->common->phpgw_header();
+                               }
+ 
+                               /* Make sure user is keeping his password in 
order */
+                               /* Maybe we should create a common function in 
the phpgw_accounts_shared.inc.php file */
+                               /* to get rid of duplicate code. */
+                               if 
($GLOBALS['phpgw_info']['user']['lastpasswd_change'] == 0)
+                               {
+                                       $message = lang('You are required to 
change your password during your first login')
+                                               . '<br> Click this image on the 
navbar: <img src="'
+                                               . 
$GLOBALS['phpgw']->common->image('preferences','navbar').'">';
+                                       
$GLOBALS['phpgw_info']['flags']['msgbox_data'][$message]=False;
+                               }
+                               elseif 
($GLOBALS['phpgw_info']['user']['lastpasswd_change'] < time() - (86400*30))
+                               {
+                                       $message = lang('it has been more then 
x days since you changed your password',30);
+                                       
$GLOBALS['phpgw_info']['flags']['msgbox_data'][$message]=False;
                                }