XaBerr / JATE

dist/jate/modules/File/File.php

Braces +18 added lines, -12 removed lines

@@ -24,16 +24,20 @@ 
       $this->files["required"][] = $_file;
     }
     public function addFiles( $_files ) {
-      if(!is_array($_files))
-        throw new JException("Parameter must be an array.");
-      foreach ($_files as $value)
-        $this->addFile($value);
+      if(!is_array($_files)) {
+              throw new JException("Parameter must be an array.");
+      }
+      foreach ($_files as $value) {
+              $this->addFile($value);
+      }
     }
     public function addFilesRequired( $_files ) {
-      if(!is_array($_files))
-        throw new JException("Parameter must be an array.");
-      foreach ($_files as $value)
-        $this->addFileRequired($value);
+      if(!is_array($_files)) {
+              throw new JException("Parameter must be an array.");
+      }
+      foreach ($_files as $value) {
+              $this->addFileRequired($value);
+      }
     }
     public function getFiles() {
       return $this->files["attached"];
@@ -42,10 +46,12 @@ 
       return $this->files["required"];
     }
     protected function isCorrectPath( $_file ) {
-      if(!is_string($_file))
-        throw new JException("Path must be a string.");
-      if(!(file_exists($_file) || $this->isCorrectUrl($_file)))
-        throw new JException("File [$_file] not found.");
+      if(!is_string($_file)) {
+              throw new JException("Path must be a string.");
+      }
+      if(!(file_exists($_file) || $this->isCorrectUrl($_file))) {
+              throw new JException("File [$_file] not found.");
+      }
     }
     protected function isCorrectUrl( $_url ) {
       return strpos(@get_headers($_url)[0],'200') === false ? false : true;

dist/jate/modules/Router/Router.php

Braces +20 added lines, -14 removed lines

@@ -6,8 +6,9 @@ 
     protected $defaultPage;
     protected $urlCaseSensitive;
     public function __construct( $_path, $_urlCaseSensitive = false ) {
-      if(!is_string($_path))
-        throw new JException("Parameter must be a string.");
+      if(!is_string($_path)) {
+              throw new JException("Parameter must be a string.");
+      }
       $jConfig   = new JConfig($_path);
       $server    = new ServerVars();
       $request   = $server->server["REQUEST_URI"];
@@ -24,8 +25,9 @@ 
       foreach ($this->pages as $page) {
         $urlParameters = $this->pathSeeker(explode("/", $page[0]), $this->url);
         if(is_array($urlParameters)) {
-          if(isset($page[2]) && is_array($page[2]))
-            $urlParameters = array_merge($urlParameters, $page[2]);
+          if(isset($page[2]) && is_array($page[2])) {
+                      $urlParameters = array_merge($urlParameters, $page[2]);
+          }
           $pageSelected = [
             $page[1],
             $urlParameters
@@ -33,10 +35,11 @@ 
           break;
         }
       }
-      if( $pageSelected !== null )
-        return $pageSelected;
-      else
-        return $this->defaultPage;
+      if( $pageSelected !== null ) {
+              return $pageSelected;
+      } else {
+              return $this->defaultPage;
+      }
     }
     protected function pathSeeker( $_path, $_url ) {
       $urlLength = count($_url);
@@ -47,15 +50,18 @@ 
         while($cont < $urlLength) {
           if(
             ($this->urlCaseSensitive && $_path[$cont] == $_url[$cont]) ||
-            (!$this->urlCaseSensitive && strtolower($_path[$cont]) == strtolower($_url[$cont])) )
-            $cont++;
-          else if( strpos($_path[$cont], "\$") !== false ) {
+            (!$this->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/Html/Html.php

Braces +33 added lines, -22 removed lines

@@ -27,8 +27,9 @@ 
     }
     abstract public function init();
     public function draw() {
-      if($this->template == "")
-        throw new JException("The variable \$this->template must be set in class $this->name function init().");
+      if($this->template == "") {
+              throw new JException("The variable \$this->template must be set in class $this->name function init().");
+      }
       $server = new ServerVars();
       $this->addDipendences();
       $this->tags["css"]  = array_unique($this->tags["css"]);
@@ -47,34 +48,41 @@ 
       return $this->jsVars;
     }
     public function addJsVar( $_name, $_value ) {
-      if(!is_string($_name))
-        throw new InvalidArgumentException("Parameter name must be a string.");
-      if(!is_string($_value))
-        throw new InvalidArgumentException("Parameter value must be a string.");
+      if(!is_string($_name)) {
+              throw new InvalidArgumentException("Parameter name must be a string.");
+      }
+      if(!is_string($_value)) {
+              throw new InvalidArgumentException("Parameter value must be a string.");
+      }
       $this->jsVars[] = [$_name, $_value];
     }
     public function addJsVars( $_array ) {
-      if(!is_array($_array))
-        throw new InvalidArgumentException("Parameter must be an array.");
-      foreach ($_array as $value)
-        $this->addJsVar($value[0], $value[1]);
+      if(!is_array($_array)) {
+              throw new InvalidArgumentException("Parameter must be an array.");
+      }
+      foreach ($_array as $value) {
+              $this->addJsVar($value[0], $value[1]);
+      }
     }
     protected function stringifyDipendences() {
       $tempStr = "";
       $timeParameter = "?t=".time();
       $time = ($this->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->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["jsVar"] as $i)
-      $tempStr .= " $i[0] = $i[1];\n";
+      foreach ($this->tags["jsVar"] as $i) {
+            $tempStr .= " $i[0] = $i[1];\n";
+      }
       $tempStr .= "</script>";
       $this->tags["jsVar"] = $tempStr;
     }
@@ -87,14 +95,17 @@ 
       $temp = [];
       $filesRequired = $this->getFilesRequired();
       $files         = $this->getFiles();
-      foreach ($filesRequired as $i)
-        if (!is_array($i) && strpos($i, $_extenction) !== FALSE)
+      foreach ($filesRequired as $i) {
+              if (!is_array($i) && strpos($i, $_extenction) !== FALSE)
           $temp[] = $i;
-      foreach ($this->modules as $i)
-        $temp = array_merge( $temp, $i->$_function() );
-      foreach ($files as $i)
-        if (!is_array($i) && strpos($i, $_extenction) !== FALSE)
+      }
+      foreach ($this->modules as $i) {
+              $temp = array_merge( $temp, $i->$_function() );
+      }
+      foreach ($files as $i) {
+              if (!is_array($i) && strpos($i, $_extenction) !== FALSE)
           $temp[] = $i;
+      }
       return $temp;
     }
   }

dist/jate/modules/Module/Module.php

Braces +15 added lines, -10 removed lines

@@ -17,19 +17,24 @@
       $this->__fileConstruct();
     }
     public function addModules( $_modules ) {
-      if(!is_array($_modules))
-        throw new JException("Parameter must be an array.");
-      foreach ($_modules as $value)
-        $this->addModule($value);
+      if(!is_array($_modules)) {
+              throw new JException("Parameter must be an array.");
+      }
+      foreach ($_modules as $value) {
+              $this->addModule($value);
+      }
     }
     public function addModule( $_module ) {
-      if(!is_object($_module))
-        throw new JException("Parameter must be a object.");
-      if(! is_subclass_of ($_module, "Module"))
-        throw new JException("Parameter must be a object inherited from Module object.");
+      if(!is_object($_module)) {
+              throw new JException("Parameter must be a object.");
+      }
+      if(! is_subclass_of ($_module, "Module")) {
+              throw new JException("Parameter must be a object inherited from Module object.");
+      }
       $this->modules[$_module->name] = $_module;
-      if($this->currentConnection)
-        $this->modules[$_module->name]->addConnectionMan($this->currentConnection);
+      if($this->currentConnection) {
+              $this->modules[$_module->name]->addConnectionMan($this->currentConnection);
+      }
     }
   }
 ?>

dist/jate/modules/JConfig/JConfig.php

Braces +15 added lines, -10 removed lines

@@ -1,19 +1,24 @@
 <?php
   class JConfig {
     public function __construct( $_path ) {
-      if(!is_string($_path))
-        throw new JException("Path must be a string.");
-      if(!file_exists($_path))
-        throw new JException("File [$_path] not found.");
+      if(!is_string($_path)) {
+              throw new JException("Path must be a string.");
+      }
+      if(!file_exists($_path)) {
+              throw new JException("File [$_path] not found.");
+      }
       $data = file_get_contents($_path);
       $data = json_decode($data);
-      if($data === NULL)
-        throw new JException("Invalid file data. [$_path]");
-      if(is_object($data))
-        foreach (get_object_vars($data) as $key => $value)
+      if($data === NULL) {
+              throw new JException("Invalid file data. [$_path]");
+      }
+      if(is_object($data)) {
+              foreach (get_object_vars($data) as $key => $value)
           $this->$key = $value;
-      if(is_array($data))
-        $this->data = $data;
+      }
+      if(is_array($data)) {
+              $this->data = $data;
+      }
     }
   }
 ?>

dist/jate/modules/Connection/Connection.php

Braces +6 added lines, -4 removed lines

@@ -4,8 +4,9 @@ 
     public $database;
     public $info;
     public function __construct( $_object ) {
-      if(!is_object($_object))
-        throw new JException("Parameter must be an object.");
+      if(!is_object($_object)) {
+              throw new JException("Parameter must be an object.");
+      }
       $this->setConnection(
         $_object->server,
         $_object->database,
@@ -40,9 +41,10 @@ 
     }
     protected function getConnectionType( $_type ) {
       $array = (array)$_type;
-      foreach ($array as $key => $value)
-        if($value)
+      foreach ($array as $key => $value) {
+              if($value)
           return $key;
+      }
       return "pdo";
     }
   }

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

Braces +3 added lines, -2 removed lines

@@ -30,14 +30,15 @@
         $database = $this->connection;
         $query = $database->prepare($_query);
         $result = $query->execute();
-        if(!$result)
-          throw new JException(json_encode([
+        if(!$result) {
+                  throw new JException(json_encode([
             "query" => $_query,
             "error" => [
               $query->errorInfo(),
               $database->errorInfo()
             ]
           ]));
+        }
         return $query;
       }
   }

dist/jate/modules/Query/Query.php

Braces +45 added lines, -30 removed lines

@@ -10,8 +10,9 @@ 
       $this->currentConnection = null;
     }
     public function addConnection( $_path, $_name = "default" ) {
-      if(!is_string($_path))
-        throw new JException("Parameter must be a string.", 1);
+      if(!is_string($_path)) {
+              throw new JException("Parameter must be a string.", 1);
+      }
       try {
         $jConfig = new JConfig($_path);
         if($jConfig->enable) {
@@ -23,30 +24,36 @@ 
       }
     }
     public function addConnectionMan( $_connection, $_name = "default") {
-      if(!is_object($_connection) || !is_a($_connection, "Connection"))
-        throw new JException("Parameter must be a Connection object.", 1);
+      if(!is_object($_connection) || !is_a($_connection, "Connection")) {
+              throw new JException("Parameter must be a Connection object.", 1);
+      }
       try {
         $this->connection["$_name"] = $_connection;
         $this->currentConnection = $_connection;
-        foreach ($this->modules as &$module)
-          if(isset($this->currentConnection))
+        foreach ($this->modules as &$module) {
+                  if(isset($this->currentConnection))
             $module->addConnectionMan($this->currentConnection, $_name);
+        }
       } catch (Exception $e) {
         throw new JException($e->getMessage(), 1);
       }
     }
     public function setConnection( $_name = "default" ) {
-      if(!is_string($_name))
-        throw new JException("Parameter must be a string.", 1);
-      if(!isset($this->connection["$_name"]))
-        throw new JException("This connection name does not exist.", 1);
+      if(!is_string($_name)) {
+              throw new JException("Parameter must be a string.", 1);
+      }
+      if(!isset($this->connection["$_name"])) {
+              throw new JException("This connection name does not exist.", 1);
+      }
       $this->currentConnection = $this->connection["$_name"];
     }
     public function query( $_query ) {
-      if(!is_string($_query))
-        throw new JException("Parameter must be a string.", 1);
-      if($this->currentConnection == null)
-        throw new JException("No connection selected.", 1);
+      if(!is_string($_query)) {
+              throw new JException("Parameter must be a string.", 1);
+      }
+      if($this->currentConnection == null) {
+              throw new JException("No connection selected.", 1);
+      }
       try {
         $temp = $this->currentConnection->database->query($_query);
       } catch (Exception $e) {
@@ -55,10 +62,12 @@ 
       return $temp;
     }
     public function queryInsert( $_query ) {
-      if(!is_string($_query))
-        throw new JException("Parameter must be a string.", 1);
-      if($this->currentConnection == null)
-        throw new JException("No connection selected.", 1);
+      if(!is_string($_query)) {
+              throw new JException("Parameter must be a string.", 1);
+      }
+      if($this->currentConnection == null) {
+              throw new JException("No connection selected.", 1);
+      }
       try {
         $temp = $this->currentConnection->database->queryInsert($_query);
       } catch (Exception $e) {
@@ -67,10 +76,12 @@ 
       return $temp;
     }
     public function queryFetch( $_query ) {
-      if(!is_string($_query))
-        throw new JException("Parameter must be a string.", 1);
-      if($this->currentConnection == null)
-        throw new JException("No connection selected.", 1);
+      if(!is_string($_query)) {
+              throw new JException("Parameter must be a string.", 1);
+      }
+      if($this->currentConnection == null) {
+              throw new JException("No connection selected.", 1);
+      }
       try {
         $temp = $this->currentConnection->database->queryFetch($_query);
       } catch (Exception $e) {
@@ -79,10 +90,12 @@ 
       return $temp;
     }
     public function queryArray( $_query ) {
-      if(!is_string($_query))
-        throw new JException("Parameter must be a string.", 1);
-      if($this->currentConnection == null)
-        throw new JException("No connection selected.", 1);
+      if(!is_string($_query)) {
+              throw new JException("Parameter must be a string.", 1);
+      }
+      if($this->currentConnection == null) {
+              throw new JException("No connection selected.", 1);
+      }
       try {
         $temp = $this->currentConnection->database->queryArray($_query);
       } catch (Exception $e) {
@@ -91,10 +104,12 @@ 
       return $temp;
     }
     public function newTable( $_query ) {
-      if(!is_string($_query))
-        throw new JException("Parameter must be a string.", 1);
-      if($this->currentConnection == null)
-        throw new JException("No connection selected.", 1);
+      if(!is_string($_query)) {
+              throw new JException("Parameter must be a string.", 1);
+      }
+      if($this->currentConnection == null) {
+              throw new JException("No connection selected.", 1);
+      }
       try {
         $temp = $this->currentConnection->database->newTable($_query);
       } catch (Exception $e) {