Changeset 72 for trunk/preferences

Timestamp:

09/24/07 10:22:29 (17 years ago)

Author:

niltonneto

Message:

* empty log message *

Location:

trunk/preferences

Files:

• changepassword.php (modified) (4 diffs)
• setup/phpgw_pt-br.lang (modified) (previous)

trunk/preferences/changepassword.php

@@ -26 +26 @@
         if(!$GLOBALS['phpgw']->acl->check('changepassword', 1) || $_POST['cancel'])
         {
+                if(($GLOBALS['phpgw_info']['user']['lastpasswd_change'] == '0') && (!$_POST['cancel']))
+                        $GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/login.php','cd=6'));
+                
                 if ($GLOBALS['phpgw_info']['server']['use_https'] == 1)
                         Header('Location: http://' . $_SERVER['HTTP_HOST'] . $GLOBALS['phpgw_info']['server']['webserver_url'] . '/preferences/index.php');
@@ -43 +46 @@
         $GLOBALS['phpgw']->template->set_var('lang_cancel',lang('Cancel'));
         $GLOBALS['phpgw']->template->set_var('form_action',$GLOBALS['phpgw']->link('/preferences/changepassword.php'));
+
+        if ($_GET['cd'] == 1)
+        {
+                $lang1 = lang('Your password has expired');
+                $lang2 = lang('You must register a new password');
+                $GLOBALS['phpgw']->template->set_var('messages',"<font color=red><h1>$lang1.<br>$lang2.</h1></font>");
+        }
 
         if ($GLOBALS['phpgw_info']['server']['auth_type'] != 'ldap')
@@ -66 +76 @@
                         $errors[] = lang('The two passwords are not the same');
                 }
+                else if ($a_passwd == $n_passwd)
+                {
+                        $errors[] = lang('Your old password and your new password are the same. Choose a different new password');
+                }
                 else if (! $n_passwd)
                 {
@@ -75 +89 @@
                 }               
                 # password that start with a-Z or 0-9 and contain _.-!@#$%&*+=| will be accepted.
-                else if (! ereg ("(^[a-zA-Z0-9_.\-\!@#$%&*+=|]*)$", $n_passwd ) )
+                //else if (! ereg ("(^[a-zA-Z0-9_.\-\!@#$%&*+=|]*)$", $n_passwd ) )
+                //else if (! ereg ("(^[a-zA-Z0-9_.\-\!@#$%&*+=|\(\)\^\~\}\{\[\]\/\\\"\'\:\;\?]*)$", $n_passwd ) )
+                else if (! ereg ("([]^[a-zA-Z0-9\_\.\-\!\@\#\$\%\&\*\+\=\|\(\)\^\~\}\{\/\\\"\'\:\;\?]*)$", $n_passwd ) )
                 {                       
                         $errors[] = lang('Your password contains characters not allowed');
                 }               
                 # password must contain 2 special letters, numbers or special characters
-                else if ($GLOBALS['phpgw_info']['server']['num_special_letters_userpass'] && ! ereg ("([0-9_.\-!@#$%&*+=|]){".$GLOBALS['phpgw_info']['server']['num_special_letters_userpass'].",}", $n_passwd ) )
+                //else if ($GLOBALS['phpgw_info']['server']['num_special_letters_userpass'] && ! ereg ("([0-9_.\-!@#$%&*+=|]){".$GLOBALS['phpgw_info']['server']['num_special_letters_userpass'].",}", $n_passwd ) )
+                //else if ($GLOBALS['phpgw_info']['server']['num_special_letters_userpass'] && ! ereg ("([0-9_.\-!@#$%&*+=|\(\)\^\~\}\{\[\]\/\\\"\'\:\;\?]){".$GLOBALS['phpgw_info']['server']['num_special_letters_userpass']."}", $n_passwd ) )
+                else if ($GLOBALS['phpgw_info']['server']['num_special_letters_userpass'] && ! ereg ("([][0-9\_\.\-\!\@\#\$\%\&\*\+\=\|\(\)\^\~\}\{\/\\\"\'\:\;\?]){".$GLOBALS['phpgw_info']['server']['num_special_letters_userpass']."}", $n_passwd ) )
                 {
                         $errors[] = lang('Your password must contain at least %1 numbers or characters special', $GLOBALS['phpgw_info']['server']['num_special_letters_userpass']);