Pleets / SQLWebManager

module/Auth/source/Controller/LogOut.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/Connections/source/Controller/Tools.php

Braces +117 added lines, -98 removed lines

@@ -96,8 +96,9 @@ 
      */
     private function getUsersEntity()
     {
-        if (!is_null($this->usersEntity))
-            return $this->usersEntity;
+        if (!is_null($this->usersEntity)) {
+                    return $this->usersEntity;
+        }
 
         $this->usersEntity = new EntityAdapter(new TableGateway(new UserModel()));
 
@@ -109,8 +110,9 @@ 
      */
     private function getIdentifiersEntity()
     {
-        if (!is_null($this->identifiersEntity))
-            return $this->identifiersEntity;
+        if (!is_null($this->identifiersEntity)) {
+                    return $this->identifiersEntity;
+        }
 
         $this->identifiersEntity = new EntityAdapter(new TableGateway(new Identifiers()));
 
@@ -122,8 +124,9 @@ 
      */
     private function getConnectionTypesEntity()
     {
-        if (!is_null($this->connectionTypesEntity))
-            return $this->connectionTypesEntity;
+        if (!is_null($this->connectionTypesEntity)) {
+                    return $this->connectionTypesEntity;
+        }
 
         $this->connectionTypesEntity = new EntityAdapter(new TableGateway(new ConnectionType()));
 
@@ -135,8 +138,9 @@ 
      */
     private function getConnectionFieldsEntity()
     {
-        if (!is_null($this->connectionFieldsEntity))
-            return $this->connectionFieldsEntity;
+        if (!is_null($this->connectionFieldsEntity)) {
+                    return $this->connectionFieldsEntity;
+        }
 
         $this->connectionFieldsEntity = new EntityAdapter(new TableGateway(new ConnectionTypeField()));
 
@@ -148,8 +152,9 @@ 
      */
     private function getUserConnectionEntity()
     {
-        if (!is_null($this->userConnectionEntity))
-            return $this->userConnectionEntity;
+        if (!is_null($this->userConnectionEntity)) {
+                    return $this->userConnectionEntity;
+        }
 
         $this->userConnectionEntity = new EntityAdapter(new UserConnectionsTable(new UserConnection()));
 
@@ -161,8 +166,9 @@ 
      */
     private function getUserConnectionDetailsEntity()
     {
-        if (!is_null($this->userConnectionDetailsEntity))
-            return $this->userConnectionDetailsEntity;
+        if (!is_null($this->userConnectionDetailsEntity)) {
+                    return $this->userConnectionDetailsEntity;
+        }
 
         $this->userConnectionDetailsEntity = new EntityAdapter(new TableGateway(new UserConnectionDetails()));
 
@@ -226,12 +232,12 @@ 
                 {
                     foreach ($idenfiers as $identifier)
                     {
-                        if ($field->CONN_IDENTI_ID == $identifier->CONN_IDENTI_ID)
-                            $dbconfig[$identifier->CONN_IDENTI_NAME] = $field->FIELD_VALUE;
+                        if ($field->CONN_IDENTI_ID == $identifier->CONN_IDENTI_ID) {
+                                                    $dbconfig[$identifier->CONN_IDENTI_NAME] = $field->FIELD_VALUE;
+                        }
                     }
                 }
-            }
-            else
+            } else
             {
                 # STANDARD VALIDATIONS [check needed arguments]
                 $needles = ['type', 'aliasname'];
@@ -287,8 +293,9 @@ 
                 {
                     foreach ($idenfiers as $identifier)
                     {
-                        if ($field_number == $identifier->CONN_IDENTI_ID)
-                            $dbconfig[$identifier->CONN_IDENTI_NAME] = $field_value;
+                        if ($field_number == $identifier->CONN_IDENTI_ID) {
+                                                    $dbconfig[$identifier->CONN_IDENTI_NAME] = $field_value;
+                        }
                     }
                 }
             }
@@ -300,8 +307,7 @@ 
 
                 $driverAdapter = new \Drone\Db\Driver\DriverAdapter($dbconfig, false);
                 $driverAdapter->getDb()->connect();
-            }
-            catch (\Exception $e)
+            } catch (\Exception $e)
             {
                 # SUCCESS-MESSAGE
                 $data["process"] = "error";
@@ -312,14 +318,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");
@@ -427,13 +431,15 @@ 
                 "USER_CONN_ID" => $id
             ]);
 
-            if (!count($connection))
-                throw new \Exception("The Connection does not exists");
+            if (!count($connection)) {
+                            throw new \Exception("The Connection does not exists");
+            }
 
             $connection = array_shift($connection);
 
-            if ($connection->STATE == 'I')
-                throw new \Drone\Exception\Exception("This connection was deleted", 300);
+            if ($connection->STATE == 'I') {
+                            throw new \Drone\Exception\Exception("This connection was deleted", 300);
+            }
 
             $details = $this->getUserConnectionDetailsEntity()->select([
                 "USER_CONN_ID" => $id
@@ -447,16 +453,18 @@ 
             {
                 foreach ($idenfiers as $identifier)
                 {
-                    if ($field->CONN_IDENTI_ID == $identifier->CONN_IDENTI_ID)
-                        $dbconfig[$identifier->CONN_IDENTI_NAME] = $field->FIELD_VALUE;
+                    if ($field->CONN_IDENTI_ID == $identifier->CONN_IDENTI_ID) {
+                                            $dbconfig[$identifier->CONN_IDENTI_NAME] = $field->FIELD_VALUE;
+                    }
                 }
             }
 
             /* identifies if sql is base64 encoded */
             if (array_key_exists('base64', $post))
             {
-                if ((bool) $post["base64"])
-                    $post["sql"] = base64_decode($post["sql"]);
+                if ((bool) $post["base64"]) {
+                                    $post["sql"] = base64_decode($post["sql"]);
+                }
             }
 
             $data["sql"] = base64_encode($post["sql"]);
@@ -468,8 +476,9 @@ 
              */
             $sql_text = trim($sql_text);
 
-            if (empty($sql_text))
-                throw new \Drone\Exception\Exception("Empty statement");
+            if (empty($sql_text)) {
+                            throw new \Drone\Exception\Exception("Empty statement");
+            }
 
             $pos = strpos($sql_text, ';');
 
@@ -477,8 +486,9 @@ 
             {
                 $end_stament = strstr($sql_text, ';');
 
-                if ($end_stament == ';')
-                    $sql_text = strstr($sql_text, ';', true);
+                if ($end_stament == ';') {
+                                    $sql_text = strstr($sql_text, ';', true);
+                }
             }
 
              # clean comments and other characters
@@ -556,10 +566,11 @@ 
                     case 'mysqli':
 
                         # show statement cannot be a subquery
-                        if (!$isShowStm)
-                            $sql_text = "SELECT (@ROW_NUM:=@ROW_NUM + 1) AS ROW_NUM, V.* FROM (
+                        if (!$isShowStm) {
+                                                    $sql_text = "SELECT (@ROW_NUM:=@ROW_NUM + 1) AS ROW_NUM, V.* FROM (
                                             " . $sql_text . "
                                         ) V LIMIT $row_start, $step";
+                        }
                         break;
 
                     case 'oci8':
@@ -636,8 +647,7 @@ 
 
                 # redirect view
                 $this->setMethod('error');
-            }
-            catch (\Exception $e)
+            } catch (\Exception $e)
             {
                 # SUCCESS-MESSAGE
                 $data["process"] = "error";
@@ -689,8 +699,9 @@ 
 
                     foreach ($row as $column => $value)
                     {
-                        if ($isShowStm)
-                            $column++;
+                        if ($isShowStm) {
+                                                    $column++;
+                        }
 
                         if (gettype($value) == 'object')
                         {
@@ -703,11 +714,10 @@ 
                                 }
 
                                 $data["data"][$key][$column] = $val;
+                            } else {
+                                                            $data["data"][$key][$column] = $value;
                             }
-                            else
-                                $data["data"][$key][$column] = $value;
-                        }
-                        else {
+                        } else {
                             $data["data"][$key][$column] = $value;
                         }
                     }
