XaBerr / JATE

dist/jate/modules/WebApp/WebApp.php

Indentation +14 added lines, -14 removed lines

@@ -2,19 +2,19 @@
   jRequire("../Router/Router.php");
   jRequire("../JConfig/JConfig.php");
   class WebApp {
-    private $router;
-    private $misc;
-    public function __construct() {
-      $configPath   = "config";
-      $this->misc   = new JConfig("$configPath/app.json");
-      $this->router = new Router("$configPath/router.json", $this->misc->urlCaseSensitive);
-    }
-    public function draw() {
-      $pageSelected = $this->router->getPage();
-      $currentPage = new $pageSelected[0]();
-      $currentPage->setParameters(["app" => $this->misc, "page" => $pageSelected[1]]);
-      $currentPage->init();
-      echo minifyOutput($currentPage->draw());
-    }
+	private $router;
+	private $misc;
+	public function __construct() {
+	  $configPath   = "config";
+	  $this->misc   = new JConfig("$configPath/app.json");
+	  $this->router = new Router("$configPath/router.json", $this->misc->urlCaseSensitive);
+	}
+	public function draw() {
+	  $pageSelected = $this->router->getPage();
+	  $currentPage = new $pageSelected[0]();
+	  $currentPage->setParameters(["app" => $this->misc, "page" => $pageSelected[1]]);
+	  $currentPage->init();
+	  echo minifyOutput($currentPage->draw());
+	}
   }
 ?>

dist/jate/modules/Router/Router.php

Indentation +58 added lines, -58 removed lines

@@ -1,63 +1,63 @@
 <?php
   requireComponent("../ServerVars/ServerVars.php");
   class Router {
-    protected $url;
-    protected $pages;
-    protected $defaultPage;
-    protected $urlCaseSensitive;
-    public function __construct( $_path, $_urlCaseSensitive = false ) {
-      if(!is_string($_path))
-        throw new JException("Parameter must be a string.");
-      $jConfig   = new JConfig($_path);
-      $server    = new ServerVars();
-      $request   = $server->server["REQUEST_URI"];
-      $base      = $server->server["RELATIVE"];
-      $url       = str_replace($base, "", $request);
-      $this->url = explode("/", $url);
-      $this->pages       = $jConfig->pages;
-      $this->defaultPage = $jConfig->defaultPage;
-      $this->urlCaseSensitive = $_urlCaseSensitive;
-    }
-    public function getPage() {
-      $parameters = [];
-      $pageSelected = null;
-      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]);
-          $pageSelected = [
-            $page[1],
-            $urlParameters
-          ];
-          break;
-        }
-      }
-      if( $pageSelected !== null )
-        return $pageSelected;
-      else
-        return $this->defaultPage;
-    }
-    protected function pathSeeker( $_path, $_url ) {
-      $urlLength = count($_url);
-      $cont = 0;
-      $variables = [];
-      $pathLength = count($_path);
-      if($urlLength == $pathLength) {
-        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 ) {
-            $variables[str_replace('$', "", $_path[$cont])] = $_url[$cont];
-            $cont++;
-          } else break;
-        }
-        if($cont == $urlLength)
-          return $variables;
-      }
-      return null;
-    }
+	protected $url;
+	protected $pages;
+	protected $defaultPage;
+	protected $urlCaseSensitive;
+	public function __construct( $_path, $_urlCaseSensitive = false ) {
+	  if(!is_string($_path))
+		throw new JException("Parameter must be a string.");
+	  $jConfig   = new JConfig($_path);
+	  $server    = new ServerVars();
+	  $request   = $server->server["REQUEST_URI"];
+	  $base      = $server->server["RELATIVE"];
+	  $url       = str_replace($base, "", $request);
+	  $this->url = explode("/", $url);
+	  $this->pages       = $jConfig->pages;
+	  $this->defaultPage = $jConfig->defaultPage;
+	  $this->urlCaseSensitive = $_urlCaseSensitive;
+	}
+	public function getPage() {
+	  $parameters = [];
+	  $pageSelected = null;
+	  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]);
+		  $pageSelected = [
+			$page[1],
+			$urlParameters
+		  ];
+		  break;
+		}
+	  }
+	  if( $pageSelected !== null )
+		return $pageSelected;
+	  else
+		return $this->defaultPage;
+	}
+	protected function pathSeeker( $_path, $_url ) {
+	  $urlLength = count($_url);
+	  $cont = 0;
+	  $variables = [];
+	  $pathLength = count($_path);
+	  if($urlLength == $pathLength) {
+		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 ) {
+			$variables[str_replace('$', "", $_path[$cont])] = $_url[$cont];
+			$cont++;
+		  } else break;
+		}
+		if($cont == $urlLength)
+		  return $variables;
+	  }
+	  return null;
+	}
   }
 ?>

