XaBerr / JATE

dist/jate/modules/WebApp/WebApp.php

Braces +20 added lines, -14 removed lines

@@ -19,15 +19,17 @@ 
       if(is_array($_page)) {
         $path  = $_page[0];
         $class = $_page[1];
-        if(isset($_page[2]))
-          $param = $_page[2];
+        if(isset($_page[2])) {
+                  $param = $_page[2];
+        }
       }
       $this->pages[$path] = [$class, $param];
       return $this->pages[$path];
     }
     public function addPages( $_pages ) {
-      foreach ($_pages as $i)
-        $this->addPage($i);
+      foreach ($_pages as $i) {
+              $this->addPage($i);
+      }
     }
     public function fetchPage() {
       $router = new Router();
@@ -43,10 +45,11 @@ 
           break;
         }
       }
-      if( isset($temp[1]) && is_array($temp[1]) )
-        $temp[1] = array_merge($temp[1], $parameters);
-      else
-        $temp[1] = $parameters;
+      if( isset($temp[1]) && is_array($temp[1]) ) {
+              $temp[1] = array_merge($temp[1], $parameters);
+      } else {
+              $temp[1] = $parameters;
+      }
       $this->currentPage = new $temp[0](["app" => $this->jConfig, "page" => $temp[1]]);
       return $this->currentPage;
     }
@@ -68,15 +71,18 @@ 
         while($cont < $urlLength) {
           if(
             ($this->jConfig->urlCaseSensitive && $_path[$cont] == $_url[$cont]) ||
-            (!$this->jConfig->urlCaseSensitive && strtolower($_path[$cont]) == strtolower($_url[$cont])) )
-            $cont++;
-          else if( strpos($_path[$cont], "\$") !== false ) {
+            (!$this->jConfig->urlCaseSensitive && strtolower($_path[$cont]) == strtolower($_url[$cont])) ) {
+                      $cont++;
+          } else if( strpos($_path[$cont], "\$") !== false ) {
             $variables[str_replace('$', "", $_path[$cont])] = $_url[$cont];
             $cont++;
-          } else break;
+          } else {
+          	break;
+          }
+        }
+        if($cont == $urlLength) {
+                  return $variables;
         }
-        if($cont == $urlLength)
-          return $variables;
       }
       return null;
     }

dist/jate/modules/Module/Module.php

Braces +48 added lines, -32 removed lines

@@ -29,50 +29,63 @@ 
     }
     public function getJsVariables() {
       $temp = [];
-      foreach ($this->required as $i)
-        if (is_array($i))
+      foreach ($this->required as $i) {
+              if (is_array($i))
           array_push($temp,$i);
-      foreach ($this->modules as $i)
-        $temp = array_merge( $temp, $i->getJsVariables() );
-      foreach ($this->files as $i)
-        if (is_array($i))
+      }
+      foreach ($this->modules as $i) {
+              $temp = array_merge( $temp, $i->getJsVariables() );
+      }
+      foreach ($this->files as $i) {
+              if (is_array($i))
           array_push($temp,$i);
+      }
       return $temp;
     }
     public function addModules( $_mods ) {
-      if(!is_array($_mods))
-        throw new InvalidArgumentException("Parameter must be an array.");
-      foreach ($_mods as $value)
-        $this->addModule($value);
+      if(!is_array($_mods)) {
+              throw new InvalidArgumentException("Parameter must be an array.");
+      }
+      foreach ($_mods as $value) {
+              $this->addModule($value);
+      }
     }
     public function addModule( $_mod ) {
-      if(!is_object($_mod))
-        throw new InvalidArgumentException("Parameter must be a class.");
-      if(! is_subclass_of ($_mod, "Module"))
-        throw new InvalidArgumentException("Parameter must be a class.");
+      if(!is_object($_mod)) {
+              throw new InvalidArgumentException("Parameter must be a class.");
+      }
+      if(! is_subclass_of ($_mod, "Module")) {
+              throw new InvalidArgumentException("Parameter must be a class.");
+      }
       $this->modules[$_mod->name] = $_mod;
       $this->modules[$_mod->name]->parameters = &$this->parameters;
     }
     public function addFiles( $_files ) {
-      if(!is_array($_files))
-        throw new InvalidArgumentException("Parameter must be an array.");
-      foreach ($_files as $value)
-        $this->addFile($value);
+      if(!is_array($_files)) {
+              throw new InvalidArgumentException("Parameter must be an array.");
+      }
+      foreach ($_files as $value) {
+              $this->addFile($value);
+      }
     }
     public function addFile( $_file ) {
-      if(!(is_string($_file) || is_array($_file)))
-        throw new InvalidArgumentException("Parameter must be a string or an array.");
+      if(!(is_string($_file) || is_array($_file))) {
+              throw new InvalidArgumentException("Parameter must be a string or an array.");
+      }
       array_push($this->files, $_file);
     }
     public function addFilesRequired( $_files ) {
-      if(!is_array($_files))
-        throw new InvalidArgumentException("Parameter must be an array.");
-      foreach ($_files as $value)
-        $this->addFileRequired($value);
+      if(!is_array($_files)) {
+              throw new InvalidArgumentException("Parameter must be an array.");
+      }
+      foreach ($_files as $value) {
+              $this->addFileRequired($value);
+      }
     }
     public function addFileRequired( $_file ) {
-      if(!is_string($_file))
-        throw new InvalidArgumentException("Parameter must be a string.");
+      if(!is_string($_file)) {
+              throw new InvalidArgumentException("Parameter must be a string.");
+      }
       array_push($this->required, $_file);
     }
     protected function addDipendences() {
@@ -82,14 +95,17 @@ 
     }
     protected function getRequire( $_function, $_extenction) {
       $temp = [];
-      foreach ($this->required as $i)
-        if (!is_array($i) && strpos($i, $_extenction) !== FALSE)
+      foreach ($this->required as $i) {
+              if (!is_array($i) && strpos($i, $_extenction) !== FALSE)
           array_push($temp,$i);
-      foreach ($this->modules as $i)
-        $temp = array_merge( $temp, $i->$_function() );
-      foreach ($this->files as $i)
-        if (!is_array($i) && strpos($i, $_extenction) !== FALSE)
+      }
+      foreach ($this->modules as $i) {
+              $temp = array_merge( $temp, $i->$_function() );
+      }
+      foreach ($this->files as $i) {
+              if (!is_array($i) && strpos($i, $_extenction) !== FALSE)
           array_push($temp,$i);
+      }
       return $temp;
     }
   }

