@@ -14,42 +14,42 @@ |
||
14 | 14 | $this->all = ""; |
15 | 15 | $this->DEBUG = 0; |
16 | 16 | $this->pages = []; |
17 | - $this->server = []; |
|
17 | + $this->server = []; |
|
18 | 18 | $this->server["HTTP_HOST"] = $_SERVER["HTTP_HOST"]; |
19 | 19 | $this->server["REQUEST_URI"] = $_SERVER["REQUEST_URI"]; |
20 | 20 | $this->server["PHP_SELF"] = $_SERVER["PHP_SELF"]; |
21 | 21 | $this->server["RELATIVE"] = str_replace("/index.php", "", $_SERVER["PHP_SELF"]); |
22 | 22 | } |
23 | - public function import( $_path, $_type = "misc" ) { |
|
24 | - if(!file_exists($_path)) |
|
23 | + public function import($_path, $_type = "misc") { |
|
24 | + if (!file_exists($_path)) |
|
25 | 25 | Debug::fatal("File [$_path] not found."); |
26 | 26 | $data = file_get_contents($_path); |
27 | 27 | $data = json_decode($data); |
28 | - if($data === NULL) |
|
28 | + if ($data === NULL) |
|
29 | 29 | Debug::fatal("Error processing [$_path]"); |
30 | - if( $_type == "connection" ) |
|
30 | + if ($_type == "connection") |
|
31 | 31 | $this->overlayConnection($data); |
32 | 32 | else |
33 | 33 | $this->overlayMisc($data); |
34 | 34 | } |
35 | - protected function overlayConnection( $_data ) { |
|
35 | + protected function overlayConnection($_data) { |
|
36 | 36 | $this->connection = $this->obj2array($_data); |
37 | 37 | } |
38 | - protected function overlayMisc( $_data ) { |
|
38 | + protected function overlayMisc($_data) { |
|
39 | 39 | $this->importObject($_data); |
40 | 40 | } |
41 | - protected function obj2array ( &$_instance ) { |
|
42 | - $clone = (array) $_instance; |
|
43 | - $return = []; |
|
41 | + protected function obj2array(&$_instance) { |
|
42 | + $clone = (array) $_instance; |
|
43 | + $return = []; |
|
44 | 44 | $return['___SOURCE_KEYS_'] = $clone; |
45 | - while ( list ($key, $value) = each ($clone) ) { |
|
46 | - $temp = explode ("\0", $key); |
|
47 | - $newkey = $temp[count($temp)-1]; |
|
45 | + while (list ($key, $value) = each($clone)) { |
|
46 | + $temp = explode("\0", $key); |
|
47 | + $newkey = $temp[count($temp) - 1]; |
|
48 | 48 | $return[$newkey] = &$return['___SOURCE_KEYS_'][$key]; |
49 | 49 | } |
50 | 50 | return $return; |
51 | 51 | } |
52 | - protected function importObject( $_object ) { |
|
52 | + protected function importObject($_object) { |
|
53 | 53 | foreach (get_object_vars($_object) as $key => $value) |
54 | 54 | $this->$key = $value; |
55 | 55 | } |
@@ -6,13 +6,13 @@ |
||
6 | 6 | public function __construct() { |
7 | 7 | parent::__construct(); |
8 | 8 | } |
9 | - public function drawFile( $_template ) { |
|
9 | + public function drawFile($_template) { |
|
10 | 10 | return $this->draw($_template); |
11 | 11 | } |
12 | - public function drawText( $_template ) { |
|
12 | + public function drawText($_template) { |
|
13 | 13 | return $this->draw(trim($_template)); |
14 | 14 | } |
15 | - public function draw( $_template ) { |
|
15 | + public function draw($_template) { |
|
16 | 16 | $Parsedown = new Parsedown\Parsedown(); |
17 | 17 | $page = $Parsedown->text($_template); |
18 | 18 | $page = preg_replace('/[ ](?=[^>]*(?:<|$))/', " ", $page); |
@@ -2,43 +2,43 @@ |
||
2 | 2 | jRequire("ConnectionInterface.php"); |
3 | 3 | class ConnectionPostgresqlAdapter 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 $error ) { |
|
9 | + } catch (Exception $error) { |
|
10 | 10 | Debug::fatal($error->getMessage()); |
11 | 11 | exit(); |
12 | 12 | } |
13 | 13 | } |
14 | - public function query( $_query ) { |
|
14 | + public function query($_query) { |
|
15 | 15 | $this->stdQuery($_query); |
16 | 16 | return true; |
17 | 17 | } |
18 | - public function queryInsert( $_query ) { |
|
18 | + public function queryInsert($_query) { |
|
19 | 19 | $this->stdQuery($_query); |
20 | 20 | return $this->stdQuery("SELECT lastval()"); |
21 | 21 | } |
22 | - public function queryFetch( $_query ) { |
|
22 | + public function queryFetch($_query) { |
|
23 | 23 | $result = $this->stdQuery($_query); |
24 | 24 | $rows = []; |
25 | - while($row = pg_fetch_assoc($result)) |
|
25 | + while ($row = pg_fetch_assoc($result)) |
|
26 | 26 | $rows[] = $row; |
27 | 27 | pg_free_result($result); |
28 | 28 | return $rows; |
29 | 29 | } |
30 | - public function queryArray( $_query ) { |
|
30 | + public function queryArray($_query) { |
|
31 | 31 | $result = $this->stdQuery($_query); |
32 | 32 | $rows = []; |
33 | - while($row = pg_fetch_array($result)) |
|
33 | + while ($row = pg_fetch_array($result)) |
|
34 | 34 | $rows[] = $row; |
35 | 35 | pg_free_result($result); |
36 | 36 | return $rows; |
37 | 37 | } |
38 | - protected function stdQuery( $_query ) { |
|
38 | + protected function stdQuery($_query) { |
|
39 | 39 | $database = $this->connection; |
40 | 40 | $result = pg_query($database, $_query); |
41 | - if(!$result) { |
|
41 | + if (!$result) { |
|
42 | 42 | Debug::fatalStack([ |
43 | 43 | "query" => $_query, |
44 | 44 | "error" => pg_last_error() |
@@ -2,40 +2,40 @@ |
||
2 | 2 | jRequire("ConnectionInterface.php"); |
3 | 3 | class ConnectionMysqliAdapter 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 $error ) { |
|
7 | + $this->connection = new mysqli($_srv, $_usr, $_pass, $_db); |
|
8 | + } catch (Exception $error) { |
|
9 | 9 | Debug::fatal($error->getMessage()); |
10 | 10 | exit(); |
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->connection->insert_id; |
20 | 20 | } |
21 | - public function queryFetch( $_query ) { |
|
21 | + public function queryFetch($_query) { |
|
22 | 22 | $result = $this->stdQuery($_query); |
23 | 23 | $rows = []; |
24 | - while($row = $result->fetch_assoc()) |
|
24 | + while ($row = $result->fetch_assoc()) |
|
25 | 25 | $rows[] = $row; |
26 | 26 | return $rows; |
27 | 27 | } |
28 | - public function queryArray( $_query ) { |
|
28 | + public function queryArray($_query) { |
|
29 | 29 | $result = $this->stdQuery($_query); |
30 | 30 | $rows = []; |
31 | - while($row = $result->fetch_array()) |
|
31 | + while ($row = $result->fetch_array()) |
|
32 | 32 | $rows[] = $row; |
33 | 33 | return $rows; |
34 | 34 | } |
35 | - protected function stdQuery( $_query ) { |
|
35 | + protected function stdQuery($_query) { |
|
36 | 36 | $database = $this->connection; |
37 | 37 | $result = $database->query($_query); |
38 | - if(!$result) { |
|
38 | + if (!$result) { |
|
39 | 39 | Debug::fatalStack([ |
40 | 40 | "query" => $_query, |
41 | 41 | "error" => $database->error |
@@ -2,36 +2,36 @@ |
||
2 | 2 | jRequire("ConnectionInterface.php"); |
3 | 3 | class ConnectionPdoAdapter 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 | $connection = "mysql:host=$_srv;dbname=$_db"; |
8 | - $this->connection = new PDO( $connection, $_usr, $_pass, [PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'utf8'"] ); |
|
9 | - } catch( Exception $error ) { |
|
8 | + $this->connection = new PDO($connection, $_usr, $_pass, [PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'utf8'"]); |
|
9 | + } catch (Exception $error) { |
|
10 | 10 | Debug::fatal($error->getMessage()); |
11 | 11 | exit(); |
12 | 12 | } |
13 | 13 | } |
14 | - public function query( $_query ) { |
|
14 | + public function query($_query) { |
|
15 | 15 | $this->stdQuery($_query); |
16 | 16 | return true; |
17 | 17 | } |
18 | - public function queryInsert( $_query ) { |
|
18 | + public function queryInsert($_query) { |
|
19 | 19 | $this->stdQuery($_query); |
20 | 20 | return $this->connection->lastInsertId(); |
21 | 21 | } |
22 | - public function queryFetch( $_query ) { |
|
22 | + public function queryFetch($_query) { |
|
23 | 23 | $temp = $this->stdQuery($_query); |
24 | 24 | return $temp->fetchAll(PDO::FETCH_ASSOC); |
25 | 25 | } |
26 | - public function queryArray( $_query ) { |
|
26 | + public function queryArray($_query) { |
|
27 | 27 | $temp = $this->stdQuery($_query); |
28 | 28 | return $temp->fetchAll(PDO::FETCH_COLUMN, 0); |
29 | 29 | } |
30 | - protected function stdQuery( $_query ) { |
|
30 | + protected function stdQuery($_query) { |
|
31 | 31 | $database = $this->connection; |
32 | 32 | $query = $database->prepare($_query); |
33 | 33 | $result = $query->execute(); |
34 | - if(!$result) { |
|
34 | + if (!$result) { |
|
35 | 35 | Debug::fatalStack([ |
36 | 36 | "query" => $_query, |
37 | 37 | "error" => [ |
@@ -9,30 +9,30 @@ discard block |
||
9 | 9 | self::$stack = []; |
10 | 10 | self::$initialized = true; |
11 | 11 | } |
12 | - private static function out( $_object ) { |
|
13 | - if(is_object($_object)) { |
|
12 | + private static function out($_object) { |
|
13 | + if (is_object($_object)) { |
|
14 | 14 | echo "isObject"; |
15 | - } else if(is_array($_object)) { |
|
15 | + } else if (is_array($_object)) { |
|
16 | 16 | arrayDump($_object, "Debug"); |
17 | 17 | } else { |
18 | 18 | echo $_object; |
19 | 19 | } |
20 | 20 | } |
21 | - public static function error( $_object ) { |
|
21 | + public static function error($_object) { |
|
22 | 22 | self::out(["Error" => $_object]); |
23 | 23 | } |
24 | - public static function warning( $_object ) { |
|
24 | + public static function warning($_object) { |
|
25 | 25 | self::out(["Warning" => $_object]); |
26 | 26 | } |
27 | - public static function fatal( $_object ) { |
|
27 | + public static function fatal($_object) { |
|
28 | 28 | self::out(["Fatal error" => $_object]); |
29 | 29 | exit(1); |
30 | 30 | } |
31 | - public static function logln( $_object ) { |
|
31 | + public static function logln($_object) { |
|
32 | 32 | self::log($_object); |
33 | 33 | self::out("<br>"); |
34 | 34 | } |
35 | - public static function logStack( $_object ) { |
|
35 | + public static function logStack($_object) { |
|
36 | 36 | self::out([ |
37 | 37 | "position" => self::$stack, |
38 | 38 | "error" => $_object |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | self::$stack[] = $debugInfo; |
51 | 51 | } |
52 | 52 | public static function pop() { |
53 | - if(count(self::$stack)>0) |
|
53 | + if (count(self::$stack) > 0) |
|
54 | 54 | array_shift(self::$stack); |
55 | 55 | } |
56 | 56 | public static function emptyStack() { |
@@ -6,30 +6,30 @@ discard block |
||
6 | 6 | return ob_start(); |
7 | 7 | } |
8 | 8 | |
9 | - function jBlockClose( $_type = "html", $_parameters = [] ) { |
|
9 | + function jBlockClose($_type = "html", $_parameters = []) { |
|
10 | 10 | return jBlockEnd($_type, $_parameters); |
11 | 11 | } |
12 | 12 | |
13 | - function jBlockFile( $_path, $_parameters = [] ) { |
|
13 | + function jBlockFile($_path, $_parameters = []) { |
|
14 | 14 | $extension = explode(".", $_path); |
15 | - $extension = $extension[count($extension)-1]; |
|
15 | + $extension = $extension[count($extension) - 1]; |
|
16 | 16 | $extension = strtolower($extension); |
17 | 17 | return jBlockFileMan($_path, $extension, $_parameters); |
18 | 18 | } |
19 | 19 | |
20 | - function jBlockFileMan( $_path, $_type, $_parameters = [] ) { |
|
21 | - if(!file_exists($_path)) |
|
20 | + function jBlockFileMan($_path, $_type, $_parameters = []) { |
|
21 | + if (!file_exists($_path)) |
|
22 | 22 | Debug::fatal("File [$_path] not found."); |
23 | 23 | $temp = file_get_contents($_path); |
24 | 24 | return jBlockParsing($_type, $temp, $_parameters); |
25 | 25 | } |
26 | 26 | |
27 | - function jBlockEnd( $_type = "html", $_parameters = [] ) { |
|
27 | + function jBlockEnd($_type = "html", $_parameters = []) { |
|
28 | 28 | $text = ob_get_clean(); |
29 | 29 | return jBlockParsing($_type, $text, $_parameters); |
30 | 30 | } |
31 | 31 | |
32 | - function jBlockParsing( $_type = "html", $_string = "", $_parameters = [] ) { |
|
32 | + function jBlockParsing($_type = "html", $_string = "", $_parameters = []) { |
|
33 | 33 | switch ($_type) { |
34 | 34 | case "pug": |
35 | 35 | case "jade": |
@@ -52,9 +52,9 @@ discard block |
||
52 | 52 | } |
53 | 53 | |
54 | 54 | function minifyOutput($_buffer) { |
55 | - $search = array ( '/\>[^\S ]+/s', '/[^\S ]+\</s', '/(\s)+/s' ); |
|
56 | - $replace = array ( '>', '<', '\\1' ); |
|
57 | - if (preg_match("/\<html/i",$_buffer) == 1 && preg_match("/\<\/html\>/i",$_buffer) == 1) |
|
55 | + $search = array('/\>[^\S ]+/s', '/[^\S ]+\</s', '/(\s)+/s'); |
|
56 | + $replace = array('>', '<', '\\1'); |
|
57 | + if (preg_match("/\<html/i", $_buffer) == 1 && preg_match("/\<\/html\>/i", $_buffer) == 1) |
|
58 | 58 | $_buffer = preg_replace($search, $replace, utf8_decode($_buffer)); |
59 | 59 | return utf8_encode($_buffer); |
60 | 60 | } |