diff --git a/include/class_listing.inc b/include/class_listing.inc index 45e8e6175c8f8061de2133a6cb133c98e1538abf..0b752db39496156400d671baf0585d95ddbb77e5 100644 --- a/include/class_listing.inc +++ b/include/class_listing.inc @@ -967,13 +967,13 @@ class listing */ function filterObjectType($row, $dn) { - return $this->filterGenericType($row, $dn, $this->objectTypes, $this->getObjectType($dn, $this->entries[$row])); + return $this->filterGenericType($dn, $this->objectTypes, $this->getObjectType($dn, $this->entries[$row])); } /*! * \brief Generic method for department and objects once type is known */ - protected function filterGenericType($row, $dn, $types, $type) + protected function filterGenericType($dn, $types, $type) { $result = " "; @@ -997,7 +997,7 @@ class listing */ function filterDepartmentType($row, $dn) { - return $this->filterGenericType($row, $dn, $this->departmentTypes, $this->getDepartmentType($dn, $this->departments[$row])); + return $this->filterGenericType($dn, $this->departmentTypes, $this->getDepartmentType($dn, $this->departments[$row])); } /*! diff --git a/plugins/addons/dashboard/class_dashBoardPasswords.inc b/plugins/addons/dashboard/class_dashBoardPasswords.inc index c498733a1c1a3d38515322fb70d38a130bdfcc1f..62bccae29611a2017eed15468f5e151b151aa46c 100644 --- a/plugins/addons/dashboard/class_dashBoardPasswords.inc +++ b/plugins/addons/dashboard/class_dashBoardPasswords.inc @@ -59,7 +59,7 @@ class dashboardPassword extends simplePlugin $nb_accounts = count($users); $nb_locked_accounts = 0; $methods_stats = array(); - foreach ($users as $dn => $userPassword) { + foreach ($users as $userPassword) { if (!empty($userPassword)) { if (preg_match("/^\{[^\}]+\}!/", $userPassword)) { $nb_locked_accounts++; diff --git a/plugins/admin/groups/class_ogroup.inc b/plugins/admin/groups/class_ogroup.inc index 731b94c4f3d6c7e9fe5afe63da0714853ed7ae2e..b00805b09fa4b9c9272059e63548bfce833306a9 100644 --- a/plugins/admin/groups/class_ogroup.inc +++ b/plugins/admin/groups/class_ogroup.inc @@ -235,7 +235,6 @@ class ogroup extends simplePlugin function __construct ($dn = NULL, $object = NULL, $parent = NULL, $mainTab = FALSE) { - global $config; parent::__construct($dn, $object, $parent, $mainTab); $this->attributesAccess['trustMode']->setInLdap(FALSE);