From 6a2d29e9cd32815b870febf2a784f5ab4d20423d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Tue, 30 Aug 2016 11:24:39 +0200
Subject: [PATCH] Removed unused vars, fixed a few mistakes
---
include/class_CopyPasteHandler.inc | 2 --
include/class_listing.inc | 1 -
include/class_objects.inc | 2 --
include/class_pluglist.inc | 2 +-
include/password-methods/class_password-methods.inc | 4 +---
.../simpleplugin/attributes/class_CompositeAttribute.inc | 1 -
include/simpleplugin/attributes/class_FileAttribute.inc | 1 +
plugins/admin/aclrole/class_aclEditionDialog.inc | 2 --
plugins/admin/users/class_userManagement.inc | 4 +---
plugins/config/class_configInLdap.inc | 1 -
plugins/config/class_recoveryConfig.inc | 9 ++++++---
11 files changed, 10 insertions(+), 19 deletions(-)
diff --git a/include/class_CopyPasteHandler.inc b/include/class_CopyPasteHandler.inc
index 91a581272..11f8227c4 100644
--- a/include/class_CopyPasteHandler.inc
+++ b/include/class_CopyPasteHandler.inc
@@ -78,7 +78,6 @@ class CopyPasteHandler
*/
function add_to_queue($dn, $action, $type)
{
- global $config;
@DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $dn, 'add_to_queue');
if (!in_array($action, array('cut','copy'))) {
@@ -142,7 +141,6 @@ class CopyPasteHandler
*/
protected function load_entry_from_ldap($entry, $base)
{
- global $config;
@DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $entry['dn'], 'load_entry_from_ldap');
if (!isset($entry['tab_class']) && !isset($entry['type'])) {
return array();
diff --git a/include/class_listing.inc b/include/class_listing.inc
index 5c8df9860..5af4b617e 100644
--- a/include/class_listing.inc
+++ b/include/class_listing.inc
@@ -1614,7 +1614,6 @@ class listing {
function renderCopyPasteActions($row, $dn, $category, $class, $copy = TRUE, $cut = TRUE)
{
- global $config;
// We can only provide information if we've got a copypaste handler
// instance
if (!(isset($this->copyPasteHandler) && is_object($this->copyPasteHandler))) {
diff --git a/include/class_objects.inc b/include/class_objects.inc
index d8db92bd0..7275178bd 100644
--- a/include/class_objects.inc
+++ b/include/class_objects.inc
@@ -142,8 +142,6 @@ class objects
*/
static function open ($dn, $type)
{
- global $config;
-
$infos = static::infos($type);
$tabClass = $infos['tabClass'];
diff --git a/include/class_pluglist.inc b/include/class_pluglist.inc
index d24a656f7..4adcad5ab 100644
--- a/include/class_pluglist.inc
+++ b/include/class_pluglist.inc
@@ -58,7 +58,7 @@ class pluglist {
*/
function __construct()
{
- global $class_mapping, $config;
+ global $class_mapping;
/* Fill info part of pluglist */
$classes = get_declared_classes();
diff --git a/include/password-methods/class_password-methods.inc b/include/password-methods/class_password-methods.inc
index 0d6fa8711..0eee3e028 100644
--- a/include/password-methods/class_password-methods.inc
+++ b/include/password-methods/class_password-methods.inc
@@ -211,7 +211,7 @@ class passwordMethod
*/
static function get_available_methods()
{
- global $class_mapping, $config;
+ global $class_mapping;
$ret = FALSE;
$i = 0;
@@ -321,8 +321,6 @@ class passwordMethod
*/
static function get_method($password_hash, $dn = "")
{
- global $config;
-
$methods = passwordMethod::get_available_methods();
foreach ($methods['class'] as $class) {
diff --git a/include/simpleplugin/attributes/class_CompositeAttribute.inc b/include/simpleplugin/attributes/class_CompositeAttribute.inc
index 2d34eee48..fd36aa141 100644
--- a/include/simpleplugin/attributes/class_CompositeAttribute.inc
+++ b/include/simpleplugin/attributes/class_CompositeAttribute.inc
@@ -162,7 +162,6 @@ class CompositeAttribute extends Attribute
if (!is_array($values)) {
$values = $this->inputValue($values);
}
- $i = 0;
reset($values);
foreach ($this->attributes as &$attribute) {
$attribute->setValue(current($values));
diff --git a/include/simpleplugin/attributes/class_FileAttribute.inc b/include/simpleplugin/attributes/class_FileAttribute.inc
index 01f080756..925584f6a 100644
--- a/include/simpleplugin/attributes/class_FileAttribute.inc
+++ b/include/simpleplugin/attributes/class_FileAttribute.inc
@@ -191,6 +191,7 @@ class FileTextAreaAttribute extends FileDownloadAttribute
public function htmlIds()
{
+ $id = $this->getHtmlId();
$ids = parent::htmlIds();
$ids[] = $id.'_text';
return $ids;
diff --git a/plugins/admin/aclrole/class_aclEditionDialog.inc b/plugins/admin/aclrole/class_aclEditionDialog.inc
index a8435313f..89ed55392 100644
--- a/plugins/admin/aclrole/class_aclEditionDialog.inc
+++ b/plugins/admin/aclrole/class_aclEditionDialog.inc
@@ -269,8 +269,6 @@ class ACLEditionDialog extends GenericDialog
*/
function buildAclSelector($list)
{
- global $config;
-
$display = '<input type="hidden" name="acl_dummy_0_0_0" value="1"/>';
$cols = 3;
$tmp = session::global_get('plist');
diff --git a/plugins/admin/users/class_userManagement.inc b/plugins/admin/users/class_userManagement.inc
index cbab10fb3..48c94715c 100644
--- a/plugins/admin/users/class_userManagement.inc
+++ b/plugins/admin/users/class_userManagement.inc
@@ -137,7 +137,7 @@ class userManagement extends simpleManagement
global $config, $ui;
// Filter out entries we are not allowed to modify
$disallowed = array();
- $dns = array();
+ $allowed = array();
foreach ($entry as $dn) {
if (!preg_match('/w/', $ui->get_permissions($dn, 'user/password'))) {
$disallowed[] = $dn;
@@ -188,8 +188,6 @@ class userManagement extends simpleManagement
sprintf(_('Password method "%s" does not support locking. Account "%s" has not been locked!'),
$hn, $dn), WARNING_DIALOG);
}
- } else {
- // Can't lock unknown methods.
}
}
}
diff --git a/plugins/config/class_configInLdap.inc b/plugins/config/class_configInLdap.inc
index c36be130a..2a44f5647 100644
--- a/plugins/config/class_configInLdap.inc
+++ b/plugins/config/class_configInLdap.inc
@@ -477,7 +477,6 @@ class configInLdap extends simplePlugin
function __construct ($dn = NULL, $object = NULL, $parent = NULL, $mainTab = FALSE, $attributesInfo = NULL)
{
- global $config;
$attributesInfo = static::getAttributesInfo();
/* Languages */
$languages = get_languages(TRUE);
diff --git a/plugins/config/class_recoveryConfig.inc b/plugins/config/class_recoveryConfig.inc
index 521ce8104..eecad1bc5 100644
--- a/plugins/config/class_recoveryConfig.inc
+++ b/plugins/config/class_recoveryConfig.inc
@@ -128,10 +128,13 @@ class recoveryConfig extends simplePlugin
$ldap->cd($config->current['BASE']);
$ldap->create_missing_trees($tokenBranch);
if (!$ldap->success()) {
- $display = msgPool::ldaperror($ldap->get_error(),
- $tokenBranch, LDAP_MOD, get_class());
+ msg_dialog::display(
+ _('LDAP error'),
+ msgPool::ldaperror($ldap->get_error(), $tokenBranch, LDAP_MOD, get_class()),
+ LDAP_ERROR
+ );
}
- fusiondirectory_log("Created token branch ".$tokenBranch);
+ fusiondirectory_log('Created token branch '.$tokenBranch);
}
parent::__construct($dn, $object, $parent, $mainTab);
--
GitLab