@@ -718,24 +728,24 @@ 
                 {
                     $data["column_errors"] = $column_errors;
 
-                    if ($row_start > 1)
-                        $this->setMethod('nextResults');
+                    if ($row_start > 1) {
+                                            $this->setMethod('nextResults');
+                    }
                 }
 
-                if (array_key_exists('id', $post))
-                    $data["id"] = $post["id"];
+                if (array_key_exists('id', $post)) {
+                                    $data["id"] = $post["id"];
+                }
 
                 # 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");
@@ -869,13 +879,15 @@ 
                 "USER_CONN_ID" => $id
             ]);
 
-            if (!count($connection))
-                throw new \Exception("The Connection does not exists");
+            if (!count($connection)) {
+                            throw new \Exception("The Connection does not exists");
+            }
 
             $connection = array_shift($connection);
 
-            if ($connection->STATE == 'I')
-                throw new \Drone\Exception\Exception("This connection was deleted", 300);
+            if ($connection->STATE == 'I') {
+                            throw new \Drone\Exception\Exception("This connection was deleted", 300);
+            }
 
             $details = $this->getUserConnectionDetailsEntity()->select([
                 "USER_CONN_ID" => $id
@@ -889,16 +901,18 @@ 
             {
                 foreach ($idenfiers as $identifier)
                 {
-                    if ($field->CONN_IDENTI_ID == $identifier->CONN_IDENTI_ID)
-                        $dbconfig[$identifier->CONN_IDENTI_NAME] = $field->FIELD_VALUE;
+                    if ($field->CONN_IDENTI_ID == $identifier->CONN_IDENTI_ID) {
+                                            $dbconfig[$identifier->CONN_IDENTI_NAME] = $field->FIELD_VALUE;
+                    }
                 }
             }
 
             /* identifies if sql is base64 encoded */
             if (array_key_exists('base64', $post))
             {
-                if ((bool) $post["base64"])
-                    $post["sql"] = base64_decode($post["sql"]);
+                if ((bool) $post["base64"]) {
+                                    $post["sql"] = base64_decode($post["sql"]);
+                }
             }
 
             $data["sql"] = base64_encode($post["sql"]);
@@ -910,8 +924,9 @@ 
              */
             $sql_text = trim($sql_text);
 
-            if (empty($sql_text))
-                throw new \Drone\Exception\Exception("Empty statement");
+            if (empty($sql_text)) {
+                            throw new \Drone\Exception\Exception("Empty statement");
+            }
 
             $pos = strpos($sql_text, ';');
 
@@ -919,8 +934,9 @@ 
             {
                 $end_stament = strstr($sql_text, ';');
 
-                if ($end_stament == ';')
-                    $sql_text = strstr($sql_text, ';', true);
+                if ($end_stament == ';') {
+                                    $sql_text = strstr($sql_text, ';', true);
+                }
             }
 
              # clean comments and other characters
@@ -941,8 +957,9 @@ 
             $isShowStm   = $data["showStm"]   = (preg_match('/^SHOW/i', $clean_code));
 
             # detect selection
-            if (!$isSelectStm && !$isShowStm)
-                throw new \Exception("You can't export a non-selection statement!");
+            if (!$isSelectStm && !$isShowStm) {
+                            throw new \Exception("You can't export a non-selection statement!");
+            }
 
             try {
 
@@ -988,8 +1005,7 @@ 
 
                 # redirect view
                 $this->setMethod('error');
-            }
-            catch (\Exception $e)
+            } catch (\Exception $e)
             {
                 # SUCCESS-MESSAGE
                 $data["process"] = "error";
@@ -1060,8 +1076,9 @@ 
 
                         foreach ($rows[0] as $column_name => $row)
                         {
-                            if (!is_numeric($column_name))
-                                $column_names[] = $column_name;
+                            if (!is_numeric($column_name)) {
+                                                            $column_names[] = $column_name;
+                            }
                         }
 
                         $table .= "\t<thead>\r\n\t\t<tr>\r\n";
@@ -1080,8 +1097,9 @@ 
 
                             foreach ($row as $column => $value)
                             {
-                                if ($isShowStm)
-                                    $column++;
+                                if ($isShowStm) {
+                                                                    $column++;
+                                }
 
                                 if (gettype($value) == 'object')
                                 {
@@ -1094,11 +1112,10 @@ 
                                         }
 
                                         $data["data"][$key][$column] = $val;
+                                    } else {
+                                                                            $data["data"][$key][$column] = $value;
                                     }
-                                    else
-                                        $data["data"][$key][$column] = $value;
-                                }
-                                else {
+                                } else {
                                     $data["data"][$key][$column] = $value;
                                 }
                             }
