From 08638e58d2e029ef0745fae762f602065b436a1c Mon Sep 17 00:00:00 2001 From: cajus Date: Mon, 29 May 2006 04:50:06 +0000 Subject: [PATCH] Moved from "1" to "true" git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3532 594d385d-05f5-0310-b6e9-bd551577e9d8 --- FAQ | 7 ++++--- html/index.php | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/FAQ b/FAQ index 63aa03888..5d2d91095 100644 --- 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 e799f3559..e55d51c7d 100644 --- 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){ -- 2.30.2