Pleets / SQLWebManager

module/Auth/Module.php

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/Connections/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/Connections/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/Utils/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/Auth/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;
 	}
 }