Spacing +11 added lines, -11 removed lines

@@ -5,8 +5,8 @@ 
     protected $pages;
     protected $defaultPage;
     protected $urlCaseSensitive;
-    public function __construct( $_path, $_urlCaseSensitive = false ) {
-      if(!is_string($_path))
+    public function __construct($_path, $_urlCaseSensitive = false) {
+      if (!is_string($_path))
         throw new JException("Parameter must be a string.");
       $jConfig   = new JConfig($_path);
       $server    = new ServerVars();
@@ -23,8 +23,8 @@ 
       $pageSelected = null;
       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]))
+        if (is_array($urlParameters)) {
+          if (isset($page[2]) && is_array($page[2]))
             $urlParameters = array_merge($urlParameters, $page[2]);
           $pageSelected = [
             $page[1],
@@ -33,28 +33,28 @@ 
           break;
         }
       }
-      if( $pageSelected !== null )
+      if ($pageSelected !== null)
         return $pageSelected;
       else
         return $this->defaultPage;
     }
-    protected function pathSeeker( $_path, $_url ) {
+    protected 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->urlCaseSensitive && $_path[$cont] == $_url[$cont]) ||
             (!$this->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;

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

Indentation +29 added lines, -29 removed lines

@@ -2,34 +2,34 @@
   jRequire("../Query/Query.php");
   jRequire("../File/File.php");
   class Module {
-    use Query {
-      Query::__construct as private __queryConstruct;
-    }
-    use File {
-      File::__construct as private __fileConstruct;
-    }
-    public $name;
-    public $modules;
-    public function __construct() {
-      $this->name    = get_class($this);
-      $this->modules = [];
-      $this->__queryConstruct();
-      $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);
-    }
-    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.");
-      $this->modules[$_module->name] = $_module;
-      if($this->currentConnection)
-        $this->modules[$_module->name]->addConnectionMan($this->currentConnection);
-    }
+	use Query {
+	  Query::__construct as private __queryConstruct;
+	}
+	use File {
+	  File::__construct as private __fileConstruct;
+	}
+	public $name;
+	public $modules;
+	public function __construct() {
+	  $this->name    = get_class($this);
+	  $this->modules = [];
+	  $this->__queryConstruct();
+	  $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);
+	}
+	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.");
+	  $this->modules[$_module->name] = $_module;
+	  if($this->currentConnection)
+		$this->modules[$_module->name]->addConnectionMan($this->currentConnection);
+	}
   }
 ?>

Spacing +6 added lines, -6 removed lines

@@ -16,19 +16,19 @@
       $this->__queryConstruct();
       $this->__fileConstruct();
     }
-    public function addModules( $_modules ) {
-      if(!is_array($_modules))
+    public function addModules($_modules) {
+      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))
+    public function addModule($_module) {
+      if (!is_object($_module))
         throw new JException("Parameter must be a object.");
-      if(! is_subclass_of ($_module, "Module"))
+      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)
+      if ($this->currentConnection)
         $this->modules[$_module->name]->addConnectionMan($this->currentConnection);
     }
   }

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

Indentation +15 added lines, -15 removed lines

@@ -1,19 +1,19 @@
 <?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.");
-      $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)
-          $this->$key = $value;
-      if(is_array($data))
-        $this->data = $data;
-    }
+	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.");
+	  $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)
+		  $this->$key = $value;
+	  if(is_array($data))
+		$this->data = $data;
+	}
   }
 ?>

Spacing +6 added lines, -6 removed lines

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

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