From 2a10013f36c82562ab982c55e58596eaf7681bc2 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Sun, 23 Dec 2018 11:01:29 +0100 Subject: [PATCH] refactoring --- lam/lib/lists.inc | 31 ++++++++++++++++--------- lam/templates/config/confmain.php | 4 ++-- lam/templates/config/confmodules.php | 6 +++-- lam/templates/config/conftypes.php | 6 +++-- lam/templates/config/moduleSettings.php | 6 +++-- lam/templates/login.php | 2 +- lam/templates/tools/importexport.php | 12 ++++++---- lam/templates/tools/multiEdit.php | 2 +- lam/templates/tools/ou_edit.php | 2 +- sonar-project.properties | 2 +- 10 files changed, 45 insertions(+), 28 deletions(-) diff --git a/lam/lib/lists.inc b/lam/lib/lists.inc index 1b340550..03d5ca61 100644 --- a/lam/lib/lists.inc +++ b/lam/lib/lists.inc @@ -192,24 +192,24 @@ class lamList { // show form echo "
"; echo "
\n"; - echo ("
type->getId() . "&norefresh=true\" method=\"post\">\n"); + echo "type->getId() . "&norefresh=true\" method=\"post\">\n"; // draw account list if accounts were found if (sizeof($this->entries) > 0) { // buttons $this->listPrintButtons(false); - echo ("
\n"); + echo "
\n"; // navigation bar $this->listDrawNavigationBar(sizeof($this->entries)); - echo ("
\n"); + echo "
\n"; $this->printAccountTable($this->entries); } else { // buttons $this->listPrintButtons(true); - echo ("
\n"); + echo "
\n"; // navigation bar $this->listDrawNavigationBar(sizeof($this->entries)); - echo ("
\n"); + echo "
\n"; $accounts = array(); $this->printAccountTable($accounts); echo "
\n"; @@ -267,8 +267,9 @@ class lamList { * @param array $info the account list */ protected function listCreateSortMapping(&$info) { - if (!is_array($this->attrArray)) return; - if (!is_string($this->sortColumn)) return; + if (!is_array($this->attrArray) || !is_string($this->sortColumn)) { + return; + } $toSort = array(); $col = $this->sortColumn; $size = sizeof($info); @@ -498,8 +499,12 @@ class lamList { private function addDataElements(&$data, &$info, &$onClickEvents, &$onDoubleClickEvents) { // calculate which rows to show $table_begin = ($this->page - 1) * $this->maxPageEntries; - if (($this->page * $this->maxPageEntries) > sizeof($info)) $table_end = sizeof($info); - else $table_end = ($this->page * $this->maxPageEntries); + if (($this->page * $this->maxPageEntries) > sizeof($info)) { + $table_end = sizeof($info); + } + else { + $table_end = ($this->page * $this->maxPageEntries); + } // get sort mapping $sortMapping = &$this->sortMapping; if (empty($sortMapping)) { @@ -964,8 +969,12 @@ class lamList { exit(); } // get current page - if (!empty($_GET["page"])) $this->page = $_GET["page"]; - else $this->page = 1; + if (!empty($_GET["page"])) { + $this->page = $_GET["page"]; + } + else { + $this->page = 1; + } // generate attribute-description table $temp_array = $this->listGetAttributeDescriptionList(); $this->attrArray = array_keys($temp_array); // list of LDAP attributes to show diff --git a/lam/templates/config/confmain.php b/lam/templates/config/confmain.php index fc702f89..fda1a529 100644 --- a/lam/templates/config/confmain.php +++ b/lam/templates/config/confmain.php @@ -152,7 +152,7 @@ $tabindex = 1; echo $_SESSION['header']; printHeaderContents(_("LDAP Account Manager Configuration"), '../..'); -echo ("\n"); +echo "\n"; // include all JavaScript files printJsIncludes('../..'); printConfigurationPageHeaderBar($conf); @@ -171,7 +171,7 @@ if (sizeof($errorsToDisplay) > 0) { } // display formular -echo ("\n"); +echo "\n"; printConfigurationPageTabs(ConfigurationPageTab::GENERAL); diff --git a/lam/templates/config/confmodules.php b/lam/templates/config/confmodules.php index fa1c4d7a..4e615ce4 100644 --- a/lam/templates/config/confmodules.php +++ b/lam/templates/config/confmodules.php @@ -117,9 +117,11 @@ printJsIncludes('../..'); printConfigurationPageHeaderBar($conf); // print error messages -for ($i = 0; $i < sizeof($errorsToDisplay); $i++) call_user_func_array('StatusMessage', $errorsToDisplay[$i]); +for ($i = 0; $i < sizeof($errorsToDisplay); $i++) { + call_user_func_array('StatusMessage', $errorsToDisplay[$i]); +} -echo ("\n"); +echo "\n"; printConfigurationPageTabs(ConfigurationPageTab::MODULES); diff --git a/lam/templates/config/conftypes.php b/lam/templates/config/conftypes.php index 040f1dff..105ab9c5 100644 --- a/lam/templates/config/conftypes.php +++ b/lam/templates/config/conftypes.php @@ -143,9 +143,11 @@ printJsIncludes('../..'); printConfigurationPageHeaderBar($conf); // print error messages -for ($i = 0; $i < sizeof($errorsToDisplay); $i++) call_user_func_array('StatusMessage', $errorsToDisplay[$i]); +for ($i = 0; $i < sizeof($errorsToDisplay); $i++) { + call_user_func_array('StatusMessage', $errorsToDisplay[$i]); +} -echo ("\n"); +echo "\n"; printConfigurationPageTabs(ConfigurationPageTab::TYPES); diff --git a/lam/templates/config/moduleSettings.php b/lam/templates/config/moduleSettings.php index f23aabf1..92f636a3 100644 --- a/lam/templates/config/moduleSettings.php +++ b/lam/templates/config/moduleSettings.php @@ -111,9 +111,11 @@ printJsIncludes('../..'); printConfigurationPageHeaderBar($conf); // print error messages -for ($i = 0; $i < sizeof($errorsToDisplay); $i++) call_user_func_array('StatusMessage', $errorsToDisplay[$i]); +for ($i = 0; $i < sizeof($errorsToDisplay); $i++) { + call_user_func_array('StatusMessage', $errorsToDisplay[$i]); +} -echo ("\n"); +echo "\n"; printConfigurationPageTabs(ConfigurationPageTab::MODULE_SETTINGS); diff --git a/lam/templates/login.php b/lam/templates/login.php index 838f8d72..51427c6c 100644 --- a/lam/templates/login.php +++ b/lam/templates/login.php @@ -229,7 +229,7 @@ function display_LoginPage($licenseValidator, $error_message) { - + diff --git a/lam/templates/tools/importexport.php b/lam/templates/tools/importexport.php index 8af10c62..b853c737 100644 --- a/lam/templates/tools/importexport.php +++ b/lam/templates/tools/importexport.php @@ -62,7 +62,9 @@ startSecureSession(); enforceUserIsLoggedIn(); // die if no write access -if (!checkIfWriteAccessIsAllowed()) die(); +if (!checkIfWriteAccessIsAllowed()) { + die(); +} checkIfToolIsActive('ImportExport'); @@ -175,7 +177,7 @@ function printImportTabContent(&$tabindex) { addSecurityTokenToMetaHTML($container); parseHtml(null, $container, array(), false, $tabindex, 'user'); - echo ("
\n"); + echo "\n"; } /** @@ -220,7 +222,7 @@ function printImportTabProcessing(&$tabindex) { addSecurityTokenToMetaHTML($container); parseHtml(null, $container, array(), false, $tabindex, 'user'); - echo ("\n"); + echo "\n"; } /** @@ -303,7 +305,7 @@ function printExportTabContent(&$tabindex) { addSecurityTokenToMetaHTML($container); parseHtml(null, $container, array(), false, $tabindex, 'user'); - echo ("\n"); + echo "\n"; } /** @@ -380,7 +382,7 @@ function printExportTabProcessing(&$tabindex) { addSecurityTokenToMetaHTML($container); parseHtml(null, $container, array(), false, $tabindex, 'user'); - echo ("\n"); + echo "\n"; } /** diff --git a/lam/templates/tools/multiEdit.php b/lam/templates/tools/multiEdit.php index 6924837f..be5cc191 100644 --- a/lam/templates/tools/multiEdit.php +++ b/lam/templates/tools/multiEdit.php @@ -201,7 +201,7 @@ function displayStartPage() { addSecurityTokenToMetaHTML($container); parseHtml(null, $container, array(), false, $tabindex, 'user'); - echo ("\n"); + echo "\n"; echo '
'; include '../../lib/adminFooter.inc'; } diff --git a/lam/templates/tools/ou_edit.php b/lam/templates/tools/ou_edit.php index 86dc0508..cd888f64 100644 --- a/lam/templates/tools/ou_edit.php +++ b/lam/templates/tools/ou_edit.php @@ -228,7 +228,7 @@ function display_main($message, $error) { addSecurityTokenToMetaHTML($container); parseHtml(null, $container, array(), false, $tabindex, 'user'); - echo ("\n"); + echo "\n"; echo '
'; include '../../lib/adminFooter.inc'; } diff --git a/sonar-project.properties b/sonar-project.properties index 34226208..da925138 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -15,4 +15,4 @@ sonar.links.issue=https://github.com/LDAPAccountManager/lam sonar.sources=lam sonar.tests=lam/tests -sonar.exclusions=**/3rdParty/**,**/lib/extra/**,**/lib/*jquery*.js,**/tests/**,**/style/*jquery*.css,,**/style/*cropper*.css,**/style/*magnific*.css +sonar.exclusions=**/3rdParty/**,**/lib/extra/**,**/lib/*jquery*.js,**/tests/**,**/style/*jquery*.css,,**/style/*cropper*.css,**/style/*magnific*.css,**/schema.inc