Pleets / SQLWebManager

public/index.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 date_default_timezone_set("America/Bogota");
 
 // Memory limit
-ini_set("memory_limit","256M");
+ini_set("memory_limit", "256M");
 
 // Run application
 require_once("vendor/autoload.php");

module/Auth/source/Controller/LogIn.php

Spacing +4 added lines, -4 removed lines

@@ -86,7 +86,7 @@ 
             $http = new Http();
             $http->writeStatus($http::HTTP_METHOD_NOT_ALLOWED);
 
-            die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED .' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!');
+            die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED . ' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!');
         }
 
         $this->checkSession();
@@ -116,7 +116,7 @@ 
                 $http = new Http();
                 $http->writeStatus($http::HTTP_METHOD_NOT_ALLOWED);
 
-                die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED .' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!');
+                die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED . ' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!');
             }
 
             # STANDARD VALIDATIONS [check needed arguments]
@@ -128,7 +128,7 @@ 
                     $http = new Http();
                     $http->writeStatus($http::HTTP_BAD_REQUEST);
 
-                    die('Error ' . $http::HTTP_BAD_REQUEST .' (' . $http->getStatusText($http::HTTP_BAD_REQUEST) . ')!!');
+                    die('Error ' . $http::HTTP_BAD_REQUEST . ' (' . $http->getStatusText($http::HTTP_BAD_REQUEST) . ')!!');
                 }
             });
 
@@ -268,7 +268,7 @@ 
             foreach ($errors as $errno => $error)
             {
                 $errorInformation .=
-                    "<strong style='color: #a94442'>".
+                    "<strong style='color: #a94442'>" .
                         $method
                             . "</strong>: <span style='color: #e24f4c'>{$error}</span> \n<br />";
             }

Braces +46 added lines, -36 removed lines

@@ -39,8 +39,9 @@ 
      */
     private function getUserAdapter()
     {
-        if (!is_null($this->userAdapter))
-            return $this->userAdapter;
+        if (!is_null($this->userAdapter)) {
+                    return $this->userAdapter;
+        }
 
         $this->userAdapter = new EntityAdapter(new TableGateway(new User()));
 
@@ -52,8 +53,9 @@ 
      */
     private function getUserRoleAdapter()
     {
-        if (!is_null($this->userRoleAdapter))
-            return $this->userRoleAdapter;
+        if (!is_null($this->userRoleAdapter)) {
+                    return $this->userRoleAdapter;
+        }
 
         $this->userRoleAdapter = new EntityAdapter(new TableGateway(new UserRole()));
 
@@ -65,8 +67,9 @@ 
      */
     private function getDbUserRoleAdapter()
     {
-        if (!is_null($this->dbUserRoleAdapter))
-            return $this->dbUserRoleAdapter;
+        if (!is_null($this->dbUserRoleAdapter)) {
+                    return $this->dbUserRoleAdapter;
+        }
 
         $this->dbUserRoleAdapter = new EntityAdapter(new TableGateway(new DbUserRole()));
 
@@ -95,24 +98,27 @@ 
          * $_SESSION["last_uri_" . $global_config["project"]["id"]] = $_SERVER["REQUEST_URI"];
          * It should be an unique session id for the app to prevent bad redirections with other projects.
          */
-        if (array_key_exists("last_uri_" . $global_config["project"]["id"], $_SESSION) || !empty($_SESSION["last_uri_" . $global_config["project"]["id"]]))
-            $location = $_SESSION["last_uri_" . $global_config["project"]["id"]];
-        else
-            $location = $this->getBasePath() . "/public/" . $config["redirect"];
+        if (array_key_exists("last_uri_" . $global_config["project"]["id"], $_SESSION) || !empty($_SESSION["last_uri_" . $global_config["project"]["id"]])) {
+                    $location = $_SESSION["last_uri_" . $global_config["project"]["id"]];
+        } else {
+                    $location = $this->getBasePath() . "/public/" . $config["redirect"];
+        }
 
         switch ($method)
         {
             case '_COOKIE':
 
-                if (array_key_exists($key, $_COOKIE) || !empty($_COOKIE[$key]))
-                    header("location: " . $location);
+                if (array_key_exists($key, $_COOKIE) || !empty($_COOKIE[$key])) {
+                                    header("location: " . $location);
+                }
 
                 break;
 
             case '_SESSION':
 
-                if (array_key_exists($key, $_SESSION) || !empty($_SESSION[$key]))
-                    header("location: " . $location);
+                if (array_key_exists($key, $_SESSION) || !empty($_SESSION[$key])) {
+                                    header("location: " . $location);
+                }
 
                 break;
         }
@@ -241,14 +247,14 @@ 
                                 $username_str => strtoupper($post["username"])
                             ]);
 
-                            if (!count($rowset))
-                                throw new \Drone\Exception\Exception("Your user is not authorized to use this application!");
+                            if (!count($rowset)) {
+                                                            throw new \Drone\Exception\Exception("Your user is not authorized to use this application!");
+                            }
                         }
 
                         $auth = new Authentication("default", false);
                         $result = $auth->authenticate($post["username"], $post["password"]);
