Code cleanup

kimai · Feb 12, 2021 · 3456266 · 3456266
1 parent 6dae596
commit 3456266
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/extensions/ki_adminpanel/functions.php b/extensions/ki_adminpanel/functions.php
@@ -117,12 +117,11 @@ function getCustomersData(Kimai_Database_Mysql $database, $kgaUser, $viewOtherGr
  */
 function getUsersData(Kimai_Database_Mysql $database, $kgaUser, $viewOtherGroupsAllowed)
 {
-    $result = [
+    return [
         'showDeletedUsers' => get_cookie('adminPanel_extension_show_deleted_users', 0),
         'curr_user' => $kgaUser['name'],
         'users' => getEditUserList($database, $kgaUser, $viewOtherGroupsAllowed)
     ];
-    return $result;
 }
 
 /**

diff --git a/libraries/Kimai/Auth/Ldapadvanced.php b/libraries/Kimai/Auth/Ldapadvanced.php
@@ -37,7 +37,6 @@
  */
 class Kimai_Auth_Ldapadvanced extends Kimai_Auth_Abstract
 {
-
     /**
      * Your LDAP-Server URI
      *
@@ -424,8 +423,8 @@ public function getDefaultGlobalRole()
     public function getDefaultGroups()
     {
         $groups = [];
-        $roles  = [];
-        $map    = [];
+        $roles = [];
+        $map = [];
 
         $database = $this->getDatabase();
         foreach ($database->membership_roles() as $role) {

diff --git a/libraries/Kimai/Extensions.php b/libraries/Kimai/Extensions.php
@@ -60,7 +60,12 @@ public function loadConfigurations()
         }
 
         while (false !== ($dir = readdir($handle))) {
-            if (is_file($dir) || $dir == '.' || $dir == '..' || substr($dir, 0) == '.' || substr($dir, 0, 1) == '#') {
+            if (is_file($dir)
+                || $dir == '.'
+                || $dir == '..'
+                || substr($dir, 0) == '.'
+                || substr($dir, 0, 1) == '#'
+            ) {
                 continue;
             }
 
@@ -212,10 +217,10 @@ public function resizeHooks()
 
     public function timeoutList()
     {
-        $timeoutlist = '';
+        $timeoutList = '';
         foreach ($this->timeouts as $timeout) {
-            $timeoutlist .= "kill_timeout('" . $timeout . "');";
+            $timeoutList .= "kill_timeout('" . $timeout . "');";
         }
-        return $timeoutlist;
+        return $timeoutList;
     }
 }
diff --git a/libraries/Kimai/Logger.php b/libraries/Kimai/Logger.php
@@ -5,7 +5,7 @@
  */
 class Kimai_Logger
 {
-    private static $instance = null;
+    private static $instance;
     private $file;
 
     /**