XaBerr / JATE

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

Braces +6 added lines, -4 removed lines

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

Indentation +43 added lines, -43 removed lines

@@ -1,48 +1,48 @@
 <?php
   jRequire("ConnectionInterface.php");
   class ConnectionMysqliAdapter implements ConnectionAdapterInterface {
-      public $connection;
-      public function __construct( $_srv, $_db, $_usr, $_pass ) {
-        try {
-          $this->connection = new mysqli( $_srv, $_usr, $_pass, $_db );
-        } 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->insert_id;
-      }
-      public function queryFetch( $_query ) {
-        $result = $this->stdQuery($_query);
-        $rows = [];
-        while($row = $result->fetch_assoc())
-          $rows[] = $row;
-        return $rows;
-      }
-      public function queryArray( $_query ) {
-        $result = $this->stdQuery($_query);
-        $rows = [];
-        while($row = $result->fetch_array())
-          $rows[] = $row;
-        return $rows;
-      }
-      protected function stdQuery( $_query ) {
-        $database = $this->connection;
-        $result = $database->query($_query);
-        if(!$result) {
-          Debug::fatal([
-            "query" => $_query,
-            "error" => $database->error
-          ]);
-          exit();
-        }
-        return $result;
-      }
+	  public $connection;
+	  public function __construct( $_srv, $_db, $_usr, $_pass ) {
+		try {
+		  $this->connection = new mysqli( $_srv, $_usr, $_pass, $_db );
+		} 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->insert_id;
+	  }
+	  public function queryFetch( $_query ) {
+		$result = $this->stdQuery($_query);
+		$rows = [];
+		while($row = $result->fetch_assoc())
+		  $rows[] = $row;
+		return $rows;
+	  }
+	  public function queryArray( $_query ) {
+		$result = $this->stdQuery($_query);
+		$rows = [];
+		while($row = $result->fetch_array())
+		  $rows[] = $row;
+		return $rows;
+	  }
+	  protected function stdQuery( $_query ) {
+		$database = $this->connection;
+		$result = $database->query($_query);
+		if(!$result) {
+		  Debug::fatal([
+			"query" => $_query,
+			"error" => $database->error
+		  ]);
+		  exit();
+		}
+		return $result;
+	  }
   }
 ?>

Spacing +11 added lines, -11 removed lines