-                    }
-                    catch (\Drone\Db\Driver\Exception\ConnectionException $e)
+                    } catch (\Drone\Db\Driver\Exception\ConnectionException $e)
                     {
                         throw new \Drone\Exception\Exception("Wrong user or password");
                     }
@@ -261,8 +267,9 @@ 
                         $username_str => $post["username"]
                     ]);
 
-                    if (!count($rowset))
-                        throw new \Drone\Exception\Exception("Username or password are incorrect");
+                    if (!count($rowset)) {
+                                            throw new \Drone\Exception\Exception("Username or password are incorrect");
+                    }
 
                     $user = array_shift($rowset);
 
@@ -274,23 +281,26 @@ 
                             $id_field => $user->{$id_field}
                         ]);
 
-                        if (!count($rowset))
-                            throw new \Drone\Exception\Exception("Your user is not authorized to use this application!");
+                        if (!count($rowset)) {
+                                                    throw new \Drone\Exception\Exception("Your user is not authorized to use this application!");
+                        }
                     }
 
                     $state_field = $config["authentication"]["gateway"]["table_info"]["columns"]["state_field"];
                     $state_pending_value = $config["authentication"]["gateway"]["table_info"]["column_values"]["state_field"]["pending_email"];
 
-                    if ($user->{$state_field} == $state_pending_value)
-                        throw new \Drone\Exception\Exception("User pending of email checking");
+                    if ($user->{$state_field} == $state_pending_value) {
+                                            throw new \Drone\Exception\Exception("User pending of email checking");
+                    }
 
                     $securePass = $user->{$password_str};
                     $password = $post["password"];
 
                     $bcrypt = new Bcrypt();
 
-                    if (!$bcrypt->verify($password, $securePass))
-                        throw new \Drone\Exception\Exception("Username or password are incorrect");
+                    if (!$bcrypt->verify($password, $securePass)) {
+                                            throw new \Drone\Exception\Exception("Username or password are incorrect");
+                    }
 
                     break;
 
@@ -315,14 +325,12 @@ 
 
             # SUCCESS-MESSAGE
             $data["process"] = "success";
-        }
-        catch (\Drone\Exception\Exception $e)
+        } catch (\Drone\Exception\Exception $e)
         {
             # ERROR-MESSAGE
             $data["process"] = "warning";
             $data["message"] = $e->getMessage();
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             $file = str_replace('\\', '', __CLASS__);
             $storage = new \Drone\Exception\Storage("cache/$file.json");
@@ -337,8 +345,9 @@ 
             }
 
             # errors retrived by the use of ErrorTrait
-            if (count($this->getErrors()))
-                $this->handleErrors($this->getErrors(), __METHOD__);
+            if (count($this->getErrors())) {
+                            $this->handleErrors($this->getErrors(), __METHOD__);
+            }
 
             $data["code"]    = $errorCode;
             $data["message"] = $e->getMessage();
@@ -374,15 +383,16 @@ 
             if (!$hd || !@fwrite($hd, $errorInformation))
             {
                 # error storing are not mandatory!
+            } else {
+                            @fclose($hd);
             }
-            else
-                @fclose($hd);
 
             $config = include 'config/application.config.php';
             $dev = $config["environment"]["dev_mode"];
 
-            if ($dev)
-                echo $errorInformation;
+            if ($dev) {
+                            echo $errorInformation;
+            }
         }
     }
 }
