Clean some ugly logic

src/pineapple/api/Authentication.php

@@ -27,6 +27,7 @@ class Authentication extends APIModule
             $result = $this->dbConnection->query("SELECT token FROM api_tokens WHERE token='%s';", $token);
             if (!empty($result) && isset($result[0]["token"]) && $result[0]["token"] === $token) {
                 $this->response = array("valid" => true);
+                return;
             }
         }
         $this->response = array("valid" => false);
@@ -39,9 +40,9 @@ class Authentication extends APIModule
             $name = $this->request->name;
             $this->dbConnection->exec("INSERT INTO api_tokens(token, name) VALUES('%s','%s');", $token, $name);
             $this->response = array("success" => true);
-        } else {
-            $this->error = "Missing token or name";
+            return;
         }
+        $this->error = "Missing token or name";
     }
 
     private function login()
@@ -54,7 +55,7 @@ class Authentication extends APIModule
                     return;
                 }
                 $epoch = intval($this->request->time);
-                if (is_int($epoch) && $epoch > 1) {
+                if ($epoch > 1) {
                     exec('date -s @' . $epoch);
                 }
                 return;
@@ -69,7 +70,7 @@ class Authentication extends APIModule
         $shadowContents = file_get_contents('/etc/shadow');
         $rootArray = explode(':', explode('root:', $shadowContents)[1]);
         $rootPass = $rootArray[0];
-        if ($rootPass != null && !empty($rootPass) && gettype($rootPass) === "string") {
+        if (!empty($rootPass) && gettype($rootPass) === "string") {
             return hash_equals($rootPass, crypt($password, $rootPass));
         }
         return false;

src/pineapple/api/DatabaseConnection.php

@@ -24,13 +24,9 @@ class DatabaseConnection
             switch ($errorType) {
                 case 'databaseConnectionError':
                     return "Could not connect to database: $errorMessage";
-                    break;
-                case 'databaseQueryError':
-                    return "Could not execute query: $errorMessage";
-                    break;
                 case 'databaseExecutionError':
+                case 'databaseQueryError':
                     return "Could not execute query: $errorMessage";
-                    break;
                 default:
                     return "Unknown database error";
             }
@@ -77,7 +73,7 @@ class DatabaseConnection
         }
         $resultArray = array();
         while ($row = $result->fetchArray(SQLITE3_ASSOC)) {
-            array_push($resultArray, $row);
+            $resultArray[] = $row;
         }
         return $resultArray;
     }

src/pineapple/api/Modules.php

@@ -18,7 +18,7 @@ class Modules extends APIModule
         require_once('DatabaseConnection.php');
 
         $dir = scandir("../modules");
-        if ($dir == false) {
+        if ($dir === false) {
             $this->error = "Unable to access modules directory";
             return $this->modules;
         }
@@ -54,7 +54,7 @@ class Modules extends APIModule
                     $this->modules['systemModules'][$moduleInfo->index] = $module;
                 }
             } else {
-                array_push($this->modules['userModules'], $module);
+                $this->modules['userModules'][] = $module;
             }
         }