@@ -1130,8 +1147,9 @@ 
 
                         foreach ($rows[0] as $column_name => $row)
                         {
-                            if (!is_numeric($column_name))
-                                $column_names[] = $column_name;
+                            if (!is_numeric($column_name)) {
+                                                            $column_names[] = $column_name;
+                            }
                         }
 
                         foreach ($column_names as $column_name)
@@ -1148,8 +1166,9 @@ 
 
                             foreach ($row as $column => $value)
                             {
-                                if ($isShowStm)
-                                    $column++;
+                                if ($isShowStm) {
+                                                                    $column++;
+                                }
 
                                 if (gettype($value) == 'object')
                                 {
@@ -1162,11 +1181,10 @@ 
                                         }
 
                                         $data["data"][$key][$column] = $val;
+                                    } else {
+                                                                            $data["data"][$key][$column] = $value;
                                     }
-                                    else
-                                        $data["data"][$key][$column] = $value;
-                                }
-                                else {
+                                } else {
                                     $data["data"][$key][$column] = $value;
                                 }
                             }
@@ -1203,20 +1221,19 @@ 
 
                 $data["filename"] = $filename;
 
-                if (array_key_exists('id', $post))
-                    $data["id"] = $post["id"];
+                if (array_key_exists('id', $post)) {
+                                    $data["id"] = $post["id"];
+                }
 
                 # 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");
