included system reference, made it work(not rly) -> requires extensive text and tag rework

This commit is contained in:
Ulf Gebhardt 2015-05-20 15:28:42 +02:00
parent 2743beba44
commit 7cbc9cee55
9 changed files with 28 additions and 53 deletions

3
.gitmodules vendored Normal file
View File

@ -0,0 +1,3 @@
[submodule "lib/system"]
path = lib/system
url = git@mojotrollz.eu:system.git

View File

@ -1,9 +1,9 @@
<?php
require_once 'system/autoload.inc.php'; //SYSTEM Classes
require_once 'neopolimatrix/autoload.inc'; //Project Classes
require_once 'lib/system/autoload.inc'; //SYSTEM Classes
require_once 'neopolimatrix/autoload.inc'; //Project Classes
require_once '/home/web/web/config/get_config.php';
require_once 'config.php';
SYSTEM\system::start($neopolimatrix_config);
\SYSTEM\system::start(\WEBCRAFT\get_config(dirname(__FILE__)));
\SYSTEM\system::include_ExceptionShortcut();
\SYSTEM\system::include_ResultShortcut();
\SYSTEM\system::register_errorhandler_dbwriter();

View File

@ -1,18 +0,0 @@
<?php
$neopolimatrix_config=array(array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_ERRORREPORTING, E_ALL | E_STRICT),
array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL, 'http://www.neopolimatrix.eu/'),
array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEPATH, '/home/web/webdir/Neopolimatrix/'),
array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_TYPE, \SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_TYPE_MYS),
array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_HOST, '127.0.0.1'),
array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_PORT, ''),
array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_USER, 'mojotrolls_mysql'),
array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_PASSWORD, 'dajsabeaisvd345'),
array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_DBNAME, 'host_neopolimatrix'),
array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_NAVIMG, '/web/system/sai/page/img/logo.png'),//not working, cuz paths are not set yet! \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'page/default_page/img/logo.png')),
array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_BASEURL, 'http://www.neopolimatrix.eu/sai.php?'),
array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_TITLE, 'Neopolimatrix - Admin Bereich'),
array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_COPYRIGHT, '<a href="http://www.neopolimatrix.eu/" target="_blank"></a> &copy; WebCraft Media 2013'),
array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_SYSTEMPATHREL, 'system/'),
array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_LANGS, array('deDE')),
array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_LANG, 'deDE'),
array(\SYSTEM\CONFIG\config_ids::SYS_CRON_LOG2SQLITE_PATH, '/home/web/webdir/Neopolimatrix/neopolimatrix/files/log/'));

View File

@ -1,13 +1,13 @@
<?php
require_once 'system/autoload.inc.php'; //SYSTEM Classes
require_once 'neopolimatrix/autoload.inc'; //Project Classes
require_once 'lib/system/autoload.inc'; //SYSTEM Classes
require_once 'neopolimatrix/autoload.inc'; //Project Classes
require_once '/home/web/web/config/get_config.php';
require_once 'config.php';
\SYSTEM\system::start($neopolimatrix_config);
\SYSTEM\system::start(\WEBCRAFT\get_config(dirname(__FILE__)));
\SYSTEM\system::include_ExceptionShortcut();
\SYSTEM\system::include_ResultShortcut();
\SYSTEM\system::register_errorhandler_dbwriter();
\SYSTEM\system::register_errorhandler_jsonoutput();
echo \SYSTEM\API\api::run('\SYSTEM\API\verify', 'page_neopolimatrix', array_merge($_POST,$_GET), 1, true, true)->html();
echo \SYSTEM\API\api::run('\SYSTEM\API\verify', 'page_neopolimatrix', array_merge($_POST,$_GET), 1, true, true);
new \SYSTEM\LOG\COUNTER("Page was called sucessfully.");

1
lib/system Submodule

@ -0,0 +1 @@
Subproject commit 90ce83ba36c6081b1395b555575260cb13358693

View File

@ -19,21 +19,12 @@ class default_page extends \SYSTEM\PAGE\Page {
'<link href="'.SYSTEM\WEBPATH(new PLIB(),'bootstrap/css/bootstrap-responsive.min.css').'" rel="stylesheet">';
}
/*public function generate_elementlist(){
$result = '';
$elements = elements::getAllElementsOfTag('%');
foreach($elements as $element){
$element['title'] = $element['id'];
$result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/tpl/element.tpl'), $element);
}
return $result;
}*/
public function html(){
$vars = array();
$vars['js'] = $this->js();
public function html($_escaped_fragment_ = NULL){
$vars = array();
$vars['js'] = '';
if(!$_escaped_fragment_){
$vars['js'] = $this->js();}
$vars['css'] = $this->css();
//$vars['content'] = $this->generate_elementlist();
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/tpl/default_page.tpl'), $vars);
}
}

View File

@ -1,20 +1,19 @@
<?php
class page_neopolimatrix extends \SYSTEM\API\api_default {
public static function default_page(){
return new default_page();}
public static function default_page($_escaped_fragment_ = NULL){
return (new default_page())->html($_escaped_fragment_);}
public static function page_list($filter=1){
return new default_list($filter);}
return (new default_list($filter))->html();}
public static function page_article($id){
return new default_article($id);}
return (new default_article($id))->html();}
public static function page_search($param){
new SYSTEM\LOG\INFO($param);
return new default_search($param);}
return (new default_search($param))->html();}
public static function page_impressum(){
return new default_impressum();}
return (new default_impressum())->html();}
}

View File

@ -1,9 +1,9 @@
<?php
require_once 'system/autoload.inc.php'; //SYSTEM Classes
require_once 'neopolimatrix/autoload.inc'; //Project Classes
require_once 'lib/system/autoload.inc'; //SYSTEM Classes
require_once 'neopolimatrix/autoload.inc'; //Project Classes
require_once '/home/web/web/config/get_config.php';
require_once 'config.php'; //Server config
SYSTEM\system::start($neopolimatrix_config); //Start System time + config
\SYSTEM\system::start(\WEBCRAFT\get_config(dirname(__FILE__)));
SYSTEM\system::include_ExceptionShortcut(); //allow ERROR() instead of \SYSTEM\LOG\ERROR()
SYSTEM\system::include_ResultShortcut(); //allow JsonResult() instead of \SYSTEM\LOG\JsonResult()
SYSTEM\system::register_errorhandler_dbwriter(); //write errors to database (must be first errorhandler to register)

1
system

@ -1 +0,0 @@
Subproject commit 5ebb40d49d315440680f19430f3d50790736ba0b