Updated expiration detection

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

diff --git a/gosa-core/html/index.php b/gosa-core/html/index.php
index 4f017779bc9e5484dfce953474840da24328e8a6..152ba449c37a0d18d804868fec430dfb8e103449 100644 (file)
--- a/gosa-core/html/index.php
+++ b/gosa-core/html/index.php
@@ -352,7 +352,7 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
             }
 
             /* are we using accountexpiration */
-            if ($config->get_cfg_value("core","handleExpiredAccounts") == "true") {
+            if ($config->boolValueIsTrue("core","handleExpiredAccounts")) {
                 $expired= ldap_expired_account($config, $ui->dn, $ui->username);
 
                 if ($expired == POSIX_ACCOUNT_EXPIRED) {

diff --git a/gosa-core/html/main.php b/gosa-core/html/main.php
index 4b7baf12c56de24d68ed1ae6fbc06a129915d058..09dd56d22250b8cc791777a7a90fa21d73ca8980 100644 (file)
--- a/gosa-core/html/main.php
+++ b/gosa-core/html/main.php
@@ -198,7 +198,7 @@ $plist->genPathMenu();
 
 /* check if we are using account expiration */
 $smarty->assign("hideMenus", FALSE);
-if ($config->get_cfg_value("core","handleExpiredAccounts") == "true"){
+if ($config->boolValueIsTrue("core","handleExpiredAccounts")){
     $expired= ldap_expired_account($config, $ui->dn, $ui->username);
  
     if ($expired == POSIX_WARN_ABOUT_EXPIRATION && !session::is_set('POSIX_WARN_ABOUT_EXPIRATION__DONE')){

diff --git a/gosa-core/plugins/personal/password/class_password.inc b/gosa-core/plugins/personal/password/class_password.inc
index 2aa7e0eaaf87487d2a16b15d078a690f503129e4..c0fd38b9e626de9f1ba93acc21a1635b35643e76 100644 (file)
--- a/gosa-core/plugins/personal/password/class_password.inc
+++ b/gosa-core/plugins/personal/password/class_password.inc
@@ -71,7 +71,7 @@ class password extends plugin
 
         /* Display expiration template */
         $smarty->assign("passwordExpired", FALSE);
-        if ($this->config->get_cfg_value("core","handleExpiredAccounts") == "true"){
+        if ($this->config->boolValueIsTrue("core","handleExpiredAccounts")){
             $expired= ldap_expired_account($this->config, $ui->dn, $ui->username);
             $smarty->assign("passwordExpired", $expired & POSIX_FORCE_PASSWORD_CHANGE);
             if($expired == POSIX_DISALLOW_PASSWORD_CHANGE){