XaBerr / JATE

dist/jate/functions/array.php

Indentation +30 added lines, -30 removed lines

@@ -1,45 +1,45 @@
 <?php
   function utf8ize($_array) {
-    return travelStringArray($_array,"utf8_encode");
+	return travelStringArray($_array,"utf8_encode");
   }
   function unutf8ize($_array) {
-    return travelStringArray($_array,"utf8_decode");
+	return travelStringArray($_array,"utf8_decode");
   }
   function arraySlash($_array) {
-    return travelStringArray($_array,"addslashes");
+	return travelStringArray($_array,"addslashes");
   }
   function arrayHtmlParser($_array) {
-    return travelStringArray($_array,"htmlParser");
+	return travelStringArray($_array,"htmlParser");
   }
   function travelStringArray ( $_array, $_function ) {
-    if (is_array($_array)) {
-      foreach ($_array as $k => $v) {
-        $_array[$k] = travelStringArray($v, $_function);
-      }
-    } else if (is_string ($_array)) {
-      return call_user_func($_function,$_array);
-    }
-    return $_array;
+	if (is_array($_array)) {
+	  foreach ($_array as $k => $v) {
+		$_array[$k] = travelStringArray($v, $_function);
+	  }
+	} else if (is_string ($_array)) {
+	  return call_user_func($_function,$_array);
+	}
+	return $_array;
   }
   function arrayDepth( $_array ) {
-    $maxDepth = 1;
-    foreach ($_array as $value) {
-      if (is_array($value)) {
-        $depth = arrayDepth($value) + 1;
-        if ($depth > $maxDepth) {
-          $maxDepth = $depth;
-        }
-      }
-    }
-    return $maxDepth;
+	$maxDepth = 1;
+	foreach ($_array as $value) {
+	  if (is_array($value)) {
+		$depth = arrayDepth($value) + 1;
+		if ($depth > $maxDepth) {
+		  $maxDepth = $depth;
+		}
+	  }
+	}
+	return $maxDepth;
   }
   function arrayDump( $_array, $_name = "Array", $_tab = "&nbsp;&nbsp;" ) {
-      $position = preg_replace('/&nbsp;&nbsp;/', '', $_tab, 1);
-      echo "$position<span style=\"color:rgb(230,0,0)\">$_name:</span><br>";
-      foreach ($_array as $k => $i)
-        if(is_array($i))
-          arrayDump( $i, $k, "&nbsp;&nbsp;$_tab" );
-        else
-          echo "$_tab<b>$k:</b> $i<br>";
-    }
+	  $position = preg_replace('/&nbsp;&nbsp;/', '', $_tab, 1);
+	  echo "$position<span style=\"color:rgb(230,0,0)\">$_name:</span><br>";
+	  foreach ($_array as $k => $i)
+		if(is_array($i))
+		  arrayDump( $i, $k, "&nbsp;&nbsp;$_tab" );
+		else
+		  echo "$_tab<b>$k:</b> $i<br>";
+	}
 ?>

dist/jate/functions/folder.php

Indentation +31 added lines, -31 removed lines

@@ -1,45 +1,45 @@
 <?php
   function subFolder( $_dir = "./" ) {
-    $temp = fetchInSubFolder($_dir, function() {
-      return true;
-    });
-    return $temp;
+	$temp = fetchInSubFolder($_dir, function() {
+	  return true;
+	});
+	return $temp;
   }
   function subFolderFile( $_dir = "./" ) {
-    $temp = fetchInSubFolder($_dir, function( $_file ) {
-      return !is_dir($_file);
-    });
-    return $temp;
+	$temp = fetchInSubFolder($_dir, function( $_file ) {
+	  return !is_dir($_file);
+	});
+	return $temp;
   }
   function subFolderDir( $_dir = "./" ) {
-    $temp = fetchInSubFolder($_dir, function( $_file ) {
-      return !is_file($_file);
-    });
-    return $temp;
+	$temp = fetchInSubFolder($_dir, function( $_file ) {
+	  return !is_file($_file);
+	});
+	return $temp;
   }
   function fetchInSubFolder( $_dir = "./", $_function) {
-    $temp = [];
-    if (is_dir($_dir)) {
-        if ($dirOpened = opendir($_dir)) {
-            while (($file = readdir($dirOpened)) !== false)
-                if( ($file !='.')&&($file !='..') )
-                  if($_function($file))
-                    array_push($temp,$file);
-            closedir($dirOpened);
-        }
-    }
-    return $temp;
+	$temp = [];
+	if (is_dir($_dir)) {
+		if ($dirOpened = opendir($_dir)) {
+			while (($file = readdir($dirOpened)) !== false)
+				if( ($file !='.')&&($file !='..') )
+				  if($_function($file))
+					array_push($temp,$file);
+			closedir($dirOpened);
+		}
+	}
+	return $temp;
   }
   function requireSubfolder( $_dir = "./" ) {
-    $temp = subFolderFile($_dir);
-    foreach ($temp as $i)
-      jRequire($_dir."/".$i);
+	$temp = subFolderFile($_dir);
+	foreach ($temp as $i)
+	  jRequire($_dir."/".$i);
   }
   function require_js( $_dir = "./" ) {
-    $tempArray = [];
-    $temp = subFolderFile($_dir);
-    foreach ($temp as $i)
-      array_push($tempArray, $_dir."/".$i);
-    return $tempArray;
+	$tempArray = [];
+	$temp = subFolderFile($_dir);
+	foreach ($temp as $i)
+	  array_push($tempArray, $_dir."/".$i);
+	return $tempArray;
   }
 ?>

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");
   }
 ?>

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

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>

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.");
 ?>

