[Phpgroupware-cvs] phpgwapi/templates/idots navbar.inc.php, 1.1.2.16

[Caeies]

Update of phpgwapi/templates/idots

Modified Files:
     Branch: Version-0_9_16-branch
            navbar.inc.php lines: +16 -4

Log Message:
Patch #4478 (password Reminder)

====================================================
Index: phpgwapi/templates/idots/navbar.inc.php
diff -u phpgwapi/templates/idots/navbar.inc.php:1.1.2.15 
phpgwapi/templates/idots/navbar.inc.php:1.1.2.16
--- phpgwapi/templates/idots/navbar.inc.php:1.1.2.15    Sat Nov  6 15:34:27 2004
+++ phpgwapi/templates/idots/navbar.inc.php     Tue Oct  4 07:51:36 2005
@@ -95,15 +95,27 @@
                . lang($GLOBALS['phpgw']->common->show_date($now,'l')) . ' '
                . 
$GLOBALS['phpgw']->common->show_date($now,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);

+               if 
($GLOBALS['phpgw']->acl->get_rights('changepassword','preferences') > 0)
+               {
                if ($GLOBALS['phpgw_info']['user']['lastpasswd_change'] == 0)
                {
                        $api_messages = 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').'">';
+                            . '<br /> Click <a href="' . 
$GLOBALS['phpgw']->link('/preferences/changepassword.php') . '">here</a>';
                }
                else if ($GLOBALS['phpgw_info']['user']['lastpasswd_change'] < 
time() - (86400*30))
                {
-                       $api_messages = lang('it has been more then %1 days 
since you changed your password',30);
+                               $api_messages = lang('it has been more then %1 
days since you changed your password',30)
+                            . '<br /> Click <a href="' . 
$GLOBALS['phpgw']->link('/preferences/changepassword.php') . '">' . 
lang('here') . '</a>';
+                       }
+
+                       if($api_messages)
+                       {
+                               $url = 
parse_url($GLOBALS['phpgw']->link('/preferences/changepassword.php'));
+                               if($_SERVER['PHP_SELF'] != $url['path'])
+                               {
+                                       $var['messages'] = $api_messages;
+                               }
+                       }
                }

                // This is gonna change