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");

Indentation +3 added lines, -3 removed lines

@@ -13,9 +13,9 @@
 
 try
 {
-	$config = include "config/application.config.php";
-	$mvc = new Drone\Mvc\Application($config);
-	$mvc->run();
+    $config = include "config/application.config.php";
+    $mvc = new Drone\Mvc\Application($config);
+    $mvc->run();
 }
 # to load only the error view
 catch (Drone\Mvc\Exception\ViewNotFoundException $e)

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/Auth/lang/en.php

Indentation +6 added lines, -6 removed lines

@@ -3,12 +3,12 @@
 return [
     "Register form" => "Register form",
     "User registering" => "User registering",
-	"Username" => "Username",
-	"username" => "username",
-	"Email" => "Email",
-	"email" => "email",
-	"Password" => "Password",
-	"password" => "password",
+    "Username" => "Username",
+    "username" => "username",
+    "Email" => "Email",
+    "email" => "email",
+    "Password" => "Password",
+    "password" => "password",
     "Repeat your password" => "Repeat your password",
     "Register now" => "Register now",
     "Log in" => "Log in",

module/Auth/config/module.config.php

Indentation +5 added lines, -5 removed lines

@@ -3,11 +3,11 @@
 return [
     'router' => [
         'routes' => [
-        	'Auth' => [
-        		'module' => 'Auth',
-        		'controller' => 'LogIn',
-        		'view' => 'index'
-        	]
+            'Auth' => [
+                'module' => 'Auth',
+                'controller' => 'LogIn',
+                'view' => 'index'
+            ]
         ],
     ],
     'view_manager' => [

module/Utils/source/Model/Entity.php

Indentation +1 added lines, -1 removed lines

@@ -6,5 +6,5 @@
 
 class Entity extends DbEntity
 {
-	// general table gateway
+    // general table gateway
 }
\ No newline at end of file

module/Utils/Module.php

Indentation +4 added lines, -4 removed lines

@@ -7,8 +7,8 @@
 
 class Module extends AbstractionModule
 {
-	public function init(AbstractionController $c)
-	{
-		// init procedures
-	}
+    public function init(AbstractionController $c)
+    {
+        // init procedures
+    }
 }
\ No newline at end of file

module/Utils/config/module.config.php

Indentation +5 added lines, -5 removed lines

@@ -3,11 +3,11 @@
 return [
     'router' => [
         'routes' => [
-        	'Utils' => [
-        		'module' => 'Utils',
-        		'controller' => '',
-        		'view' => ''
-        	]
+            'Utils' => [
+                'module' => 'Utils',
+                'controller' => '',
+                'view' => ''
+            ]
         ],
     ],
     'view_manager' => [