\ No newline at end of file

module/Auth/source/Controller/LogOut.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
             $http = new Http();
             $http->writeStatus($http::HTTP_METHOD_NOT_ALLOWED);
 
-            die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED .' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!');
+            die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED . ' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!');
         }
 
         $config = include 'module/Auth/config/user.config.php';

Braces +3 added lines, -2 removed lines

@@ -30,8 +30,9 @@
         switch ($method)
         {
             case '_COOKIE':
-                if (array_key_exists($key, $_COOKIE) || !empty($_COOKIE[$key]))
-                    setcookie($key, $_COOKIE[$key], time() - 1, '/');
+                if (array_key_exists($key, $_COOKIE) || !empty($_COOKIE[$key])) {
+                                    setcookie($key, $_COOKIE[$key], time() - 1, '/');
+                }
                 break;
 
             case '_SESSION':

module/Auth/source/Model/Authentication.php

Braces +3 added lines, -2 removed lines

@@ -21,9 +21,10 @@
         $db->setDbuser($user);
         $db->setDbpass($pass);
 
-        if ($db->isConnected())
-            return $db->reconnect()
+        if ($db->isConnected()) {
+                    return $db->reconnect()
         else
             return $db->connect();
+        }
     }
 }
\ No newline at end of file

module/Catcher/source/Controller/Index.php

Spacing +1 added lines, -1 removed lines

@@ -81,7 +81,7 @@
         {
             $new = array();
 
-            foreach($obj as $key => $val)
+            foreach ($obj as $key => $val)
             {
                 $new[$key] = $this->object_to_array($val);
             }

Braces +8 added lines, -6 removed lines

@@ -26,8 +26,9 @@ 
 
             foreach ($files as $file)
             {
-                if (!in_array($file, ['.', '..']))
-                    $_files[] = $file;
+                if (!in_array($file, ['.', '..'])) {
+                                    $_files[] = $file;
+                }
             }
 
             $_folders[$folder] = $_files;
@@ -74,8 +75,9 @@ 
 
     private function object_to_array($obj)
     {
-        if (is_object($obj))
-            $obj = (array) $obj;
+        if (is_object($obj)) {
+                    $obj = (array) $obj;
+        }
 
         if (is_array($obj))
         {
@@ -85,9 +87,9 @@ 
             {
                 $new[$key] = $this->object_to_array($val);
             }
+        } else {
+                    $new = $obj;
         }
-        else
-            $new = $obj;
 
         return $new;
     }

module/Workarea/source/Controller/Connections.php

Spacing +17 added lines, -17 removed lines

@@ -156,7 +156,7 @@ 
         $data = array();
 
         # environment settings
-        $this->setTerminal(true);           # set terminal
+        $this->setTerminal(true); # set terminal
 
         # TRY-CATCH-BLOCK
         try {
@@ -167,7 +167,7 @@ 
                 $http = new Http();
                 $http->writeStatus($http::HTTP_METHOD_NOT_ALLOWED);
 
-                die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED .' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!');
+                die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED . ' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!');
             }
 
             $data["connections"] = $this->getUserConnectionEntity()->select([
@@ -227,8 +227,8 @@ 
         $data = array();
 
         # environment settings
-        $post = $this->getPost();           # catch $_POST
-        $this->setTerminal(true);           # set terminal
+        $post = $this->getPost(); # catch $_POST
+        $this->setTerminal(true); # set terminal
 
         # TRY-CATCH-BLOCK
         try {
@@ -239,7 +239,7 @@ 
                 $http = new Http();
                 $http->writeStatus($http::HTTP_METHOD_NOT_ALLOWED);
 
-                die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED .' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!');
+                die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED . ' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!');
             }
 
             # STANDARD VALIDATIONS [check needed arguments]
@@ -251,7 +251,7 @@ 
                     $http = new Http();
                     $http->writeStatus($http::HTTP_BAD_REQUEST);
 
-                    die('Error ' . $http::HTTP_BAD_REQUEST .' (' . $http->getStatusText($http::HTTP_BAD_REQUEST) . ')!!');
+                    die('Error ' . $http::HTTP_BAD_REQUEST . ' (' . $http->getStatusText($http::HTTP_BAD_REQUEST) . ')!!');
                 }
             });
 
