From 5529e4fc1ad3c64c7fcadf7fdac25a09bd4c2956 Mon Sep 17 00:00:00 2001 From: cajus Date: Mon, 29 May 2006 10:34:54 +0000 Subject: [PATCH] Moved remaining ACCOUNTEXPIRED entries git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3540 594d385d-05f5-0310-b6e9-bd551577e9d8 --- html/main.php | 3 ++- plugins/personal/password/main.inc | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/html/main.php b/html/main.php index 35295c0cb..212707878 100644 --- a/html/main.php +++ b/html/main.php @@ -344,7 +344,8 @@ if (is_file("$plugin_dir/main.inc")){ /* check if we are using account expiration */ - if((isset($config->data['MAIN']['ACCOUNTEXPIRED'])) && $config->data['MAIN']['ACCOUNTEXPIRED'] == "1"){ + if((isset($config->data['MAIN']['ACCOUNT_EXPIRATION'])) && + preg_match('/true/i', $config->data['MAIN']['ACCOUNT_EXPIRATION'])){ $expired= ldap_expired_account($config, $ui->dn, $ui->username); diff --git a/plugins/personal/password/main.inc b/plugins/personal/password/main.inc index 467a7c6f1..df07d1162 100644 --- a/plugins/personal/password/main.inc +++ b/plugins/personal/password/main.inc @@ -100,7 +100,8 @@ if (!$remove_lock){ } if ($display == ""){ - if((isset($config->data['MAIN']['ACCOUNTEXPIRED'])) && $config->data['MAIN']['ACCOUNTEXPIRED'] == "0"){ + if((isset($config->data['MAIN']['ACCOUNT_EXPIRATION'])) && + !preg_match('/true/i', $config->data['MAIN']['ACCOUNT_EXPIRATION'])){ $display= $smarty->fetch(get_template_path("password.tpl", TRUE)); }else{ $expired= ldap_expired_account($config, $ui->dn, $ui->username); -- 2.30.2