Pleets / SQLWebManager

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/Catcher/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/Workarea/config/user.config.php

Indentation +40 added lines, -40 removed lines

@@ -2,52 +2,52 @@
 
 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
-	],
-	"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
-	],
-	"database" => [
-	    /** TABLE PREFIX:
-	     * Database prefix of tables, specifically here, the prefix of entity gateway above.
-	     */
-		"prefix" => ifdef('APP', ["database", "prefix"])
-	],
-	"redirect" => "Auth"			# where users will be redirect to if the they aren't logged in
+    '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
+    ],
+    "database" => [
+        /** TABLE PREFIX:
+         * Database prefix of tables, specifically here, the prefix of entity gateway above.
+         */
+        "prefix" => ifdef('APP', ["database", "prefix"])
+    ],
+    "redirect" => "Auth"			# where users will be redirect to if the they aren't logged in
 ];
\ No newline at end of file

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

module/Auth/config/user.config.php

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" => "Workarea"			# 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" => "Workarea"			# the module that will be redirect to, after authentication
 ];
\ No newline at end of file

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

module/Auth/source/Model/Resource.php

Indentation +15 added lines, -15 removed lines

@@ -6,32 +6,32 @@
 
 class Resource extends Entity
 {
-	/**
-	 * @var integer
-	 */
+    /**
+     * @var integer
+     */
     public $RESOURCE_ID;
 
-	/**
-	 * @var string
-	 */
+    /**
+     * @var string
+     */
     public $RESOURCE_NAME;
 
-	/**
-	 * @var string
-	 */
+    /**
+     * @var string
+     */
     public $STATE;
 
-	/**
-	 * @var date
-	 */
+    /**
+     * @var date
+     */
     public $RECORD_DATE;
 
     public function __construct($data = [])
     {
-    	parent::__construct($data);
+        parent::__construct($data);
 
-		$config = include 'module/Auth/config/user.config.php';
-		$prefix = $config["database"]["prefix"];
+        $config = include 'module/Auth/config/user.config.php';
+        $prefix = $config["database"]["prefix"];
 
         $this->setTableName($prefix . "_" . "RESOURCE");
     }

module/Auth/source/Model/UserTbl.php

Spacing +3 added lines, -3 removed lines

@@ -16,7 +16,7 @@ 
         $table = $this->getEntity()->getTableName();
 
         $config = include 'module/Auth/config/user.config.php';
-        $id_field  = $config["authentication"]["gateway"]["table_info"]["columns"]["id_field"];
+        $id_field = $config["authentication"]["gateway"]["table_info"]["columns"]["id_field"];
 
         $sql = "SELECT CASE WHEN MAX($id_field) IS NULL THEN 1 ELSE MAX($id_field) + 1 END AS USER_ID FROM $table";
 
@@ -37,7 +37,7 @@ 
     public function getUserById($id)
     {
         $config = include 'module/Auth/config/user.config.php';
-        $id_field  = $config["authentication"]["gateway"]["table_info"]["columns"]["id_field"];
+        $id_field = $config["authentication"]["gateway"]["table_info"]["columns"]["id_field"];
 
         $rowset = $this->select([
             $id_field => $id
@@ -69,7 +69,7 @@ 
     public function getUserByUsernameCredential($username)
     {
         $config = include 'module/Auth/config/user.config.php';
-        $username_credential  = $config["authentication"]["gateway"]["credentials"]["username"];
+        $username_credential = $config["authentication"]["gateway"]["credentials"]["username"];
 
         $rowset = $this->select([
             $username_credential => $username

Braces +6 added lines, -4 removed lines

@@ -49,8 +49,9 @@ 
 
         foreach ($row as $key => $value)
         {
-            if (is_string($key))
-                $filtered_array[$key] = $value;
+            if (is_string($key)) {
+                            $filtered_array[$key] = $value;
+            }
         }
 
         $user = new User();
@@ -81,8 +82,9 @@ 
 
         foreach ($row as $key => $value)
         {
-            if (is_string($key))
-                $filtered_array[$key] = $value;
+            if (is_string($key)) {
+                            $filtered_array[$key] = $value;
+            }
         }
 
         $user = new User();

module/Auth/source/Model/UserRole.php

Indentation +6 added lines, -6 removed lines

@@ -6,14 +6,14 @@
 
 class UserRole extends Entity
 {
-	/**
-	 * @var string
-	 */
+    /**
+     * @var string
+     */
     public $USER_ID;
 
-	/**
-	 * @var integer
-	 */
+    /**
+     * @var integer
+     */
     public $ROLE_ID;
 
     public function __construct($data = [])