@@ -1231,8 +1248,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();
@@ -1268,15 +1286,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/Catcher/source/Controller/Index.php

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

module/Workarea/source/Controller/Connections.php

Braces +50 added lines, -50 removed lines

@@ -85,8 +85,9 @@ 
      */
     private function getUsersEntity()
     {
-        if (!is_null($this->usersEntity))
-            return $this->usersEntity;
+        if (!is_null($this->usersEntity)) {
+                    return $this->usersEntity;
+        }
 
         $this->usersEntity = new EntityAdapter(new TableGateway(new UserModel()));
 
@@ -98,8 +99,9 @@ 
      */
     private function getConnectionTypesEntity()
     {
-        if (!is_null($this->connectionTypesEntity))
-            return $this->connectionTypesEntity;
+        if (!is_null($this->connectionTypesEntity)) {
+                    return $this->connectionTypesEntity;
+        }
 
         $this->connectionTypesEntity = new EntityAdapter(new TableGateway(new ConnectionType()));
 
@@ -111,8 +113,9 @@ 
      */
     private function getConnectionFieldsEntity()
     {
-        if (!is_null($this->connectionFieldsEntity))
-            return $this->connectionFieldsEntity;
+        if (!is_null($this->connectionFieldsEntity)) {
+                    return $this->connectionFieldsEntity;
+        }
 
         $this->connectionFieldsEntity = new EntityAdapter(new TableGateway(new ConnectionTypeField()));
 
@@ -124,8 +127,9 @@ 
      */
     private function getUserConnectionEntity()
     {
-        if (!is_null($this->userConnectionEntity))
-            return $this->userConnectionEntity;
+        if (!is_null($this->userConnectionEntity)) {
+                    return $this->userConnectionEntity;
+        }
 
         $this->userConnectionEntity = new EntityAdapter(new UserConnectionsTable(new UserConnection()));
 
@@ -137,8 +141,9 @@ 
      */
     private function getUserConnectionDetailsEntity()
     {
-        if (!is_null($this->userConnectionDetailsEntity))
-            return $this->userConnectionDetailsEntity;
+        if (!is_null($this->userConnectionDetailsEntity)) {
+                    return $this->userConnectionDetailsEntity;
+        }
 
         $this->userConnectionDetailsEntity = new EntityAdapter(new TableGateway(new UserConnectionDetails()));
 
@@ -177,14 +182,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");
@@ -289,13 +292,15 @@ 
                 "USER_CONN_ID" => $post["id"]
             ]);
 
-            if (!count($connection))
-                throw new \Exception("The Connection does not exists");
+            if (!count($connection)) {
+                            throw new \Exception("The Connection does not exists");
+            }
 
             $connection = array_shift($connection);
 
-            if ($connection->STATE == 'I')
-                throw new \Drone\Exception\Exception("This connection was deleted", 300);
+            if ($connection->STATE == 'I') {
+                            throw new \Drone\Exception\Exception("This connection was deleted", 300);
+            }
 
             $connection->exchangeArray([
                 "STATE" =>  'I'
@@ -309,14 +314,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");
@@ -387,8 +390,7 @@ 
 
                 # SUCCESS-MESSAGE
                 $data["process"] = "register-form";
-            }
-            else if ($this->isPost())
+            } else if ($this->isPost())
             {
                 # STANDARD VALIDATIONS [check needed arguments]
                 $needles = ['field', 'type', 'aliasname'];
@@ -486,22 +488,19 @@ 
 
                 # SUCCESS-MESSAGE
                 $data["process"] = "process-response";
-            }
-            else
+            } else
             {
                 $http = new Http();
                 $http->writeStatus($http::HTTP_METHOD_NOT_ALLOWED);
 
                 die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED .' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!');
             }
-        }
-        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");
@@ -588,13 +587,15 @@ 
                     "USER_CONN_ID" => $get["id"]
                 ]);
 
