Moved from "1" to "true"

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3532 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/FAQ b/FAQ
index 63aa03888122ec7cead4789ffa622be063e330be..5d2d91095d27e7245a9862f421d6d539d3eae49c 100644 (file)
--- a/FAQ
+++ b/FAQ
@@ -299,9 +299,10 @@ A: No need to modify anything. Just add a hook the the plugin you'd like to
 
 Q: Is there a way to use ACL independet filtering when using administrative units?
 
-A: Yes. Set STRICT_UNITS to TRUE in your gosa.conf's location section.
+A: Yes. Set STRICT_UNITS to "true" in your gosa.conf's location section.
 
-Q: how can i active the account expiration code for the gosa interface
 
-A: just add accountexpired="1" in you main section
+Q: How can i active the account expiration code for the gosa interface?
+
+A: Yes. Just set "accountexpired" to "true" in your gosa.conf's main section.
 

diff --git a/html/index.php b/html/index.php
index e799f3559ab63fa8c3970062a1eafd411856fde8..e55d51c7dd8fcf9fca497921c95ced564d9149d7 100644 (file)
--- a/html/index.php
+++ b/html/index.php
@@ -216,12 +216,13 @@ if ($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])){
       $_SESSION['config']= $config;
 
       /* are we using accountexpiration */
-      if((isset($config->data['MAIN']['ACCOUNTEXPIRED'])) && $config->data['MAIN']['ACCOUNTEXPIRED'] == "1"){
+      if((isset($config->data['MAIN']['ACCOUNTEXPIRED'])) && 
+          preg_match('/true/i', $config->data['MAIN']['ACCOUNTEXPIRED'])){
       
         $expired= ldap_expired_account($config, $ui->dn, $ui->username);
 
         if ($expired == 1){
-          $message= _("Account Locked");
+          $message= _("Account locked. Please contact your system administrator.");
           $smarty->assign ('nextfield', 'password');
           gosa_log ("Account for user \"$username\" has expired");
         } elseif ($expired == 3){