From c795a4aacbc44763e4e3c61b6672c5336bac5429 Mon Sep 17 00:00:00 2001
From: rylon <rylon@web.de>
Date: Sat, 6 Jun 2015 20:22:51 +0200
Subject: [PATCH] lib framework, michelf lib restructure, saimod docu update,
 sai better error messages

---
 lib/Michelf/autoload.inc                       |  3 +++
 lib/Michelf/{ => lib}/Markdown.php             |  0
 lib/Michelf/{ => lib}/MarkdownExtra.php        |  0
 lib/Michelf/{ => lib}/extra/License.md         |  0
 lib/Michelf/{ => lib}/extra/Readme.md          |  0
 lib/Michelf/{ => lib}/extra/Readme.php         |  0
 lib/Michelf/{ => lib}/extra/composer.json      |  0
 lib/Michelf/lib_michelf.php                    | 10 ++++++++++
 lib/autoload.inc                               |  3 ++-
 lib/lib.php                                    | 18 ++++++++++++++++++
 lib/lib_controll.php                           | 17 +++++++++++++++++
 lib/lib_css.php                                |  5 +++++
 lib/lib_js.php                                 |  5 +++++
 lib/lib_jscss.php                              |  6 ++++++
 lib/lib_php.php                                |  8 ++++++++
 .../saimod_sys_docu/saimod_sys_docu.php        |  1 +
 sai/sai/sai.php                                |  6 +++---
 17 files changed, 78 insertions(+), 4 deletions(-)
 create mode 100644 lib/Michelf/autoload.inc
 rename lib/Michelf/{ => lib}/Markdown.php (100%)
 rename lib/Michelf/{ => lib}/MarkdownExtra.php (100%)
 rename lib/Michelf/{ => lib}/extra/License.md (100%)
 rename lib/Michelf/{ => lib}/extra/Readme.md (100%)
 rename lib/Michelf/{ => lib}/extra/Readme.php (100%)
 rename lib/Michelf/{ => lib}/extra/composer.json (100%)
 create mode 100644 lib/Michelf/lib_michelf.php
 create mode 100644 lib/lib.php
 create mode 100644 lib/lib_controll.php
 create mode 100644 lib/lib_css.php
 create mode 100644 lib/lib_js.php
 create mode 100644 lib/lib_jscss.php
 create mode 100644 lib/lib_php.php

diff --git a/lib/Michelf/autoload.inc b/lib/Michelf/autoload.inc
new file mode 100644
index 0000000..d9efc88
--- /dev/null
+++ b/lib/Michelf/autoload.inc
@@ -0,0 +1,3 @@
+<?php
+\SYSTEM\autoload::registerFolder(dirname(__FILE__),'LIB');
+\LIB\lib_controll::register('\LIB\lib_michelf');
\ No newline at end of file
diff --git a/lib/Michelf/Markdown.php b/lib/Michelf/lib/Markdown.php
similarity index 100%
rename from lib/Michelf/Markdown.php
rename to lib/Michelf/lib/Markdown.php
diff --git a/lib/Michelf/MarkdownExtra.php b/lib/Michelf/lib/MarkdownExtra.php
similarity index 100%
rename from lib/Michelf/MarkdownExtra.php
rename to lib/Michelf/lib/MarkdownExtra.php
diff --git a/lib/Michelf/extra/License.md b/lib/Michelf/lib/extra/License.md
similarity index 100%
rename from lib/Michelf/extra/License.md
rename to lib/Michelf/lib/extra/License.md
diff --git a/lib/Michelf/extra/Readme.md b/lib/Michelf/lib/extra/Readme.md
similarity index 100%
rename from lib/Michelf/extra/Readme.md
rename to lib/Michelf/lib/extra/Readme.md
diff --git a/lib/Michelf/extra/Readme.php b/lib/Michelf/lib/extra/Readme.php
similarity index 100%
rename from lib/Michelf/extra/Readme.php
rename to lib/Michelf/lib/extra/Readme.php
diff --git a/lib/Michelf/extra/composer.json b/lib/Michelf/lib/extra/composer.json
similarity index 100%
rename from lib/Michelf/extra/composer.json
rename to lib/Michelf/lib/extra/composer.json
diff --git a/lib/Michelf/lib_michelf.php b/lib/Michelf/lib_michelf.php
new file mode 100644
index 0000000..8d53c0f
--- /dev/null
+++ b/lib/Michelf/lib_michelf.php
@@ -0,0 +1,10 @@
+<?php
+namespace LIB;
+class lib_michelf extends \LIB\lib_php{
+    public static function get_class($params = null){
+        return self::class;}
+        
+    public static function php_autoload(){
+        \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/lib','Michelf');
+        return true;}
+}
diff --git a/lib/autoload.inc b/lib/autoload.inc
index 0057f5e..957eb65 100644
--- a/lib/autoload.inc
+++ b/lib/autoload.inc
@@ -1,2 +1,3 @@
 <?php
