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/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/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;
     }

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

config/database.config.php

Indentation +8 added lines, -8 removed lines

@@ -1,12 +1,12 @@
 <?php
 
 return [
-	'default' => [
-		'dbname' => '',
-		'dbuser' => '',
-		'dbpass' => '',
-		'dbhost' => '',
-		'driver' => 'Oci8',
-		'dbchar' => 'utf8'
-	],
+    'default' => [
+        'dbname' => '',
+        'dbuser' => '',
+        'dbpass' => '',
+        'dbhost' => '',
+        'driver' => 'Oci8',
+        'dbchar' => 'utf8'
+    ],
 ];
\ No newline at end of file

module/Auth/config/user.config.php

Spacing +10 added lines, -10 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,7 +37,7 @@ 
 
 return [
 	'project' => [
-		'name' => ifdef('PROJECT NAME', ["project", "name"]),			# The name of your project
+		'name' => ifdef('PROJECT NAME', ["project", "name"]), # The name of your project
 	],
 	'mail' => [
         /** CHECKING:
@@ -51,8 +51,8 @@ 
 		"host" => ifdef('localhost', ["mail", "host"])
 	],
 	"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
         /** AUTH TYPE:
          * db_table: get credentials from a table in a database
          * db_user:  get credentials from database users (database authentication)
@@ -63,7 +63,7 @@ 
          * a database and checks the specified credentials. Theses will checked only if the AUTH TYPE is db_table.
          */
 		"gateway" => [
-			"entity" => "USER",			# Table name (without prefix if exists)
+			"entity" => "USER", # Table name (without prefix if exists)
 	        /** CREDENTIALS:
 	         * The field names of credentials in the table.
 	         */
@@ -81,14 +81,14 @@ 
 	         */
 			"table_info" => [
 				"columns" => [
-					"id_field"    => "USER_ID",				# often the primary key
-					"state_field" => "USER_STATE_ID",		# required if mail_checking is enabled
+					"id_field"    => "USER_ID", # often the primary key
+					"state_field" => "USER_STATE_ID", # required if mail_checking is enabled
 					"email_field" => "EMAIL"				# required registration process
 				],
 				"column_values" => [
 					"state_field" => [
-						"pending_email" => 1,				# required if mail_checking is enabled
-						"user_active"   => 2,				# required if mail_checking is enabled
+						"pending_email" => 1, # required if mail_checking is enabled
+						"user_active"   => 2, # required if mail_checking is enabled
 					]
 				]
 			]

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;
 	}
 }
 

Indentation +79 added lines, -79 removed lines

@@ -2,100 +2,100 @@ 
 
 if (!function_exists('ifdef'))
 {
-	function ifdef($value, Array $array)
-	{
-		$global = __DIR__  . '/../../../config/global.config.php';
+    function ifdef($value, Array $array)
+    {
+        $global = __DIR__  . '/../../../config/global.config.php';
 
-		if (file_exists($global))
-		{
-			$key = array_shift($array);
-			$in  = include $global;
+        if (file_exists($global))
+        {
+            $key = array_shift($array);
+            $in  = include $global;
 
-			do
-			{
-				if (is_array($in))
-				{
-					if (array_key_exists($key, $in))
-						$in = $in[$key];
-					else
-						return $value;
-				}
-				else
-					return $value;
+            do
+            {
+                if (is_array($in))
+                {
+                    if (array_key_exists($key, $in))
+                        $in = $in[$key];
+                    else
+                        return $value;
+                }
+                else
+                    return $value;
 
-				$key = ($array) ? array_shift($array) : NULL;
+                $key = ($array) ? array_shift($array) : NULL;
 
-				if (!$key)
-					return $in;
+                if (!$key)
+                    return $in;
 
-			} while($key);
-		}
-		else
-			return $value;
-	}
+            } while($key);
+        }
+        else
+            return $value;
+    }
 }
 
 return [
-	'project' => [
-		'name' => ifdef('PROJECT NAME', ["project", "name"]),			# The name of your project
-	],
-	'mail' => [
+    'project' => [
+        'name' => ifdef('PROJECT NAME', ["project", "name"]),			# The name of your project
+    ],
+    'mail' => [
         /** CHECKING:
          * If checking is enabled, the registering process will require e-mail verification.
          * If checking is enabled, the user will log in after registering.
          */
-		'checking' => [
-			'enabled' => "N",
-			'from'    => ifdef('noreply@example.com', ["mail", "noreply"])
-		],
-		"host" => ifdef('localhost', ["mail", "host"])
-	],
-	"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
+        'checking' => [
+            'enabled' => "N",
+            'from'    => ifdef('noreply@example.com', ["mail", "noreply"])
+        ],
+        "host" => ifdef('localhost', ["mail", "host"])
+    ],
+    "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
         /** AUTH TYPE:
          * db_table: get credentials from a table in a database
          * db_user:  get credentials from database users (database authentication)
          */
-		"type"    => "db_table",
+        "type"    => "db_table",
         /** DB GATEWAY:
          * Gateway is used to connect to database. It consists in an entity that connects to
          * a database and checks the specified credentials. Theses will checked only if the AUTH TYPE is db_table.
          */
-		"gateway" => [
-			"entity" => "USER",			# Table name (without prefix if exists)
-	        /** CREDENTIALS:
-	         * The field names of credentials in the table.
-	         */
-			"credentials" => [
-				"username" => "USERNAME",
-				"password" => "USER_PASSWORD"
-			],
+        "gateway" => [
+            "entity" => "USER",			# Table name (without prefix if exists)
+            /** CREDENTIALS:
+             * The field names of credentials in the table.
+             */
+            "credentials" => [
+                "username" => "USERNAME",
+                "password" => "USER_PASSWORD"
+            ],
 
-			// [TO DO] - Add validations for the following ...
+            // [TO DO] - Add validations for the following ...
 
 
-	        /** TABLE INFO:
-	         * Other information may be required for abstraction. If mail_checking is not enabled, your must define
-	         * at least the id_field for the table.
-	         */
-			"table_info" => [
-				"columns" => [
-					"id_field"    => "USER_ID",				# often the primary key
-					"state_field" => "USER_STATE_ID",		# required if mail_checking is enabled
-					"email_field" => "EMAIL"				# required registration process
-				],
-				"column_values" => [
-					"state_field" => [
-						"pending_email" => 1,				# required if mail_checking is enabled
-						"user_active"   => 2,				# required if mail_checking is enabled
-					]
-				]
-			]
+            /** TABLE INFO:
+             * Other information may be required for abstraction. If mail_checking is not enabled, your must define
+             * at least the id_field for the table.
+             */
+            "table_info" => [
+                "columns" => [
+                    "id_field"    => "USER_ID",				# often the primary key
+                    "state_field" => "USER_STATE_ID",		# required if mail_checking is enabled
+                    "email_field" => "EMAIL"				# required registration process
+                ],
+                "column_values" => [
+                    "state_field" => [
+                        "pending_email" => 1,				# required if mail_checking is enabled
+                        "user_active"   => 2,				# required if mail_checking is enabled
+                    ]
+                ]
+            ]
 
 
-		],
-	],
+        ],
+    ],
     /** AUTHORIZATION:
      *
      * If authorization is enabled, after user registering someone must authorize the first login of a user.
@@ -104,14 +104,14 @@ 
      *
      * If authorization is not enabled, users will log in after registration process without a previous authorization.
      */
-	"authorization" => [
-		"enabled" => "N"
-	],
-	"database" => [
-	    /** TABLE PREFIX:
-	     * Database prefix of tables, specifically here, the prefix of entity gateway above.
-	     */
-		"prefix" => ifdef('APP', ["database", "prefix"])
-	],
-	"redirect" => "App"			# the module that will be redirect to, after authentication
+    "authorization" => [
+        "enabled" => "N"
+    ],
+    "database" => [
+        /** TABLE PREFIX:
+         * Database prefix of tables, specifically here, the prefix of entity gateway above.
+         */
+        "prefix" => ifdef('APP', ["database", "prefix"])
+    ],
+    "redirect" => "App"			# the module that will be redirect to, after authentication
 ];
\ No newline at end of file