@@ -359,8 +359,8 @@ 
         $data = array();
 
         # environment settings
-        $post = $this->getPost();           # catch $_POST
-        $this->setTerminal(true);           # set terminal
+        $post = $this->getPost(); # catch $_POST
+        $this->setTerminal(true); # set terminal
 
         # TRY-CATCH-BLOCK
         try {
@@ -399,7 +399,7 @@ 
                         $http = new Http();
                         $http->writeStatus($http::HTTP_BAD_REQUEST);
 
-                        die('Error ' . $http::HTTP_BAD_REQUEST .' (' . $http->getStatusText($http::HTTP_BAD_REQUEST) . ')!!');
+                        die('Error ' . $http::HTTP_BAD_REQUEST . ' (' . $http->getStatusText($http::HTTP_BAD_REQUEST) . ')!!');
                     }
                 });
 
@@ -492,7 +492,7 @@ 
                 $http = new Http();
                 $http->writeStatus($http::HTTP_METHOD_NOT_ALLOWED);
 
-                die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED .' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!');
+                die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED . ' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!');
             }
         }
         catch (\Drone\Exception\Exception $e)
@@ -544,9 +544,9 @@ 
         $data = array();
 
         # environment settings
-        $post = $this->getPost();           # catch $_POST
-        $get = $_GET;                       # catch $_GET
-        $this->setTerminal(true);           # set terminal
+        $post = $this->getPost(); # catch $_POST
+        $get = $_GET; # catch $_GET
+        $this->setTerminal(true); # set terminal
 
         # TRY-CATCH-BLOCK
         try {
@@ -562,7 +562,7 @@ 
                         $http = new Http();
                         $http->writeStatus($http::HTTP_BAD_REQUEST);
 
-                        die('Error ' . $http::HTTP_BAD_REQUEST .' (' . $http->getStatusText($http::HTTP_BAD_REQUEST) . ')!!');
+                        die('Error ' . $http::HTTP_BAD_REQUEST . ' (' . $http->getStatusText($http::HTTP_BAD_REQUEST) . ')!!');
                     }
                 });
 
@@ -624,7 +624,7 @@ 
                         $http = new Http();
                         $http->writeStatus($http::HTTP_BAD_REQUEST);
 
-                        die('Error ' . $http::HTTP_BAD_REQUEST .' (' . $http->getStatusText($http::HTTP_BAD_REQUEST) . ')!!');
+                        die('Error ' . $http::HTTP_BAD_REQUEST . ' (' . $http->getStatusText($http::HTTP_BAD_REQUEST) . ')!!');
                     }
                 });
 
@@ -729,7 +729,7 @@ 
                 $http = new Http();
                 $http->writeStatus($http::HTTP_METHOD_NOT_ALLOWED);
 
-                die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED .' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!');
+                die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED . ' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!');
             }
         }
         catch (\Drone\Exception\Exception $e)
@@ -776,7 +776,7 @@ 
             foreach ($errors as $errno => $error)
             {
                 $errorInformation .=
-                    "<strong style='color: #a94442'>".
+                    "<strong style='color: #a94442'>" .
                         $method
                             . "</strong>: <span style='color: #e24f4c'>{$error}</span> \n<br />";
             }

Braces +50 added lines, -50 removed lines

