From 2998ec4cdbac3937f3a5dc9182196f9b6f7e8176 Mon Sep 17 00:00:00 2001 From: hickert Date: Mon, 28 Apr 2008 09:26:14 +0000 Subject: [PATCH] Fixed gosaSupportDaemon ids_exists git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@10710 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/include/class_gosaSupportDaemon.inc | 2 +- gosa-core/include/password-methods/class_password-methods.inc | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gosa-core/include/class_gosaSupportDaemon.inc b/gosa-core/include/class_gosaSupportDaemon.inc index 657d8a027..503b8f0cf 100644 --- a/gosa-core/include/class_gosaSupportDaemon.inc +++ b/gosa-core/include/class_gosaSupportDaemon.inc @@ -514,7 +514,7 @@ class gosaSupportDaemon $entries = $this->xml_to_array($str); if(isset($entries['XML']) && is_array($entries['XML'])){ foreach($entries['XML'] as $entry){ - if(isset($entry['ID'])){ + if(is_array($entry) && array_key_exists("ID",$entry)){ $ret[] = $entry['ID']; } } diff --git a/gosa-core/include/password-methods/class_password-methods.inc b/gosa-core/include/password-methods/class_password-methods.inc index b2d0ac6fd..07b346f09 100644 --- a/gosa-core/include/password-methods/class_password-methods.inc +++ b/gosa-core/include/password-methods/class_password-methods.inc @@ -131,6 +131,7 @@ class passwordMethod foreach ($methods['class'] as $class){ $test = new $class($config); + if(!$test->is_available())continue; $method= $test->_extract_method($password_hash); if ($method != ""){ $test->set_hash($method); -- 2.30.2