XaBerr / JATE

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

Braces +6 added lines, -4 removed lines

@@ -17,16 +17,18 @@
       public function queryFetch( $_query ) {
         $result = $this->stdQuery($_query);
         $rows = [];
-        while($row = pg_fetch_assoc($result))
-          $rows[] = $row;
+        while($row = pg_fetch_assoc($result)) {
+                  $rows[] = $row;
+        }
         pg_free_result($result);
         return $rows;
       }
       public function queryArray( $_query ) {
         $result = $this->stdQuery($_query);
         $rows = [];
-        while($row = pg_fetch_array($result))
-          $rows[] = $row;
+        while($row = pg_fetch_array($result)) {
+                  $rows[] = $row;
+        }
         pg_free_result($result);
         return $rows;
       }

Indentation +46 added lines, -46 removed lines

@@ -1,51 +1,51 @@
 <?php
   jRequire("ConnectionInterface.php");
   class ConnectionPostgresqlAdapter implements ConnectionAdapterInterface {
-      public $connection;
-      public function __construct( $_srv, $_db, $_usr, $_pass ) {
-        try {
-          $this->connection = pg_connect("host=$_srv dbname=$_db user=$_usr password=$_pass")
-            or die('Could not connect: '.pg_last_error());
-        } catch( Exception $error ) {
-          Debug::fatal($error->getMessage());
-          exit();
-        }
-      }
-      public function query( $_query ) {
-        $this->stdQuery($_query);
-        return true;
-      }
-      public function queryInsert( $_query ) {
-        $this->stdQuery($_query);
-        return $this->stdQuery("SELECT lastval()");
-      }
-      public function queryFetch( $_query ) {
-        $result = $this->stdQuery($_query);
-        $rows = [];
-        while($row = pg_fetch_assoc($result))
-          $rows[] = $row;
-        pg_free_result($result);
-        return $rows;
-      }
-      public function queryArray( $_query ) {
-        $result = $this->stdQuery($_query);
-        $rows = [];
-        while($row = pg_fetch_array($result))
-          $rows[] = $row;
-        pg_free_result($result);
-        return $rows;
-      }
-      protected function stdQuery( $_query ) {
-        $database = $this->connection;
-        $result = pg_query($database, $_query);
-        if(!$result) {
-          Debug::fatal([
-            "query" => $_query,
-            "error" => pg_last_error()
-          ]);
-          exit();
-        }
-        return $result;
-      }
+	  public $connection;
+	  public function __construct( $_srv, $_db, $_usr, $_pass ) {
+		try {
+		  $this->connection = pg_connect("host=$_srv dbname=$_db user=$_usr password=$_pass")
+			or die('Could not connect: '.pg_last_error());
+		} catch( Exception $error ) {
+		  Debug::fatal($error->getMessage());
+		  exit();
+		}
+	  }
+	  public function query( $_query ) {
+		$this->stdQuery($_query);
+		return true;
+	  }
+	  public function queryInsert( $_query ) {
+		$this->stdQuery($_query);
+		return $this->stdQuery("SELECT lastval()");
+	  }
+	  public function queryFetch( $_query ) {
+		$result = $this->stdQuery($_query);
+		$rows = [];
+		while($row = pg_fetch_assoc($result))
+		  $rows[] = $row;
+		pg_free_result($result);
+		return $rows;
+	  }
+	  public function queryArray( $_query ) {
+		$result = $this->stdQuery($_query);
+		$rows = [];
+		while($row = pg_fetch_array($result))
+		  $rows[] = $row;
+		pg_free_result($result);
+		return $rows;
+	  }
+	  protected function stdQuery( $_query ) {
+		$database = $this->connection;
+		$result = pg_query($database, $_query);
+		if(!$result) {
+		  Debug::fatal([
+			"query" => $_query,
+			"error" => pg_last_error()
+		  ]);
+		  exit();
+		}
+		return $result;
+	  }
   }
 ?>

Spacing +10 added lines, -10 removed lines