-                if (!count($connection))
-                    throw new \Exception("The Connection does not exists");
+                if (!count($connection)) {
+                                    throw new \Exception("The Connection does not exists");
+                }
 
                 $connection = array_shift($connection);
 
-                if ($connection->STATE == 'I')
-                    throw new \Drone\Exception\Exception("This connection was deleted", 300);
+                if ($connection->STATE == 'I') {
+                                    throw new \Drone\Exception\Exception("This connection was deleted", 300);
+                }
 
                 $connection_details = $this->getUserConnectionDetailsEntity()->select([
                     "USER_CONN_ID" => $get["id"]
@@ -612,8 +613,7 @@ 
 
                 # SUCCESS-MESSAGE
                 $data["process"] = "update-form";
-            }
-            else if ($this->isPost())
+            } else if ($this->isPost())
             {
                 # STANDARD VALIDATIONS [check needed arguments]
                 $needles = ['_conn_id', 'type', 'aliasname'];
@@ -685,13 +685,15 @@ 
                     "USER_CONN_ID"    => $post["_conn_id"],
                 ]);
 
-                if (!count($userConnection))
-                    throw new \Exception("The Connection does not exists");
+                if (!count($userConnection)) {
+                                    throw new \Exception("The Connection does not exists");
+                }
 
                 $userConnection = array_shift($userConnection);
 
-                if ($userConnection->STATE == 'I')
-                    throw new \Drone\Exception\Exception("This connection was deleted", 300);
+                if ($userConnection->STATE == 'I') {
+                                    throw new \Drone\Exception\Exception("This connection was deleted", 300);
+                }
 
                 $userConnection->exchangeArray([
                     "CONN_TYPE_ID"    => $post["type"],
@@ -723,22 +725,19 @@ 
 
                 # SUCCESS-MESSAGE
                 $data["process"] = "process-response";
-            }
-            else
+            } else
             {
                 $http = new Http();
                 $http->writeStatus($http::HTTP_METHOD_NOT_ALLOWED);
 
                 die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED .' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!');
             }
-        }
-        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");
@@ -786,15 +785,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/Workarea/config/user.config.php

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/source/Model/UserTbl.php

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/Controller/LogIn.php

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