@@ -85,8 +85,9 @@ 
      */
     private function getUsersEntity()
     {
-        if (!is_null($this->usersEntity))
-            return $this->usersEntity;
+        if (!is_null($this->usersEntity)) {
+                    return $this->usersEntity;
+        }
 
         $this->usersEntity = new EntityAdapter(new TableGateway(new UserModel()));
 
@@ -98,8 +99,9 @@ 
      */
     private function getConnectionTypesEntity()
     {
-        if (!is_null($this->connectionTypesEntity))
-            return $this->connectionTypesEntity;
+        if (!is_null($this->connectionTypesEntity)) {
+                    return $this->connectionTypesEntity;
+        }
 
         $this->connectionTypesEntity = new EntityAdapter(new TableGateway(new ConnectionType()));
 
@@ -111,8 +113,9 @@ 
      */
     private function getConnectionFieldsEntity()
     {
-        if (!is_null($this->connectionFieldsEntity))
-            return $this->connectionFieldsEntity;
+        if (!is_null($this->connectionFieldsEntity)) {
+                    return $this->connectionFieldsEntity;
+        }
 
         $this->connectionFieldsEntity = new EntityAdapter(new TableGateway(new ConnectionTypeField()));
 
@@ -124,8 +127,9 @@ 
      */
     private function getUserConnectionEntity()
     {
-        if (!is_null($this->userConnectionEntity))
-            return $this->userConnectionEntity;
+        if (!is_null($this->userConnectionEntity)) {
+                    return $this->userConnectionEntity;
+        }
 
         $this->userConnectionEntity = new EntityAdapter(new UserConnectionsTable(new UserConnection()));
 
@@ -137,8 +141,9 @@ 
      */
     private function getUserConnectionDetailsEntity()
     {
-        if (!is_null($this->userConnectionDetailsEntity))
-            return $this->userConnectionDetailsEntity;
+        if (!is_null($this->userConnectionDetailsEntity)) {
+                    return $this->userConnectionDetailsEntity;
+        }
 
         $this->userConnectionDetailsEntity = new EntityAdapter(new TableGateway(new UserConnectionDetails()));
 
@@ -177,14 +182,12 @@ 
 
             # SUCCESS-MESSAGE
             $data["process"] = "success";
-        }
-        catch (\Drone\Exception\Exception $e)
+        } catch (\Drone\Exception\Exception $e)
         {
             # ERROR-MESSAGE
             $data["process"] = "warning";
             $data["message"] = $e->getMessage();
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             $file = str_replace('\\', '', __CLASS__);
             $storage = new \Drone\Exception\Storage("cache/$file.json");
@@ -289,13 +292,15 @@ 
                 "USER_CONN_ID" => $post["id"]
             ]);
 
-            if (!count($connection))
-                throw new \Exception("The Connection does not exists");
+            if (!count($connection)) {
+                            throw new \Exception("The Connection does not exists");
+            }
 
             $connection = array_shift($connection);
 
-            if ($connection->STATE == 'I')
-                throw new \Drone\Exception\Exception("This connection was deleted", 300);
+            if ($connection->STATE == 'I') {
+                            throw new \Drone\Exception\Exception("This connection was deleted", 300);
+            }
 
             $connection->exchangeArray([
                 "STATE" =>  'I'
@@ -309,14 +314,12 @@ 
 
             # SUCCESS-MESSAGE
             $data["process"] = "success";
-        }
-        catch (\Drone\Exception\Exception $e)
+        } catch (\Drone\Exception\Exception $e)
         {
             # ERROR-MESSAGE
             $data["process"] = "warning";
             $data["message"] = $e->getMessage();
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             $file = str_replace('\\', '', __CLASS__);
             $storage = new \Drone\Exception\Storage("cache/$file.json");
@@ -387,8 +390,7 @@ 
 
                 # SUCCESS-MESSAGE
                 $data["process"] = "register-form";
-            }
-            else if ($this->isPost())
+            } else if ($this->isPost())
             {
                 # STANDARD VALIDATIONS [check needed arguments]
                 $needles = ['field', 'type', 'aliasname'];
@@ -486,22 +488,19 @@ 
 
                 # SUCCESS-MESSAGE
                 $data["process"] = "process-response";
-            }
-            else
+            } else
             {
                 $http = new Http();
                 $http->writeStatus($http::HTTP_METHOD_NOT_ALLOWED);
 
                 die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED .' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!');
             }
-        }
-        catch (\Drone\Exception\Exception $e)
+        } catch (\Drone\Exception\Exception $e)
         {
             # ERROR-MESSAGE
             $data["process"] = "warning";
             $data["message"] = $e->getMessage();
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             $file = str_replace('\\', '', __CLASS__);
             $storage = new \Drone\Exception\Storage("cache/$file.json");
@@ -588,13 +587,15 @@ 
                     "USER_CONN_ID" => $get["id"]
                 ]);
 
-                if (!count($connection))
-                    throw new \Exception("The Connection does not exists");
+                if (!count($connection)) {
+                                    throw new \Exception("The Connection does not exists");
+                }
 
                 $connection = array_shift($connection);
 