@@ -2,43 +2,43 @@
   jRequire("ConnectionInterface.php");
   class ConnectionPostgresqlAdapter implements ConnectionAdapterInterface {
       public $connection;
-      public function __construct( $_srv, $_db, $_usr, $_pass ) {
+      public function __construct($_srv, $_db, $_usr, $_pass) {
         try {
           $this->connection = pg_connect("host=$_srv dbname=$_db user=$_usr password=$_pass")
             or die('Could not connect: '.pg_last_error());
-        } catch( Exception $error ) {
+        } catch (Exception $error) {
           Debug::fatal($error->getMessage());
           exit();
         }
       }
-      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->stdQuery("SELECT lastval()");
       }
-      public function queryFetch( $_query ) {
+      public function queryFetch($_query) {
         $result = $this->stdQuery($_query);
         $rows = [];
-        while($row = pg_fetch_assoc($result))
+        while ($row = pg_fetch_assoc($result))
           $rows[] = $row;
         pg_free_result($result);
         return $rows;
       }
-      public function queryArray( $_query ) {
+      public function queryArray($_query) {
         $result = $this->stdQuery($_query);
         $rows = [];
-        while($row = pg_fetch_array($result))
+        while ($row = pg_fetch_array($result))
           $rows[] = $row;
         pg_free_result($result);
         return $rows;
       }
-      protected function stdQuery( $_query ) {
+      protected function stdQuery($_query) {
         $database = $this->connection;
         $result = pg_query($database, $_query);
-        if(!$result) {
+        if (!$result) {
           Debug::fatal([
             "query" => $_query,
             "error" => pg_last_error()

dist/jate/modules/Query/Query.php

Indentation +43 added lines, -43 removed lines

@@ -1,48 +1,48 @@
 <?php
   jRequire("../Module/Module.php");
   class Query extends Module {
-    public $connection;
-    public $currentConnection;
-    public function __construct() {
-      parent::__construct();
-      $this->connection = [];
-      $this->currentConnection = null;
-    }
-    public function addConnection( $_name, $_connection ) {
-      Debug::push();
-      $this->connection["$_name"] = $_connection;
-      $this->currentConnection = $_connection;
-      foreach ($this->modules as &$module)
-        if(isset($module->currentConnection))
-          $module->addConnection($_name, $_connection);
-      Debug::pop();
-    }
-    public function setConnection( $_name ) {
-      $this->currentConnection = $this->connection["$_name"];
-    }
-    public function query( $_query ) {
-      Debug::push();
-      $temp = $this->currentConnection->database->query($_query);
-      Debug::pop();
-      return $temp;
-    }
-    public function queryInsert( $_query ) {
-      Debug::push();
-      $temp = $this->currentConnection->database->queryInsert($_query);
-      Debug::pop();
-      return $temp;
-    }
-    public function queryFetch( $_query ) {
-      Debug::push();
-      $temp = $this->currentConnection->database->queryFetch($_query);
-      Debug::pop();
-      return $temp;
-    }
-    public function queryArray( $_query ) {
-      Debug::push();
-      $temp = $this->currentConnection->database->queryArray($_query);
-      Debug::pop();
-      return $temp;
-    }
+	public $connection;
+	public $currentConnection;
+	public function __construct() {
+	  parent::__construct();
+	  $this->connection = [];
+	  $this->currentConnection = null;
+	}
+	public function addConnection( $_name, $_connection ) {
+	  Debug::push();
+	  $this->connection["$_name"] = $_connection;
+	  $this->currentConnection = $_connection;
+	  foreach ($this->modules as &$module)
+		if(isset($module->currentConnection))
+		  $module->addConnection($_name, $_connection);
+	  Debug::pop();
+	}
+	public function setConnection( $_name ) {
+	  $this->currentConnection = $this->connection["$_name"];
+	}
+	public function query( $_query ) {
+	  Debug::push();
+	  $temp = $this->currentConnection->database->query($_query);
+	  Debug::pop();
+	  return $temp;
+	}
+	public function queryInsert( $_query ) {
+	  Debug::push();
+	  $temp = $this->currentConnection->database->queryInsert($_query);
+	  Debug::pop();
+	  return $temp;
+	}
+	public function queryFetch( $_query ) {
+	  Debug::push();
+	  $temp = $this->currentConnection->database->queryFetch($_query);
+	  Debug::pop();
+	  return $temp;
+	}
+	public function queryArray( $_query ) {
+	  Debug::push();
+	  $temp = $this->currentConnection->database->queryArray($_query);
+	  Debug::pop();
+	  return $temp;
+	}
   }
 ?>

Spacing +7 added lines, -7 removed lines

@@ -8,37 +8,37 @@
       $this->connection = [];
       $this->currentConnection = null;
     }
-    public function addConnection( $_name, $_connection ) {
+    public function addConnection($_name, $_connection) {
       Debug::push();
       $this->connection["$_name"] = $_connection;
       $this->currentConnection = $_connection;
       foreach ($this->modules as &$module)
-        if(isset($module->currentConnection))
+        if (isset($module->currentConnection))
           $module->addConnection($_name, $_connection);
       Debug::pop();
     }
-    public function setConnection( $_name ) {
+    public function setConnection($_name) {
       $this->currentConnection = $this->connection["$_name"];
     }
-    public function query( $_query ) {
+    public function query($_query) {
       Debug::push();
       $temp = $this->currentConnection->database->query($_query);
       Debug::pop();
       return $temp;
     }
-    public function queryInsert( $_query ) {
+    public function queryInsert($_query) {
       Debug::push();
       $temp = $this->currentConnection->database->queryInsert($_query);
       Debug::pop();
       return $temp;
     }
-    public function queryFetch( $_query ) {
+    public function queryFetch($_query) {
       Debug::push();
       $temp = $this->currentConnection->database->queryFetch($_query);
       Debug::pop();
       return $temp;
     }
-    public function queryArray( $_query ) {
+    public function queryArray($_query) {
       Debug::push();
       $temp = $this->currentConnection->database->queryArray($_query);
       Debug::pop();

Braces +3 added lines, -2 removed lines

@@ -12,9 +12,10 @@
       Debug::push();
       $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);
+      }
       Debug::pop();
     }
     public function setConnection( $_name ) {

dist/jate/modules/Debug/Debug.php

Braces +6 added lines, -4 removed lines

@@ -5,8 +5,9 @@ 
     private static $initialized = false;
     private function __construct() {}
     private static function initialize() {
-      if (self::$initialized)
-        return;
+      if (self::$initialized) {
+              return;
+      }
       self::$stack = [];
       self::$initialized = true;
     }
@@ -44,8 +45,9 @@ 
       self::$stack[] = $debugInfo;
     }
     public static function pop() {
-      if(count(self::$stack)>0)
-        array_shift(self::$stack);
+      if(count(self::$stack)>0) {
+              array_shift(self::$stack);
+      }
     }
     public static function emptyStack() {
       self::$stack = [];

Indentation +56 added lines, -56 removed lines

@@ -1,60 +1,60 @@
 <?php
   class Debug {
-    public static $stack;
-    private static $initialized = false;
-    private function __construct() {}
-    private static function initialize() {
-      if (self::$initialized)
-        return;
-      self::$stack = [];
-      self::$initialized = true;
-    }
-    private static function out( $_object ) {
-      if(is_object($_object)) {
-        echo "isObject";
-      } else if(is_array($_object)) {
-        arrayDump($_object, "Debug");
-      } else {
-        echo $_object;
-      }
-    }
-    public static function error( $_object ) {
-      self::out(["Error" => $_object]);
-    }
-    public static function warning( $_object ) {
-      self::out(["Warning" => $_object]);
-    }
-    public static function fatal( $_object ) {
-      self::out(["Fatal error" => $_object]);
-      exit(1);
-    }
-    public static function logln( $_object ) {
-      self::log($_object);
-      self::out("<br>");
-    }
-    public static function logStack( $_object ) {
-      self::out([
-        "position" => self::$stack,
-        "error" => $_object
-      ]);
-      self::out("<br>");
-    }
-    public static function push() {
-      $debugInfo = debug_backtrace();
-      $debugInfo = [
-        "file" => $debugInfo[1]["file"],
-        "line" => $debugInfo[1]["line"],
-        "function" => $debugInfo[1]["function"],
-        "class" => $debugInfo[1]["class"]
-      ];
-      self::$stack[] = $debugInfo;
-    }
-    public static function pop() {
-      if(count(self::$stack)>0)
-        array_shift(self::$stack);
-    }
-    public static function emptyStack() {
-      self::$stack = [];
-    }
+	public static $stack;
+	private static $initialized = false;
+	private function __construct() {}
+	private static function initialize() {
+	  if (self::$initialized)
+		return;
+	  self::$stack = [];
+	  self::$initialized = true;
+	}
+	private static function out( $_object ) {
+	  if(is_object($_object)) {
+		echo "isObject";
+	  } else if(is_array($_object)) {
+		arrayDump($_object, "Debug");
+	  } else {
+		echo $_object;
+	  }
+	}
+	public static function error( $_object ) {
+	  self::out(["Error" => $_object]);
+	}
+	public static function warning( $_object ) {
+	  self::out(["Warning" => $_object]);
+	}
+	public static function fatal( $_object ) {
+	  self::out(["Fatal error" => $_object]);
+	  exit(1);
+	}
+	public static function logln( $_object ) {
+	  self::log($_object);
+	  self::out("<br>");
+	}
+	public static function logStack( $_object ) {
+	  self::out([
+		"position" => self::$stack,
+		"error" => $_object
+	  ]);
+	  self::out("<br>");
+	}
+	public static function push() {
+	  $debugInfo = debug_backtrace();
+	  $debugInfo = [
+		"file" => $debugInfo[1]["file"],
+		"line" => $debugInfo[1]["line"],
+		"function" => $debugInfo[1]["function"],
+		"class" => $debugInfo[1]["class"]
+	  ];
+	  self::$stack[] = $debugInfo;
+	}
+	public static function pop() {
+	  if(count(self::$stack)>0)
+		array_shift(self::$stack);
+	}
+	public static function emptyStack() {
+	  self::$stack = [];
+	}
   }
 ?>

Spacing +9 added lines, -9 removed lines

@@ -9,30 +9,30 @@ 
       self::$stack = [];
       self::$initialized = true;
     }
-    private static function out( $_object ) {
-      if(is_object($_object)) {
+    private static function out($_object) {
+      if (is_object($_object)) {
         echo "isObject";
-      } else if(is_array($_object)) {
+      } else if (is_array($_object)) {
         arrayDump($_object, "Debug");
       } else {
         echo $_object;
       }
     }
-    public static function error( $_object ) {
+    public static function error($_object) {
       self::out(["Error" => $_object]);
     }
-    public static function warning( $_object ) {
+    public static function warning($_object) {
       self::out(["Warning" => $_object]);
     }
-    public static function fatal( $_object ) {
+    public static function fatal($_object) {
       self::out(["Fatal error" => $_object]);
       exit(1);
     }
-    public static function logln( $_object ) {
+    public static function logln($_object) {
       self::log($_object);
       self::out("<br>");
     }
-    public static function logStack( $_object ) {
+    public static function logStack($_object) {
       self::out([
         "position" => self::$stack,
         "error" => $_object
@@ -50,7 +50,7 @@ 
       self::$stack[] = $debugInfo;
     }
     public static function pop() {
-      if(count(self::$stack)>0)
+      if (count(self::$stack) > 0)
         array_shift(self::$stack);
     }
     public static function emptyStack() {

dist/jate/functions/block.php

Doc Comments +3 added lines

@@ -17,6 +17,9 @@
     return jBlockFileMan($_path, $extension, $_parameters);
   }
 
+  /**
+   * @param string $_type
+   */
   function jBlockFileMan( $_path, $_type, $_parameters = [] ) {
     if(!file_exists($_path))
       Debug::fatal("File [$_path] not found.");

Indentation +36 added lines, -36 removed lines

@@ -3,59 +3,59 @@
   jRequire("../modules/Parsedown/Parsedown.php");
   jRequire("../modules/Debug/Debug.php");
   function jBlock() {
-    return ob_start();
+	return ob_start();
   }
 
   function jBlockClose( $_type = "html", $_parameters = [] ) {
-    return jBlockEnd($_type, $_parameters);
+	return jBlockEnd($_type, $_parameters);
   }
 
   function jBlockFile( $_path, $_parameters = [] ) {
-    $extension = explode(".", $_path);
-    $extension = $extension[count($extension)-1];
-    $extension = strtolower($extension);
-    return jBlockFileMan($_path, $extension, $_parameters);
+	$extension = explode(".", $_path);
+	$extension = $extension[count($extension)-1];
+	$extension = strtolower($extension);
+	return jBlockFileMan($_path, $extension, $_parameters);
   }
 
   function jBlockFileMan( $_path, $_type, $_parameters = [] ) {
-    if(!file_exists($_path))
-      Debug::fatal("File [$_path] not found.");
-    $temp = file_get_contents($_path);
-    return jBlockParsing($_type, $temp, $_parameters);
+	if(!file_exists($_path))
+	  Debug::fatal("File [$_path] not found.");
+	$temp = file_get_contents($_path);
+	return jBlockParsing($_type, $temp, $_parameters);
   }
 
   function jBlockEnd( $_type = "html", $_parameters = [] ) {
-    $text = ob_get_clean();
-    return jBlockParsing($_type, $text, $_parameters);
+	$text = ob_get_clean();
+	return jBlockParsing($_type, $text, $_parameters);
   }
 
   function jBlockParsing( $_type = "html", $_string = "", $_parameters = [] ) {
-    switch ($_type) {
-      case "pug":
-      case "jade":
-        $Pug = new Pug();
-        $_string = $Pug->drawText($_string, $_parameters);
-      break;
-      case "md":
-      case "markdown":
-      case "parsedown":
-        $Parsedown = new Parsedown();
-        $_string = $Parsedown->drawText($_string);
-      break;
-      case "twig":
-        $Twig = new Twig();
-        $_string = $Twig->drawText($_string, $_parameters);
-      break;
-      default: break;
-    }
-    return $_string;
+	switch ($_type) {
+	  case "pug":
+	  case "jade":
+		$Pug = new Pug();
+		$_string = $Pug->drawText($_string, $_parameters);
+	  break;
+	  case "md":
+	  case "markdown":
+	  case "parsedown":
+		$Parsedown = new Parsedown();
+		$_string = $Parsedown->drawText($_string);
+	  break;
+	  case "twig":
+		$Twig = new Twig();
+		$_string = $Twig->drawText($_string, $_parameters);
+	  break;
+	  default: break;
+	}
+	return $_string;
   }
 
   function minifyOutput($_buffer) {
-    $search = array ( '/\>[^\S ]+/s', '/[^\S ]+\</s', '/(\s)+/s' );
-    $replace = array ( '>', '<', '\\1' );
-    if (preg_match("/\<html/i",$_buffer) == 1 && preg_match("/\<\/html\>/i",$_buffer) == 1)
-      $_buffer = preg_replace($search, $replace, utf8_decode($_buffer));
-    return utf8_encode($_buffer);
+	$search = array ( '/\>[^\S ]+/s', '/[^\S ]+\</s', '/(\s)+/s' );
+	$replace = array ( '>', '<', '\\1' );
+	if (preg_match("/\<html/i",$_buffer) == 1 && preg_match("/\<\/html\>/i",$_buffer) == 1)
+	  $_buffer = preg_replace($search, $replace, utf8_decode($_buffer));
+	return utf8_encode($_buffer);
   }
 ?>

Spacing +10 added lines, -10 removed lines

@@ -6,30 +6,30 @@ 
     return ob_start();
   }
 
-  function jBlockClose( $_type = "html", $_parameters = [] ) {
+  function jBlockClose($_type = "html", $_parameters = []) {
     return jBlockEnd($_type, $_parameters);
   }
 
-  function jBlockFile( $_path, $_parameters = [] ) {
+  function jBlockFile($_path, $_parameters = []) {
     $extension = explode(".", $_path);
-    $extension = $extension[count($extension)-1];
+    $extension = $extension[count($extension) - 1];
     $extension = strtolower($extension);
     return jBlockFileMan($_path, $extension, $_parameters);
   }
 
-  function jBlockFileMan( $_path, $_type, $_parameters = [] ) {
-    if(!file_exists($_path))
+  function jBlockFileMan($_path, $_type, $_parameters = []) {
+    if (!file_exists($_path))
       Debug::fatal("File [$_path] not found.");
     $temp = file_get_contents($_path);
     return jBlockParsing($_type, $temp, $_parameters);
   }
 
-  function jBlockEnd( $_type = "html", $_parameters = [] ) {
+  function jBlockEnd($_type = "html", $_parameters = []) {
     $text = ob_get_clean();
     return jBlockParsing($_type, $text, $_parameters);
   }
 
-  function jBlockParsing( $_type = "html", $_string = "", $_parameters = [] ) {
+  function jBlockParsing($_type = "html", $_string = "", $_parameters = []) {
     switch ($_type) {
       case "pug":
       case "jade":
@@ -52,9 +52,9 @@ 
   }
 
   function minifyOutput($_buffer) {
-    $search = array ( '/\>[^\S ]+/s', '/[^\S ]+\</s', '/(\s)+/s' );
-    $replace = array ( '>', '<', '\\1' );
-    if (preg_match("/\<html/i",$_buffer) == 1 && preg_match("/\<\/html\>/i",$_buffer) == 1)
+    $search = array('/\>[^\S ]+/s', '/[^\S ]+\</s', '/(\s)+/s');
+    $replace = array('>', '<', '\\1');
+    if (preg_match("/\<html/i", $_buffer) == 1 && preg_match("/\<\/html\>/i", $_buffer) == 1)
       $_buffer = preg_replace($search, $replace, utf8_decode($_buffer));
     return utf8_encode($_buffer);
   }

Braces +6 added lines, -4 removed lines

@@ -18,8 +18,9 @@ 
   }
 
   function jBlockFileMan( $_path, $_type, $_parameters = [] ) {
-    if(!file_exists($_path))
-      Debug::fatal("File [$_path] not found.");
+    if(!file_exists($_path)) {
+          Debug::fatal("File [$_path] not found.");
+    }
     $temp = file_get_contents($_path);
     return jBlockParsing($_type, $temp, $_parameters);
   }
@@ -54,8 +55,9 @@ 
   function minifyOutput($_buffer) {
     $search = array ( '/\>[^\S ]+/s', '/[^\S ]+\</s', '/(\s)+/s' );
     $replace = array ( '>', '<', '\\1' );
-    if (preg_match("/\<html/i",$_buffer) == 1 && preg_match("/\<\/html\>/i",$_buffer) == 1)
-      $_buffer = preg_replace($search, $replace, utf8_decode($_buffer));
+    if (preg_match("/\<html/i",$_buffer) == 1 && preg_match("/\<\/html\>/i",$_buffer) == 1) {
+          $_buffer = preg_replace($search, $replace, utf8_decode($_buffer));
+    }
     return utf8_encode($_buffer);
   }
 ?>

dist/jate/modules/JConfig/JConfig.php

Indentation +53 added lines, -53 removed lines

@@ -1,57 +1,57 @@
 <?php
   class JConfig {
-    public $connection;
-    public $all;
-    public $DEBUG;
-    public $pages;
-    public $server;
-    public function __construct() {
-      $this->connection["enable"]    = false;
-      $this->connection["user"]      = "";
-      $this->connection["password"] = "";
-      $this->connection["database"] = "";
-      $this->connection["server"]    = "";
-      $this->all    = "";
-      $this->DEBUG  = 0;
-      $this->pages  = [];
-      $this->server  = [];
-      $this->server["HTTP_HOST"]    = $_SERVER["HTTP_HOST"];
-      $this->server["REQUEST_URI"]  = $_SERVER["REQUEST_URI"];
-      $this->server["PHP_SELF"]      = $_SERVER["PHP_SELF"];
-      $this->server["RELATIVE"]      = str_replace("/index.php", "", $_SERVER["PHP_SELF"]);
-    }
-    public function import( $_path, $_type = "misc" ) {
-      if(!file_exists($_path))
-        Debug::fatal("File [$_path] not found.");
-      $data = file_get_contents($_path);
-      $data = json_decode($data);
-      if($data === NULL)
-        Debug::fatal("Error processing [$_path]");
-      if( $_type == "connection" )
-        $this->overlayConnection($data);
-      else
-        $this->overlayMisc($data);
-    }
-    protected function overlayConnection( $_data ) {
-      $this->connection = $this->obj2array($_data);
-    }
-    protected function overlayMisc( $_data ) {
-      $this->importObject($_data);
-    }
-    protected function obj2array ( &$_instance ) {
-      $clone  = (array) $_instance;
-      $return  = [];
-      $return['___SOURCE_KEYS_'] = $clone;
-      while ( list ($key, $value) = each ($clone) ) {
-        $temp    = explode ("\0", $key);
-        $newkey  = $temp[count($temp)-1];
-        $return[$newkey] = &$return['___SOURCE_KEYS_'][$key];
-      }
-      return $return;
-    }
-    protected function importObject( $_object ) {
-      foreach (get_object_vars($_object) as $key => $value)
-        $this->$key = $value;
-    }
+	public $connection;
+	public $all;
+	public $DEBUG;
+	public $pages;
+	public $server;
+	public function __construct() {
+	  $this->connection["enable"]    = false;
+	  $this->connection["user"]      = "";
+	  $this->connection["password"] = "";
+	  $this->connection["database"] = "";
+	  $this->connection["server"]    = "";
+	  $this->all    = "";
+	  $this->DEBUG  = 0;
+	  $this->pages  = [];
+	  $this->server  = [];
+	  $this->server["HTTP_HOST"]    = $_SERVER["HTTP_HOST"];
+	  $this->server["REQUEST_URI"]  = $_SERVER["REQUEST_URI"];
+	  $this->server["PHP_SELF"]      = $_SERVER["PHP_SELF"];
+	  $this->server["RELATIVE"]      = str_replace("/index.php", "", $_SERVER["PHP_SELF"]);
+	}
+	public function import( $_path, $_type = "misc" ) {
+	  if(!file_exists($_path))
+		Debug::fatal("File [$_path] not found.");
+	  $data = file_get_contents($_path);
+	  $data = json_decode($data);
+	  if($data === NULL)
+		Debug::fatal("Error processing [$_path]");
+	  if( $_type == "connection" )
+		$this->overlayConnection($data);
+	  else
+		$this->overlayMisc($data);
+	}
+	protected function overlayConnection( $_data ) {
+	  $this->connection = $this->obj2array($_data);
+	}
+	protected function overlayMisc( $_data ) {
+	  $this->importObject($_data);
+	}
+	protected function obj2array ( &$_instance ) {
+	  $clone  = (array) $_instance;
+	  $return  = [];
+	  $return['___SOURCE_KEYS_'] = $clone;
+	  while ( list ($key, $value) = each ($clone) ) {
+		$temp    = explode ("\0", $key);
+		$newkey  = $temp[count($temp)-1];
+		$return[$newkey] = &$return['___SOURCE_KEYS_'][$key];
+	  }
+	  return $return;
+	}
+	protected function importObject( $_object ) {
+	  foreach (get_object_vars($_object) as $key => $value)
+		$this->$key = $value;
+	}
   }
 ?>

Spacing +14 added lines, -14 removed lines

@@ -14,42 +14,42 @@
       $this->all    = "";
       $this->DEBUG  = 0;
       $this->pages  = [];
-      $this->server  = [];
+      $this->server = [];
       $this->server["HTTP_HOST"]    = $_SERVER["HTTP_HOST"];
       $this->server["REQUEST_URI"]  = $_SERVER["REQUEST_URI"];
       $this->server["PHP_SELF"]      = $_SERVER["PHP_SELF"];
       $this->server["RELATIVE"]      = str_replace("/index.php", "", $_SERVER["PHP_SELF"]);
     }
-    public function import( $_path, $_type = "misc" ) {
-      if(!file_exists($_path))
+    public function import($_path, $_type = "misc") {
+      if (!file_exists($_path))
         Debug::fatal("File [$_path] not found.");
       $data = file_get_contents($_path);
       $data = json_decode($data);
-      if($data === NULL)
+      if ($data === NULL)
         Debug::fatal("Error processing [$_path]");
-      if( $_type == "connection" )
+      if ($_type == "connection")
         $this->overlayConnection($data);
       else
         $this->overlayMisc($data);
     }
-    protected function overlayConnection( $_data ) {
+    protected function overlayConnection($_data) {
       $this->connection = $this->obj2array($_data);
     }
-    protected function overlayMisc( $_data ) {
+    protected function overlayMisc($_data) {
       $this->importObject($_data);
     }
-    protected function obj2array ( &$_instance ) {
-      $clone  = (array) $_instance;
-      $return  = [];
+    protected function obj2array(&$_instance) {
+      $clone = (array) $_instance;
+      $return = [];
       $return['___SOURCE_KEYS_'] = $clone;
-      while ( list ($key, $value) = each ($clone) ) {
-        $temp    = explode ("\0", $key);
-        $newkey  = $temp[count($temp)-1];
+      while (list ($key, $value) = each($clone)) {
+        $temp    = explode("\0", $key);
+        $newkey  = $temp[count($temp) - 1];
         $return[$newkey] = &$return['___SOURCE_KEYS_'][$key];
       }
       return $return;
     }
-    protected function importObject( $_object ) {
+    protected function importObject($_object) {
       foreach (get_object_vars($_object) as $key => $value)
         $this->$key = $value;
     }

Braces +14 added lines, -10 removed lines

@@ -21,16 +21,19 @@ 
       $this->server["RELATIVE"]      = str_replace("/index.php", "", $_SERVER["PHP_SELF"]);
     }
     public function import( $_path, $_type = "misc" ) {
-      if(!file_exists($_path))
-        Debug::fatal("File [$_path] not found.");
+      if(!file_exists($_path)) {
+              Debug::fatal("File [$_path] not found.");
+      }
       $data = file_get_contents($_path);
       $data = json_decode($data);
-      if($data === NULL)
-        Debug::fatal("Error processing [$_path]");
-      if( $_type == "connection" )
-        $this->overlayConnection($data);
-      else
-        $this->overlayMisc($data);
+      if($data === NULL) {
+              Debug::fatal("Error processing [$_path]");
+      }
+      if( $_type == "connection" ) {
+              $this->overlayConnection($data);
+      } else {
+              $this->overlayMisc($data);
+      }
     }
     protected function overlayConnection( $_data ) {
       $this->connection = $this->obj2array($_data);
@@ -50,8 +53,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/functions/requirer.php

Doc Comments +11 added lines

@@ -1,4 +1,7 @@ 
 <?php
+  /**
+   * @param string $_path
+   */
   function requireComponent( $_path, $_local = true ) {
     $path = getJFolder($_path, $_local, debug_backtrace());
     if(file_exists($path) && isPhp($path))
@@ -26,6 +29,10 @@ 
     $info = pathinfo($_file);
     return ($info["extension"] == "php") || ($info["extension"] == "PHP");
   }
+
+  /**
+   * @param string $_path
+   */
   function requireModules( $_path, $_local = true ) {
     $path = getJFolder($_path, $_local, debug_backtrace());
     $subFolders = subFolderDir($path);
@@ -36,6 +43,10 @@ 
     $path = getJFolder($_path, $_local, debug_backtrace());
     require_once( $path );
   }
+
+  /**
+   * @param boolean $_local
+   */
   function getJFolder( $_path, $_local, $_stack ) {
     if($_local) {
       $stackInfo = $_stack;

Indentation +46 added lines, -46 removed lines

@@ -1,64 +1,64 @@
 <?php
   function requireComponent( $_path, $_local = true ) {
-    $path = getJFolder($_path, $_local, debug_backtrace());
-    if(file_exists($path) && isPhp($path))
-      jRequire($path, false, 0);
-    else
-      requireError($_path);
+	$path = getJFolder($_path, $_local, debug_backtrace());
+	if(file_exists($path) && isPhp($path))
+	  jRequire($path, false, 0);
+	else
+	  requireError($_path);
   }
   function requireComponents( $_path, $_local = true ) {
-    $path = getJFolder($_path, $_local, debug_backtrace());
-    if(file_exists($path)) {
-      $files = subFolderFile($path);
-      foreach ($files as $i)
-        if(isPhp("$path/$i"))
-          requireComponent($path."/".$i, false);
-    } else
-      requireError($_path);
+	$path = getJFolder($_path, $_local, debug_backtrace());
+	if(file_exists($path)) {
+	  $files = subFolderFile($path);
+	  foreach ($files as $i)
+		if(isPhp("$path/$i"))
+		  requireComponent($path."/".$i, false);
+	} else
+	  requireError($_path);
   }
   function requireError( $_path ) {
-    global $DEBUG;
-    if( $DEBUG == 1 )
-      echo "Error load ($_path)<br>";
+	global $DEBUG;
+	if( $DEBUG == 1 )
+	  echo "Error load ($_path)<br>";
   }
   function isPhp ( $_file ) {
-    if(!is_file($_file)) return false;
-    $info = pathinfo($_file);
-    return ($info["extension"] == "php") || ($info["extension"] == "PHP");
+	if(!is_file($_file)) return false;
+	$info = pathinfo($_file);
+	return ($info["extension"] == "php") || ($info["extension"] == "PHP");
   }
   function requireModules( $_path, $_local = true ) {
-    $path = getJFolder($_path, $_local, debug_backtrace());
-    $subFolders = subFolderDir($path);
-    foreach ($subFolders as $i)
-      requireComponents("$path/$i", false);
+	$path = getJFolder($_path, $_local, debug_backtrace());
+	$subFolders = subFolderDir($path);
+	foreach ($subFolders as $i)
+	  requireComponents("$path/$i", false);
   }
   function jRequire( $_path, $_local = true ) {
-    $path = getJFolder($_path, $_local, debug_backtrace());
-    require_once( $path );
+	$path = getJFolder($_path, $_local, debug_backtrace());
+	require_once( $path );
   }
   function getJFolder( $_path, $_local, $_stack ) {
-    if($_local) {
-      $stackInfo = $_stack;
-      $folder = dirname($stackInfo[0]["file"]);
-      $file = "$folder/$_path";
-    } else
-      $file = $_path;
-    return $file;
+	if($_local) {
+	  $stackInfo = $_stack;
+	  $folder = dirname($stackInfo[0]["file"]);
+	  $file = "$folder/$_path";
+	} else
+	  $file = $_path;
+	return $file;
   }
   function requireModulesList( $_path ) {
-    if(!file_exists($_path))
-      return;
-    $data = file_get_contents($_path);
-    $data = json_decode($data);
-    if($data === NULL)
-      throw new Exception("Error in the file format [$_path]", 1);
-    foreach ($data as $item) {
-      if(substr($item, -1) == "*")
-        requireModules(substr($item, 0, -2), false);
-      else {
-        $path = getJFolder($item, false, debug_backtrace());
-        requireComponents("$path", false);
-      }
-    }
+	if(!file_exists($_path))
+	  return;
+	$data = file_get_contents($_path);
+	$data = json_decode($data);
+	if($data === NULL)
+	  throw new Exception("Error in the file format [$_path]", 1);
+	foreach ($data as $item) {
+	  if(substr($item, -1) == "*")
+		requireModules(substr($item, 0, -2), false);
+	  else {
+		$path = getJFolder($item, false, debug_backtrace());
+		requireComponents("$path", false);
+	  }
+	}
   }
 ?>

Spacing +18 added lines, -18 removed lines

@@ -1,43 +1,43 @@ 
 <?php
-  function requireComponent( $_path, $_local = true ) {
+  function requireComponent($_path, $_local = true) {
     $path = getJFolder($_path, $_local, debug_backtrace());
-    if(file_exists($path) && isPhp($path))
+    if (file_exists($path) && isPhp($path))
       jRequire($path, false, 0);
     else
       requireError($_path);
   }
-  function requireComponents( $_path, $_local = true ) {
+  function requireComponents($_path, $_local = true) {
     $path = getJFolder($_path, $_local, debug_backtrace());
-    if(file_exists($path)) {
+    if (file_exists($path)) {
       $files = subFolderFile($path);
       foreach ($files as $i)
-        if(isPhp("$path/$i"))
+        if (isPhp("$path/$i"))
           requireComponent($path."/".$i, false);
     } else
       requireError($_path);
   }
-  function requireError( $_path ) {
+  function requireError($_path) {
     global $DEBUG;
-    if( $DEBUG == 1 )
+    if ($DEBUG == 1)
       echo "Error load ($_path)<br>";
   }
-  function isPhp ( $_file ) {
-    if(!is_file($_file)) return false;
+  function isPhp($_file) {
+    if (!is_file($_file)) return false;
     $info = pathinfo($_file);
     return ($info["extension"] == "php") || ($info["extension"] == "PHP");
   }
-  function requireModules( $_path, $_local = true ) {
+  function requireModules($_path, $_local = true) {
     $path = getJFolder($_path, $_local, debug_backtrace());
     $subFolders = subFolderDir($path);
     foreach ($subFolders as $i)
       requireComponents("$path/$i", false);
   }
-  function jRequire( $_path, $_local = true ) {
+  function jRequire($_path, $_local = true) {
     $path = getJFolder($_path, $_local, debug_backtrace());
-    require_once( $path );
+    require_once($path);
   }
-  function getJFolder( $_path, $_local, $_stack ) {
-    if($_local) {
+  function getJFolder($_path, $_local, $_stack) {
+    if ($_local) {
       $stackInfo = $_stack;
       $folder = dirname($stackInfo[0]["file"]);
       $file = "$folder/$_path";
@@ -45,15 +45,15 @@ 
       $file = $_path;
     return $file;
   }
-  function requireModulesList( $_path ) {
-    if(!file_exists($_path))
+  function requireModulesList($_path) {
+    if (!file_exists($_path))
       return;
     $data = file_get_contents($_path);
     $data = json_decode($data);
-    if($data === NULL)
+    if ($data === NULL)
       throw new Exception("Error in the file format [$_path]", 1);
     foreach ($data as $item) {
-      if(substr($item, -1) == "*")
+      if (substr($item, -1) == "*")
         requireModules(substr($item, 0, -2), false);
       else {
         $path = getJFolder($item, false, debug_backtrace());

Braces +32 added lines, -22 removed lines

@@ -1,36 +1,43 @@ 
 <?php
   function requireComponent( $_path, $_local = true ) {
     $path = getJFolder($_path, $_local, debug_backtrace());
-    if(file_exists($path) && isPhp($path))
-      jRequire($path, false, 0);
-    else
-      requireError($_path);
+    if(file_exists($path) && isPhp($path)) {
+          jRequire($path, false, 0);
+    } else {
+          requireError($_path);
+    }
   }
   function requireComponents( $_path, $_local = true ) {
     $path = getJFolder($_path, $_local, debug_backtrace());
     if(file_exists($path)) {
       $files = subFolderFile($path);
-      foreach ($files as $i)
-        if(isPhp("$path/$i"))
+      foreach ($files as $i) {
+              if(isPhp("$path/$i"))
           requireComponent($path."/".$i, false);
-    } else
-      requireError($_path);
+      }
+    } else {
+          requireError($_path);
+    }
   }
   function requireError( $_path ) {
     global $DEBUG;
-    if( $DEBUG == 1 )
-      echo "Error load ($_path)<br>";
+    if( $DEBUG == 1 ) {
+          echo "Error load ($_path)<br>";
+    }
   }
   function isPhp ( $_file ) {
-    if(!is_file($_file)) return false;
+    if(!is_file($_file)) {
+    	return false;
+    }
     $info = pathinfo($_file);
     return ($info["extension"] == "php") || ($info["extension"] == "PHP");
   }
   function requireModules( $_path, $_local = true ) {
     $path = getJFolder($_path, $_local, debug_backtrace());
     $subFolders = subFolderDir($path);
-    foreach ($subFolders as $i)
-      requireComponents("$path/$i", false);
+    foreach ($subFolders as $i) {
+          requireComponents("$path/$i", false);
+    }
   }
   function jRequire( $_path, $_local = true ) {
     $path = getJFolder($_path, $_local, debug_backtrace());
@@ -41,21 +48,24 @@ 
       $stackInfo = $_stack;
       $folder = dirname($stackInfo[0]["file"]);
       $file = "$folder/$_path";
-    } else
-      $file = $_path;
+    } else {
+          $file = $_path;
+    }
     return $file;
   }
   function requireModulesList( $_path ) {
-    if(!file_exists($_path))
-      return;
+    if(!file_exists($_path)) {
+          return;
+    }
     $data = file_get_contents($_path);
     $data = json_decode($data);
-    if($data === NULL)
-      throw new Exception("Error in the file format [$_path]", 1);
+    if($data === NULL) {
+          throw new Exception("Error in the file format [$_path]", 1);
+    }
     foreach ($data as $item) {
-      if(substr($item, -1) == "*")
-        requireModules(substr($item, 0, -2), false);
-      else {
+      if(substr($item, -1) == "*") {
+              requireModules(substr($item, 0, -2), false);
+      } else {
         $path = getJFolder($item, false, debug_backtrace());
         requireComponents("$path", false);
       }

dist/jate/coreEngine.php

Spacing +5 added lines, -5 removed lines

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

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

Indentation +42 added lines, -42 removed lines

@@ -1,47 +1,47 @@
 <?php
   jRequire("ConnectionInterface.php");
   class ConnectionPdoAdapter implements ConnectionAdapterInterface {
-      public $connection;
-      public function __construct( $_srv, $_db, $_usr, $_pass ) {
-        try {
-          $connection = "mysql:host=$_srv;dbname=$_db";
-          $this->connection = new PDO( $connection, $_usr, $_pass, [PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'utf8'"] );
-        } catch( Exception $error ) {
-          Debug::fatal($error->getMessage());
-          exit();
-        }
-      }
-      public function query( $_query ) {
-        $this->stdQuery($_query);
-        return true;
-      }
-      public function queryInsert( $_query ) {
-        $this->stdQuery($_query);
-        return $this->connection->lastInsertId();
-      }
-      public function queryFetch( $_query ) {
-        $temp = $this->stdQuery($_query);
-        return $temp->fetchAll(PDO::FETCH_ASSOC);
-      }
-      public function queryArray( $_query ) {
-        $temp = $this->stdQuery($_query);
-        return $temp->fetchAll(PDO::FETCH_COLUMN, 0);
-      }
-      protected function stdQuery( $_query ) {
-        $database = $this->connection;
-        $query = $database->prepare($_query);
-        $result = $query->execute();
-        if(!$result) {
-          Debug::fatal([
-            "query" => $_query,
-            "error" => [
-              $query->errorInfo(),
-              $database->errorInfo()
-            ]
-          ]);
-          exit();
-        }
-        return $query;
-      }
+	  public $connection;
+	  public function __construct( $_srv, $_db, $_usr, $_pass ) {
+		try {
+		  $connection = "mysql:host=$_srv;dbname=$_db";
+		  $this->connection = new PDO( $connection, $_usr, $_pass, [PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'utf8'"] );
+		} catch( Exception $error ) {
+		  Debug::fatal($error->getMessage());
+		  exit();
+		}
+	  }
+	  public function query( $_query ) {
+		$this->stdQuery($_query);
+		return true;
+	  }
+	  public function queryInsert( $_query ) {
+		$this->stdQuery($_query);
+		return $this->connection->lastInsertId();
+	  }
+	  public function queryFetch( $_query ) {
+		$temp = $this->stdQuery($_query);
+		return $temp->fetchAll(PDO::FETCH_ASSOC);
+	  }
+	  public function queryArray( $_query ) {
+		$temp = $this->stdQuery($_query);
+		return $temp->fetchAll(PDO::FETCH_COLUMN, 0);
+	  }
+	  protected function stdQuery( $_query ) {
+		$database = $this->connection;
+		$query = $database->prepare($_query);
+		$result = $query->execute();
+		if(!$result) {
+		  Debug::fatal([
+			"query" => $_query,
+			"error" => [
+			  $query->errorInfo(),
+			  $database->errorInfo()
+			]
+		  ]);
+		  exit();
+		}
+		return $query;
+	  }
   }
 ?>

Spacing +9 added lines, -9 removed lines

@@ -2,36 +2,36 @@
   jRequire("ConnectionInterface.php");
   class ConnectionPdoAdapter implements ConnectionAdapterInterface {
       public $connection;
-      public function __construct( $_srv, $_db, $_usr, $_pass ) {
+      public function __construct($_srv, $_db, $_usr, $_pass) {
         try {
           $connection = "mysql:host=$_srv;dbname=$_db";
-          $this->connection = new PDO( $connection, $_usr, $_pass, [PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'utf8'"] );
-        } catch( Exception $error ) {
+          $this->connection = new PDO($connection, $_usr, $_pass, [PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'utf8'"]);
+        } catch (Exception $error) {
           Debug::fatal($error->getMessage());
           exit();
         }
       }
-      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;
         $query = $database->prepare($_query);
         $result = $query->execute();
-        if(!$result) {
+        if (!$result) {
           Debug::fatal([
             "query" => $_query,
             "error" => [