From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 6 Jul 2010 12:24:51 +0000 (+0000)
Subject: Updated expiration detection
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5ebcb47d0a153a971aa018023eea9093abc8b648;p=gosa.git

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 4f017779b..152ba449c 100644
--- 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 4b7baf12c..09dd56d22 100644
--- 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 2aa7e0eaa..c0fd38b9e 100644
--- 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){