Pleets / SQLWebManager

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 = [])

module/Auth/source/Model/User.php

Indentation +10 added lines, -10 removed lines

@@ -6,19 +6,19 @@ 
 
 class User extends Entity
 {
-	/**
-	 * @var string
-	 */
+    /**
+     * @var string
+     */
     public $TOKEN;
 
-	/**
-	 * @var date
-	 */
+    /**
+     * @var date
+     */
     public $RECORD_DATE;
 
     public function __construct($data = [])
     {
-		$config = include 'module/Auth/config/user.config.php';
+        $config = include 'module/Auth/config/user.config.php';
 
         $username_str = $config["authentication"]["gateway"]["credentials"]["username"];
         $password_str = $config["authentication"]["gateway"]["credentials"]["password"];
@@ -31,10 +31,10 @@ 
             $this->{$field} = null;
         }
 
-    	parent::__construct($data);
+        parent::__construct($data);
 
-		$table  = $config["authentication"]["gateway"]["entity"];
-		$prefix = $config["database"]["prefix"];
+        $table  = $config["authentication"]["gateway"]["entity"];
+        $prefix = $config["database"]["prefix"];
 
         $this->setTableName($prefix . "_" . $table);
     }

module/Auth/source/Model/Role.php

Indentation +15 added lines, -15 removed lines

@@ -6,32 +6,32 @@
 
 class Role extends Entity
 {
-	/**
-	 * @var integer
-	 */
+    /**
+     * @var integer
+     */
     public $ROLE_ID;
 
-	/**
-	 * @var string
-	 */
+    /**
+     * @var string
+     */
     public $ROLE_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 . "_" . "ROLE");
     }

module/Auth/source/Model/DbUserRole.php

Indentation +3 added lines, -3 removed lines

@@ -6,9 +6,9 @@
 
 class DbUserRole extends Entity
 {
-	/**
-	 * @var string
-	 */
+    /**
+     * @var string
+     */
     public $USERNAME;
 
     /**

module/Auth/source/Controller/SingUp.php

Spacing +9 added lines, -9 removed lines

@@ -93,7 +93,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();
@@ -112,8 +112,8 @@ 
         $data = [];
 
         # 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 {
@@ -124,7 +124,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]
@@ -136,7 +136,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) . ')!!');
                 }
             });
 
@@ -247,7 +247,7 @@ 
 
             $this->getUserAdapter()->insert($user);
 
-            $link = $_SERVER["REQUEST_SCHEME"] .'://'. $_SERVER["HTTP_HOST"] . $this->getBasePath() . "/public/Auth/SingUp/verifyEmail/user/" . $post["username"] . "/token/" . $token;
+            $link = $_SERVER["REQUEST_SCHEME"] . '://' . $_SERVER["HTTP_HOST"] . $this->getBasePath() . "/public/Auth/SingUp/verifyEmail/user/" . $post["username"] . "/token/" . $token;
 
             if ($data["mail"])
             {
@@ -338,7 +338,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]
@@ -350,7 +350,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) . ')!!');
                 }
             });
 
@@ -437,7 +437,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 +41 added lines, -34 removed lines

@@ -27,8 +27,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()));
 
@@ -57,24 +58,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;
         }
@@ -142,8 +146,9 @@ 
 
             $this->checkSession();
 
-            if ($post["password"] !== $post["password_confirm"])
-                throw new \Drone\Exception\Exception("The password fields are different!", 300);
+            if ($post["password"] !== $post["password_confirm"]) {
+                            throw new \Drone\Exception\Exception("The password fields are different!", 300);
+            }
 
             $components = [
                 "attributes" => [
@@ -221,8 +226,9 @@ 
                 $username_str => $post["username"]
             ]);
 
-            if (count($rowset))
-                throw new \Drone\Exception\Exception("This username already exists!", 300);
+            if (count($rowset)) {
+                            throw new \Drone\Exception\Exception("This username already exists!", 300);
+            }
 
             $bcrypt = new Bcrypt();
             $securePass = $bcrypt->create($post["password"]);
@@ -279,14 +285,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");
@@ -301,8 +305,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();
@@ -370,13 +375,15 @@ 
                 "TOKEN"       => $token
             ]);
 
-            if (!count($row))
-                throw new \Drone\Exception\Exception("Token has expired or username does not exists!.");
+            if (!count($row)) {
+                            throw new \Drone\Exception\Exception("Token has expired or username does not exists!.");
+            }
 
             $user = array_shift($row);
 
-            if ($user->{$state_field} <> $pending_state)
-                throw new \Drone\Exception\Exception("This email address had verified before!.", 300);
+            if ($user->{$state_field} <> $pending_state) {
+                            throw new \Drone\Exception\Exception("This email address had verified before!.", 300);
+            }
 
             $user->exchangeArray([
                 $state_field => $active_state
@@ -388,14 +395,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");
@@ -410,8 +415,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();
@@ -447,15 +453,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/Module.php

Indentation +4 added lines, -4 removed lines

@@ -202,8 +202,8 @@
         $c->translator = new \Zend\Mvc\I18n\Translator($i18nTranslator);
     }
 
-	public function getUserConfig()
-	{
-		return include __DIR__ . "/config/user.config.php";
-	}
+    public function getUserConfig()
+    {
+        return include __DIR__ . "/config/user.config.php";
+    }
 }
\ No newline at end of file

Braces +6 added lines, -6 removed lines

@@ -143,8 +143,7 @@ 
                 $data["messages"] = $validator->getMessages();
                 throw new \Exception("Module config errros in user.config!", 300);
             }
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             $file = str_replace('\\', '', __CLASS__);
             $storage = new \Drone\Exception\Storage("cache/$file.json");
@@ -175,10 +174,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');
+            }
         }
     }
 

module/Catcher/config/user.config.php

Indentation +29 added lines, -29 removed lines

@@ -2,43 +2,43 @@
 
 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
-	],
+    'project' => [
+        'name' => ifdef('PROJECT NAME', ["project", "name"]),			# The name of your project
+    ],
     'output' => [
         'cache'
     ]

Spacing +3 added lines, -3 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
 	],
     'output' => [
         'cache'

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/Catcher/Module.php

Indentation +7 added lines, -7 removed lines

@@ -11,8 +11,8 @@ 
 
 class Module extends AbstractionModule
 {
-	public function init(AbstractionController $c)
-	{
+    public function init(AbstractionController $c)
+    {
         $config = $this->getUserConfig();
 
         $_config = ArrayDimension::toUnidimensional($config, "_");
@@ -90,7 +90,7 @@ 
             else
                 $layoutManager->fromTemplate($this, 'blank');
         }
-	}
+    }
 
     private function setTranslator(AbstractionController $c)
     {
@@ -112,8 +112,8 @@ 
         $c->translator = new \Zend\Mvc\I18n\Translator($i18nTranslator);
     }
 
-	public function getUserConfig()
-	{
-		return include __DIR__ . "/config/user.config.php";
-	}
+    public function getUserConfig()
+    {
+        return include __DIR__ . "/config/user.config.php";
+    }
 }
\ No newline at end of file

Braces +6 added lines, -6 removed lines

@@ -53,8 +53,7 @@ 
                 $data["messages"] = $validator->getMessages();
                 throw new \Exception("Module config errros in user.config!", 300);
             }
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             $file = str_replace('\\', '', __CLASS__);
             $storage = new \Drone\Exception\Storage("cache/$file.json");
@@ -85,10 +84,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');
+            }
         }
 	}