Changeset 3338 for branches/2.2

Timestamp:

10/07/10 13:43:20 (14 years ago)

Author:

rafaelraymundo

Message:

Ticket #1366 - Configura dias de validade da senha do usuario(desabilta se null)

Location:

branches/2.2

Files:

• admin/setup/phpgw_en.lang (modified) (previous)
• admin/setup/phpgw_pt-br.lang (modified) (previous)
• admin/templates/default/config.tpl (modified) (1 diff)
• phpgwapi/templates/default/navbar.inc.php (modified) (1 diff)

branches/2.2/admin/templates/default/config.tpl

@@ -143 +143 @@
 
 <tr class="row_off">
-    <td>{lang_How_many_days_the_password_should_be_kept(default_90)_?}:</td>
-    <td>
-     <input name="newsettings[max_password_age]" value="{value_max_password_age}" size="5">
+    <td>{lang_How_many_days_the_password_should_be_kept(empty to disable this)_?}:</td>
+    <td>
+     <input name="newsettings[max_pwd_age]" value="{value_max_pwd_age}" size="5">
     </td>
    </tr>

branches/2.2/phpgwapi/templates/default/navbar.inc.php

@@ -266 +266 @@
                         }
 
-                        if (!$GLOBALS['phpgw_info']['server']['max_password_age'])
-                                $GLOBALS['phpgw_info']['server']['max_password_age'] = 90;
+                        if ($GLOBALS['phpgw_info']['server']['max_pwd_age'] && $GLOBALS['phpgw_info']['server']['max_pwd_age'] > 0 )
+                            {
+                                $aux = time() - (86400*$GLOBALS['phpgw_info']['server']['max_pwd_age']);
+                            }
+                        else
+                            {
+                                $aux = $GLOBALS['phpgw_info']['server']['max_pwd_age'];
+                            }
 
                         if(($GLOBALS['phpgw_info']['user']['lastpasswd_change'] == '0'  && (($GLOBALS['phpgw_info']['user']['agree_terms'] == 1) || ($GLOBALS['phpgw_info']['server']['use_agree_term']!='True'))) ||
-                                ($GLOBALS['phpgw_info']['user']['lastpasswd_change'] < time() - (86400*$GLOBALS['phpgw_info']['server']['max_password_age'])))
+                                $GLOBALS['phpgw_info']['user']['lastpasswd_change'] < $aux)
                         {
                                 $changepasswd_url = $_SERVER['HTTP_HOST'] . $GLOBALS['phpgw_info']['server']['webserver_url'] . '/preferences/changepassword.php?cd=1';