Improved error message on audit log data view.

Author: abpai94

htdocs/checkpassword.php

@@ -49,15 +49,14 @@
 
         if (!$result) {
 	    $bind = ldap_bind($ldap, $dn, $password);
-	    $result = $bind ? "passwordok" : "ldaperror";
-            $error_msg = ldap_error($ldap);
+	    $result = $bind ? "passwordok" : "passwordincorrect";
         }
 
     }
 }
 
 if ($audit_log_file) {
-    auditlog($audit_log_file, $dn, $audit_admin, "checkpassword", $error_msg, NULL);
+    auditlog($audit_log_file, $dn, $audit_admin, "checkpassword", $result, NULL);
 }
 
 header('Location: index.php?page=display&dn='.$dn.'&checkpasswordresult='.$result);

lang/en.inc.php

@@ -107,6 +107,7 @@
 $messages['password'] = "Password";
 $messages['passwordchanged'] = "Password changed";
 $messages['passwordexpired'] = "Password is expired";
+$messages['passwordincorrect'] = "Password incorrect";
 $messages['passwordinvalid'] = "Authentication has failed";
 $messages['passwordok'] = "Authentication succeeds!";
 $messages['passwordrefused'] = "Password was refused";

lang/fr.inc.php

@@ -107,6 +107,7 @@
 $messages['password'] = "Mot de passe";
 $messages['passwordchanged'] = "Le mot de passe a été changé";
 $messages['passwordexpired'] = "Le mot de passe est expiré";
+$messages['passwordincorrect'] = "Mot de passe incorrect";
 $messages['passwordinvalid'] = "Authentification en échec";
 $messages['passwordok'] = "Authentification réussie !";
 $messages['passwordrefused'] = "Le mot de passe a été refusé";

templates/display.tpl

@@ -134,8 +134,8 @@
                      {if $checkpasswordresult eq 'passwordrequired'}
                      <div class="alert alert-warning"><i class="fa fa-fw fa-exclamation-triangle"></i> {$msg_passwordrequired}</div>
                      {/if}
-                     {if $checkpasswordresult eq 'ldaperror'}
-                     <div class="alert alert-danger"><i class="fa fa-fw fa-exclamation-triangle"></i> {$msg_passwordinvalid}</div>
+                     {if $checkpasswordresult eq 'passwordincorrect'}
+                     <div class="alert alert-danger"><i class="fa fa-fw fa-exclamation-triangle"></i> {$msg_passwordincorrect}</div>
                      {/if}
                      {if $checkpasswordresult eq 'passwordok'}
                      <div class="alert alert-success"><i class="fa fa-fw fa-check"></i> {$msg_passwordok}</div>