From 726f1e13b4ad9acf8c101a53a101511febc1ba76 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Thu, 19 Mar 2020 20:26:49 +0100 Subject: [PATCH] refactoring --- lam/lib/baseModule.inc | 3 +-- lam/lib/modules/account.inc | 7 ++----- lam/lib/modules/dhcp_settings.inc | 3 +-- lam/lib/modules/freeRadius.inc | 6 ++---- lam/lib/modules/inetOrgPerson.inc | 3 +-- lam/lib/modules/posixAccount.inc | 3 +-- lam/lib/modules/sambaSamAccount/sambaMungedDial.inc | 4 +--- lam/lib/modules/shadowAccount.inc | 8 +++----- lam/lib/types/dhcp.inc | 2 +- 9 files changed, 13 insertions(+), 26 deletions(-) diff --git a/lam/lib/baseModule.inc b/lam/lib/baseModule.inc index d6344431..919886e4 100644 --- a/lam/lib/baseModule.inc +++ b/lam/lib/baseModule.inc @@ -2031,8 +2031,7 @@ abstract class baseModule { * @return array messages and attributes (array('messages' => array(), 'add' => array('mail' => array('test@test.com')), 'del' => array(), 'mod' => array(), 'info' => array())) */ public function checkSelfServiceOptions($fields, $attributes, $passwordChangeOnly, $readOnlyFields) { - $return = array('messages' => array(), 'add' => array(), 'del' => array(), 'mod' => array(), 'info' => array()); - return $return; + return array('messages' => array(), 'add' => array(), 'del' => array(), 'mod' => array(), 'info' => array()); } /** diff --git a/lam/lib/modules/account.inc b/lam/lib/modules/account.inc index c8cb20cb..96b0acd4 100644 --- a/lam/lib/modules/account.inc +++ b/lam/lib/modules/account.inc @@ -3,7 +3,7 @@ This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/) Copyright (C) 2003 - 2006 Tilo Lutz - 2005 - 2019 Roland Gruber + 2005 - 2020 Roland Gruber This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -177,10 +177,7 @@ class account extends baseModule { if (!$this->getAccountContainer()->isNewAccount && !in_array('account', $this->getAccountContainer()->attributes_orig['objectClass'])) { return array(); } - // Get easy attributes - $return = $this->getAccountContainer()->save_module_attributes($this->attributes, $this->orig); - // Return attributes - return $return; + return $this->getAccountContainer()->save_module_attributes($this->attributes, $this->orig); } /** diff --git a/lam/lib/modules/dhcp_settings.inc b/lam/lib/modules/dhcp_settings.inc index 67a1c420..c9a062d0 100644 --- a/lam/lib/modules/dhcp_settings.inc +++ b/lam/lib/modules/dhcp_settings.inc @@ -375,8 +375,7 @@ By default, the nodes are configured as H-Nodes which fits for small networks. I $this->attributes['objectClass'] = array_delete(array("dhcpSubnet"), $this->attributes['objectClass']); } } - $return = parent::save_attributes(); - return $return; + return parent::save_attributes(); } /** diff --git a/lam/lib/modules/freeRadius.inc b/lam/lib/modules/freeRadius.inc index 8ed67d5e..11a085f5 100644 --- a/lam/lib/modules/freeRadius.inc +++ b/lam/lib/modules/freeRadius.inc @@ -835,8 +835,7 @@ if (interface_exists('\LAM\JOB\Job', false)) { protected function findUsers($jobID, $options) { // read users $attrs = array('radiusExpiration'); - $userResults = searchLDAPByFilter('(radiusExpiration=*)', $attrs, array('user')); - return $userResults; + return searchLDAPByFilter('(radiusExpiration=*)', $attrs, array('user')); } /** @@ -902,8 +901,7 @@ if (interface_exists('\LAM\JOB\Job', false)) { $sysattrs = array('radiusExpiration', 'mail'); $attrs = $this->getAttrWildcards($jobID, $options); $attrs = array_values(array_unique(array_merge($attrs, $sysattrs))); - $userResults = searchLDAPByFilter('(&(radiusExpiration=*)(mail=*))', $attrs, array('user')); - return $userResults; + return searchLDAPByFilter('(&(radiusExpiration=*)(mail=*))', $attrs, array('user')); } /** diff --git a/lam/lib/modules/inetOrgPerson.inc b/lam/lib/modules/inetOrgPerson.inc index 968c3ea2..47fbeef2 100644 --- a/lam/lib/modules/inetOrgPerson.inc +++ b/lam/lib/modules/inetOrgPerson.inc @@ -3718,8 +3718,7 @@ class inetOrgPerson extends baseModule implements passwordService { $imageManipulator->thumbnail($maxWidth, $maxHeight); } $imageManipulator->convertToJpeg(); - $data = $imageManipulator->getImageData(); - return $data; + return $imageManipulator->getImageData(); } /** diff --git a/lam/lib/modules/posixAccount.inc b/lam/lib/modules/posixAccount.inc index 6e6bdd61..bdf72c3a 100644 --- a/lam/lib/modules/posixAccount.inc +++ b/lam/lib/modules/posixAccount.inc @@ -3715,8 +3715,7 @@ class posixAccount extends baseModule implements passwordService { */ private function cleanSuggestionPart($part) { $result = str_replace(array_keys($this->umlautReplacements), array_values($this->umlautReplacements), strtolower($part)); - $result = str_replace(array(' ', '_', '-'), array('', '', ''), $result); - return $result; + return str_replace(array(' ', '_', '-'), array('', '', ''), $result); } /** diff --git a/lam/lib/modules/sambaSamAccount/sambaMungedDial.inc b/lam/lib/modules/sambaSamAccount/sambaMungedDial.inc index f618b06f..ea2e41ba 100644 --- a/lam/lib/modules/sambaSamAccount/sambaMungedDial.inc +++ b/lam/lib/modules/sambaSamAccount/sambaMungedDial.inc @@ -316,9 +316,7 @@ class sambaMungedDial $this->ctx[$value]= 0; } } - $result= base64_encode($this->encode_munged($this->ctx)); - - return $result; + return base64_encode($this->encode_munged($this->ctx)); } /** Returns array of flags, which can be set on-demand with activated java-script */ diff --git a/lam/lib/modules/shadowAccount.inc b/lam/lib/modules/shadowAccount.inc index 1bedce63..d070b358 100644 --- a/lam/lib/modules/shadowAccount.inc +++ b/lam/lib/modules/shadowAccount.inc @@ -3,7 +3,7 @@ This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/) Copyright (C) 2003 - 2006 Tilo Lutz - Copyright (C) 2007 - 2019 Roland Gruber + Copyright (C) 2007 - 2020 Roland Gruber This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -887,8 +887,7 @@ if (interface_exists('\LAM\JOB\Job', false)) { $sysattrs = array('mail', 'shadowLastChange', 'shadowWarning', 'shadowMax', 'userPassword'); $attrs = $this->getAttrWildcards($jobID, $options); $attrs = array_values(array_unique(array_merge($attrs, $sysattrs))); - $userResults = searchLDAPByFilter('(&(shadowLastChange=*)(shadowMax=*)(mail=*))', $attrs, array('user')); - return $userResults; + return searchLDAPByFilter('(&(shadowLastChange=*)(shadowMax=*)(mail=*))', $attrs, array('user')); } /** @@ -1091,8 +1090,7 @@ if (interface_exists('\LAM\JOB\Job', false)) { protected function findUsers($jobID, $options) { // read users $attrs = array('shadowExpire'); - $userResults = searchLDAPByFilter('(shadowExpire=*)', $attrs, array('user')); - return $userResults; + return searchLDAPByFilter('(shadowExpire=*)', $attrs, array('user')); } /** diff --git a/lam/lib/types/dhcp.inc b/lam/lib/types/dhcp.inc index 25ab4fb3..711e847a 100644 --- a/lam/lib/types/dhcp.inc +++ b/lam/lib/types/dhcp.inc @@ -312,7 +312,7 @@ class lamDHCPList extends lamList { if (empty($pool['dhcprange'])) { continue; } - foreach($pool['dhcprange'] AS $id => $value) { + foreach($pool['dhcprange'] AS $value) { if (!empty($value) && !is_numeric($value)) { $ex = explode(" ", $value); $row = new htmlTableRow(