-                if ($connection->STATE == 'I')
-                    throw new \Drone\Exception\Exception("This connection was deleted", 300);
+                if ($connection->STATE == 'I') {
+                                    throw new \Drone\Exception\Exception("This connection was deleted", 300);
+                }
 
                 $connection_details = $this->getUserConnectionDetailsEntity()->select([
                     "USER_CONN_ID" => $get["id"]
@@ -612,8 +613,7 @@ 
 
                 # SUCCESS-MESSAGE
                 $data["process"] = "update-form";
-            }
-            else if ($this->isPost())
+            } else if ($this->isPost())
             {
                 # STANDARD VALIDATIONS [check needed arguments]
                 $needles = ['_conn_id', 'type', 'aliasname'];
@@ -685,13 +685,15 @@ 
                     "USER_CONN_ID"    => $post["_conn_id"],
                 ]);
 
-                if (!count($userConnection))
-                    throw new \Exception("The Connection does not exists");
+                if (!count($userConnection)) {
+                                    throw new \Exception("The Connection does not exists");
+                }
 
                 $userConnection = array_shift($userConnection);
 
-                if ($userConnection->STATE == 'I')
-                    throw new \Drone\Exception\Exception("This connection was deleted", 300);
+                if ($userConnection->STATE == 'I') {
+                                    throw new \Drone\Exception\Exception("This connection was deleted", 300);
+                }
 
                 $userConnection->exchangeArray([
                     "CONN_TYPE_ID"    => $post["type"],
@@ -723,22 +725,19 @@ 
 
                 # SUCCESS-MESSAGE
                 $data["process"] = "process-response";
-            }
-            else
+            } else
             {
                 $http = new Http();
                 $http->writeStatus($http::HTTP_METHOD_NOT_ALLOWED);
 
                 die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED .' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!');
             }
-        }
-        catch (\Drone\Exception\Exception $e)
+        } catch (\Drone\Exception\Exception $e)
         {
             # ERROR-MESSAGE
             $data["process"] = "warning";
             $data["message"] = $e->getMessage();
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             $file = str_replace('\\', '', __CLASS__);
             $storage = new \Drone\Exception\Storage("cache/$file.json");
@@ -786,15 +785,16 @@ 
             if (!$hd || !@fwrite($hd, $errorInformation))
             {
                 # error storing are not mandatory!
+            } else {
+                            @fclose($hd);
             }
-            else
-                @fclose($hd);
 
             $config = include 'config/application.config.php';
             $dev = $config["environment"]["dev_mode"];
 
-            if ($dev)
-                echo $errorInformation;
+            if ($dev) {
+                            echo $errorInformation;
+            }
         }
     }
 }
\ No newline at end of file

config/application.config.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
     ],
     'environment' => [
         'base_path' => (dirname(dirname($_SERVER['PHP_SELF'])) == "/") ? "" : dirname(dirname($_SERVER['PHP_SELF'])),
-        'dev_mode'  => true,                       // set this to FALSE for production environments
+        'dev_mode'  => true, // set this to FALSE for production environments
         'locale' => 'en'
     ],
 ];
\ No newline at end of file

module/Workarea/config/user.config.php

Spacing +5 added lines, -5 removed lines

@@ -4,7 +4,7 @@ 
 {
 	function ifdef($value, Array $array)
 	{
-		$global = __DIR__  . '/../../../config/global.config.php';
+		$global = __DIR__ . '/../../../config/global.config.php';
 
 		if (file_exists($global))
 		{
@@ -28,7 +28,7 @@ 
 				if (!$key)
 					return $in;
 
-			} while($key);
+			} while ($key);
 		}
 		else
 			return $value;