tests/jate/modules/Module/ModuleTest.php

Indentation +51 added lines, -51 removed lines

@@ -2,60 +2,60 @@
   declare( strict_types = 1 );
   // backward compatibility
   if (!class_exists('\PHPUnit\Framework\TestCase')) {
-    class_alias('\PHPUnit_Framework_TestCase', '\PHPUnit\Framework\TestCase');
+	class_alias('\PHPUnit_Framework_TestCase', '\PHPUnit\Framework\TestCase');
   }
   use PHPUnit\Framework\TestCase;
 
   final class ModuleTest extends TestCase {
-    public function testAddFile() {
-      $this->expectException(InvalidArgumentException::class);
-      $module = new Module();
-      $module->addFile(123);
-    }
-    public function testAddFileRequired() {
-      $this->expectException(InvalidArgumentException::class);
-      $module = new Module();
-      $module->addFileRequired(123);
-    }
-    public function testAddFiles() {
-      $this->expectException(InvalidArgumentException::class);
-      $module = new Module();
-      $module->addFiles("/file.php");
-    }
-    public function testAddFilesRequired() {
-      $this->expectException(InvalidArgumentException::class);
-      $module = new Module();
-      $module->addFilesRequired("/file.php");
-    }
-    public function testAddModuleClass() {
-      $this->expectException(InvalidArgumentException::class);
-      $module = new Module();
-      $module->addModule(123);
-    }
-    public function testAddModuleNoModule() {
-      $this->expectException(InvalidArgumentException::class);
-      $module = new Module();
-      $module->addModule((object)[1,2,3]);
-    }
-    public function testAddModules() {
-      $this->expectException(InvalidArgumentException::class);
-      $module = new Module();
-      $module->addModules("Module");
-    }
-    public function testGetCss() {
-      $module = new Module();
-      $module->addFiles(["1.css","2.js","3.css","4.js"]);
-      $this->assertEquals(["1.css","3.css"], $module->getCss());
-    }
-    public function testGetJs() {
-      $module = new Module();
-      $module->addFiles(["1.css","2.js","3.css","4.js"]);
-      $this->assertEquals(["2.js","4.js"], $module->getJs());
-    }
-    public function testGetJsVariables() {
-      $module = new Module();
-      $module->addFiles(["1.css",["variable","2"],"3.css","4.js"]);
-      $this->assertEquals([["variable","2"]], $module->getJsVariables());
-    }
+	public function testAddFile() {
+	  $this->expectException(InvalidArgumentException::class);
+	  $module = new Module();
+	  $module->addFile(123);
+	}
+	public function testAddFileRequired() {
+	  $this->expectException(InvalidArgumentException::class);
+	  $module = new Module();
+	  $module->addFileRequired(123);
+	}
+	public function testAddFiles() {
+	  $this->expectException(InvalidArgumentException::class);
+	  $module = new Module();
+	  $module->addFiles("/file.php");
+	}
+	public function testAddFilesRequired() {
+	  $this->expectException(InvalidArgumentException::class);
+	  $module = new Module();
+	  $module->addFilesRequired("/file.php");
+	}
+	public function testAddModuleClass() {
+	  $this->expectException(InvalidArgumentException::class);
+	  $module = new Module();
+	  $module->addModule(123);
+	}
+	public function testAddModuleNoModule() {
+	  $this->expectException(InvalidArgumentException::class);
+	  $module = new Module();
+	  $module->addModule((object)[1,2,3]);
+	}
+	public function testAddModules() {
+	  $this->expectException(InvalidArgumentException::class);
+	  $module = new Module();
+	  $module->addModules("Module");
+	}
+	public function testGetCss() {
+	  $module = new Module();
+	  $module->addFiles(["1.css","2.js","3.css","4.js"]);
+	  $this->assertEquals(["1.css","3.css"], $module->getCss());
+	}
+	public function testGetJs() {
+	  $module = new Module();
+	  $module->addFiles(["1.css","2.js","3.css","4.js"]);
+	  $this->assertEquals(["2.js","4.js"], $module->getJs());
+	}
+	public function testGetJsVariables() {
+	  $module = new Module();
+	  $module->addFiles(["1.css",["variable","2"],"3.css","4.js"]);
+	  $this->assertEquals([["variable","2"]], $module->getJsVariables());
+	}
   }
 ?>

dist/jate/modules/Connection/Connection.php

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