Moved remaining ACCOUNTEXPIRED entries

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

diff --git a/html/main.php b/html/main.php
index 35295c0cbed87bd585c7f8dcf4798ca2efbf2741..212707878f2312e3a49084ed83ca47a17c87c803 100644 (file)
--- 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 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);