@@ -37,11 +37,11 @@ 
 
 return [
 	'project' => [
-		'name' => ifdef('PROJECT NAME', ["project", "name"]),			# The name of your project
+		'name' => ifdef('PROJECT NAME', ["project", "name"]), # The name of your project
 	],
 	"authentication" => [
-		"method"  => ifdef('_COOKIE', ["authentication", "method"]),		# the method to store credentials (_COOKIE, _SESSION)
-		"key"     => ifdef('session_id', ["authentication", "key"]),		# the key in the array to store credentials
+		"method"  => ifdef('_COOKIE', ["authentication", "method"]), # the method to store credentials (_COOKIE, _SESSION)
+		"key"     => ifdef('session_id', ["authentication", "key"]), # the key in the array to store credentials
 	],
 	"database" => [
 	    /** TABLE PREFIX:

Braces +12 added lines, -10 removed lines

@@ -15,23 +15,25 @@
 			{
 				if (is_array($in))
 				{
-					if (array_key_exists($key, $in))
-						$in = $in[$key];
-					else
-						return $value;
+					if (array_key_exists($key, $in)) {
+											$in = $in[$key];
+					} else {
+											return $value;
+					}
+				} else {
+									return $value;
 				}
-				else
-					return $value;
 
 				$key = ($array) ? array_shift($array) : NULL;
 
-				if (!$key)
-					return $in;
+				if (!$key) {
+									return $in;
+				}
 
 			} while($key);
+		} else {
+					return $value;
 		}
-		else
-			return $value;
 	}
 }
 

module/Workarea/Module.php

Braces +22 added lines, -18 removed lines

@@ -24,8 +24,9 @@ 
      */
     private function getUserAdapter()
     {
-        if (!is_null($this->userAdapter))
-            return $this->userAdapter;
+        if (!is_null($this->userAdapter)) {
+                    return $this->userAdapter;
+        }
 
         $this->userAdapter = new EntityAdapter(new UserTbl(new User()));
 
@@ -48,8 +49,9 @@ 
          * when users log in. It should be an unique session id for the app to prevent bad redirections with other projects.
          */
         # save only no XmlHttpRequest!
-        if (!$c->isXmlHttpRequest())
-            $_SESSION["last_uri_" . $global_config["project"]["id"]] = $_SERVER["REQUEST_URI"];
+        if (!$c->isXmlHttpRequest()) {
+                    $_SESSION["last_uri_" . $global_config["project"]["id"]] = $_SERVER["REQUEST_URI"];
+        }
 
         # config constraints
         $components = [
@@ -133,9 +135,9 @@ 
                         $c->stopExecution(false);
 
                         header("location: " . $c->getBasePath() . "/public/" . $redirect);
+                    } else {
+                                            $username_credential = $_COOKIE[$key];
                     }
-                    else
-                        $username_credential = $_COOKIE[$key];
 
                     break;
 
@@ -147,9 +149,9 @@ 
                         $c->stopExecution(false);
 
                         header("location: " . $c->getBasePath() . "/public/" . $redirect);
+                    } else {
+                                            $username_credential = $_SESSION[$key];
                     }
-                    else
-                        $username_credential = $_SESSION[$key];
 
                     break;
             }
@@ -161,10 +163,10 @@ 
             $state_field  = $config["authentication"]["gateway"]["table_info"]["columns"]["state_field"];
             $active_state = $config["authentication"]["gateway"]["table_info"]["column_values"]["state_field"]["user_active"];
 
-            if ($user->{$state_field} != $active_state)
-                throw new \Exception("The user has been inactived!. Please log-in again.");
-        }
-        catch (\Exception $e)
+            if ($user->{$state_field} != $active_state) {
+                            throw new \Exception("The user has been inactived!. Please log-in again.");
+            }
+        } catch (\Exception $e)
         {
             $file = str_replace('\\', '', __CLASS__);
             $storage = new \Drone\Exception\Storage("cache/$file.json");
@@ -194,10 +196,11 @@ 
             $layoutManager->setParams($data);
 
             # for AJAX requests!
-            if ($c->isXmlHttpRequest())
-                $layoutManager->content();
-            else
-                $layoutManager->fromTemplate($this, 'blank');
+            if ($c->isXmlHttpRequest()) {
+                            $layoutManager->content();
+            } else {
+                            $layoutManager->fromTemplate($this, 'blank');
+            }
         }
     }
 
@@ -207,8 +210,9 @@ 
 
         if (array_key_exists('locale', $_GET))
         {
-            if (in_array($_GET['locale'], ['en', 'es', 'fr']))
-                $_SESSION["LOCALE"] = $_GET['locale'];
+            if (in_array($_GET['locale'], ['en', 'es', 'fr'])) {
+                            $_SESSION["LOCALE"] = $_GET['locale'];
+            }
         }
 
         $locale = (array_key_exists('LOCALE', $_SESSION)) ? $_SESSION["LOCALE"] : $config["environment"]["locale"];