Changeset 32 for trunk/preferences

Timestamp:

06/08/07 15:18:19 (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)
• templates/default/changepassword.tpl (modified) (1 diff)

trunk/preferences/changepassword.php

@@ -20 +20 @@
         include('../header.inc.php');
 
+        $a_passwd   = $_POST['a_passwd'];
         $n_passwd   = $_POST['n_passwd'];
         $n_passwd_2 = $_POST['n_passwd_2'];
@@ -32 +33 @@
                 'form' => 'changepassword.tpl'
         ));
+        $GLOBALS['phpgw']->template->set_var('lang_enter_actual_password',lang('Enter your actual password'));
         $GLOBALS['phpgw']->template->set_var('lang_enter_password',lang('Enter your new password'));
         $GLOBALS['phpgw']->template->set_var('lang_reenter_password',lang('Re-enter your password'));
@@ -46 +48 @@
         if ($_POST['change'])
         {
+                if (! $GLOBALS['phpgw']->auth->authenticate($GLOBALS['phpgw_info']['user']['account_lid'], $a_passwd))
+                {
+                        $errors[] = lang('Your actual password is wrong');
+                }
+
                 if ($n_passwd != $n_passwd_2)
                 {
@@ -55 +62 @@
                         $errors[] = lang('You must enter a password');
                 }
+                
+                // Default number of letters = 3
+                if (!$GLOBALS['phpgw_info']['server']['num_letters_userpass'])
+                        $GLOBALS['phpgw_info']['server']['num_letters_userpass'] = 3;
+                // Default number of special letters = 0
+                if (!$GLOBALS['phpgw_info']['server']['num_special_letters_userpass'])
+                        $GLOBALS['phpgw_info']['server']['num_special_letters_userpass'] = 0;
 
+                if ( strlen( $n_passwd ) < $GLOBALS['phpgw_info']['server']['num_letters_userpass'] )
+                {
+                        $errors[] = lang('Your password must contain %1 or more letters', $GLOBALS['phpgw_info']['server']['num_letters_userpass']);
+                }
+                
+                # password that start with a-Z or 0-9 and contain _.-!@#$%&*+=| will be accepted.
+                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
+                if (! 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']);
+                }
+                
                 if(is_array($errors))
                 {

trunk/preferences/templates/default/changepassword.tpl

@@ -5 +5 @@
    <form method="POST" action="{form_action}">
     <table border="0">
+     <tr>
+       <td>
+        {lang_enter_actual_password}
+       </td>
+       <td>
+        <input type="password" name="a_passwd">
+       </td>
+     </tr>
      <tr>
        <td>