Pleets / SQLWebManager

module/Workarea/source/Model/UserConnectionDetails.php

Indentation +13 added lines, -13 removed lines

@@ -6,24 +6,24 @@
 
 class UserConnectionDetails extends Entity
 {
-	/**
-	* @var integer
-	*/
-	public $USER_CONN_ID;
+    /**
+     * @var integer
+     */
+    public $USER_CONN_ID;
 
-	/**
-	* @var integer
-	*/
-	public $CONN_IDENTI_ID;
+    /**
+     * @var integer
+     */
+    public $CONN_IDENTI_ID;
 
-	/**
-	* @var string
-	*/
-	public $FIELD_VALUE;
+    /**
+     * @var string
+     */
+    public $FIELD_VALUE;
 
     public function __construct($data = [])
     {
-    	parent::__construct($data);
+        parent::__construct($data);
         $this->setTableName("SWM_USER_CONN_DETAILS");
     }
 }
\ No newline at end of file

module/Workarea/source/Model/UserConnection.php

Indentation +30 added lines, -30 removed lines

@@ -6,39 +6,39 @@
 
 class UserConnection extends Entity
 {
-	/**
-	* @var integer
-	*/
-	public $USER_CONN_ID;
-
-	/**
-	* @var integer
-	*/
-	public $USER_ID;
-
-	/**
-	* @var integer
-	*/
-	public $CONN_TYPE_ID;
-
-	/**
-	* @var string
-	*/
-	public $CONNECTION_NAME;
-
-	/**
-	* @var string
-	*/
-	public $STATE;
-
-	/**
-	* @var date
-	*/
-	public $RECORD_DATE;
+    /**
+     * @var integer
+     */
+    public $USER_CONN_ID;
+
+    /**
+     * @var integer
+     */
+    public $USER_ID;
+
+    /**
+     * @var integer
+     */
+    public $CONN_TYPE_ID;
+
+    /**
+     * @var string
+     */
+    public $CONNECTION_NAME;
+
+    /**
+     * @var string
+     */
+    public $STATE;
+
+    /**
+     * @var date
+     */
+    public $RECORD_DATE;
 
     public function __construct($data = [])
     {
-    	parent::__construct($data);
+        parent::__construct($data);
         $this->setTableName("SWM_USER_CONNECTIONS");
     }
 }
\ No newline at end of file

module/Workarea/config/module.config.php

Indentation +5 added lines, -5 removed lines

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

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:

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

module/Utils/source/Controller/Error.php

Indentation +12 added lines, -12 removed lines

@@ -7,25 +7,25 @@
 
 class Error extends AbstractionController
 {
-	public function notFound()
-	{
-		$this->setShowView(false);
-		$this->setLayout('HTTP404');
+    public function notFound()
+    {
+        $this->setShowView(false);
+        $this->setLayout('HTTP404');
 
         $http = new Http();
         $http->writeStatus($http::HTTP_NOT_FOUND);
 
-		return [];
-	}
+        return [];
+    }
 
-	public function notFoundView()
-	{
-		$this->setLayout('blank');
-		//$this->setTerminal(true);
+    public function notFoundView()
+    {
+        $this->setLayout('blank');
+        //$this->setTerminal(true);
 
         $http = new Http();
         $http->writeStatus($http::HTTP_NOT_FOUND);
 
-		return [];
-	}
+        return [];
+    }
 }
\ No newline at end of file

config/global.config.php

Indentation +16 added lines, -16 removed lines

@@ -2,21 +2,21 @@
 
 return [
     'project' => [
-		'id'   => 'id6447896',              # Unique ID for the project
-		'name' => 'SQLWebManager'           # The name of your project
+        'id'   => 'id6447896',              # Unique ID for the project
+        'name' => 'SQLWebManager'           # The name of your project
     ],
-	'mail' => [
-		"noreply" => "",
-		"host"    => ""
-	],
-	"authentication" => [
-		"method"  => "_COOKIE",				# the method to store credentials (_COOKIE, _SESSION)
-		"key"     => "session_id6448654",		# the key in the array to store credentials
-	],
-	"database" => [
-	    /** TABLE PREFIX:
-	     * Database prefix of tables, specifically here, the prefix of entity gateway above.
-	     */
-		"prefix" => "SWM"
-	]
+    'mail' => [
+        "noreply" => "",
+        "host"    => ""
+    ],
+    "authentication" => [
+        "method"  => "_COOKIE",				# the method to store credentials (_COOKIE, _SESSION)
+        "key"     => "session_id6448654",		# the key in the array to store credentials
+    ],
+    "database" => [
+        /** TABLE PREFIX:
+         * Database prefix of tables, specifically here, the prefix of entity gateway above.
+         */
+        "prefix" => "SWM"
+    ]
 ];
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -2,7 +2,7 @@ 
 
 return [
     'project' => [
-		'id'   => 'id6447896',              # Unique ID for the project
+		'id'   => 'id6447896', # Unique ID for the project
 		'name' => 'SQLWebManager'           # The name of your project
     ],
 	'mail' => [
@@ -10,8 +10,8 @@ 
 		"host"    => ""
 	],
 	"authentication" => [
-		"method"  => "_COOKIE",				# the method to store credentials (_COOKIE, _SESSION)
-		"key"     => "session_id6448654",		# the key in the array to store credentials
+		"method"  => "_COOKIE", # the method to store credentials (_COOKIE, _SESSION)
+		"key"     => "session_id6448654", # the key in the array to store credentials
 	],
 	"database" => [
 	    /** TABLE PREFIX:

public/index.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)