Moved remaining ACCOUNTEXPIRED entries

[gosa.git] / plugins / personal / password / main.inc

diff --git a/plugins/personal/password/main.inc b/plugins/personal/password/main.inc
index 467a7c6f177ed5a4ee519fefe9313891b14c261c..df07d11623bc9e282028dcf0dd2f26f28a0751be 100644 (file)
--- 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);