From d9bf49c5dc2c7c2ce47c37396f2619a467015055 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 31 Oct 2020 21:04:38 +0100 Subject: [PATCH] phpcs --- htdocs/admin/system/modules.php | 8 +- htdocs/admin/workflow.php | 2 +- htdocs/api/class/api_access.class.php | 2 +- htdocs/api/index.php | 2 +- .../core/class/commondocgenerator.class.php | 2 +- htdocs/dav/fileserver.php | 2 +- htdocs/debugbar/class/autoloader.php | 2 +- htdocs/product/admin/price_rules.php | 2 +- htdocs/user/class/api_users.class.php | 88 +++++++------------ 9 files changed, 43 insertions(+), 67 deletions(-) diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php index 8347a9a6e4c..28dcb6641ef 100644 --- a/htdocs/admin/system/modules.php +++ b/htdocs/admin/system/modules.php @@ -270,13 +270,13 @@ print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $ print ''; // sort list -if ($sortfield == "name" && $sortorder == "asc") usort($moduleList, function(stdClass $a, stdClass $b) { +if ($sortfield == "name" && $sortorder == "asc") usort($moduleList, function (stdClass $a, stdClass $b) { return strcasecmp($a->name, $b->name); }); -if ($sortfield == "name" && $sortorder == "desc") usort($moduleList, function(stdClass $a, stdClass $b) { +if ($sortfield == "name" && $sortorder == "desc") usort($moduleList, function (stdClass $a, stdClass $b) { return strcasecmp($b->name, $a->name); }); -if ($sortfield == "version" && $sortorder == "asc") usort($moduleList, function(stdClass $a, stdClass $b) { +if ($sortfield == "version" && $sortorder == "asc") usort($moduleList, function (stdClass $a, stdClass $b) { return strcasecmp($a->version, $b->version); }); -if ($sortfield == "version" && $sortorder == "desc") usort($moduleList, function(stdClass $a, stdClass $b) { +if ($sortfield == "version" && $sortorder == "desc") usort($moduleList, function (stdClass $a, stdClass $b) { return strcasecmp($b->version, $a->version); }); if ($sortfield == "id" && $sortorder == "asc") usort($moduleList, "compareIdAsc"); if ($sortfield == "id" && $sortorder == "desc") usort($moduleList, "compareIdDesc"); diff --git a/htdocs/admin/workflow.php b/htdocs/admin/workflow.php index 5ee707a8002..6bd3edca2b8 100644 --- a/htdocs/admin/workflow.php +++ b/htdocs/admin/workflow.php @@ -139,7 +139,7 @@ if (!empty($conf->modules_parts['workflow']) && is_array($conf->modules_parts['w } // remove not available workflows (based on activated modules and global defined keys) -$workflowcodes = array_filter($workflowcodes, function($var) { +$workflowcodes = array_filter($workflowcodes, function ($var) { return $var['enabled']; }); /* diff --git a/htdocs/api/class/api_access.class.php b/htdocs/api/class/api_access.class.php index 6f6e1a2fb6c..e7b8ac8536b 100644 --- a/htdocs/api/class/api_access.class.php +++ b/htdocs/api/class/api_access.class.php @@ -18,7 +18,7 @@ // Create the autoloader for Luracast require_once DOL_DOCUMENT_ROOT.'/includes/restler/framework/Luracast/Restler/AutoLoader.php'; -call_user_func(function() { +call_user_func(function () { $loader = Luracast\Restler\AutoLoader::instance(); spl_autoload_register($loader); return $loader; diff --git a/htdocs/api/index.php b/htdocs/api/index.php index f605ff11d85..2fba9fbb554 100644 --- a/htdocs/api/index.php +++ b/htdocs/api/index.php @@ -45,7 +45,7 @@ if (!$res) die("Include of main fails"); require_once DOL_DOCUMENT_ROOT.'/includes/restler/framework/Luracast/Restler/AutoLoader.php'; -call_user_func(function() { +call_user_func(function () { $loader = Luracast\Restler\AutoLoader::instance(); spl_autoload_register($loader); return $loader; diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php index 7e8d2da34ce..6015bbceece 100644 --- a/htdocs/core/class/commondocgenerator.class.php +++ b/htdocs/core/class/commondocgenerator.class.php @@ -1288,7 +1288,7 @@ abstract class CommonDocGenerator if (!empty($fields)) { // Sort extrafields by rank - uasort($fields, function($a, $b) { + uasort($fields, function ($a, $b) { return ($a->rank > $b->rank) ? 1 : -1; }); diff --git a/htdocs/dav/fileserver.php b/htdocs/dav/fileserver.php index c4939bd4069..bd6df769553 100644 --- a/htdocs/dav/fileserver.php +++ b/htdocs/dav/fileserver.php @@ -82,7 +82,7 @@ $tmpDir = $conf->dav->multidir_output[$entity]; // We need root dir, not a dir t // Authentication callback function -$authBackend = new \Sabre\DAV\Auth\Backend\BasicCallBack(function($username, $password) { +$authBackend = new \Sabre\DAV\Auth\Backend\BasicCallBack(function ($username, $password) { global $user; global $conf; global $dolibarr_main_authentication, $dolibarr_auto_user; diff --git a/htdocs/debugbar/class/autoloader.php b/htdocs/debugbar/class/autoloader.php index 721febdd13c..91606babb84 100644 --- a/htdocs/debugbar/class/autoloader.php +++ b/htdocs/debugbar/class/autoloader.php @@ -4,7 +4,7 @@ * Simple autoloader, so we don't need Composer just for this. */ -spl_autoload_register(function($class) { +spl_autoload_register(function ($class) { if (preg_match('/^DebugBar/', $class)) { $file = DOL_DOCUMENT_ROOT.'/includes/maximebf/debugbar/src/'.str_replace('\\', DIRECTORY_SEPARATOR, $class).'.php'; //var_dump($class.' - '.file_exists($file).' - '.$file); diff --git a/htdocs/product/admin/price_rules.php b/htdocs/product/admin/price_rules.php index 000acb485d2..84510dfabad 100644 --- a/htdocs/product/admin/price_rules.php +++ b/htdocs/product/admin/price_rules.php @@ -141,7 +141,7 @@ for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) { $price_options[$i] = $langs->trans('SellingPrice').' '.$i; } -$genPriceOptions = function($level) use ($price_options) { +$genPriceOptions = function ($level) use ($price_options) { $return = array(); diff --git a/htdocs/user/class/api_users.class.php b/htdocs/user/class/api_users.class.php index dedbd1992f3..d04c735eeed 100644 --- a/htdocs/user/class/api_users.class.php +++ b/htdocs/user/class/api_users.class.php @@ -86,7 +86,9 @@ class Users extends DolibarrApi $sql .= ", ".MAIN_DB_PREFIX."categorie_user as c"; } $sql .= ' WHERE t.entity IN ('.getEntity('user').')'; - if ($user_ids) $sql .= " AND t.rowid IN (".$user_ids.")"; + if ($user_ids) { + $sql .= " AND t.rowid IN (".$user_ids.")"; + } // Select products of given category if ($category > 0) { @@ -95,10 +97,8 @@ class Users extends DolibarrApi } // Add sql filters - if ($sqlfilters) - { - if (!DolibarrApi::_checkFilters($sqlfilters)) - { + if ($sqlfilters) { + if (!DolibarrApi::_checkFilters($sqlfilters)) { throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters); } $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)'; @@ -107,8 +107,7 @@ class Users extends DolibarrApi $sql .= $this->db->order($sortfield, $sortorder); if ($limit) { - if ($page < 0) - { + if ($page < 0) { $page = 0; } $offset = $limit * $page; @@ -118,13 +117,11 @@ class Users extends DolibarrApi $result = $this->db->query($sql); - if ($result) - { + if ($result) { $i = 0; $num = $this->db->num_rows($result); $min = min($num, ($limit <= 0 ? $num : $limit)); - while ($i < $min) - { + while ($i < $min) { $obj = $this->db->fetch_object($result); $user_static = new User($this->db); if ($user_static->fetch($obj->rowid)) { @@ -158,13 +155,11 @@ class Users extends DolibarrApi //} $result = $this->useraccount->fetch($id); - if (!$result) - { + if (!$result) { throw new RestException(404, 'User not found'); } - if (!DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user')) - { + if (!DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user')) { throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login); } @@ -194,13 +189,11 @@ class Users extends DolibarrApi //} $result = $this->useraccount->fetch('', $login); - if (!$result) - { + if (!$result) { throw new RestException(404, 'User not found'); } - if (!DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user')) - { + if (!DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user')) { throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login); } @@ -230,13 +223,11 @@ class Users extends DolibarrApi //} $result = $this->useraccount->fetch('', '', '', 0, -1, $email); - if (!$result) - { + if (!$result) { throw new RestException(404, 'User not found'); } - if (!DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user')) - { + if (!DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user')) { throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login); } @@ -301,13 +292,12 @@ class Users extends DolibarrApi if (!isset($request_data["lastname"])) throw new RestException(400, "lastname field missing");*/ //assign field values - foreach ($request_data as $field => $value) - { + foreach ($request_data as $field => $value) { $this->useraccount->$field = $value; } if ($this->useraccount->create(DolibarrApiAccess::$user) < 0) { - throw new RestException(500, 'Error creating', array_merge(array($this->useraccount->error), $this->useraccount->errors)); + throw new RestException(500, 'Error creating', array_merge(array($this->useraccount->error), $this->useraccount->errors)); } return $this->useraccount->id; } @@ -329,13 +319,11 @@ class Users extends DolibarrApi //} $result = $this->useraccount->fetch($id); - if (!$result) - { + if (!$result) { throw new RestException(404, 'Account not found'); } - if (!DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user')) - { + if (!DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user')) { throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login); } @@ -356,8 +344,7 @@ class Users extends DolibarrApi // If there is no error, update() returns the number of affected // rows so if the update is a no op, the return value is zezo. - if ($this->useraccount->update(DolibarrApiAccess::$user) >= 0) - { + if ($this->useraccount->update(DolibarrApiAccess::$user) >= 0) { return $this->get($id); } else { throw new RestException(500, $this->useraccount->error); @@ -419,18 +406,15 @@ class Users extends DolibarrApi //throw new RestException(401); //} $result = $this->useraccount->fetch($id); - if (!$result) - { + if (!$result) { throw new RestException(404, 'User not found'); } - if (!DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user')) - { + if (!DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user')) { throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login); } - if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && !empty(DolibarrApiAccess::$user->admin) && empty(DolibarrApiAccess::$user->entity)) - { + if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && !empty(DolibarrApiAccess::$user->admin) && empty(DolibarrApiAccess::$user->entity)) { $entity = (!empty($entity) ? $entity : $conf->entity); } else { // When using API, action is done on entity of logged user because a user of entity X with permission to create user should not be able to @@ -439,8 +423,7 @@ class Users extends DolibarrApi } $result = $this->useraccount->SetInGroup($group, $entity); - if (!($result > 0)) - { + if (!($result > 0)) { throw new RestException(500, $this->useraccount->error); } @@ -480,10 +463,8 @@ class Users extends DolibarrApi $sql .= ' WHERE t.entity IN ('.getEntity('user').')'; if ($group_ids) $sql .= " AND t.rowid IN (".$group_ids.")"; // Add sql filters - if ($sqlfilters) - { - if (!DolibarrApi::_checkFilters($sqlfilters)) - { + if ($sqlfilters) { + if (!DolibarrApi::_checkFilters($sqlfilters)) { throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters); } $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)'; @@ -492,8 +473,7 @@ class Users extends DolibarrApi $sql .= $this->db->order($sortfield, $sortorder); if ($limit) { - if ($page < 0) - { + if ($page < 0) { $page = 0; } $offset = $limit * $page; @@ -545,11 +525,10 @@ class Users extends DolibarrApi throw new RestException(401, "You are not allowed to read groups"); } - $group_static = new UserGroup($this->db); - $result = $group_static->fetch($group, '', $load_members); + $group_static = new UserGroup($this->db); + $result = $group_static->fetch($group, '', $load_members); - if (!$result) - { + if (!$result) { throw new RestException(404, 'Group not found'); } @@ -568,13 +547,11 @@ class Users extends DolibarrApi //throw new RestException(401); //} $result = $this->useraccount->fetch($id); - if (!$result) - { + if (!$result) { throw new RestException(404, 'User not found'); } - if (!DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user')) - { + if (!DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user')) { throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login); } $this->useraccount->oldcopy = clone $this->useraccount; @@ -636,8 +613,7 @@ class Users extends DolibarrApi $canreadsalary = ((!empty($conf->salaries->enabled) && !empty(DolibarrApiAccess::$user->rights->salaries->read)) || (!empty($conf->hrm->enabled) && !empty(DolibarrApiAccess::$user->rights->hrm->employee->read))); - if (!$canreadsalary) - { + if (!$canreadsalary) { unset($object->salary); unset($object->salaryextra); unset($object->thm);