@@ -3,20 +3,20 @@ |
||
| 3 | 3 | jRequire("Parsedown/Parsedown.php"); |
| 4 | 4 | use Parsedown as Parsedown; |
| 5 | 5 | class Parsedown extends Module { |
| 6 | - public function __construct() { |
|
| 7 | - parent::__construct(); |
|
| 8 | - } |
|
| 9 | - public function drawFile( $_template ) { |
|
| 10 | - return $this->draw($_template); |
|
| 11 | - } |
|
| 12 | - public function drawText( $_template ) { |
|
| 13 | - return $this->draw(trim($_template)); |
|
| 14 | - } |
|
| 15 | - public function draw( $_template ) { |
|
| 16 | - $Parsedown = new Parsedown\Parsedown(); |
|
| 17 | - $page = $Parsedown->text($_template); |
|
| 18 | - $page = preg_replace('/[ ](?=[^>]*(?:<|$))/', " ", $page); |
|
| 19 | - return $page; |
|
| 20 | - } |
|
| 6 | + public function __construct() { |
|
| 7 | + parent::__construct(); |
|
| 8 | + } |
|
| 9 | + public function drawFile( $_template ) { |
|
| 10 | + return $this->draw($_template); |
|
| 11 | + } |
|
| 12 | + public function drawText( $_template ) { |
|
| 13 | + return $this->draw(trim($_template)); |
|
| 14 | + } |
|
| 15 | + public function draw( $_template ) { |
|
| 16 | + $Parsedown = new Parsedown\Parsedown(); |
|
| 17 | + $page = $Parsedown->text($_template); |
|
| 18 | + $page = preg_replace('/[ ](?=[^>]*(?:<|$))/', " ", $page); |
|
| 19 | + return $page; |
|
| 20 | + } |
|
| 21 | 21 | } |
| 22 | 22 | ?> |
@@ -1,51 +1,51 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | jRequire("ConnectionInterface.php"); |
| 3 | 3 | class ConnectionPostgresqlAdapter implements ConnectionAdapterInterface { |
| 4 | - public $connection; |
|
| 5 | - public function __construct( $_srv, $_db, $_usr, $_pass ) { |
|
| 6 | - try { |
|
| 7 | - $this->connection = pg_connect("host=$_srv dbname=$_db user=$_usr password=$_pass") |
|
| 8 | - or die('Could not connect: '.pg_last_error()); |
|
| 9 | - } catch( Exception $error ) { |
|
| 10 | - Debug::fatal($error->getMessage()); |
|
| 11 | - exit(); |
|
| 12 | - } |
|
| 13 | - } |
|
| 14 | - public function query( $_query ) { |
|
| 15 | - $this->stdQuery($_query); |
|
| 16 | - return true; |
|
| 17 | - } |
|
| 18 | - public function queryInsert( $_query ) { |
|
| 19 | - $this->stdQuery($_query); |
|
| 20 | - return $this->stdQuery("SELECT lastval()"); |
|
| 21 | - } |
|
| 22 | - public function queryFetch( $_query ) { |
|
| 23 | - $result = $this->stdQuery($_query); |
|
| 24 | - $rows = []; |
|
| 25 | - while($row = pg_fetch_assoc($result)) |
|
| 26 | - $rows[] = $row; |
|
| 27 | - pg_free_result($result); |
|
| 28 | - return $rows; |
|
| 29 | - } |
|
| 30 | - public function queryArray( $_query ) { |
|
| 31 | - $result = $this->stdQuery($_query); |
|
| 32 | - $rows = []; |
|
| 33 | - while($row = pg_fetch_array($result)) |
|
| 34 | - $rows[] = $row; |
|
| 35 | - pg_free_result($result); |
|
| 36 | - return $rows; |
|
| 37 | - } |
|
| 38 | - protected function stdQuery( $_query ) { |
|
| 39 | - $database = $this->connection; |
|
| 40 | - $result = pg_query($database, $_query); |
|
| 41 | - if(!$result) { |
|
| 42 | - Debug::fatalStack([ |
|
| 43 | - "query" => $_query, |
|
| 44 | - "error" => pg_last_error() |
|
| 45 | - ]); |
|
| 46 | - exit(); |
|
| 47 | - } |
|
| 48 | - return $result; |
|
| 49 | - } |
|
| 4 | + public $connection; |
|
| 5 | + public function __construct( $_srv, $_db, $_usr, $_pass ) { |
|
| 6 | + try { |
|
| 7 | + $this->connection = pg_connect("host=$_srv dbname=$_db user=$_usr password=$_pass") |
|
| 8 | + or die('Could not connect: '.pg_last_error()); |
|
| 9 | + } catch( Exception $error ) { |
|
| 10 | + Debug::fatal($error->getMessage()); |
|
| 11 | + exit(); |
|
| 12 | + } |
|
| 13 | + } |
|
| 14 | + public function query( $_query ) { |
|
| 15 | + $this->stdQuery($_query); |
|
| 16 | + return true; |
|
| 17 | + } |
|
| 18 | + public function queryInsert( $_query ) { |
|
| 19 | + $this->stdQuery($_query); |
|
| 20 | + return $this->stdQuery("SELECT lastval()"); |
|
| 21 | + } |
|
| 22 | + public function queryFetch( $_query ) { |
|
| 23 | + $result = $this->stdQuery($_query); |
|
| 24 | + $rows = []; |
|
| 25 | + while($row = pg_fetch_assoc($result)) |
|
| 26 | + $rows[] = $row; |
|
| 27 | + pg_free_result($result); |
|
| 28 | + return $rows; |
|
| 29 | + } |
|
| 30 | + public function queryArray( $_query ) { |
|
| 31 | + $result = $this->stdQuery($_query); |
|
| 32 | + $rows = []; |
|
| 33 | + while($row = pg_fetch_array($result)) |
|
| 34 | + $rows[] = $row; |
|
| 35 | + pg_free_result($result); |
|
| 36 | + return $rows; |
|
| 37 | + } |
|
| 38 | + protected function stdQuery( $_query ) { |
|
| 39 | + $database = $this->connection; |
|
| 40 | + $result = pg_query($database, $_query); |
|
| 41 | + if(!$result) { |
|
| 42 | + Debug::fatalStack([ |
|
| 43 | + "query" => $_query, |
|
| 44 | + "error" => pg_last_error() |
|
| 45 | + ]); |
|
| 46 | + exit(); |
|
| 47 | + } |
|
| 48 | + return $result; |
|
| 49 | + } |
|
| 50 | 50 | } |
| 51 | 51 | ?> |
@@ -1,48 +1,48 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | jRequire("ConnectionInterface.php"); |
| 3 | 3 | class ConnectionMysqliAdapter implements ConnectionAdapterInterface { |
| 4 | - public $connection; |
|
| 5 | - public function __construct( $_srv, $_db, $_usr, $_pass ) { |
|
| 6 | - try { |
|
| 7 | - $this->connection = new mysqli( $_srv, $_usr, $_pass, $_db ); |
|
| 8 | - } catch( Exception $error ) { |
|
| 9 | - Debug::fatal($error->getMessage()); |
|
| 10 | - exit(); |
|
| 11 | - } |
|
| 12 | - } |
|
| 13 | - public function query( $_query ) { |
|
| 14 | - $this->stdQuery($_query); |
|
| 15 | - return true; |
|
| 16 | - } |
|
| 17 | - public function queryInsert( $_query ) { |
|
| 18 | - $this->stdQuery($_query); |
|
| 19 | - return $this->connection->insert_id; |
|
| 20 | - } |
|
| 21 | - public function queryFetch( $_query ) { |
|
| 22 | - $result = $this->stdQuery($_query); |
|
| 23 | - $rows = []; |
|
| 24 | - while($row = $result->fetch_assoc()) |
|
| 25 | - $rows[] = $row; |
|
| 26 | - return $rows; |
|
| 27 | - } |
|
| 28 | - public function queryArray( $_query ) { |
|
| 29 | - $result = $this->stdQuery($_query); |
|
| 30 | - $rows = []; |
|
| 31 | - while($row = $result->fetch_array()) |
|
| 32 | - $rows[] = $row; |
|
| 33 | - return $rows; |
|
| 34 | - } |
|
| 35 | - protected function stdQuery( $_query ) { |
|
| 36 | - $database = $this->connection; |
|
| 37 | - $result = $database->query($_query); |
|
| 38 | - if(!$result) { |
|
| 39 | - Debug::fatalStack([ |
|
| 40 | - "query" => $_query, |
|
| 41 | - "error" => $database->error |
|
| 42 | - ]); |
|
| 43 | - exit(); |
|
| 44 | - } |
|
| 45 | - return $result; |
|
| 46 | - } |
|
| 4 | + public $connection; |
|
| 5 | + public function __construct( $_srv, $_db, $_usr, $_pass ) { |
|
| 6 | + try { |
|
| 7 | + $this->connection = new mysqli( $_srv, $_usr, $_pass, $_db ); |
|
| 8 | + } catch( Exception $error ) { |
|
| 9 | + Debug::fatal($error->getMessage()); |
|
| 10 | + exit(); |
|
| 11 | + } |
|
| 12 | + } |
|
| 13 | + public function query( $_query ) { |
|
| 14 | + $this->stdQuery($_query); |
|
| 15 | + return true; |
|
| 16 | + } |
|
| 17 | + public function queryInsert( $_query ) { |
|
| 18 | + $this->stdQuery($_query); |
|
| 19 | + return $this->connection->insert_id; |
|
| 20 | + } |
|
| 21 | + public function queryFetch( $_query ) { |
|
| 22 | + $result = $this->stdQuery($_query); |
|
| 23 | + $rows = []; |
|
| 24 | + while($row = $result->fetch_assoc()) |
|
| 25 | + $rows[] = $row; |
|
| 26 | + return $rows; |
|
| 27 | + } |
|
| 28 | + public function queryArray( $_query ) { |
|
| 29 | + $result = $this->stdQuery($_query); |
|
| 30 | + $rows = []; |
|
| 31 | + while($row = $result->fetch_array()) |
|
| 32 | + $rows[] = $row; |
|
| 33 | + return $rows; |
|
| 34 | + } |
|
| 35 | + protected function stdQuery( $_query ) { |
|
| 36 | + $database = $this->connection; |
|
| 37 | + $result = $database->query($_query); |
|
| 38 | + if(!$result) { |
|
| 39 | + Debug::fatalStack([ |
|
| 40 | + "query" => $_query, |
|
| 41 | + "error" => $database->error |
|
| 42 | + ]); |
|
| 43 | + exit(); |
|
| 44 | + } |
|
| 45 | + return $result; |
|
| 46 | + } |
|
| 47 | 47 | } |
| 48 | 48 | ?> |
@@ -1,47 +1,47 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | jRequire("ConnectionInterface.php"); |
| 3 | 3 | class ConnectionPdoAdapter implements ConnectionAdapterInterface { |
| 4 | - public $connection; |
|
| 5 | - public function __construct( $_srv, $_db, $_usr, $_pass ) { |
|
| 6 | - try { |
|
| 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 ) { |
|
| 10 | - Debug::fatal($error->getMessage()); |
|
| 11 | - exit(); |
|
| 12 | - } |
|
| 13 | - } |
|
| 14 | - public function query( $_query ) { |
|
| 15 | - $this->stdQuery($_query); |
|
| 16 | - return true; |
|
| 17 | - } |
|
| 18 | - public function queryInsert( $_query ) { |
|
| 19 | - $this->stdQuery($_query); |
|
| 20 | - return $this->connection->lastInsertId(); |
|
| 21 | - } |
|
| 22 | - public function queryFetch( $_query ) { |
|
| 23 | - $temp = $this->stdQuery($_query); |
|
| 24 | - return $temp->fetchAll(PDO::FETCH_ASSOC); |
|
| 25 | - } |
|
| 26 | - public function queryArray( $_query ) { |
|
| 27 | - $temp = $this->stdQuery($_query); |
|
| 28 | - return $temp->fetchAll(PDO::FETCH_COLUMN, 0); |
|
| 29 | - } |
|
| 30 | - protected function stdQuery( $_query ) { |
|
| 31 | - $database = $this->connection; |
|
| 32 | - $query = $database->prepare($_query); |
|
| 33 | - $result = $query->execute(); |
|
| 34 | - if(!$result) { |
|
| 35 | - Debug::fatalStack([ |
|
| 36 | - "query" => $_query, |
|
| 37 | - "error" => [ |
|
| 38 | - $query->errorInfo(), |
|
| 39 | - $database->errorInfo() |
|
| 40 | - ] |
|
| 41 | - ]); |
|
| 42 | - exit(); |
|
| 43 | - } |
|
| 44 | - return $query; |
|
| 45 | - } |
|
| 4 | + public $connection; |
|
| 5 | + public function __construct( $_srv, $_db, $_usr, $_pass ) { |
|
| 6 | + try { |
|
| 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 ) { |
|
| 10 | + Debug::fatal($error->getMessage()); |
|
| 11 | + exit(); |
|
| 12 | + } |
|
| 13 | + } |
|
| 14 | + public function query( $_query ) { |
|
| 15 | + $this->stdQuery($_query); |
|
| 16 | + return true; |
|
| 17 | + } |
|
| 18 | + public function queryInsert( $_query ) { |
|
| 19 | + $this->stdQuery($_query); |
|
| 20 | + return $this->connection->lastInsertId(); |
|
| 21 | + } |
|
| 22 | + public function queryFetch( $_query ) { |
|
| 23 | + $temp = $this->stdQuery($_query); |
|
| 24 | + return $temp->fetchAll(PDO::FETCH_ASSOC); |
|
| 25 | + } |
|
| 26 | + public function queryArray( $_query ) { |
|
| 27 | + $temp = $this->stdQuery($_query); |
|
| 28 | + return $temp->fetchAll(PDO::FETCH_COLUMN, 0); |
|
| 29 | + } |
|
| 30 | + protected function stdQuery( $_query ) { |
|
| 31 | + $database = $this->connection; |
|
| 32 | + $query = $database->prepare($_query); |
|
| 33 | + $result = $query->execute(); |
|
| 34 | + if(!$result) { |
|
| 35 | + Debug::fatalStack([ |
|
| 36 | + "query" => $_query, |
|
| 37 | + "error" => [ |
|
| 38 | + $query->errorInfo(), |
|
| 39 | + $database->errorInfo() |
|
| 40 | + ] |
|
| 41 | + ]); |
|
| 42 | + exit(); |
|
| 43 | + } |
|
| 44 | + return $query; |
|
| 45 | + } |
|
| 46 | 46 | } |
| 47 | 47 | ?> |
@@ -1,60 +1,60 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | class Debug { |
| 3 | - public static $stack; |
|
| 4 | - private static $initialized = false; |
|
| 5 | - private function __construct() {} |
|
| 6 | - private static function initialize() { |
|
| 7 | - if (self::$initialized) |
|
| 8 | - return; |
|
| 9 | - self::$stack = []; |
|
| 10 | - self::$initialized = true; |
|
| 11 | - } |
|
| 12 | - private static function out( $_object ) { |
|
| 13 | - if(is_object($_object)) { |
|
| 14 | - echo "isObject"; |
|
| 15 | - } else if(is_array($_object)) { |
|
| 16 | - arrayDump($_object, "Debug"); |
|
| 17 | - } else { |
|
| 18 | - echo $_object; |
|
| 19 | - } |
|
| 20 | - } |
|
| 21 | - public static function error( $_object ) { |
|
| 22 | - self::out(["Error" => $_object]); |
|
| 23 | - } |
|
| 24 | - public static function warning( $_object ) { |
|
| 25 | - self::out(["Warning" => $_object]); |
|
| 26 | - } |
|
| 27 | - public static function fatal( $_object ) { |
|
| 28 | - self::out(["Fatal error" => $_object]); |
|
| 29 | - exit(1); |
|
| 30 | - } |
|
| 31 | - public static function logln( $_object ) { |
|
| 32 | - self::log($_object); |
|
| 33 | - self::out("<br>"); |
|
| 34 | - } |
|
| 35 | - public static function logStack( $_object ) { |
|
| 36 | - self::out([ |
|
| 37 | - "position" => self::$stack, |
|
| 38 | - "error" => $_object |
|
| 39 | - ]); |
|
| 40 | - self::out("<br>"); |
|
| 41 | - } |
|
| 42 | - public static function push() { |
|
| 43 | - $debugInfo = debug_backtrace(); |
|
| 44 | - $debugInfo = [ |
|
| 45 | - "file" => $debugInfo[1]["file"], |
|
| 46 | - "line" => $debugInfo[1]["line"], |
|
| 47 | - "function" => $debugInfo[1]["function"], |
|
| 48 | - "class" => $debugInfo[1]["class"] |
|
| 49 | - ]; |
|
| 50 | - self::$stack[] = $debugInfo; |
|
| 51 | - } |
|
| 52 | - public static function pop() { |
|
| 53 | - if(count(self::$stack)>0) |
|
| 54 | - array_shift(self::$stack); |
|
| 55 | - } |
|
| 56 | - public static function emptyStack() { |
|
| 57 | - self::$stack = []; |
|
| 58 | - } |
|
| 3 | + public static $stack; |
|
| 4 | + private static $initialized = false; |
|
| 5 | + private function __construct() {} |
|
| 6 | + private static function initialize() { |
|
| 7 | + if (self::$initialized) |
|
| 8 | + return; |
|
| 9 | + self::$stack = []; |
|
| 10 | + self::$initialized = true; |
|
| 11 | + } |
|
| 12 | + private static function out( $_object ) { |
|
| 13 | + if(is_object($_object)) { |
|
| 14 | + echo "isObject"; |
|
| 15 | + } else if(is_array($_object)) { |
|
| 16 | + arrayDump($_object, "Debug"); |
|
| 17 | + } else { |
|
| 18 | + echo $_object; |
|
| 19 | + } |
|
| 20 | + } |
|
| 21 | + public static function error( $_object ) { |
|
| 22 | + self::out(["Error" => $_object]); |
|
| 23 | + } |
|
| 24 | + public static function warning( $_object ) { |
|
| 25 | + self::out(["Warning" => $_object]); |
|
| 26 | + } |
|
| 27 | + public static function fatal( $_object ) { |
|
| 28 | + self::out(["Fatal error" => $_object]); |
|
| 29 | + exit(1); |
|
| 30 | + } |
|
| 31 | + public static function logln( $_object ) { |
|
| 32 | + self::log($_object); |
|
| 33 | + self::out("<br>"); |
|
| 34 | + } |
|
| 35 | + public static function logStack( $_object ) { |
|
| 36 | + self::out([ |
|
| 37 | + "position" => self::$stack, |
|
| 38 | + "error" => $_object |
|
| 39 | + ]); |
|
| 40 | + self::out("<br>"); |
|
| 41 | + } |
|
| 42 | + public static function push() { |
|
| 43 | + $debugInfo = debug_backtrace(); |
|
| 44 | + $debugInfo = [ |
|
| 45 | + "file" => $debugInfo[1]["file"], |
|
| 46 | + "line" => $debugInfo[1]["line"], |
|
| 47 | + "function" => $debugInfo[1]["function"], |
|
| 48 | + "class" => $debugInfo[1]["class"] |
|
| 49 | + ]; |
|
| 50 | + self::$stack[] = $debugInfo; |
|
| 51 | + } |
|
| 52 | + public static function pop() { |
|
| 53 | + if(count(self::$stack)>0) |
|
| 54 | + array_shift(self::$stack); |
|
| 55 | + } |
|
| 56 | + public static function emptyStack() { |
|
| 57 | + self::$stack = []; |
|
| 58 | + } |
|
| 59 | 59 | } |
| 60 | 60 | ?> |
@@ -3,59 +3,59 @@ |
||
| 3 | 3 | jRequire("../modules/Parsedown/Parsedown.php"); |
| 4 | 4 | jRequire("../modules/Debug/Debug.php"); |
| 5 | 5 | function jBlock() { |
| 6 | - return ob_start(); |
|
| 6 | + return ob_start(); |
|
| 7 | 7 | } |
| 8 | 8 | |
| 9 | 9 | function jBlockClose( $_type = "html", $_parameters = [] ) { |
| 10 | - return jBlockEnd($_type, $_parameters); |
|
| 10 | + return jBlockEnd($_type, $_parameters); |
|
| 11 | 11 | } |
| 12 | 12 | |
| 13 | 13 | function jBlockFile( $_path, $_parameters = [] ) { |
| 14 | - $extension = explode(".", $_path); |
|
| 15 | - $extension = $extension[count($extension)-1]; |
|
| 16 | - $extension = strtolower($extension); |
|
| 17 | - return jBlockFileMan($_path, $extension, $_parameters); |
|
| 14 | + $extension = explode(".", $_path); |
|
| 15 | + $extension = $extension[count($extension)-1]; |
|
| 16 | + $extension = strtolower($extension); |
|
| 17 | + return jBlockFileMan($_path, $extension, $_parameters); |
|
| 18 | 18 | } |
| 19 | 19 | |
| 20 | 20 | function jBlockFileMan( $_path, $_type, $_parameters = [] ) { |
| 21 | - if(!file_exists($_path)) |
|
| 22 | - Debug::fatal("File [$_path] not found."); |
|
| 23 | - $temp = file_get_contents($_path); |
|
| 24 | - return jBlockParsing($_type, $temp, $_parameters); |
|
| 21 | + if(!file_exists($_path)) |
|
| 22 | + Debug::fatal("File [$_path] not found."); |
|
| 23 | + $temp = file_get_contents($_path); |
|
| 24 | + return jBlockParsing($_type, $temp, $_parameters); |
|
| 25 | 25 | } |
| 26 | 26 | |
| 27 | 27 | function jBlockEnd( $_type = "html", $_parameters = [] ) { |
| 28 | - $text = ob_get_clean(); |
|
| 29 | - return jBlockParsing($_type, $text, $_parameters); |
|
| 28 | + $text = ob_get_clean(); |
|
| 29 | + return jBlockParsing($_type, $text, $_parameters); |
|
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | function jBlockParsing( $_type = "html", $_string = "", $_parameters = [] ) { |
| 33 | - switch ($_type) { |
|
| 34 | - case "pug": |
|
| 35 | - case "jade": |
|
| 36 | - $Pug = new Pug(); |
|
| 37 | - $_string = $Pug->drawText($_string, $_parameters); |
|
| 38 | - break; |
|
| 39 | - case "md": |
|
| 40 | - case "markdown": |
|
| 41 | - case "parsedown": |
|
| 42 | - $Parsedown = new Parsedown(); |
|
| 43 | - $_string = $Parsedown->drawText($_string); |
|
| 44 | - break; |
|
| 45 | - case "twig": |
|
| 46 | - $Twig = new Twig(); |
|
| 47 | - $_string = $Twig->drawText($_string, $_parameters); |
|
| 48 | - break; |
|
| 49 | - default: break; |
|
| 50 | - } |
|
| 51 | - return $_string; |
|
| 33 | + switch ($_type) { |
|
| 34 | + case "pug": |
|
| 35 | + case "jade": |
|
| 36 | + $Pug = new Pug(); |
|
| 37 | + $_string = $Pug->drawText($_string, $_parameters); |
|
| 38 | + break; |
|
| 39 | + case "md": |
|
| 40 | + case "markdown": |
|
| 41 | + case "parsedown": |
|
| 42 | + $Parsedown = new Parsedown(); |
|
| 43 | + $_string = $Parsedown->drawText($_string); |
|
| 44 | + break; |
|
| 45 | + case "twig": |
|
| 46 | + $Twig = new Twig(); |
|
| 47 | + $_string = $Twig->drawText($_string, $_parameters); |
|
| 48 | + break; |
|
| 49 | + default: break; |
|
| 50 | + } |
|
| 51 | + return $_string; |
|
| 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) |
|
| 58 | - $_buffer = preg_replace($search, $replace, utf8_decode($_buffer)); |
|
| 59 | - return utf8_encode($_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) |
|
| 58 | + $_buffer = preg_replace($search, $replace, utf8_decode($_buffer)); |
|
| 59 | + return utf8_encode($_buffer); |
|
| 60 | 60 | } |
| 61 | 61 | ?> |
@@ -1,64 +1,64 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | function requireComponent( $_path, $_local = true ) { |
| 3 | - $path = getJFolder($_path, $_local, debug_backtrace()); |
|
| 4 | - if(file_exists($path) && isPhp($path)) |
|
| 5 | - jRequire($path, false, 0); |
|
| 6 | - else |
|
| 7 | - requireError($_path); |
|
| 3 | + $path = getJFolder($_path, $_local, debug_backtrace()); |
|
| 4 | + if(file_exists($path) && isPhp($path)) |
|
| 5 | + jRequire($path, false, 0); |
|
| 6 | + else |
|
| 7 | + requireError($_path); |
|
| 8 | 8 | } |
| 9 | 9 | function requireComponents( $_path, $_local = true ) { |
| 10 | - $path = getJFolder($_path, $_local, debug_backtrace()); |
|
| 11 | - if(file_exists($path)) { |
|
| 12 | - $files = subFolderFile($path); |
|
| 13 | - foreach ($files as $i) |
|
| 14 | - if(isPhp("$path/$i")) |
|
| 15 | - requireComponent($path."/".$i, false); |
|
| 16 | - } else |
|
| 17 | - requireError($_path); |
|
| 10 | + $path = getJFolder($_path, $_local, debug_backtrace()); |
|
| 11 | + if(file_exists($path)) { |
|
| 12 | + $files = subFolderFile($path); |
|
| 13 | + foreach ($files as $i) |
|
| 14 | + if(isPhp("$path/$i")) |
|
| 15 | + requireComponent($path."/".$i, false); |
|
| 16 | + } else |
|
| 17 | + requireError($_path); |
|
| 18 | 18 | } |
| 19 | 19 | function requireError( $_path ) { |
| 20 | - global $DEBUG; |
|
| 21 | - if( $DEBUG == 1 ) |
|
| 22 | - echo "Error load ($_path)<br>"; |
|
| 20 | + global $DEBUG; |
|
| 21 | + if( $DEBUG == 1 ) |
|
| 22 | + echo "Error load ($_path)<br>"; |
|
| 23 | 23 | } |
| 24 | 24 | function isPhp ( $_file ) { |
| 25 | - if(!is_file($_file)) return false; |
|
| 26 | - $info = pathinfo($_file); |
|
| 27 | - return ($info["extension"] == "php") || ($info["extension"] == "PHP"); |
|
| 25 | + if(!is_file($_file)) return false; |
|
| 26 | + $info = pathinfo($_file); |
|
| 27 | + return ($info["extension"] == "php") || ($info["extension"] == "PHP"); |
|
| 28 | 28 | } |
| 29 | 29 | function requireModules( $_path, $_local = true ) { |
| 30 | - $path = getJFolder($_path, $_local, debug_backtrace()); |
|
| 31 | - $subFolders = subFolderDir($path); |
|
| 32 | - foreach ($subFolders as $i) |
|
| 33 | - requireComponents("$path/$i", false); |
|
| 30 | + $path = getJFolder($_path, $_local, debug_backtrace()); |
|
| 31 | + $subFolders = subFolderDir($path); |
|
| 32 | + foreach ($subFolders as $i) |
|
| 33 | + requireComponents("$path/$i", false); |
|
| 34 | 34 | } |
| 35 | 35 | function jRequire( $_path, $_local = true ) { |
| 36 | - $path = getJFolder($_path, $_local, debug_backtrace()); |
|
| 37 | - require_once( $path ); |
|
| 36 | + $path = getJFolder($_path, $_local, debug_backtrace()); |
|
| 37 | + require_once( $path ); |
|
| 38 | 38 | } |
| 39 | 39 | function getJFolder( $_path, $_local, $_stack ) { |
| 40 | - if($_local) { |
|
| 41 | - $stackInfo = $_stack; |
|
| 42 | - $folder = dirname($stackInfo[0]["file"]); |
|
| 43 | - $file = "$folder/$_path"; |
|
| 44 | - } else |
|
| 45 | - $file = $_path; |
|
| 46 | - return $file; |
|
| 40 | + if($_local) { |
|
| 41 | + $stackInfo = $_stack; |
|
| 42 | + $folder = dirname($stackInfo[0]["file"]); |
|
| 43 | + $file = "$folder/$_path"; |
|
| 44 | + } else |
|
| 45 | + $file = $_path; |
|
| 46 | + return $file; |
|
| 47 | 47 | } |
| 48 | 48 | function requireModulesList( $_path ) { |
| 49 | - if(!file_exists($_path)) |
|
| 50 | - throw new InvalidArgumentException("File not found! [$_path]"); |
|
| 51 | - $data = file_get_contents($_path); |
|
| 52 | - $data = json_decode($data); |
|
| 53 | - if($data === NULL) |
|
| 54 | - throw new Exception("Error in the file format [$_path]", 1); |
|
| 55 | - foreach ($data as $item) { |
|
| 56 | - if(substr($item, -1) == "*") |
|
| 57 | - requireModules(substr($item, 0, -2), false); |
|
| 58 | - else { |
|
| 59 | - $path = getJFolder($item, false, debug_backtrace()); |
|
| 60 | - requireComponents("$path", false); |
|
| 61 | - } |
|
| 62 | - } |
|
| 49 | + if(!file_exists($_path)) |
|
| 50 | + throw new InvalidArgumentException("File not found! [$_path]"); |
|
| 51 | + $data = file_get_contents($_path); |
|
| 52 | + $data = json_decode($data); |
|
| 53 | + if($data === NULL) |
|
| 54 | + throw new Exception("Error in the file format [$_path]", 1); |
|
| 55 | + foreach ($data as $item) { |
|
| 56 | + if(substr($item, -1) == "*") |
|
| 57 | + requireModules(substr($item, 0, -2), false); |
|
| 58 | + else { |
|
| 59 | + $path = getJFolder($item, false, debug_backtrace()); |
|
| 60 | + requireComponents("$path", false); |
|
| 61 | + } |
|
| 62 | + } |
|
| 63 | 63 | } |
| 64 | 64 | ?> |