[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] phpgwapi/templates/desktop navbar.inc.php, 1.1.2.4
From: |
skwashd |
Subject: |
[Phpgroupware-cvs] phpgwapi/templates/desktop navbar.inc.php, 1.1.2.4 |
Date: |
Thu, 8 Dec 2005 00:08:00 +0100 |
Update of phpgwapi/templates/desktop
Modified Files:
Branch: Version-0_9_16-branch
navbar.inc.php lines: +11 -11
Log Message:
fix grammar, cleanup logic, some formatting
====================================================
Index: phpgwapi/templates/desktop/navbar.inc.php
diff -u phpgwapi/templates/desktop/navbar.inc.php:1.1.2.3
phpgwapi/templates/desktop/navbar.inc.php:1.1.2.4
--- phpgwapi/templates/desktop/navbar.inc.php:1.1.2.3 Tue Oct 4 07:51:36 2005
+++ phpgwapi/templates/desktop/navbar.inc.php Wed Dec 7 23:08:55 2005
@@ -127,21 +127,21 @@
// Maybe we should create a common function in the
phpgw_accounts_shared.inc.php file
// to get rid of duplicate code.
- if
($GLOBALS['phpgw']->acl->get_rights('changepassword','preferences') > 0)
+ if ( $GLOBALS['phpgw']->acl->check('changepassword', 1,
'preferences') )
{
- if ($GLOBALS['phpgw_info']['user']['lastpasswd_change'] == 0)
- {
- $api_messages = lang('You are required to change your
password during your first login')
- . '<br /> Click <a href="' .
$GLOBALS['phpgw']->link('/preferences/changepassword.php') . '">here</a>';
- }
+ if (
intval($GLOBALS['phpgw_info']['user']['lastpasswd_change']) == 0)
+ {
+ $api_messages = lang('You are required to
change your password during your first login')
+ . '<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)
- . '<br /> Click <a href="' .
$GLOBALS['phpgw']->link('/preferences/changepassword.php') . '">' .
lang('here') . '</a>';
- }
+ $api_messages = lang('it has been more than %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'])
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] phpgwapi/templates/desktop navbar.inc.php, 1.1.2.4,
skwashd <=