dist/jate/modules/GUI/GUI.php

Braces +3 added lines, -2 removed lines

@@ -18,9 +18,10 @@
       echo minifyOutput($render);
     }
     protected function overlayTag( $_page ) {
-      foreach($this->tags as $key => $value)
-        if(!is_array($value))
+      foreach($this->tags as $key => $value) {
+              if(!is_array($value))
           $_page = str_replace("<_${key}_>", "$value", $_page);
+      }
       return $_page;
     }
     protected function parsingFile( $_file, $_type = "html" ) {

dist/jate/modules/Connection/Adapters/ConnectionMysqliAdapter.php

Braces +6 added lines, -4 removed lines

@@ -16,15 +16,17 @@
       public function queryFetch( $_query ) {
         $result = $this->stdQuery($_query);
         $rows = [];
-        while($row = $result->fetch_assoc())
-          $rows[] = $row;
+        while($row = $result->fetch_assoc()) {
+                  $rows[] = $row;
+        }
         return $rows;
       }
       public function queryArray( $_query ) {
         $result = $this->stdQuery($_query);
         $rows = [];
-        while($row = $result->fetch_array())
-          $rows[] = $row;
+        while($row = $result->fetch_array()) {
+                  $rows[] = $row;
+        }
         return $rows;
       }
       protected function stdQuery( $_query ) {

dist/jate/modules/Connection/Connection.php

Braces +6 added lines, -4 removed lines

@@ -8,8 +8,9 @@ 
       parent::__construct();
       $args = func_get_args();
       $count = func_num_args();
-      if (method_exists($this,$func='__construct'.$count))
-        call_user_func_array(array($this,$func),$args);
+      if (method_exists($this,$func='__construct'.$count)) {
+              call_user_func_array(array($this,$func),$args);
+      }
     }
     public function __construct0() {
       $this->database = null;
@@ -33,9 +34,10 @@ 
       $this->setConnectionParameters( $_srv, $_db, $_usr, $_pass);
     }
     protected function getConnectionType( $_type ) {
-      foreach ($_type as $key => $value)
-        if($value)
+      foreach ($_type as $key => $value) {
+              if($value)
           return $key;
+      }
       return "pdo";
     }
     protected function setConnectionParameters( $_srv, $_db, $_usr, $_pass) {

dist/jate/modules/JConfig/JConfig.php

Braces +8 added lines, -6 removed lines

@@ -23,10 +23,11 @@ 
     public function import( $_path, $_type = "misc" ) {
       $data = file_get_contents($_path);
       $data = json_decode($data);
-      if( $_type == "connection" )
-        $this->overlayConnection($data);
-      else
-        $this->overlayMisc($data);
+      if( $_type == "connection" ) {
+              $this->overlayConnection($data);
+      } else {
+              $this->overlayMisc($data);
+      }
     }
     protected function overlayConnection( $_data ) {
       $this->connection = $this->obj2array($_data);
@@ -46,8 +47,9 @@ 
       return $return;
     }
     protected function importObject( $_object ) {
-      foreach (get_object_vars($_object) as $key => $value)
-        $this->$key = $value;
+      foreach (get_object_vars($_object) as $key => $value) {
+              $this->$key = $value;
+      }
     }
   }
 ?>

dist/jate/modules/Html/Html.php

Braces +9 added lines, -6 removed lines

@@ -30,18 +30,21 @@
       $tempStr = "";
       $timeParameter = "?t=".time();
       $time = ($this->parameters["app"]->cache->css == true) ? "" : $timeParameter;
-      foreach ($this->tags["css"] as $i)
-        $tempStr .= "<link rel='stylesheet' href='$i$time'>";
+      foreach ($this->tags["css"] as $i) {
+              $tempStr .= "<link rel='stylesheet' href='$i$time'>";
+      }
       $this->tags["css"] = $tempStr;
       $tempStr = "";
       $time = ($this->parameters["app"]->cache->js == true) ? "" : $timeParameter;
-      foreach ($this->tags["js"] as $i)
-        $tempStr .= "<script src='$i$time'></script>";
+      foreach ($this->tags["js"] as $i) {
+              $tempStr .= "<script src='$i$time'></script>";
+      }
       $this->tags["js"] = $tempStr;
       $tempStr = "";
       $tempStr .= "<script type='text/javascript'>";
-      foreach ($this->tags["jsVariables"] as $i)
-        $tempStr .= " $i[0] = $i[1];\n";
+      foreach ($this->tags["jsVariables"] as $i) {
+              $tempStr .= " $i[0] = $i[1];\n";
+      }
       $tempStr .= "</script>";
       $this->tags["jsVariables"] = $tempStr;
     }

