| @@ -1,9 +1,9 @@ | ||
| 1 | 1 | <?php | 
| 2 | 2 |    interface ConnectionAdapterInterface { | 
| 3 | - public function __construct( $_srv, $_db, $_usr, $_pass); | |
| 4 | - public function query( $_query ); | |
| 5 | - public function queryFetch( $_query ); | |
| 6 | - public function queryArray( $_query ); | |
| 7 | - public function queryInsert( $_query ); | |
| 3 | + public function __construct($_srv, $_db, $_usr, $_pass); | |
| 4 | + public function query($_query); | |
| 5 | + public function queryFetch($_query); | |
| 6 | + public function queryArray($_query); | |
| 7 | + public function queryInsert($_query); | |
| 8 | 8 | } | 
| 9 | 9 | ?> | 
| @@ -1,41 +1,41 @@ | ||
| 1 | 1 | <?php | 
| 2 | -  function subFolder( $_dir = "./" ) { | |
| 2 | +  function subFolder($_dir = "./") { | |
| 3 | 3 |      $temp = fetchInSubFolder($_dir, function() { | 
| 4 | 4 | return true; | 
| 5 | 5 | }); | 
| 6 | 6 | return $temp; | 
| 7 | 7 | } | 
| 8 | -  function subFolderFile( $_dir = "./" ) { | |
| 9 | -    $temp = fetchInSubFolder($_dir, function( $_file ) { | |
| 8 | +  function subFolderFile($_dir = "./") { | |
| 9 | +    $temp = fetchInSubFolder($_dir, function($_file) { | |
| 10 | 10 | return !is_dir($_file); | 
| 11 | 11 | }); | 
| 12 | 12 | return $temp; | 
| 13 | 13 | } | 
| 14 | -  function subFolderDir( $_dir = "./" ) { | |
| 15 | -    $temp = fetchInSubFolder($_dir, function( $_file ) { | |
| 14 | +  function subFolderDir($_dir = "./") { | |
| 15 | +    $temp = fetchInSubFolder($_dir, function($_file) { | |
| 16 | 16 | return !is_file($_file); | 
| 17 | 17 | }); | 
| 18 | 18 | return $temp; | 
| 19 | 19 | } | 
| 20 | -  function fetchInSubFolder( $_dir = "./", $_function) { | |
| 20 | +  function fetchInSubFolder($_dir = "./", $_function) { | |
| 21 | 21 | $temp = []; | 
| 22 | 22 |      if (is_dir($_dir)) { | 
| 23 | 23 |          if ($dirOpened = opendir($_dir)) { | 
| 24 | 24 | while (($file = readdir($dirOpened)) !== false) | 
| 25 | - if( ($file !='.')&&($file !='..') ) | |
| 26 | - if($_function($file)) | |
| 27 | - array_push($temp,$file); | |
| 25 | + if (($file != '.') && ($file != '..')) | |
| 26 | + if ($_function($file)) | |
| 27 | + array_push($temp, $file); | |
| 28 | 28 | closedir($dirOpened); | 
| 29 | 29 | } | 
| 30 | 30 | } | 
| 31 | 31 | return $temp; | 
| 32 | 32 | } | 
| 33 | -  function requireSubfolder( $_dir = "./" ) { | |
| 33 | +  function requireSubfolder($_dir = "./") { | |
| 34 | 34 | $temp = subFolderFile($_dir); | 
| 35 | 35 | foreach ($temp as $i) | 
| 36 | 36 | jRequire($_dir."/".$i); | 
| 37 | 37 | } | 
| 38 | -  function require_js( $_dir = "./" ) { | |
| 38 | +  function require_js($_dir = "./") { | |
| 39 | 39 | $tempArray = []; | 
| 40 | 40 | $temp = subFolderFile($_dir); | 
| 41 | 41 | foreach ($temp as $i) | 
| @@ -1,5 +1,5 @@ discard block | ||
| 1 | 1 | <?php | 
| 2 | - if(!isset($GLOBALS["JATEPath"])) | |
| 2 | + if (!isset($GLOBALS["JATEPath"])) | |
| 3 | 3 | $GLOBALS["JATEPath"] = []; | 
| 4 | 4 | $commonLocations = [ | 
| 5 | 5 | "bower_components/JATE/dist/" | 
| @@ -10,12 +10,12 @@ discard block | ||
| 10 | 10 | ]; | 
| 11 | 11 | $jSuccess = false; | 
| 12 | 12 | foreach ($commonLocations as $path) | 
| 13 | -    if(file_exists("${path}jate/coreEngine.php")) { | |
| 13 | +    if (file_exists("${path}jate/coreEngine.php")) { | |
| 14 | 14 | array_push($GLOBALS["JATEPath"], $path); | 
| 15 | 15 |        require_once("${path}jate/coreEngine.php"); | 
| 16 | 16 | $jSuccess = true; | 
| 17 | 17 | break; | 
| 18 | 18 | } | 
| 19 | - if( !$jSuccess ) | |
| 19 | + if (!$jSuccess) | |
| 20 | 20 |      throw new Exception("JATE can't find coreEngine.php."); | 
| 21 | 21 | ?> | 
| @@ -1,43 +1,43 @@ discard block | ||
| 1 | 1 | <?php | 
| 2 | -  function requireComponent( $_path, $_local = true ) { | |
| 2 | +  function requireComponent($_path, $_local = true) { | |
| 3 | 3 | $path = getJFolder($_path, $_local, debug_backtrace()); | 
| 4 | - if(file_exists($path) && isPhp($path)) | |
| 4 | + if (file_exists($path) && isPhp($path)) | |
| 5 | 5 | jRequire($path, false, 0); | 
| 6 | 6 | else | 
| 7 | 7 | requireError($_path); | 
| 8 | 8 | } | 
| 9 | -  function requireComponents( $_path, $_local = true ) { | |
| 9 | +  function requireComponents($_path, $_local = true) { | |
| 10 | 10 | $path = getJFolder($_path, $_local, debug_backtrace()); | 
| 11 | -    if(file_exists($path)) { | |
| 11 | +    if (file_exists($path)) { | |
| 12 | 12 | $files = subFolderFile($path); | 
| 13 | 13 | foreach ($files as $i) | 
| 14 | -        if(isPhp("$path/$i")) | |
| 14 | +        if (isPhp("$path/$i")) | |
| 15 | 15 | requireComponent($path."/".$i, false); | 
| 16 | 16 | } else | 
| 17 | 17 | requireError($_path); | 
| 18 | 18 | } | 
| 19 | -  function requireError( $_path ) { | |
| 19 | +  function requireError($_path) { | |
| 20 | 20 | global $DEBUG; | 
| 21 | - if( $DEBUG == 1 ) | |
| 21 | + if ($DEBUG == 1) | |
| 22 | 22 | echo "Error load ($_path)<br>"; | 
| 23 | 23 | } | 
| 24 | -  function isPhp ( $_file ) { | |
| 25 | - if(!is_file($_file)) return false; | |
| 24 | +  function isPhp($_file) { | |
| 25 | + if (!is_file($_file)) return false; | |
| 26 | 26 | $info = pathinfo($_file); | 
| 27 | 27 | return ($info["extension"] == "php") || ($info["extension"] == "PHP"); | 
| 28 | 28 | } | 
| 29 | -  function requireModules( $_path, $_local = true ) { | |
| 29 | +  function requireModules($_path, $_local = true) { | |
| 30 | 30 | $path = getJFolder($_path, $_local, debug_backtrace()); | 
| 31 | 31 | $subFolders = subFolderDir($path); | 
| 32 | 32 | foreach ($subFolders as $i) | 
| 33 | 33 |        requireComponents("$path/$i", false); | 
| 34 | 34 | } | 
| 35 | -  function jRequire( $_path, $_local = true ) { | |
| 35 | +  function jRequire($_path, $_local = true) { | |
| 36 | 36 | $path = getJFolder($_path, $_local, debug_backtrace()); | 
| 37 | - require_once( $path ); | |
| 37 | + require_once($path); | |
| 38 | 38 | } | 
| 39 | -  function getJFolder( $_path, $_local, $_stack ) { | |
| 40 | -    if($_local) { | |
| 39 | +  function getJFolder($_path, $_local, $_stack) { | |
| 40 | +    if ($_local) { | |
| 41 | 41 | $stackInfo = $_stack; | 
| 42 | 42 | $folder = dirname($stackInfo[0]["file"]); | 
| 43 | 43 | $file = "$folder/$_path"; | 
| @@ -45,15 +45,15 @@ discard block | ||
| 45 | 45 | $file = $_path; | 
| 46 | 46 | return $file; | 
| 47 | 47 | } | 
| 48 | -  function requireModulesList( $_path ) { | |
| 49 | - if(!file_exists($_path)) | |
| 48 | +  function requireModulesList($_path) { | |
| 49 | + if (!file_exists($_path)) | |
| 50 | 50 | return; | 
| 51 | 51 | $data = file_get_contents($_path); | 
| 52 | 52 | $data = json_decode($data); | 
| 53 | - if($data === NULL) | |
| 53 | + if ($data === NULL) | |
| 54 | 54 |        throw new Exception("Error in the file format [$_path]", 1); | 
| 55 | 55 |      foreach ($data as $item) { | 
| 56 | - if(substr($item, -1) == "*") | |
| 56 | + if (substr($item, -1) == "*") | |
| 57 | 57 | requireModules(substr($item, 0, -2), false); | 
| 58 | 58 |        else { | 
| 59 | 59 | $path = getJFolder($item, false, debug_backtrace()); | 
| @@ -1,27 +1,27 @@ discard block | ||
| 1 | 1 | <?php | 
| 2 | 2 |    function utf8ize($_array) { | 
| 3 | - return travelStringArray($_array,"utf8_encode"); | |
| 3 | + return travelStringArray($_array, "utf8_encode"); | |
| 4 | 4 | } | 
| 5 | 5 |    function unutf8ize($_array) { | 
| 6 | - return travelStringArray($_array,"utf8_decode"); | |
| 6 | + return travelStringArray($_array, "utf8_decode"); | |
| 7 | 7 | } | 
| 8 | 8 |    function arraySlash($_array) { | 
| 9 | - return travelStringArray($_array,"addslashes"); | |
| 9 | + return travelStringArray($_array, "addslashes"); | |
| 10 | 10 | } | 
| 11 | 11 |    function arrayHtmlParser($_array) { | 
| 12 | - return travelStringArray($_array,"htmlParser"); | |
| 12 | + return travelStringArray($_array, "htmlParser"); | |
| 13 | 13 | } | 
| 14 | -  function travelStringArray ( $_array, $_function ) { | |
| 14 | +  function travelStringArray($_array, $_function) { | |
| 15 | 15 |      if (is_array($_array)) { | 
| 16 | 16 |        foreach ($_array as $k => $v) { | 
| 17 | 17 | $_array[$k] = travelStringArray($v, $_function); | 
| 18 | 18 | } | 
| 19 | -    } else if (is_string ($_array)) { | |
| 20 | - return call_user_func($_function,$_array); | |
| 19 | +    } else if (is_string($_array)) { | |
| 20 | + return call_user_func($_function, $_array); | |
| 21 | 21 | } | 
| 22 | 22 | return $_array; | 
| 23 | 23 | } | 
| 24 | -  function arrayDepth( $_array ) { | |
| 24 | +  function arrayDepth($_array) { | |
| 25 | 25 | $maxDepth = 1; | 
| 26 | 26 |      foreach ($_array as $value) { | 
| 27 | 27 |        if (is_array($value)) { | 
| @@ -33,19 +33,19 @@ discard block | ||
| 33 | 33 | } | 
| 34 | 34 | return $maxDepth; | 
| 35 | 35 | } | 
| 36 | -  function arrayDump( $_array, $_name = "Array", $_tab = "  " ) { | |
| 36 | +  function arrayDump($_array, $_name = "Array", $_tab = "  ") { | |
| 37 | 37 |      $position = preg_replace('/  /', '', $_tab, 1); | 
| 38 | 38 | echo "$position<span style=\"color:rgb(230,0,0)\">$_name:</span><br>"; | 
| 39 | 39 | foreach ($_array as $k => $i) | 
| 40 | - if(is_array($i)) | |
| 41 | - arrayDump( $i, $k, "  $_tab" ); | |
| 42 | - else if(is_object($i)) | |
| 40 | + if (is_array($i)) | |
| 41 | + arrayDump($i, $k, "  $_tab"); | |
| 42 | + else if (is_object($i)) | |
| 43 | 43 | echo "$_tab<b>object:</b> [Object]<br>"; | 
| 44 | 44 | else | 
| 45 | 45 | echo "$_tab<b>$k:</b> $i<br>"; | 
| 46 | 46 | } | 
| 47 | 47 | |
| 48 | -  function htmlParser( $_str) { | |
| 48 | +  function htmlParser($_str) { | |
| 49 | 49 | return htmlentities($_str, ENT_QUOTES | ENT_IGNORE, "UTF-8"); | 
| 50 | 50 | } | 
| 51 | 51 | ?> | 
| @@ -4,11 +4,11 @@ | ||
| 4 | 4 | |
| 5 | 5 | //JATE SUFF | 
| 6 | 6 | require_once (end($GLOBALS["JATEPath"])."jate/functions/requirer.php"); | 
| 7 | -  requireComponent ("modules/JException/JException.php"); | |
| 8 | -  requireComponent ("functions/folder.php"); | |
| 9 | -  requireComponent ("modules/JConfig/JConfig.php"); | |
| 7 | +  requireComponent("modules/JException/JException.php"); | |
| 8 | +  requireComponent("functions/folder.php"); | |
| 9 | +  requireComponent("modules/JConfig/JConfig.php"); | |
| 10 | 10 |    requireComponents("functions"); | 
| 11 | -  requireModules   ("modules"); | |
| 11 | +  requireModules("modules"); | |
| 12 | 12 | |
| 13 | 13 | //USER STUFF | 
| 14 | 14 |    requireModulesList("config/loader.json"); | 
| @@ -2,39 +2,39 @@ | ||
| 2 | 2 |    jRequire("ConnectionInterface.php"); | 
| 3 | 3 |    class MysqliAdapter implements ConnectionAdapterInterface { | 
| 4 | 4 | public $connection; | 
| 5 | -      public function __construct( $_srv, $_db, $_usr, $_pass ) { | |
| 5 | +      public function __construct($_srv, $_db, $_usr, $_pass) { | |
| 6 | 6 |          try { | 
| 7 | - $this->connection = new mysqli( $_srv, $_usr, $_pass, $_db ); | |
| 8 | -        } catch( Exception $e ) { | |
| 7 | + $this->connection = new mysqli($_srv, $_usr, $_pass, $_db); | |
| 8 | +        } catch (Exception $e) { | |
| 9 | 9 | throw new JException($e->getMessage()); | 
| 10 | 10 | } | 
| 11 | 11 | } | 
| 12 | -      public function query( $_query ) { | |
| 12 | +      public function query($_query) { | |
| 13 | 13 | $this->stdQuery($_query); | 
| 14 | 14 | return true; | 
| 15 | 15 | } | 
| 16 | -      public function queryInsert( $_query ) { | |
| 16 | +      public function queryInsert($_query) { | |
| 17 | 17 | $this->stdQuery($_query); | 
| 18 | 18 | return $this->connection->insert_id; | 
| 19 | 19 | } | 
| 20 | -      public function queryFetch( $_query ) { | |
| 20 | +      public function queryFetch($_query) { | |
| 21 | 21 | $result = $this->stdQuery($_query); | 
| 22 | 22 | $rows = []; | 
| 23 | - while($row = $result->fetch_assoc()) | |
| 23 | + while ($row = $result->fetch_assoc()) | |
| 24 | 24 | $rows[] = $row; | 
| 25 | 25 | return $rows; | 
| 26 | 26 | } | 
| 27 | -      public function queryArray( $_query ) { | |
| 27 | +      public function queryArray($_query) { | |
| 28 | 28 | $result = $this->stdQuery($_query); | 
| 29 | 29 | $rows = []; | 
| 30 | - while($row = $result->fetch_array()) | |
| 30 | + while ($row = $result->fetch_array()) | |
| 31 | 31 | $rows[] = $row; | 
| 32 | 32 | return $rows; | 
| 33 | 33 | } | 
| 34 | -      protected function stdQuery( $_query ) { | |
| 34 | +      protected function stdQuery($_query) { | |
| 35 | 35 | $database = $this->connection; | 
| 36 | 36 | $result = $database->query($_query); | 
| 37 | - if(!$result) | |
| 37 | + if (!$result) | |
| 38 | 38 | throw new JException(json_encode([ | 
| 39 | 39 | "query" => $_query, | 
| 40 | 40 | "error" => $database->error | 
| @@ -2,42 +2,42 @@ | ||
| 2 | 2 |    jRequire("ConnectionInterface.php"); | 
| 3 | 3 |    class PostgresqlAdapter implements ConnectionAdapterInterface { | 
| 4 | 4 | public $connection; | 
| 5 | -      public function __construct( $_srv, $_db, $_usr, $_pass ) { | |
| 5 | +      public function __construct($_srv, $_db, $_usr, $_pass) { | |
| 6 | 6 |          try { | 
| 7 | 7 |            $this->connection = pg_connect("host=$_srv dbname=$_db user=$_usr password=$_pass") | 
| 8 | 8 |              or die('Could not connect: '.pg_last_error()); | 
| 9 | -        } catch( Exception $e ) { | |
| 9 | +        } catch (Exception $e) { | |
| 10 | 10 | throw new JException($e->getMessage()); | 
| 11 | 11 | } | 
| 12 | 12 | } | 
| 13 | -      public function query( $_query ) { | |
| 13 | +      public function query($_query) { | |
| 14 | 14 | $this->stdQuery($_query); | 
| 15 | 15 | return true; | 
| 16 | 16 | } | 
| 17 | -      public function queryInsert( $_query ) { | |
| 17 | +      public function queryInsert($_query) { | |
| 18 | 18 | $this->stdQuery($_query); | 
| 19 | 19 |          return $this->stdQuery("SELECT lastval()"); | 
| 20 | 20 | } | 
| 21 | -      public function queryFetch( $_query ) { | |
| 21 | +      public function queryFetch($_query) { | |
| 22 | 22 | $result = $this->stdQuery($_query); | 
| 23 | 23 | $rows = []; | 
| 24 | - while($row = pg_fetch_assoc($result)) | |
| 24 | + while ($row = pg_fetch_assoc($result)) | |
| 25 | 25 | $rows[] = $row; | 
| 26 | 26 | pg_free_result($result); | 
| 27 | 27 | return $rows; | 
| 28 | 28 | } | 
| 29 | -      public function queryArray( $_query ) { | |
| 29 | +      public function queryArray($_query) { | |
| 30 | 30 | $result = $this->stdQuery($_query); | 
| 31 | 31 | $rows = []; | 
| 32 | - while($row = pg_fetch_array($result)) | |
| 32 | + while ($row = pg_fetch_array($result)) | |
| 33 | 33 | $rows[] = $row; | 
| 34 | 34 | pg_free_result($result); | 
| 35 | 35 | return $rows; | 
| 36 | 36 | } | 
| 37 | -      protected function stdQuery( $_query ) { | |
| 37 | +      protected function stdQuery($_query) { | |
| 38 | 38 | $database = $this->connection; | 
| 39 | 39 | $result = pg_query($database, $_query); | 
| 40 | - if(!$result) | |
| 40 | + if (!$result) | |
| 41 | 41 | throw new JException(json_encode([ | 
| 42 | 42 | "query" => $_query, | 
| 43 | 43 | "error" => pg_last_error() | 
| @@ -2,7 +2,7 @@ | ||
| 2 | 2 | use Pug as Pug; | 
| 3 | 3 |    jRequire("ParserAbstract.php"); | 
| 4 | 4 |    class PugAdapter extends ParserAbstract { | 
| 5 | -    public function draw( $_text, $_parameters = [] ) { | |
| 5 | +    public function draw($_text, $_parameters = []) { | |
| 6 | 6 | $pug = new Pug\Pug(); | 
| 7 | 7 | $page = $pug->render($_text, $_parameters); | 
| 8 | 8 | return $page; |