@@ -2,40 +2,40 @@
   jRequire("ConnectionInterface.php");
   class ConnectionMysqliAdapter implements ConnectionAdapterInterface {
       public $connection;
-      public function __construct( $_srv, $_db, $_usr, $_pass ) {
+      public function __construct($_srv, $_db, $_usr, $_pass) {
         try {
-          $this->connection = new mysqli( $_srv, $_usr, $_pass, $_db );
-        } catch( Exception $error ) {
+          $this->connection = new mysqli($_srv, $_usr, $_pass, $_db);
+        } 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->insert_id;
       }
-      public function queryFetch( $_query ) {
+      public function queryFetch($_query) {
         $result = $this->stdQuery($_query);
         $rows = [];
-        while($row = $result->fetch_assoc())
+        while ($row = $result->fetch_assoc())
           $rows[] = $row;
         return $rows;
       }
-      public function queryArray( $_query ) {
+      public function queryArray($_query) {
         $result = $this->stdQuery($_query);
         $rows = [];
-        while($row = $result->fetch_array())
+        while ($row = $result->fetch_array())
           $rows[] = $row;
         return $rows;
       }
-      protected function stdQuery( $_query ) {
+      protected function stdQuery($_query) {
         $database = $this->connection;
         $result = $database->query($_query);
-        if(!$result) {
+        if (!$result) {
           Debug::fatal([
             "query" => $_query,
             "error" => $database->error

dist/jate/modules/Connection/Connection.php

Spacing +9 added lines, -9 removed lines

@@ -8,20 +8,20 @@ 
       parent::__construct();
       $args = func_get_args();
       $count = func_num_args();
-      if (method_exists($this,$func='__construct'.$count))
-        call_user_func_array(array($this,$func),$args);
+      if (method_exists($this, $func = '__construct'.$count))
+        call_user_func_array(array($this, $func), $args);
     }
     public function __construct0() {
       $this->database = null;
     }
-    public function __construct4 ( $_srv, $_db, $_usr, $_pass ) {
+    public function __construct4($_srv, $_db, $_usr, $_pass) {
       $this->setConnection($_srv, $_db, $_usr, $_pass, "pdo");
     }
-    public function __construct5 ( $_srv, $_db, $_usr, $_pass, $_type ) {
+    public function __construct5($_srv, $_db, $_usr, $_pass, $_type) {
       $type = $this->getConnectionType($_type);
       $this->setConnection($_srv, $_db, $_usr, $_pass, $type);
     }
-    protected function setConnection ( $_srv, $_db, $_usr, $_pass, $_type ) {
+    protected function setConnection($_srv, $_db, $_usr, $_pass, $_type) {
       switch ($_type) {
         case "mysqli":
           $this->database = new ConnectionMysqliAdapter($_srv, $_db, $_usr, $_pass);
@@ -30,15 +30,15 @@ 
           $this->database = new ConnectionPdoAdapter($_srv, $_db, $_usr, $_pass);
         break;
       }
-      $this->setConnectionParameters( $_srv, $_db, $_usr, $_pass);
+      $this->setConnectionParameters($_srv, $_db, $_usr, $_pass);
     }
-    protected function getConnectionType( $_type ) {
+    protected function getConnectionType($_type) {
       foreach ($_type as $key => $value)
-        if($value)
+        if ($value)
           return $key;
       return "pdo";
     }
-    protected function setConnectionParameters( $_srv, $_db, $_usr, $_pass) {
+    protected function setConnectionParameters($_srv, $_db, $_usr, $_pass) {
       $this->info = [];
       $this->info["server"]    = $_srv;
       $this->info["database"]  = $_db;

Braces +6 added lines, -4 removed lines

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

Indentation +46 added lines, -46 removed lines

@@ -2,51 +2,51 @@
   jRequire("../Module/Module.php");
   requireComponents("Adapters");
   class Connection extends Module {
-    public $database;
-    public $info;
-    public function __construct() {
-      parent::__construct();
-      $args = func_get_args();
-      $count = func_num_args();
-      if (method_exists($this,$func='__construct'.$count))
-        call_user_func_array(array($this,$func),$args);
-    }
-    public function __construct0() {
-      $this->database = null;
-    }
-    public function __construct4 ( $_srv, $_db, $_usr, $_pass ) {
-      $this->setConnection($_srv, $_db, $_usr, $_pass, "pdo");
-    }
-    public function __construct5 ( $_srv, $_db, $_usr, $_pass, $_type ) {
-      $type = $this->getConnectionType($_type);
-      $this->setConnection($_srv, $_db, $_usr, $_pass, $type);
-    }
-    protected function setConnection ( $_srv, $_db, $_usr, $_pass, $_type ) {
-      switch ($_type) {
-        case "mysqli":
-          $this->database = new ConnectionMysqliAdapter($_srv, $_db, $_usr, $_pass);
-        break;
-        case "postgresql":
-          $this->database = new ConnectionPostgresqlAdapter($_srv, $_db, $_usr, $_pass);
-        break;
-        default:
-          $this->database = new ConnectionPdoAdapter($_srv, $_db, $_usr, $_pass);
-        break;
-      }
-      $this->setConnectionParameters( $_srv, $_db, $_usr, $_pass);
-    }
-    protected function getConnectionType( $_type ) {
-      foreach ($_type as $key => $value)
-        if($value)
-          return $key;
-      return "pdo";
-    }
-    protected function setConnectionParameters( $_srv, $_db, $_usr, $_pass) {
-      $this->info = [];
-      $this->info["server"]    = $_srv;
-      $this->info["database"]  = $_db;
-      $this->info["user"]      = $_usr;
-      $this->info["password"]  = $_pass;
-    }
+	public $database;
+	public $info;
+	public function __construct() {
+	  parent::__construct();
+	  $args = func_get_args();
+	  $count = func_num_args();
+	  if (method_exists($this,$func='__construct'.$count))
+		call_user_func_array(array($this,$func),$args);
+	}
+	public function __construct0() {
+	  $this->database = null;
+	}
+	public function __construct4 ( $_srv, $_db, $_usr, $_pass ) {
+	  $this->setConnection($_srv, $_db, $_usr, $_pass, "pdo");
+	}
+	public function __construct5 ( $_srv, $_db, $_usr, $_pass, $_type ) {
+	  $type = $this->getConnectionType($_type);
+	  $this->setConnection($_srv, $_db, $_usr, $_pass, $type);
+	}
+	protected function setConnection ( $_srv, $_db, $_usr, $_pass, $_type ) {
+	  switch ($_type) {
+		case "mysqli":
+		  $this->database = new ConnectionMysqliAdapter($_srv, $_db, $_usr, $_pass);
+		break;
+		case "postgresql":
+		  $this->database = new ConnectionPostgresqlAdapter($_srv, $_db, $_usr, $_pass);
+		break;
+		default:
+		  $this->database = new ConnectionPdoAdapter($_srv, $_db, $_usr, $_pass);
+		break;
+	  }
+	  $this->setConnectionParameters( $_srv, $_db, $_usr, $_pass);
+	}
+	protected function getConnectionType( $_type ) {
+	  foreach ($_type as $key => $value)
+		if($value)
+		  return $key;
+	  return "pdo";
+	}
+	protected function setConnectionParameters( $_srv, $_db, $_usr, $_pass) {
+	  $this->info = [];
+	  $this->info["server"]    = $_srv;
+	  $this->info["database"]  = $_db;
+	  $this->info["user"]      = $_usr;
+	  $this->info["password"]  = $_pass;
+	}
   }
 ?>

dist/jate/modules/Router/Router.php

Indentation +10 added lines, -10 removed lines

@@ -1,15 +1,15 @@
 <?php
   jRequire("../Module/Module.php");
   class Router extends Module {
-    public function __construct() {
-      parent::__construct();
-    }
-    public function getPage() {
-      $request  = $this->parameters["app"]->server["REQUEST_URI"];
-      $base      = $this->parameters["app"]->server["RELATIVE"];
-      $url      = str_replace($base, "", $request);
-      $url      = explode("/", $url);
-      return $url;
-    }
+	public function __construct() {
+	  parent::__construct();
+	}
+	public function getPage() {
+	  $request  = $this->parameters["app"]->server["REQUEST_URI"];
+	  $base      = $this->parameters["app"]->server["RELATIVE"];
+	  $url      = str_replace($base, "", $request);
+	  $url      = explode("/", $url);
+	  return $url;
+	}
   }
 ?>

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
     }
     public function getPage() {
       $request  = $this->parameters["app"]->server["REQUEST_URI"];
-      $base      = $this->parameters["app"]->server["RELATIVE"];
+      $base = $this->parameters["app"]->server["RELATIVE"];
       $url      = str_replace($base, "", $request);
       $url      = explode("/", $url);
       return $url;

dist/jate/modules/Html/Html.php

Indentation +44 added lines, -44 removed lines

@@ -1,49 +1,49 @@
 <?php
   requireComponent("../Query/Query.php");
   class Html extends Query {
-    public function __construct( $_parameters = [ "app" => null, "page" => null] ) {
-      parent::__construct();
-      $this->data["template"]          = "";
-      $this->tags["brand"]            = "";
-      $this->tags["brandImg"]          = "";
-      $this->tags["menu"]              = "";
-      $this->tags["title"]            = "";
-      $this->tags["subtitle"]           = "";
-      $this->tags["content"]           = "";
-      $this->tags["outContent"]         = "";
-      $this->tags["footer"]             = "";
-      $this->tags["pagePath"]           = [];
-      $this->tags["css"]              = [];
-      $this->tags["js"]                 = [];
-      $this->tags["jsVariables"]      = [];
-      $this->tags["metaDescription"]  = [];
-      $this->tags["metaKeywords"]      = [];
-      $this->tags["metaAuthor"]        = [];
-      $this->parameters                = $_parameters;
-      $this->tags["base"]              = $_parameters["app"]->server["RELATIVE"]."/";
-    }
-    public function uniforma() {
-      $this->addDipendences();
-      $this->tags["css"]      = array_unique($this->tags["css"]);
-      $this->tags["js"]        = array_unique($this->tags["js"]);
-      $this->tags["pagePath"]  = json_encode($this->tags["pagePath"]);
-      $tempStr = "";
-      $timeParameter = "?t=".time();
-      $time = ($this->parameters["app"]->cache->css == true) ? "" : $timeParameter;
-      foreach ($this->tags["css"] as $i)
-        $tempStr .= "<link rel='stylesheet' href='$i$time'>";
-      $this->tags["css"] = $tempStr;
-      $tempStr = "";
-      $time = ($this->parameters["app"]->cache->js == true) ? "" : $timeParameter;
-      foreach ($this->tags["js"] as $i)
-        $tempStr .= "<script src='$i$time'></script>";
-      $this->tags["js"] = $tempStr;
-      $tempStr = "";
-      $tempStr .= "<script type='text/javascript'>";
-      foreach ($this->tags["jsVariables"] as $i)
-        $tempStr .= " $i[0] = $i[1];\n";
-      $tempStr .= "</script>";
-      $this->tags["jsVariables"] = $tempStr;
-    }
+	public function __construct( $_parameters = [ "app" => null, "page" => null] ) {
+	  parent::__construct();
+	  $this->data["template"]          = "";
+	  $this->tags["brand"]            = "";
+	  $this->tags["brandImg"]          = "";
+	  $this->tags["menu"]              = "";
+	  $this->tags["title"]            = "";
+	  $this->tags["subtitle"]           = "";
+	  $this->tags["content"]           = "";
+	  $this->tags["outContent"]         = "";
+	  $this->tags["footer"]             = "";
+	  $this->tags["pagePath"]           = [];
+	  $this->tags["css"]              = [];
+	  $this->tags["js"]                 = [];
+	  $this->tags["jsVariables"]      = [];
+	  $this->tags["metaDescription"]  = [];
+	  $this->tags["metaKeywords"]      = [];
+	  $this->tags["metaAuthor"]        = [];
+	  $this->parameters                = $_parameters;
+	  $this->tags["base"]              = $_parameters["app"]->server["RELATIVE"]."/";
+	}
+	public function uniforma() {
+	  $this->addDipendences();
+	  $this->tags["css"]      = array_unique($this->tags["css"]);
+	  $this->tags["js"]        = array_unique($this->tags["js"]);
+	  $this->tags["pagePath"]  = json_encode($this->tags["pagePath"]);
+	  $tempStr = "";
+	  $timeParameter = "?t=".time();
+	  $time = ($this->parameters["app"]->cache->css == true) ? "" : $timeParameter;
+	  foreach ($this->tags["css"] as $i)
+		$tempStr .= "<link rel='stylesheet' href='$i$time'>";
+	  $this->tags["css"] = $tempStr;
+	  $tempStr = "";
+	  $time = ($this->parameters["app"]->cache->js == true) ? "" : $timeParameter;
+	  foreach ($this->tags["js"] as $i)
+		$tempStr .= "<script src='$i$time'></script>";
+	  $this->tags["js"] = $tempStr;
+	  $tempStr = "";
+	  $tempStr .= "<script type='text/javascript'>";
+	  foreach ($this->tags["jsVariables"] as $i)
+		$tempStr .= " $i[0] = $i[1];\n";
+	  $tempStr .= "</script>";
+	  $this->tags["jsVariables"] = $tempStr;
+	}
   }
 ?>

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@ 
 <?php
   requireComponent("../Query/Query.php");
   class Html extends Query {
-    public function __construct( $_parameters = [ "app" => null, "page" => null] ) {
+    public function __construct($_parameters = ["app" => null, "page" => null]) {
       parent::__construct();
       $this->data["template"]          = "";
       $this->tags["brand"]            = "";
@@ -24,7 +24,7 @@ 
     }
     public function uniforma() {
       $this->addDipendences();
-      $this->tags["css"]      = array_unique($this->tags["css"]);
+      $this->tags["css"] = array_unique($this->tags["css"]);
       $this->tags["js"]        = array_unique($this->tags["js"]);
       $this->tags["pagePath"]  = json_encode($this->tags["pagePath"]);
       $tempStr = "";

Braces +9 added lines, -6 removed lines

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

dist/jate/modules/Menu/Menu.php

Indentation +78 added lines, -78 removed lines

@@ -1,89 +1,89 @@
 <?php
   jRequire("../Query/Query.php");
   class Menu extends Query {
-    public function __construct() {
-      parent::__construct();
-    }
-    public function init() {
-      $menu = $this->queryFetch("SELECT * FROM menu WHERE flag_active = 1 ORDER BY `order`");
-      $temp = [];
-      foreach ($menu as $i) {
-        if($i["fk_menu"] == 0) {
-          $pk_menu = $i["pk_menu"];
-          array_push($temp, array("label" => $i["label"], "link" => $i["link"], "submenu" => [], "relative" => false));
-          $submenu = $this->queryFetch("SELECT * FROM menu WHERE fk_menu = $pk_menu ORDER BY `order`");
-          if($submenu)
-          foreach ($submenu as $j)
-            array_push( $temp[count($temp)-1]["submenu"], array("label" => $j["label"], "link" => $j["link"], "submenu" => [], "relative" => false) );
-        }
-      }
-      $this->tags["menu"] = $temp;
-      return $temp;
-    }
-    public function draw() {
-      $temp = "";
-      $host = $this->parameters["app"]->server["HTTP_HOST"];
-      $uri  = $this->parameters["app"]->server["REQUEST_URI"];
-      $actualLink  = "http://$host$uri";
-      $relative    = $this->parameters["app"]->server["RELATIVE"];
-      foreach ($this->tags["menu"] as $i) {
-        $prePath = "";
-        if($i["relative"])
-          $prePath = $relative;
-        $active = $this->isSubString($actualLink, array_merge(array_column($i["submenu"], 'link'), array($i["link"]))) ? "active" : "";
-        if( is_array($i["submenu"]) && count($i["submenu"])<1)
-            $temp .= "<li class='$active'><a href='$prePath$i[link]'>$i[label]</a></li>";
-        else {
-          $temp .= "<li class='dropdown $active'>";
-          $temp .=
-            '<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">'.
-            $i["label"].
-            '<span class="caret"></span>'.
-            '</a>'.
-            '<ul class="dropdown-menu">';
-          foreach ($i["submenu"] as $j) {
-            $prePath = "";
-            if($j["relative"])
-              $prePath = $relative;
-            $temp .= "<li><a href='$prePath$j[link]'>$j[label]</a></li>";
-          }
-          $temp .= "</ul></li>";
-        }
-      }
-      return $temp;
-    }
-    protected function isSubString( $_string, $_list) {
-      $success = false;
-      foreach ($_list as $i)
-        if(strpos($_string,$i) !== false)
-          $success = true;
-      return $success;
-    }
-    public function loginWithUser() {
-      $this->init();
-      $temp = [];
-      if(!isset($_SESSION["username"]))
-        $_SESSION["username"] ="guest";
-      $user = $_SESSION["username"];
-      $blackList = $this->queryFetch(
-        "SELECT user.*,user_section.*
+	public function __construct() {
+	  parent::__construct();
+	}
+	public function init() {
+	  $menu = $this->queryFetch("SELECT * FROM menu WHERE flag_active = 1 ORDER BY `order`");
+	  $temp = [];
+	  foreach ($menu as $i) {
+		if($i["fk_menu"] == 0) {
+		  $pk_menu = $i["pk_menu"];
+		  array_push($temp, array("label" => $i["label"], "link" => $i["link"], "submenu" => [], "relative" => false));
+		  $submenu = $this->queryFetch("SELECT * FROM menu WHERE fk_menu = $pk_menu ORDER BY `order`");
+		  if($submenu)
+		  foreach ($submenu as $j)
+			array_push( $temp[count($temp)-1]["submenu"], array("label" => $j["label"], "link" => $j["link"], "submenu" => [], "relative" => false) );
+		}
+	  }
+	  $this->tags["menu"] = $temp;
+	  return $temp;
+	}
+	public function draw() {
+	  $temp = "";
+	  $host = $this->parameters["app"]->server["HTTP_HOST"];
+	  $uri  = $this->parameters["app"]->server["REQUEST_URI"];
+	  $actualLink  = "http://$host$uri";
+	  $relative    = $this->parameters["app"]->server["RELATIVE"];
+	  foreach ($this->tags["menu"] as $i) {
+		$prePath = "";
+		if($i["relative"])
+		  $prePath = $relative;
+		$active = $this->isSubString($actualLink, array_merge(array_column($i["submenu"], 'link'), array($i["link"]))) ? "active" : "";
+		if( is_array($i["submenu"]) && count($i["submenu"])<1)
+			$temp .= "<li class='$active'><a href='$prePath$i[link]'>$i[label]</a></li>";
+		else {
+		  $temp .= "<li class='dropdown $active'>";
+		  $temp .=
+			'<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">'.
+			$i["label"].
+			'<span class="caret"></span>'.
+			'</a>'.
+			'<ul class="dropdown-menu">';
+		  foreach ($i["submenu"] as $j) {
+			$prePath = "";
+			if($j["relative"])
+			  $prePath = $relative;
+			$temp .= "<li><a href='$prePath$j[link]'>$j[label]</a></li>";
+		  }
+		  $temp .= "</ul></li>";
+		}
+	  }
+	  return $temp;
+	}
+	protected function isSubString( $_string, $_list) {
+	  $success = false;
+	  foreach ($_list as $i)
+		if(strpos($_string,$i) !== false)
+		  $success = true;
+	  return $success;
+	}
+	public function loginWithUser() {
+	  $this->init();
+	  $temp = [];
+	  if(!isset($_SESSION["username"]))
+		$_SESSION["username"] ="guest";
+	  $user = $_SESSION["username"];
+	  $blackList = $this->queryFetch(
+		"SELECT user.*,user_section.*
         FROM user
         INNER JOIN user_x_section
         ON user.pk_user = user_x_section.fk_user
         INNER JOIN user_section
         ON user_section.pk_user_section = user_x_section.fk_user_section
         WHERE user.username = '$user'"
-      );
-      foreach ($this->tags["menu"] as $i) {
-        $success = true;
-        $k = $i["label"];
-        foreach ($blackList as $j)
-          if( $j["section"] == $k)
-            $success = false;
-        if($success)
-          array_push($temp,$i);
-      }
-      $this->tags["menu"] = $temp;
-    }
+	  );
+	  foreach ($this->tags["menu"] as $i) {
+		$success = true;
+		$k = $i["label"];
+		foreach ($blackList as $j)
+		  if( $j["section"] == $k)
+			$success = false;
+		if($success)
+		  array_push($temp,$i);
+	  }
+	  $this->tags["menu"] = $temp;
+	}
   }
 ?>

Spacing +13 added lines, -13 removed lines

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

Braces +24 added lines, -17 removed lines

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

dist/jate/functions/string.php

Indentation +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
   function htmlParser( $_str) {
-    return htmlentities($_str, ENT_QUOTES | ENT_IGNORE, "UTF-8");
+	return htmlentities($_str, ENT_QUOTES | ENT_IGNORE, "UTF-8");
   }
 ?>

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-  function htmlParser( $_str) {
+  function htmlParser($_str) {
     return htmlentities($_str, ENT_QUOTES | ENT_IGNORE, "UTF-8");
   }
 ?>

dist/jate/functions/git.php

Indentation +52 added lines, -52 removed lines

@@ -1,56 +1,56 @@
 <?php
   function getGitLog( $_dir = "./" ) {
-    if(!file_exists($_dir))
-      return [];
-    $currentDir = getcwd();
-    chdir($_dir);
-    $gitHistory  = [];
-    $gitLogs    = [];
-    $gitPath    = str_replace('\\', '/', exec("git rev-parse --show-toplevel"));
-    $rootPath    = str_replace('\\', '/', getcwd ());
-    $lastHash    = null;
-    if( $gitPath != $rootPath ) {
-      chdir($currentDir);
-      return [];
-    }
-    exec("git log --decorate=full --tags", $gitLogs);
-    foreach ($gitLogs as $line) {
-      $line = trim($line);
-      if (!empty($line)) {
-        if (strpos($line, 'commit') === 0) {
-          $hash = explode(' ', $line);
-          $hash = trim(end($hash));
-          $gitHistory[$hash] = [
-            'tag'      => '-1.0.0',
-            'author'  => '',
-            'date'    => '',
-            'message'  => ''
-          ];
-          $lastHash = $hash;
-          if (strpos($line, 'tag') !== false) {
-            $tag = explode(':', $line);
-            $tag = explode('/', $tag[1]);
-            $tag = explode(',', $tag[2]);
-            $tag = explode(')', $tag[0]);
-            $tag = trim($tag[0]);
-            $gitHistory[$lastHash]['tag'] = $tag;
-          }
-        }
-        else if (strpos($line, 'Author') === 0) {
-          $author = explode(':', $line);
-          $author = trim(end($author));
-          $gitHistory[$lastHash]['author'] = $author;
-        }
-        else if (strpos($line, 'Date') === 0) {
-          $date = explode(':', $line, 2);
-          $date = trim(end($date));
-          $gitHistory[$lastHash]['date'] = date('d/m/Y H:i:s A', strtotime($date));
-        }
-        else
-          $gitHistory[$lastHash]['message'] .= "$line<br>";
-      }
-    }
-    chdir($currentDir);
-    return $gitHistory;
+	if(!file_exists($_dir))
+	  return [];
+	$currentDir = getcwd();
+	chdir($_dir);
+	$gitHistory  = [];
+	$gitLogs    = [];
+	$gitPath    = str_replace('\\', '/', exec("git rev-parse --show-toplevel"));
+	$rootPath    = str_replace('\\', '/', getcwd ());
+	$lastHash    = null;
+	if( $gitPath != $rootPath ) {
+	  chdir($currentDir);
+	  return [];
+	}
+	exec("git log --decorate=full --tags", $gitLogs);
+	foreach ($gitLogs as $line) {
+	  $line = trim($line);
+	  if (!empty($line)) {
+		if (strpos($line, 'commit') === 0) {
+		  $hash = explode(' ', $line);
+		  $hash = trim(end($hash));
+		  $gitHistory[$hash] = [
+			'tag'      => '-1.0.0',
+			'author'  => '',
+			'date'    => '',
+			'message'  => ''
+		  ];
+		  $lastHash = $hash;
+		  if (strpos($line, 'tag') !== false) {
+			$tag = explode(':', $line);
+			$tag = explode('/', $tag[1]);
+			$tag = explode(',', $tag[2]);
+			$tag = explode(')', $tag[0]);
+			$tag = trim($tag[0]);
+			$gitHistory[$lastHash]['tag'] = $tag;
+		  }
+		}
+		else if (strpos($line, 'Author') === 0) {
+		  $author = explode(':', $line);
+		  $author = trim(end($author));
+		  $gitHistory[$lastHash]['author'] = $author;
+		}
+		else if (strpos($line, 'Date') === 0) {
+		  $date = explode(':', $line, 2);
+		  $date = trim(end($date));
+		  $gitHistory[$lastHash]['date'] = date('d/m/Y H:i:s A', strtotime($date));
+		}
+		else
+		  $gitHistory[$lastHash]['message'] .= "$line<br>";
+	  }
+	}
+	chdir($currentDir);
+	return $gitHistory;
   }
 ?>

Spacing +4 added lines, -4 removed lines

@@ -1,15 +1,15 @@
 <?php
-  function getGitLog( $_dir = "./" ) {
-    if(!file_exists($_dir))
+  function getGitLog($_dir = "./") {
+    if (!file_exists($_dir))
       return [];
     $currentDir = getcwd();
     chdir($_dir);
     $gitHistory  = [];
     $gitLogs    = [];
     $gitPath    = str_replace('\\', '/', exec("git rev-parse --show-toplevel"));
-    $rootPath    = str_replace('\\', '/', getcwd ());
+    $rootPath    = str_replace('\\', '/', getcwd());
     $lastHash    = null;
-    if( $gitPath != $rootPath ) {
+    if ($gitPath != $rootPath) {
       chdir($currentDir);
       return [];
     }

Braces +7 added lines, -8 removed lines

@@ -1,7 +1,8 @@ 
 <?php
   function getGitLog( $_dir = "./" ) {
-    if(!file_exists($_dir))
-      return [];
+    if(!file_exists($_dir)) {
+          return [];
+    }
     $currentDir = getcwd();
     chdir($_dir);
     $gitHistory  = [];
@@ -35,19 +36,17 @@ 
             $tag = trim($tag[0]);
             $gitHistory[$lastHash]['tag'] = $tag;
           }
-        }
-        else if (strpos($line, 'Author') === 0) {
+        } else if (strpos($line, 'Author') === 0) {
           $author = explode(':', $line);
           $author = trim(end($author));
           $gitHistory[$lastHash]['author'] = $author;
-        }
-        else if (strpos($line, 'Date') === 0) {
+        } else if (strpos($line, 'Date') === 0) {
           $date = explode(':', $line, 2);
           $date = trim(end($date));
           $gitHistory[$lastHash]['date'] = date('d/m/Y H:i:s A', strtotime($date));
+        } else {
+                  $gitHistory[$lastHash]['message'] .= "$line<br>";
         }
-        else
-          $gitHistory[$lastHash]['message'] .= "$line<br>";
       }
     }
     chdir($currentDir);

dist/status.php

Indentation +17 added lines, -17 removed lines

@@ -15,20 +15,20 @@ 
       <div class="row" style="margin-top:20px;">
         <div class="col-lg-12">
           <?php
-          $nPerCol = 6;
-          $max = 12;
-          $dim = $max / $nPerCol;
-          $cont = 0;
-          $percent;
-          foreach (getGitLog() as $i) {
-            $cont++;
-            if($cont % $nPerCol == 1)
-              echo '<div class="row">';
-            if(isset($i["tag"])) {
-              $percent = explode(".",$i["tag"]);
-              $percent = 100 * intval($percent[0]) + 10 * intval($percent[1]) + intval($percent[2]);
-            }
-          ?>
+		  $nPerCol = 6;
+		  $max = 12;
+		  $dim = $max / $nPerCol;
+		  $cont = 0;
+		  $percent;
+		  foreach (getGitLog() as $i) {
+			$cont++;
+			if($cont % $nPerCol == 1)
+			  echo '<div class="row">';
+			if(isset($i["tag"])) {
+			  $percent = explode(".",$i["tag"]);
+			  $percent = 100 * intval($percent[0]) + 10 * intval($percent[1]) + intval($percent[2]);
+			}
+		  ?>
             <div class="col-lg-<?=$dim?>">
               <div class="well well-sm miniblock">
                 <div class="autor"><b>Autor:</b> <?=$i["author"]?><br></div>
@@ -44,9 +44,9 @@ 
               </div>
             </div>
           <?php
-          if($cont % $nPerCol == 0)
-            echo '</div>';
-          } ?>
+		  if($cont % $nPerCol == 0)
+			echo '</div>';
+		  } ?>
         </div>
       </div>
     </div>

Spacing +5 added lines, -5 removed lines

@@ -22,17 +22,17 @@ 
           $percent;
           foreach (getGitLog() as $i) {
             $cont++;
-            if($cont % $nPerCol == 1)
+            if ($cont % $nPerCol == 1)
               echo '<div class="row">';
-            if(isset($i["tag"])) {
-              $percent = explode(".",$i["tag"]);
+            if (isset($i["tag"])) {
+              $percent = explode(".", $i["tag"]);
               $percent = 100 * intval($percent[0]) + 10 * intval($percent[1]) + intval($percent[2]);
             }
           ?>
             <div class="col-lg-<?=$dim?>">
               <div class="well well-sm miniblock">
                 <div class="autor"><b>Autor:</b> <?=$i["author"]?><br></div>
-                <div class="tag"><b>Tag:</b> <?php if(isset($i["tag"])) echo $i["tag"]?><br></div>
+                <div class="tag"><b>Tag:</b> <?php if (isset($i["tag"])) echo $i["tag"]?><br></div>
                 <div class="date"><b>Date:</b> <?=$i["date"]?><br></div>
                 <div class="message"><b>Message:</b> <?=$i["message"]?><br></div>
                 <div class="progress">
@@ -44,7 +44,7 @@ 
               </div>
             </div>
           <?php
-          if($cont % $nPerCol == 0)
+          if ($cont % $nPerCol == 0)
             echo '</div>';
           } ?>
         </div>

Braces +6 added lines, -3 removed lines

@@ -22,8 +22,9 @@ 
           $percent;
           foreach (getGitLog() as $i) {
             $cont++;
-            if($cont % $nPerCol == 1)
-              echo '<div class="row">';
+            if($cont % $nPerCol == 1) {
+                          echo '<div class="row">';
+            }
             if(isset($i["tag"])) {
               $percent = explode(".",$i["tag"]);
               $percent = 100 * intval($percent[0]) + 10 * intval($percent[1]) + intval($percent[2]);
@@ -32,7 +33,8 @@ 
             <div class="col-lg-<?=$dim?>">
               <div class="well well-sm miniblock">
                 <div class="autor"><b>Autor:</b> <?=$i["author"]?><br></div>
-                <div class="tag"><b>Tag:</b> <?php if(isset($i["tag"])) echo $i["tag"]?><br></div>
+                <div class="tag"><b>Tag:</b> <?php if(isset($i["tag"])) {
+	echo $i["tag"]?><br></div>
                 <div class="date"><b>Date:</b> <?=$i["date"]?><br></div>
                 <div class="message"><b>Message:</b> <?=$i["message"]?><br></div>
                 <div class="progress">
@@ -46,6 +48,7 @@ 
           <?php
           if($cont % $nPerCol == 0)
             echo '</div>';
+}
           } ?>
         </div>
       </div>

dist/jate.php

Indentation +13 added lines, -13 removed lines

@@ -1,21 +1,21 @@
 <?php
   if(!isset($GLOBALS["JATEPath"]))
-    $GLOBALS["JATEPath"] = [];
+	$GLOBALS["JATEPath"] = [];
   $commonLocations = [
-      "bower_components/JATE/dist/"
-    , "vendor/xaberr/jate/dist/"
-    , "../../dist/"
-    , "../dist/"
-    , dirname(__FILE__)."/"
+	  "bower_components/JATE/dist/"
+	, "vendor/xaberr/jate/dist/"
+	, "../../dist/"
+	, "../dist/"
+	, dirname(__FILE__)."/"
   ];
   $jSuccess = false;
   foreach ($commonLocations as $path)
-    if(file_exists("${path}jate/coreEngine.php")) {
-      array_push($GLOBALS["JATEPath"], $path);
-      require_once("${path}jate/coreEngine.php");
-      $jSuccess = true;
-      break;
-    }
+	if(file_exists("${path}jate/coreEngine.php")) {
+	  array_push($GLOBALS["JATEPath"], $path);
+	  require_once("${path}jate/coreEngine.php");
+	  $jSuccess = true;
+	  break;
+	}
   if( !$jSuccess )
-    throw new Exception("JATE can't find coreEngine.php.");
+	throw new Exception("JATE can't find coreEngine.php.");
 ?>

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-  if(!isset($GLOBALS["JATEPath"]))
+  if (!isset($GLOBALS["JATEPath"]))
     $GLOBALS["JATEPath"] = [];
   $commonLocations = [
       "bower_components/JATE/dist/"
@@ -10,12 +10,12 @@ 
   ];
   $jSuccess = false;
   foreach ($commonLocations as $path)
-    if(file_exists("${path}jate/coreEngine.php")) {
+    if (file_exists("${path}jate/coreEngine.php")) {
       array_push($GLOBALS["JATEPath"], $path);
       require_once("${path}jate/coreEngine.php");
       $jSuccess = true;
       break;
     }
-  if( !$jSuccess )
+  if (!$jSuccess)
     throw new Exception("JATE can't find coreEngine.php.");
 ?>

Braces +10 added lines, -7 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-  if(!isset($GLOBALS["JATEPath"]))
-    $GLOBALS["JATEPath"] = [];
+  if(!isset($GLOBALS["JATEPath"])) {
+      $GLOBALS["JATEPath"] = [];
+  }
   $commonLocations = [
       "bower_components/JATE/dist/"
     , "vendor/xaberr/jate/dist/"
@@ -9,13 +10,15 @@ 
     , dirname(__FILE__)."/"
   ];
   $jSuccess = false;
-  foreach ($commonLocations as $path)
-    if(file_exists("${path}jate/coreEngine.php")) {
+  foreach ($commonLocations as $path) {
+      if(file_exists("${path}jate/coreEngine.php")) {
       array_push($GLOBALS["JATEPath"], $path);
+  }
       require_once("${path}jate/coreEngine.php");
       $jSuccess = true;
       break;
     }
-  if( !$jSuccess )
-    throw new Exception("JATE can't find coreEngine.php.");
-?>
+  if( !$jSuccess ) {
+      throw new Exception("JATE can't find coreEngine.php.");
+  }
+  ?>