-\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/Michelf','Michelf');
\ No newline at end of file
+\SYSTEM\autoload::registerFolder(dirname(__FILE__),'LIB');
+require_once dirname(__FILE__).'/Michelf/autoload.inc';
\ No newline at end of file
diff --git a/lib/lib.php b/lib/lib.php
new file mode 100644
index 0000000..b08181c
--- /dev/null
+++ b/lib/lib.php
@@ -0,0 +1,18 @@
+<?php
+namespace LIB;
+abstract class lib {
+    public static function php(){
+        if(!\method_exists(static::get_class(), 'php_autoload')){
+            throw new \SYSTEM\LOG\ERROR('Function php_autoload not implemented in '.static::get_class());}
+        return static::php_autoload();}
+    public static function css(){
+         if(!\method_exists(static::get_class(), 'css_path')){
+            throw new \SYSTEM\LOG\ERROR('Function css_path not implemented in '.static::get_class());}
+        return static::css_path(); //use tpl here? yes? any negative effex?
+    }
+    public static function js(){
+         if(!\method_exists(static::get_class(), 'js_path')){
+            throw new \SYSTEM\LOG\ERROR('Function js_path not implemented in '.static::get_class());}
+        return static::js_path();
+    }
+}
\ No newline at end of file
diff --git a/lib/lib_controll.php b/lib/lib_controll.php
new file mode 100644
index 0000000..192951c
--- /dev/null
+++ b/lib/lib_controll.php
@@ -0,0 +1,17 @@
+<?php
+namespace LIB;
+class lib_controll {
+    private static $libs = array();
+    private static function check_lib($lib){
+        if( !\class_exists($lib) ||
+            !\is_array($parents = \class_parents($lib)) ||
+            !\array_search('LIB\lib', $parents)){
+            return false;}
+        return true;}
+        
+    public static function register($classname){
+        if(!self::check_lib($classname)){
+            throw new \SYSTEM\LOG\ERROR('Problem with your lib class: '.$classname.'; it might not be available or inherits from the wrong class!');}
+        array_push(self::$libs,$classname);
+    }
+}
\ No newline at end of file
diff --git a/lib/lib_css.php b/lib/lib_css.php
new file mode 100644
index 0000000..0510822
--- /dev/null
+++ b/lib/lib_css.php
@@ -0,0 +1,5 @@
+<?php
+namespace LIB;
+abstract class lib_css extends lib{
+    protected static abstract function css_path(); //css webpath
+}
\ No newline at end of file
diff --git a/lib/lib_js.php b/lib/lib_js.php
new file mode 100644
index 0000000..4bf71ae
--- /dev/null
+++ b/lib/lib_js.php
@@ -0,0 +1,5 @@
+<?php
+namespace LIB;
+abstract class lib_js extends lib{
+    protected static function js_path(){} //js webpath
+}
\ No newline at end of file
diff --git a/lib/lib_jscss.php b/lib/lib_jscss.php
new file mode 100644
index 0000000..e250a2b
--- /dev/null
+++ b/lib/lib_jscss.php
@@ -0,0 +1,6 @@
+<?php
+namespace LIB;
+abstract class lib_jscss extends lib{
+    protected static abstract function js_path();
+    protected static abstract function css_path();
+}
\ No newline at end of file
diff --git a/lib/lib_php.php b/lib/lib_php.php
new file mode 100644
index 0000000..53785ee
--- /dev/null
+++ b/lib/lib_php.php
@@ -0,0 +1,8 @@
+<?php
+namespace LIB;
+//dont use system paths? for php yes - for js css not possibledue webpath -> PLIB object?
+//or mask all paths using api
+abstract class lib_php extends lib{
+    protected static function php_autoload(){} //autload magic? require_once lib\autoload.inc -> should do the trick -> do that in lib
+}
+
diff --git a/sai/modules/saimod_sys_docu/saimod_sys_docu.php b/sai/modules/saimod_sys_docu/saimod_sys_docu.php
index 9ec4c5d..a670459 100644
--- a/sai/modules/saimod_sys_docu/saimod_sys_docu.php
+++ b/sai/modules/saimod_sys_docu/saimod_sys_docu.php
@@ -25,6 +25,7 @@ class saimod_sys_docu extends \SYSTEM\SAI\SaiModule {
     }
     
     public static function sai_mod__SYSTEM_SAI_saimod_sys_docu_action_doc($cat = 'System',$doc = '1_system_md'){
+        \LIB\lib_michelf::php();
         $document = \SYSTEM\DOCU\docu::getDocuments()[$cat];
         foreach($document as $docu){
             if(str_replace(array('.',' ','\\','/'), '_', basename($docu)) == $doc){
diff --git a/sai/sai/sai.php b/sai/sai/sai.php
index 9c4cad9..4be260e 100644
--- a/sai/sai/sai.php
+++ b/sai/sai/sai.php
@@ -16,15 +16,15 @@ class sai {
         
     public static function register_start($module){
         if(!self::check_module($module)){
-            throw new \SYSTEM\LOG\ERROR('Problem with your Sysmodule class: '.$module);}
+            throw new \SYSTEM\LOG\ERROR('Problem with your Sysmodule class: '.$module.'; it might not be available or inherits from the wrong class!');}
         self::$module_start = $module;}    
     public static function register($module){
         if(!self::check_module($module)){
-            throw new \SYSTEM\LOG\ERROR('Problem with your Sysmodule class: '.$module);}
+            throw new \SYSTEM\LOG\ERROR('Problem with your Sysmodule class: '.$module.'; it might not be available or inherits from the wrong class!');}
         array_push(self::$modules,$module);}
     public static function register_sys($module){
         if(!self::check_module($module)){
-            throw new \SYSTEM\LOG\ERROR('Problem with your Sysmodule class: '.$module);}
+            throw new \SYSTEM\LOG\ERROR('Problem with your Sysmodule class: '.$module.'; it might not be available or inherits from the wrong class!');}
         array_push(self::$modules_sys,$module);}    
 
     public static function getStartModule(){