From cfde0fc7f61d15478432b8b5aa759357fcd04adb Mon Sep 17 00:00:00 2001 From: hickert Date: Thu, 29 Apr 2010 14:12:17 +0000 Subject: [PATCH] Fixed config flag reading for password changes - hash was renamed to passwordDefaultHash git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6@17970 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/html/password.php | 2 +- gosa-core/plugins/personal/generic/class_user.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gosa-core/html/password.php b/gosa-core/html/password.php index 459512228..405dbb47a 100644 --- a/gosa-core/html/password.php +++ b/gosa-core/html/password.php @@ -150,7 +150,7 @@ if ($config->get_cfg_value("forcessl") == 'true' && $ssl != ''){ } /* Check for selected password method */ -$method= $config->get_cfg_value("hash", "crypt/md5"); +$method= $config->get_cfg_value("passwordDefaultHash", "crypt/md5"); if (isset($_GET['method'])){ $method= validate($_GET['method']); $tmp = new passwordMethod($config); diff --git a/gosa-core/plugins/personal/generic/class_user.inc b/gosa-core/plugins/personal/generic/class_user.inc index 9d3f500a9..2a0ff3cf2 100644 --- a/gosa-core/plugins/personal/generic/class_user.inc +++ b/gosa-core/plugins/personal/generic/class_user.inc @@ -580,7 +580,7 @@ class user extends plugin /* Prepare password hashes */ if ($this->pw_storage == ""){ - $this->pw_storage= $this->config->get_cfg_value("hash"); + $this->pw_storage= $this->config->get_cfg_value("passwordDefaultHash"); } $temp= passwordMethod::get_available_methods(); -- 2.30.2