From 2569c792e768365d60db59826b69bcf8eb125084 Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Tue, 8 Sep 2020 08:13:56 +0000 Subject: [PATCH] Fixing style errors. --- htdocs/admin/system/modules.php | 81 +++++++++++++++++---------------- 1 file changed, 41 insertions(+), 40 deletions(-) diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php index bba227f9acc..7181b35f858 100644 --- a/htdocs/admin/system/modules.php +++ b/htdocs/admin/system/modules.php @@ -32,7 +32,7 @@ if (!$user->admin) $langs->loadLangs(array("install", "other", "admin")); $optioncss = GETPOST('optioncss', 'alpha'); -$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'moduleoverview'; +$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'moduleoverview'; $search_name = GETPOST("search_name", 'alpha'); $search_id = GETPOST("search_id", 'alpha'); @@ -102,8 +102,7 @@ foreach ($modulesdir as $dir) // File duplicate print "Warning duplicate file found : ".$file." (Found ".$dir.$file.", already found ".$modules_fullpath[$file].")
"; } - else - { + else { // File to load $res = include_once $dir.$file; if (class_exists($modName)) @@ -120,8 +119,7 @@ foreach ($modulesdir as $dir) dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR); } } - else - { + else { print "Warning bad descriptor file : ".$dir.$file." (Class ".$modName." not found into file)
"; } } @@ -140,16 +138,15 @@ foreach ($modules as $key=>$module) $newModule->name = $module->getName(); $newModule->version = $module->getVersion(); $newModule->id = $key; - + $alt = $module->name.' - '.$modules_files[$key]; - + if (!empty($module->picto)) { if (preg_match('/^\//', $module->picto)) $newModule->picto = img_picto($alt, $module->picto, 'width="14px"', 1); else $newModule->picto = img_object($alt, $module->picto, 'width="14px"'); } - else - { + else { $newModule->picto = img_object($alt, 'generic', 'width="14px"'); } @@ -172,24 +169,24 @@ foreach ($modules as $key=>$module) $newModule->permission = $permission; // pre-filter list - if($search_name && !stristr($newModule->name, $search_name)) continue; - if($search_version && !stristr($newModule->version, $search_version)) continue; - if($search_id && !stristr($newModule->id, $search_id)) continue; + if ($search_name && !stristr($newModule->name, $search_name)) continue; + if ($search_version && !stristr($newModule->version, $search_version)) continue; + if ($search_id && !stristr($newModule->id, $search_id)) continue; - if($search_permission) + if ($search_permission) { $found = false; - foreach($newModule->permission as $permission) + foreach ($newModule->permission as $permission) { - if(stristr($permission, $search_permission)) + if (stristr($permission, $search_permission)) { $found = true; break; } } - if(!$found) continue; + if (!$found) continue; } $moduleList[] = $newModule; @@ -227,25 +224,25 @@ print ''; // Lines with input filters print ''; -if($arrayfields['name']['checked']) +if ($arrayfields['name']['checked']) { print ''; } -if($arrayfields['version']['checked']) +if ($arrayfields['version']['checked']) { print ''; } -if($arrayfields['id']['checked']) +if ($arrayfields['id']['checked']) { print ''; } -if($arrayfields['permission']['checked']) +if ($arrayfields['permission']['checked']) { print ''; print ''; -if($arrayfields['name']['checked']) +if ($arrayfields['name']['checked']) { print_liste_field_titre($arrayfields['name']['label'], $_SERVER["PHP_SELF"], "name", "", "", "", $sortfield, $sortorder); } -if($arrayfields['version']['checked']) +if ($arrayfields['version']['checked']) { print_liste_field_titre($arrayfields['version']['label'], $_SERVER["PHP_SELF"], "version", "", "", "", $sortfield, $sortorder); } -if($arrayfields['id']['checked']) +if ($arrayfields['id']['checked']) { print_liste_field_titre($arrayfields['id']['label'], $_SERVER["PHP_SELF"], "id", "", "", "", $sortfield, $sortorder); } -if($arrayfields['permission']['checked']) +if ($arrayfields['permission']['checked']) { print_liste_field_titre($arrayfields['permission']['label'], $_SERVER["PHP_SELF"], "permission", "", "", "", $sortfield, $sortorder); } @@ -287,46 +284,50 @@ print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $ print ''; // sort list -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) { return strcasecmp($b->name, $a->name); }); -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) { return strcasecmp($b->version, $a->version); }); -if($sortfield == "id" && $sortorder == "asc") usort($moduleList, "sortIdAsc"); -if($sortfield == "id" && $sortorder == "desc") usort($moduleList, "sortIdDesc"); -if($sortfield == "permission" && $sortorder == "asc") usort($moduleList, "sortPermissionIdsAsc"); -if($sortfield == "permission" && $sortorder == "desc") usort($moduleList, "sortPermissionIdsDesc"); +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) { + return strcasecmp($b->name, $a->name); }); +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) { + return strcasecmp($b->version, $a->version); }); +if ($sortfield == "id" && $sortorder == "asc") usort($moduleList, "sortIdAsc"); +if ($sortfield == "id" && $sortorder == "desc") usort($moduleList, "sortIdDesc"); +if ($sortfield == "permission" && $sortorder == "asc") usort($moduleList, "sortPermissionIdsAsc"); +if ($sortfield == "permission" && $sortorder == "desc") usort($moduleList, "sortPermissionIdsDesc"); foreach ($moduleList as $module) { print ''; - if($arrayfields['name']['checked']) + if ($arrayfields['name']['checked']) { print '"; } - - if($arrayfields['version']['checked']) + + if ($arrayfields['version']['checked']) { print ''; } - if($arrayfields['id']['checked']) + if ($arrayfields['id']['checked']) { print ''; } - if($arrayfields['permission']['checked']) + if ($arrayfields['permission']['checked']) { $idperms = ''; foreach ($module->permission as $permission) { $idperms .= ($idperms ? ", " : "").$permission; - + $translationKey = "Permission".$permission; - if(empty($langs->tab_translate[$translationKey])) + if (empty($langs->tab_translate[$translationKey])) { $tooltip = 'Missing translation (key '.$translation.' not found in admin.lang)'; $idperms .= ' Warning'; @@ -374,7 +375,7 @@ function sortIdAsc(stdClass $a, stdClass $b) function sortIdDesc(stdClass $a, stdClass $b) { - return $b->id > $a->id ? -1 : 1; + return $b->id > $a->id ? -1 : 1; } function sortPermissionIdsAsc(stdClass $a, stdClass $b)
'; print ''; print ''; print ''; print ''; print ''; print ''; print ''; @@ -261,19 +258,19 @@ print '
'; print $module->picto; print ' '.$module->name; print "'.$module->version.''.$module->id.'