dist/jate/modules/Menu/Menu.php

Braces +24 added lines, -17 removed lines

@@ -12,9 +12,10 @@ 
           $pk_menu = $i["pk_menu"];
           array_push($temp, array("label" => $i["label"], "link" => $i["link"], "submenu" => [], "relative" => false));
           $submenu = $this->queryFetch("SELECT * FROM menu WHERE fk_menu = $pk_menu ORDER BY `order`");
-          if($submenu)
-          foreach ($submenu as $j)
+          if($submenu) {
+                    foreach ($submenu as $j)
             array_push( $temp[count($temp)-1]["submenu"], array("label" => $j["label"], "link" => $j["link"], "submenu" => [], "relative" => false) );
+          }
         }
       }
       $this->tags["menu"] = $temp;
@@ -28,12 +29,13 @@ 
       $relative    = $this->parameters["app"]->server["RELATIVE"];
       foreach ($this->tags["menu"] as $i) {
         $prePath = "";
-        if($i["relative"])
-          $prePath = $relative;
+        if($i["relative"]) {
+                  $prePath = $relative;
+        }
         $active = $this->isSubString($actualLink, array_merge(array_column($i["submenu"], 'link'), array($i["link"]))) ? "active" : "";
-        if( is_array($i["submenu"]) && count($i["submenu"])<1)
-            $temp .= "<li class='$active'><a href='$prePath$i[link]'>$i[label]</a></li>";
-        else {
+        if( is_array($i["submenu"]) && count($i["submenu"])<1) {
+                    $temp .= "<li class='$active'><a href='$prePath$i[link]'>$i[label]</a></li>";
+        } else {
           $temp .= "<li class='dropdown $active'>";
           $temp .=
             '<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">'.
@@ -43,8 +45,9 @@ 
             '<ul class="dropdown-menu">';
           foreach ($i["submenu"] as $j) {
             $prePath = "";
-            if($j["relative"])
-              $prePath = $relative;
+            if($j["relative"]) {
+                          $prePath = $relative;
+            }
             $temp .= "<li><a href='$prePath$j[link]'>$j[label]</a></li>";
           }
           $temp .= "</ul></li>";
@@ -54,16 +57,18 @@ 
     }
     protected function isSubString( $_string, $_list) {
       $success = false;
-      foreach ($_list as $i)
-        if(strpos($_string,$i) !== false)
+      foreach ($_list as $i) {
+              if(strpos($_string,$i) !== false)
           $success = true;
+      }
       return $success;
     }
     public function loginWithUser() {
       $this->init();
       $temp = [];
-      if(!isset($_SESSION["username"]))
-        $_SESSION["username"] ="guest";
+      if(!isset($_SESSION["username"])) {
+              $_SESSION["username"] ="guest";
+      }
       $user = $_SESSION["username"];
       $blackList = $this->queryFetch(
         "SELECT user.*,user_section.*
@@ -77,11 +82,13 @@ 
       foreach ($this->tags["menu"] as $i) {
         $success = true;
         $k = $i["label"];
-        foreach ($blackList as $j)
-          if( $j["section"] == $k)
+        foreach ($blackList as $j) {
+                  if( $j["section"] == $k)
             $success = false;
-        if($success)
-          array_push($temp,$i);
+        }
+        if($success) {
+                  array_push($temp,$i);
+        }
       }
       $this->tags["menu"] = $temp;
     }

dist/jate/modules/Query/Query.php

Braces +3 added lines, -2 removed lines

@@ -12,9 +12,10 @@
       $this->connection["$_name"] = $_connection;
       $this->currentConnection = $_connection;
 
-      foreach ($this->modules as &$module)
-        if(isset($module->currentConnection))
+      foreach ($this->modules as &$module) {
+              if(isset($module->currentConnection))
           $module->addConnection($_name, $_connection);
+      }
     }
     public function setConnection( $_name ) {
       $this->currentConnection = $this->connection["$_name"];