XaBerr / JATE

dist/jate/coreEngine.php

Spacing +8 added lines, -8 removed lines

@@ -4,14 +4,14 @@
 
   //JATE SUFF
   require_once      (end($GLOBALS["JATEPath"])."jate/functions/requirer.php");
-  requireComponent  ("functions/folder.php");
-  requireComponent  ("modules/JConfig/JConfig.php");
-  requireComponents  ("functions");
-  requireModules    ("modules");
+  requireComponent("functions/folder.php");
+  requireComponent("modules/JConfig/JConfig.php");
+  requireComponents("functions");
+  requireModules("modules");
 
   //USER STUFF
-  requireComponent  ("config.php",false);
-  requireModules    ("modules",false);
-  requireComponents  ("bundles/models",false);
-  requireComponents  ("bundles/controllers",false);
+  requireComponent("config.php", false);
+  requireModules("modules", false);
+  requireComponents("bundles/models", false);
+  requireComponents("bundles/controllers", false);
 ?>

dist/jate/modules/Parsedown/Parsedown.php

Spacing +3 added lines, -3 removed lines

@@ -6,13 +6,13 @@
     public function __construct() {
       parent::__construct();
     }
-    public function drawFile( $_template ) {
+    public function drawFile($_template) {
       return $this->draw($_template);
     }
-    public function drawText( $_template ) {
+    public function drawText($_template) {
       return $this->draw(trim($_template));
     }
-    public function draw( $_template ) {
+    public function draw($_template) {
       $Parsedown = new Parsedown\Parsedown();
       $page = $Parsedown->text($_template);
       return $page;

dist/jate/modules/Statistic/Statistic.php

Spacing +3 added lines, -3 removed lines

@@ -1,17 +1,17 @@
 <?php
   jRequire("../Module/Module.php");
   class Statistic extends Module {
-    public function __construct( $_webApp ) {
+    public function __construct($_webApp) {
       parent::__construct();
       $pages = [];
       $stats = [];
       $pages = $_webApp->pages;
-      foreach ( $pages as $k => $v ) {
+      foreach ($pages as $k => $v) {
         $temp = new $v[0]($v[1]);
         $temp->addDipendences();
         $stats[$k] = [];
         $stats[$k]["page"]  = $v[0];
-        $stats[$k]["css"]    = $temp->data["css"];
+        $stats[$k]["css"] = $temp->data["css"];
         $stats[$k]["js"]    = $temp->data["js"];
       }
       $this->data = $stats;

dist/jate/modules/WebApp/WebApp.php

Spacing +17 added lines, -17 removed lines

@@ -8,49 +8,49 @@ 
     public function __construct() {
       parent::__construct();
       $this->pages = [];
-      $this->defaultPage = ["Page404",[]];
+      $this->defaultPage = ["Page404", []];
       $this->currentPage = null;
       $this->jConfig     = null;
     }
-    public function addPage( $_page ) {
+    public function addPage($_page) {
       $param = [];
       $path  = $_page;
       $class = $_page;
-      if(is_array($_page)) {
+      if (is_array($_page)) {
         $path  = $_page[0];
         $class = $_page[1];
-        if(isset($_page[2]))
+        if (isset($_page[2]))
           $param = $_page[2];
       }
       $this->pages[$path] = [$class, $param];
       return $this->pages[$path];
     }
-    public function addPages( $_pages ) {
+    public function addPages($_pages) {
       foreach ($_pages as $i)
         $this->addPage($i);
     }
     public function fetchPage() {
       $router = new Router();
-      $router->parameters = [ "app" => &$this->jConfig, "page" => null];
+      $router->parameters = ["app" => &$this->jConfig, "page" => null];
       $stack = $router->getPage();
       $parameters = [];
       $temp = $this->defaultPage;
       foreach ($this->pages as $key => $value) {
         $variables = $this->pathSeeker(explode("/", $key), $stack);
-        if(is_array($variables)) {
+        if (is_array($variables)) {
           $temp = $value;
           $parameters = $variables;
           break;
         }
       }
-      if( isset($temp[1]) && is_array($temp[1]) )
+      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;
     }
-    public function setDefaultPage( $_page ) {
+    public function setDefaultPage($_page) {
       $this->defaultPage = $this->addPage($_page);
     }
     public function draw() {
@@ -59,30 +59,30 @@ 
       $gui->init($this->currentPage);
       $gui->draw($this->currentPage->data["template"]);
     }
-    public function pathSeeker( $_path, $_url ) {
+    public function pathSeeker($_path, $_url) {
       $urlLength = count($_url);
       $cont = 0;
       $variables = [];
       $pathLength = count($_path);
-      if($urlLength == $pathLength) {
-        while($cont < $urlLength) {
-          if(
+      if ($urlLength == $pathLength) {
+        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 ) {
+          else if (strpos($_path[$cont], "\$") !== false) {
             $variables[str_replace('$', "", $_path[$cont])] = $_url[$cont];
             $cont++;
           } else break;
         }
-        if($cont == $urlLength)
+        if ($cont == $urlLength)
           return $variables;
       }
       return null;
     }
-    public function newConfig( $_path = "config/") {
+    public function newConfig($_path = "config/") {
       $this->jConfig = new JConfig();
-      $this->jConfig->import("${_path}connection.json","connection");
+      $this->jConfig->import("${_path}connection.json", "connection");
       $this->jConfig->import("${_path}misc.json");
       $this->jConfig->import("${_path}router.json");
     }

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

Spacing +22 added lines, -22 removed lines

@@ -22,56 +22,56 @@ 
     // abstract public function init();
     // abstract public function draw();
     public function getCss() {
-      return $this->getRequire("getCss",".css");
+      return $this->getRequire("getCss", ".css");
     }
     public function getJs() {
-      return $this->getRequire("getJs",".js");
+      return $this->getRequire("getJs", ".js");
     }
     public function getJsVariables() {
       $temp = [];
       foreach ($this->required as $i)
         if (is_array($i))
-          array_push($temp,$i);
+          array_push($temp, $i);
       foreach ($this->modules as $i)
-        $temp = array_merge( $temp, $i->getJsVariables() );
+        $temp = array_merge($temp, $i->getJsVariables());
       foreach ($this->files as $i)
         if (is_array($i))
-          array_push($temp,$i);
+          array_push($temp, $i);
       return $temp;
     }
-    public function addModules( $_mods ) {
-      if(!is_array($_mods))
+    public function addModules($_mods) {
+      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))
+    public function addModule($_mod) {
+      if (!is_object($_mod))
         throw new InvalidArgumentException("Parameter must be a class.");
-      if(! is_subclass_of ($_mod, "Module"))
+      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))
+    public function addFiles($_files) {
+      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)))
+    public function addFile($_file) {
+      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))
+    public function addFilesRequired($_files) {
+      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))
+    public function addFileRequired($_file) {
+      if (!is_string($_file))
         throw new InvalidArgumentException("Parameter must be a string.");
       array_push($this->required, $_file);
     }
@@ -80,16 +80,16 @@ 
       $this->tags["js"] = $this->getJs();
       $this->tags["jsVariables"] = $this->getJsVariables();
     }
-    protected function getRequire( $_function, $_extenction) {
+    protected function getRequire($_function, $_extenction) {
       $temp = [];
       foreach ($this->required as $i)
         if (!is_array($i) && strpos($i, $_extenction) !== FALSE)
-          array_push($temp,$i);
+          array_push($temp, $i);
       foreach ($this->modules as $i)
-        $temp = array_merge( $temp, $i->$_function() );
+        $temp = array_merge($temp, $i->$_function());
       foreach ($this->files as $i)
         if (!is_array($i) && strpos($i, $_extenction) !== FALSE)
-          array_push($temp,$i);
+          array_push($temp, $i);
       return $temp;
     }
   }

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

Spacing +8 added lines, -8 removed lines

@@ -6,24 +6,24 @@
     public function __construct() {
       parent::__construct();
     }
-    public function init( $_page ) {
+    public function init($_page) {
       $this->tags = $_page->tags;
     }
-    public function draw( $_template ) {
+    public function draw($_template) {
       $page = "";
-      $extension = explode(".",$_template);
-      $extension = $extension[count($extension)-1];
+      $extension = explode(".", $_template);
+      $extension = $extension[count($extension) - 1];
       $page = $this->parsingFile($_template, $extension);
       $render = $this->overlayTag($page);
       echo minifyOutput($render);
     }
-    protected function overlayTag( $_page ) {
-      foreach($this->tags as $key => $value)
-        if(!is_array($value))
+    protected function overlayTag($_page) {
+      foreach ($this->tags as $key => $value)
+        if (!is_array($value))
           $_page = str_replace("<_${key}_>", "$value", $_page);
       return $_page;
     }
-    protected function parsingFile( $_file, $_type = "html" ) {
+    protected function parsingFile($_file, $_type = "html") {
       switch ($_type) {
         case 'pug':
         case 'jade':

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/Twig/Twig.php

Spacing +3 added lines, -3 removed lines

@@ -5,16 +5,16 @@
     public function __construct() {
       parent::__construct();
     }
-    public function drawFile( $_file, $_parameters = [] ) {
+    public function drawFile($_file, $_parameters = []) {
       $loader  = new Twig_Loader_Filesystem('bundles/views');
-      $twig    = new Twig_Environment( $loader, [
+      $twig    = new Twig_Environment($loader, [
         'cache' => 'bundles/views',
       ]);
       $template = $twig->loadTemplate($_text);
       $page = $template->render($_parameters);
       return $page;
     }
-    public function drawText( $_text, $_parameters = [] ) {
+    public function drawText($_text, $_parameters = []) {
       $loader = new Twig_Loader_Array([
         'index' => $_text
       ]);

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

Spacing +5 added lines, -5 removed lines

@@ -1,9 +1,9 @@
 <?php
   interface ConnectionAdapterInterface {
-    public function __construct( $_srv, $_db, $_usr, $_pass);
-    public function query( $_query );
-    public function queryFetch( $_query );
-    public function queryArray( $_query );
-    public function queryInsert( $_query );
+    public function __construct($_srv, $_db, $_usr, $_pass);
+    public function query($_query);
+    public function queryFetch($_query);
+    public function queryArray($_query);
+    public function queryInsert($_query);
   }
 ?>

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

Spacing +8 added lines, -8 removed lines

@@ -2,32 +2,32 @@
   jRequire("ConnectionInterface.php");
   class ConnectionPdoAdapter implements ConnectionAdapterInterface {
       public $connection;
-      public function __construct( $_srv, $_db, $_usr, $_pass ) {
+      public function __construct($_srv, $_db, $_usr, $_pass) {
         $connection = "mysql:host=$_srv;dbname=$_db";
-        $this->connection = new PDO( $connection, $_usr, $_pass, [PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'utf8'"] );
+        $this->connection = new PDO($connection, $_usr, $_pass, [PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'utf8'"]);
       }
-      public function query( $_query ) {
+      public function query($_query) {
         $this->stdQuery($_query);
         return true;
       }
-      public function queryInsert( $_query ) {
+      public function queryInsert($_query) {
         $this->stdQuery($_query);
         return $this->connection->lastInsertId();
       }
-      public function queryFetch( $_query ) {
+      public function queryFetch($_query) {
         $temp = $this->stdQuery($_query);
         return $temp->fetchAll(PDO::FETCH_ASSOC);
       }
-      public function queryArray( $_query ) {
+      public function queryArray($_query) {
         $temp = $this->stdQuery($_query);
         return $temp->fetchAll(PDO::FETCH_COLUMN, 0);
       }
-      protected function stdQuery( $_query ) {
+      protected function stdQuery($_query) {
         $database = $this->connection;
         $error = "Error query [$_query]";
         $query = $database->prepare($_query);
         $result = $query->execute();
-        if(!$result) {
+        if (!$result) {
           echo "$_query<br>";
           echo "Something wrong: $error";
           var_dump($query->errorInfo());