From e68c4fed17636ed65ea5efc8fc6e9960884443f8 Mon Sep 17 00:00:00 2001 From: rylon Date: Thu, 16 May 2013 20:37:28 +0200 Subject: [PATCH] sai now in a working state --- sai/autoload.inc.php | 8 +- sai/modules/badge_creator/badgecreator.js | 151 ------------ sai/modules/badge_creator/badgecreator.tpl | 128 ---------- .../saimod_dasense_badge_creator.php | 15 -- sai/modules/register_modules.php | 20 +- sai/modules/saimod_dasense_api_reference.php | 10 - .../saimod_dasense_bonusarea_creator.php | 10 - sai/modules/saimod_dasense_monitoring.php | 10 - sai/modules/saimod_dasense_push_message.php | 10 - sai/modules/saimod_dasense_text_handler.php | 10 - sai/modules/saimod_sys_api.php | 95 -------- sai/modules/saimod_sys_docu.php | 10 - sai/modules/saimod_sys_error.php | 10 - .../saimod_sys_error/saimod_sys_error.php | 41 ++++ sai/modules/saimod_sys_login/login.tpl | 18 ++ .../saimod_sys_login/login_success.tpl | 1 + .../saimod_sys_login/saimod_sys_login.php | 19 ++ sai/modules/saimod_sys_page.php | 10 - sai/modules/saimod_sys_sai/carousel.tpl | 58 +++++ sai/modules/saimod_sys_sai/saimod_sys_sai.php | 10 + sai/modules/saimod_sys_security.php | 10 - sai/modules/saimod_sys_sys.php | 10 - sai/page/default_module/default_module.php | 26 +++ sai/page/default_page/default_page.php | 54 ++--- sai/page/default_page/js/index.js | 2 +- .../modules/apireference/account/login.html | 65 ------ .../modules/apireference/account/push.html | 64 ----- .../apireference/account/registration.html | 64 ----- .../apireference/data/acquisition.html | 64 ----- .../modules/apireference/data/series.html | 64 ----- .../apireference/incentive/achievements.html | 64 ----- .../apireference/incentive/badges.html | 64 ----- .../apireference/incentive/bonusareas.html | 64 ----- .../apireference/incentive/ranking.html | 64 ----- .../apireference/incentive/statistics.html | 64 ----- .../apireference/incentive/titles.html | 64 ----- .../modules/apireference/main.html | 58 ----- .../apireference/overview/request.html | 64 ----- .../apireference/overview/response.html | 64 ----- .../apireference/overview/statuscode.html | 64 ----- .../modules/bonusareacreator/main.html | 110 --------- .../modules/documentation/client/empty.html | 14 -- .../modules/documentation/main.html | 48 ---- .../documentation/server/architecture.html | 3 - .../modules/documentation/server/barea.html | 29 --- .../documentation/server/database.html | 78 ------- .../documentation/server/incentive.html | 220 ------------------ .../modules/documentation/server/nodejs.html | 62 ----- .../modules/documentation/server/push.html | 67 ------ .../modules/documentation/server/queue.html | 60 ----- .../default_page/modules/monitoring/main.html | 73 ------ .../modules/pushmessage/main.html | 148 ------------ .../modules/texthandler/export.html | 25 -- .../modules/texthandler/import.html | 45 ---- .../modules/texthandler/main.html | 28 --- sai/page/login_page/login.tpl | 45 ---- sai/page/login_page/login_page.php | 24 -- sai/sai/SaiModule.php | 8 +- sai/sai/sai.php | 2 +- sai/sai/saigui.php | 13 +- 60 files changed, 212 insertions(+), 2591 deletions(-) delete mode 100644 sai/modules/badge_creator/badgecreator.js delete mode 100644 sai/modules/badge_creator/badgecreator.tpl delete mode 100644 sai/modules/badge_creator/saimod_dasense_badge_creator.php delete mode 100644 sai/modules/saimod_dasense_api_reference.php delete mode 100644 sai/modules/saimod_dasense_bonusarea_creator.php delete mode 100644 sai/modules/saimod_dasense_monitoring.php delete mode 100644 sai/modules/saimod_dasense_push_message.php delete mode 100644 sai/modules/saimod_dasense_text_handler.php delete mode 100644 sai/modules/saimod_sys_api.php delete mode 100644 sai/modules/saimod_sys_docu.php delete mode 100644 sai/modules/saimod_sys_error.php create mode 100644 sai/modules/saimod_sys_error/saimod_sys_error.php create mode 100644 sai/modules/saimod_sys_login/login.tpl create mode 100644 sai/modules/saimod_sys_login/login_success.tpl create mode 100644 sai/modules/saimod_sys_login/saimod_sys_login.php delete mode 100644 sai/modules/saimod_sys_page.php create mode 100644 sai/modules/saimod_sys_sai/carousel.tpl create mode 100644 sai/modules/saimod_sys_sai/saimod_sys_sai.php delete mode 100644 sai/modules/saimod_sys_security.php delete mode 100644 sai/modules/saimod_sys_sys.php create mode 100644 sai/page/default_module/default_module.php delete mode 100644 sai/page/default_page/modules/apireference/account/login.html delete mode 100644 sai/page/default_page/modules/apireference/account/push.html delete mode 100644 sai/page/default_page/modules/apireference/account/registration.html delete mode 100644 sai/page/default_page/modules/apireference/data/acquisition.html delete mode 100644 sai/page/default_page/modules/apireference/data/series.html delete mode 100644 sai/page/default_page/modules/apireference/incentive/achievements.html delete mode 100644 sai/page/default_page/modules/apireference/incentive/badges.html delete mode 100644 sai/page/default_page/modules/apireference/incentive/bonusareas.html delete mode 100644 sai/page/default_page/modules/apireference/incentive/ranking.html delete mode 100644 sai/page/default_page/modules/apireference/incentive/statistics.html delete mode 100644 sai/page/default_page/modules/apireference/incentive/titles.html delete mode 100644 sai/page/default_page/modules/apireference/main.html delete mode 100644 sai/page/default_page/modules/apireference/overview/request.html delete mode 100644 sai/page/default_page/modules/apireference/overview/response.html delete mode 100644 sai/page/default_page/modules/apireference/overview/statuscode.html delete mode 100644 sai/page/default_page/modules/bonusareacreator/main.html delete mode 100644 sai/page/default_page/modules/documentation/client/empty.html delete mode 100644 sai/page/default_page/modules/documentation/main.html delete mode 100644 sai/page/default_page/modules/documentation/server/architecture.html delete mode 100644 sai/page/default_page/modules/documentation/server/barea.html delete mode 100644 sai/page/default_page/modules/documentation/server/database.html delete mode 100644 sai/page/default_page/modules/documentation/server/incentive.html delete mode 100644 sai/page/default_page/modules/documentation/server/nodejs.html delete mode 100644 sai/page/default_page/modules/documentation/server/push.html delete mode 100644 sai/page/default_page/modules/documentation/server/queue.html delete mode 100644 sai/page/default_page/modules/monitoring/main.html delete mode 100644 sai/page/default_page/modules/pushmessage/main.html delete mode 100644 sai/page/default_page/modules/texthandler/export.html delete mode 100644 sai/page/default_page/modules/texthandler/import.html delete mode 100644 sai/page/default_page/modules/texthandler/main.html delete mode 100644 sai/page/login_page/login.tpl delete mode 100644 sai/page/login_page/login_page.php diff --git a/sai/autoload.inc.php b/sai/autoload.inc.php index 5967e04..41ec887 100644 --- a/sai/autoload.inc.php +++ b/sai/autoload.inc.php @@ -5,9 +5,13 @@ $autoload->registerFolder(dirname(__FILE__).'/sai','SYSTEM\SAI'); $autoload->registerFolder(dirname(__FILE__).'/page','SYSTEM\SAI'); $autoload->registerFolder(dirname(__FILE__).'/page/default_page','SYSTEM\SAI'); -$autoload->registerFolder(dirname(__FILE__).'/page/login_page','SYSTEM\SAI'); +$autoload->registerFolder(dirname(__FILE__).'/page/default_module','SYSTEM\SAI'); +//$autoload->registerFolder(dirname(__FILE__).'/page/login_page','SYSTEM\SAI'); $autoload->registerFolder(dirname(__FILE__).'/modules','SYSTEM\SAI'); -$autoload->registerFolder(dirname(__FILE__).'/modules/badge_creator','SYSTEM\SAI'); +$autoload->registerFolder(dirname(__FILE__).'/modules/saimod_sys_sai','SYSTEM\SAI'); +$autoload->registerFolder(dirname(__FILE__).'/modules/saimod_sys_login','SYSTEM\SAI'); +$autoload->registerFolder(dirname(__FILE__).'/modules/saimod_sys_error','SYSTEM\SAI'); +//$autoload->registerFolder(dirname(__FILE__).'/modules/badge_creator','SYSTEM\SAI'); require_once dirname(__FILE__).'/modules/register_modules.php'; \ No newline at end of file diff --git a/sai/modules/badge_creator/badgecreator.js b/sai/modules/badge_creator/badgecreator.js deleted file mode 100644 index 94c1cd2..0000000 --- a/sai/modules/badge_creator/badgecreator.js +++ /dev/null @@ -1,151 +0,0 @@ - - -/* global variables */ - -var fill = "#c7cee0"; -var stroke = "#112761"; -var strokeWidth = 0.7; -var shape = "circle"; // shield,circle -var icon = "dasense/page/default_developer/icons/red_dark/xhdpi/ic_action_achievement.png"; - -var iconX = 19; -var iconY = 20; - - -/* jQuery on document ready */ - -$(document).ready(function() { - - $("input[name=background-color]").val(fill); - $("input[name=stroke-color]").val(stroke); - $("input[name=stroke-width]").val(strokeWidth); - $("input[name=file-url]").val(icon); - $("input[name=iconx]").val(iconX); - $("input[name=icony]").val(iconY); - $("input[name=shape]").filter("[value="+shape+"]").attr('checked', true); - - drawBadge(); - - $("form input").change(function() { - updateValues(); - drawBadge(); - }); - - $("form .btn-submit").click(function() { - updateValues(); - drawBadge(); - }); - -}); - -function updateValues() { - fill = $("input[name=background-color]").val(); - stroke = $("input[name=stroke-color]").val(); - strokeWidth = $("input[name=stroke-width]").val(); - shape = $("input[name=shape]:checked").val(); - icon = $("input[name=file-url]").val(); - iconX = $("input[name=iconx]").val(); - iconY = $("input[name=icony]").val(); -} - -function drawBadge() { - var c = $("#badge")[0]; - var ctx = c.getContext("2d"); - - if(shape == 'shield') { - //iconY = 30; - //iconY = parseInt(iconY) + 10; - drawShield(ctx); - } - else if (shape == 'circle') { - //iconY = 20; - //iconY = parseInt(iconY) - 10; - strokeWidth *= 12; - drawCircle(ctx); - strokeWidth /= 12; - } - - $("input[name=iconx]").val(iconX); - $("input[name=icony]").val(iconY); - - var img = new Image(); - img.onload = function() { - ctx.drawImage(img, iconX, iconY); - onFinish(); - } - img.src = icon; -} - -function onFinish() { - var c = $("#badge")[0]; - var ctx = c.getContext("2d"); - ctx.restore(); - ctx.restore(); - ctx.save(); - $("a.btn-submit").attr('href', c.toDataURL()); -} - -function drawShield(ctx) { - ctx.canvas.height = 120; - ctx.canvas.width = 105; - clearCanvas(ctx); - ctx.save(); - ctx.beginPath(); - ctx.moveTo(0,0); - ctx.lineTo(543,0); - ctx.lineTo(543,623); - ctx.lineTo(0,623); - ctx.closePath(); - ctx.clip(); - ctx.translate(0,-5); - ctx.scale(12,12); - ctx.save(); - ctx.fillStyle = fill; - ctx.beginPath(); - ctx.moveTo(4.25,1.34); - //ctx.bezierCurveTo(2.9985,1.7142367,1.747,2.0902233,0.4955,2.46621); - //ctx.bezierCurveTo(0.58758835,5.2587502,1.2884488,8.6654921,4.25,9.66175); - //ctx.bezierCurveTo(7.2442172,8.6940151,7.8773651,5.2291438,8.0045,2.46621); - //ctx.bezierCurveTo(6.753,2.0902233,5.5015,1.7142367,4.25,1.33825); - ctx.bezierCurveTo(3,1.7,1.75,2,0.5,2.5); - ctx.bezierCurveTo(0.6,5.26,1.29,8.67,4.25,9.66); - ctx.bezierCurveTo(7.24,8.69,7.88,5.23,8,2.47); - ctx.bezierCurveTo(6.75,2,5.5,1.71,4.25,1.34); - ctx.closePath(); - ctx.fill(); - ctx.strokeStyle = stroke; - ctx.lineWidth = strokeWidth; - ctx.stroke(); - ctx.restore(); - ctx.restore(); - } - - function drawCircle(ctx) { - ctx.canvas.height = 100; - clearCanvas(ctx); - ctx.save(); - //ctx.translate(20,0); - ctx.beginPath(); - ctx.arc(50,50,40,0,2*Math.PI); - ctx.fillStyle = fill; - ctx.fill(); - ctx.strokeStyle = stroke; - ctx.lineWidth = strokeWidth; - ctx.stroke(); - ctx.restore(); - ctx.restore(); - } - - function clearCanvas(ctx) { - var c = $("#badge")[0]; - // Store the current transformation matrix - ctx.save(); - - // Use the identity matrix while clearing the canvas - ctx.setTransform(1, 0, 0, 1, 0, 0); - ctx.clearRect(0, 0, c.width, c.height); - - // Restore the transform - ctx.restore(); - } - diff --git a/sai/modules/badge_creator/badgecreator.tpl b/sai/modules/badge_creator/badgecreator.tpl deleted file mode 100644 index 37efd44..0000000 --- a/sai/modules/badge_creator/badgecreator.tpl +++ /dev/null @@ -1,128 +0,0 @@ - - - - - Badge Creator - - - - - - - - - - - - -
- -
- -

Badge Creator 1.0

-
- -
- -
-
-
- Design - - - -
-
-
- - -
-
- - -
-
- - -
-
- Icon - - - e.g. icons/red_dark/xhdpi/ic_action_achievement.png -
-
- - -
-
- - -
-
-
-
-
- Preview - -
-
-
-
- Download -

- Right-click → Save Link as -

-
- -
- - ${js} - - - diff --git a/sai/modules/badge_creator/saimod_dasense_badge_creator.php b/sai/modules/badge_creator/saimod_dasense_badge_creator.php deleted file mode 100644 index 30fdbf8..0000000 --- a/sai/modules/badge_creator/saimod_dasense_badge_creator.php +++ /dev/null @@ -1,15 +0,0 @@ -'. - '';} - public static function html_css(){return '';} - public static function html_content(){ - return \SYSTEM\PAGE\replace::replaceFile( \SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'sai/modules/badge_creator/badgecreator.tpl'), - array( 'js' => self::html_js()));} - public static function html_li_menu(){return '
  • Badge Creator
    • ';} -} \ No newline at end of file diff --git a/sai/modules/register_modules.php b/sai/modules/register_modules.php index 706b7a8..7269a88 100644 --- a/sai/modules/register_modules.php +++ b/sai/modules/register_modules.php @@ -1,16 +1,10 @@ register('\SYSTEM\SAI\saimod_sys_sys'); -\SYSTEM\SAI\sai::getInstance()->register('\SYSTEM\SAI\saimod_sys_api'); -\SYSTEM\SAI\sai::getInstance()->register('\SYSTEM\SAI\saimod_sys_page'); +\SYSTEM\SAI\sai::getInstance()->register('\SYSTEM\SAI\saimod_sys_sai'); +\SYSTEM\SAI\sai::getInstance()->register('\SYSTEM\SAI\saimod_sys_login'); \SYSTEM\SAI\sai::getInstance()->register('\SYSTEM\SAI\saimod_sys_error'); -\SYSTEM\SAI\sai::getInstance()->register('\SYSTEM\SAI\saimod_sys_security'); -\SYSTEM\SAI\sai::getInstance()->register('\SYSTEM\SAI\saimod_sys_docu'); - -//TODO extern, namespace -\SYSTEM\SAI\sai::getInstance()->register('\SYSTEM\SAI\saimod_dasense_api_reference'); -\SYSTEM\SAI\sai::getInstance()->register('\SYSTEM\SAI\saimod_dasense_badge_creator'); -\SYSTEM\SAI\sai::getInstance()->register('\SYSTEM\SAI\saimod_dasense_bonusarea_creator'); -\SYSTEM\SAI\sai::getInstance()->register('\SYSTEM\SAI\saimod_dasense_monitoring'); -\SYSTEM\SAI\sai::getInstance()->register('\SYSTEM\SAI\saimod_dasense_push_message'); -\SYSTEM\SAI\sai::getInstance()->register('\SYSTEM\SAI\saimod_dasense_text_handler'); \ No newline at end of file +//\SYSTEM\SAI\sai::getInstance()->register('\SYSTEM\SAI\saimod_sys_sys'); +//\SYSTEM\SAI\sai::getInstance()->register('\SYSTEM\SAI\saimod_sys_api'); +//\SYSTEM\SAI\sai::getInstance()->register('\SYSTEM\SAI\saimod_sys_page'); +//\SYSTEM\SAI\sai::getInstance()->register('\SYSTEM\SAI\saimod_sys_security'); +//\SYSTEM\SAI\sai::getInstance()->register('\SYSTEM\SAI\saimod_sys_docu'); \ No newline at end of file diff --git a/sai/modules/saimod_dasense_api_reference.php b/sai/modules/saimod_dasense_api_reference.php deleted file mode 100644 index d1f196a..0000000 --- a/sai/modules/saimod_dasense_api_reference.php +++ /dev/null @@ -1,10 +0,0 @@ -API Reference';} -} \ No newline at end of file diff --git a/sai/modules/saimod_dasense_bonusarea_creator.php b/sai/modules/saimod_dasense_bonusarea_creator.php deleted file mode 100644 index 2f565df..0000000 --- a/sai/modules/saimod_dasense_bonusarea_creator.php +++ /dev/null @@ -1,10 +0,0 @@ -BonusArea Creator';} -} \ No newline at end of file diff --git a/sai/modules/saimod_dasense_monitoring.php b/sai/modules/saimod_dasense_monitoring.php deleted file mode 100644 index d092a16..0000000 --- a/sai/modules/saimod_dasense_monitoring.php +++ /dev/null @@ -1,10 +0,0 @@ -Monitoring';} -} \ No newline at end of file diff --git a/sai/modules/saimod_dasense_push_message.php b/sai/modules/saimod_dasense_push_message.php deleted file mode 100644 index 2bb64fe..0000000 --- a/sai/modules/saimod_dasense_push_message.php +++ /dev/null @@ -1,10 +0,0 @@ -Push Message';} -} \ No newline at end of file diff --git a/sai/modules/saimod_dasense_text_handler.php b/sai/modules/saimod_dasense_text_handler.php deleted file mode 100644 index aff5b32..0000000 --- a/sai/modules/saimod_dasense_text_handler.php +++ /dev/null @@ -1,10 +0,0 @@ -Text Handler';} -} \ No newline at end of file diff --git a/sai/modules/saimod_sys_api.php b/sai/modules/saimod_sys_api.php deleted file mode 100644 index 65d673a..0000000 --- a/sai/modules/saimod_sys_api.php +++ /dev/null @@ -1,95 +0,0 @@ -query('SELECT * FROM '.\DBD\APITable::NAME); - - $tree = array(); - while($row = $res->next()){ - $tree[] = $row;} - - $tree = self::buildTree($tree, -1); - - $html = self::htmltree($tree,'http://www.da-sense.de/test/api.php?'); - return $html; - } - - private static function htmlTree($tree,$url, $url_rec = null){ - /*echo "
    ";
-                    print_r($tree);
-                    echo "
    "; - die();*/ - $result = ''; - if( \is_array($tree) && - \count($tree) > 0 && - \is_array($tree['com'])){ - - foreach($tree['com'] as $root){ - //print_r($root); - $url_rec_new = ($root['node'][\DBD\APITable::FIELD_PARENTVALUE] ? $root['node'][\DBD\APITable::FIELD_PARENTVALUE].'&' : ''). - $root['node'][\DBD\APITable::FIELD_NAME].'='; - - //print_r($url_rec_new); - //echo '
    '; - - $result .= ''; - } - - } - - return $result; - } - - private static function buildTree($dbtree, $parentid){ - $result = array(); - foreach($dbtree as $node){ - if( $node[\DBD\APITable::FIELD_PARENTID] == $parentid && - (!$node[\DBD\APITable::FIELD_FLAG] || $node[\DBD\APITable::FIELD_ALLOWEDVALUES] == 'FLAG')){ - /*if($node[\DBD\APITable::FIELD_FLAG] && $node[\DBD\APITable::FIELD_ALLOWEDVALUES] != 'FLAG'){ - $result['par'][$node[\DBD\APITable::FIELD_PARENTVALUE]][] = $node; - } else { - $result['com'][] = array('tree' => self::buildTree($dbtree,$node[\DBD\APITable::FIELD_ID]),'node' => $node);}*/ - $pars = array(); - foreach($dbtree as $node2){ - if( $node2[\DBD\APITable::FIELD_PARENTID] == $node[\DBD\APITable::FIELD_ID] && - $node2[\DBD\APITable::FIELD_FLAG] && $node2[\DBD\APITable::FIELD_ALLOWEDVALUES] != 'FLAG'){ - $pars[$node2[\DBD\APITable::FIELD_PARENTVALUE]][] = $node2; - } - } - $result['com'][] = array('tree' => self::buildTree($dbtree,$node[\DBD\APITable::FIELD_ID]), - 'node' => $node, - 'par' => $pars); - } - } - - return $result; - } - - public static function html_li_menu(){return '
  • SYS API
    • ';} -} \ No newline at end of file diff --git a/sai/modules/saimod_sys_docu.php b/sai/modules/saimod_sys_docu.php deleted file mode 100644 index 3f2683c..0000000 --- a/sai/modules/saimod_sys_docu.php +++ /dev/null @@ -1,10 +0,0 @@ -Documentation';} -} \ No newline at end of file diff --git a/sai/modules/saimod_sys_error.php b/sai/modules/saimod_sys_error.php deleted file mode 100644 index da7d529..0000000 --- a/sai/modules/saimod_sys_error.php +++ /dev/null @@ -1,10 +0,0 @@ -SYS Error';} -} \ No newline at end of file diff --git a/sai/modules/saimod_sys_error/saimod_sys_error.php b/sai/modules/saimod_sys_error/saimod_sys_error.php new file mode 100644 index 0000000..c4ebfa3 --- /dev/null +++ b/sai/modules/saimod_sys_error/saimod_sys_error.php @@ -0,0 +1,41 @@ +query('SELECT * FROM system.sys_log ORDER BY time DESC LIMIT 100;'); + + + $now = microtime(true); + + $result = ''. + ''.''.''.''.''.''.''.''.''.''; + while($r = $res->next()){ + $result .= ''.''.''.''.''.''.''.''.''.''; + } + $result .= '
    '.'time ago in sec'.''.'time'.''.'class'.''.'message'.''.'code'.''.'file'.''.'line'.''.'ip'.''.'querytime'.'
    '.(int)($now - strtotime($r['time'])).''.$r['time'].''.$r['class'].''.$r['message'].''.$r['code'].''.$r['file'].''.$r['line'].''.$r['ip'].''.$r['querytime'].'
    '; + return $result; + + } + + private static function tablerow_class($class){ + switch($class){ + case 'SYSTEM\LOG\INFO': case 'INFO': + return 'success'; + case 'SYSTEM\LOG\DEPRECATED': case 'DEPRECATED': + return 'info'; + case 'SYSTEM\LOG\ERROR': case 'ERROR': + return 'error'; + case 'SYSTEM\LOG\WARNING': case 'WARNING': + return 'warning'; + default: + return ''; + } + } + + public static function html_li_menu(){return '
  • SYS Error
    • ';} + public static function right_public(){return false;} + public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\system::getSystemDBInfo(), \SYSTEM\SECURITY\RIGHTS::SYS_SAI);} +} \ No newline at end of file diff --git a/sai/modules/saimod_sys_login/login.tpl b/sai/modules/saimod_sys_login/login.tpl new file mode 100644 index 0000000..806f1a2 --- /dev/null +++ b/sai/modules/saimod_sys_login/login.tpl @@ -0,0 +1,18 @@ +Please login for developer access. +
    +${message} + +
    +
    + Login + + + + + + + + + +
    +
    \ No newline at end of file diff --git a/sai/modules/saimod_sys_login/login_success.tpl b/sai/modules/saimod_sys_login/login_success.tpl new file mode 100644 index 0000000..7268a0a --- /dev/null +++ b/sai/modules/saimod_sys_login/login_success.tpl @@ -0,0 +1 @@ +Login successful. \ No newline at end of file diff --git a/sai/modules/saimod_sys_login/saimod_sys_login.php b/sai/modules/saimod_sys_login/saimod_sys_login.php new file mode 100644 index 0000000..8b8dba4 --- /dev/null +++ b/sai/modules/saimod_sys_login/saimod_sys_login.php @@ -0,0 +1,19 @@ +SYS Login';} + public static function right_public(){return true;} + public static function right_right(){} +} \ No newline at end of file diff --git a/sai/modules/saimod_sys_page.php b/sai/modules/saimod_sys_page.php deleted file mode 100644 index 0c4b6eb..0000000 --- a/sai/modules/saimod_sys_page.php +++ /dev/null @@ -1,10 +0,0 @@ -SYS PAGE';} -} \ No newline at end of file diff --git a/sai/modules/saimod_sys_sai/carousel.tpl b/sai/modules/saimod_sys_sai/carousel.tpl new file mode 100644 index 0000000..6f596fa --- /dev/null +++ b/sai/modules/saimod_sys_sai/carousel.tpl @@ -0,0 +1,58 @@ +
    +

    Design.Simple.Fast.Reliable.Innovative.

    +

    We write awesome code.

    +
    +
    + \ No newline at end of file diff --git a/sai/modules/saimod_sys_sai/saimod_sys_sai.php b/sai/modules/saimod_sys_sai/saimod_sys_sai.php new file mode 100644 index 0000000..d78426b --- /dev/null +++ b/sai/modules/saimod_sys_sai/saimod_sys_sai.php @@ -0,0 +1,10 @@ +SYS SAI';} + public static function right_public(){return true;} + public static function right_right(){} +} \ No newline at end of file diff --git a/sai/modules/saimod_sys_security.php b/sai/modules/saimod_sys_security.php deleted file mode 100644 index 1fb6e8d..0000000 --- a/sai/modules/saimod_sys_security.php +++ /dev/null @@ -1,10 +0,0 @@ -SYS Security';} -} \ No newline at end of file diff --git a/sai/modules/saimod_sys_sys.php b/sai/modules/saimod_sys_sys.php deleted file mode 100644 index 15b5557..0000000 --- a/sai/modules/saimod_sys_sys.php +++ /dev/null @@ -1,10 +0,0 @@ -SYS';} -} \ No newline at end of file diff --git a/sai/page/default_module/default_module.php b/sai/page/default_module/default_module.php new file mode 100644 index 0000000..cf1eeef --- /dev/null +++ b/sai/page/default_module/default_module.php @@ -0,0 +1,26 @@ +module = $module; + $this->post_get = $post_get;} + + public function html(){ + if($this->module != null){ + $mods = \SYSTEM\SAI\sai::getInstance()->getModules(); + if( $this->module && + \array_search($this->module, $mods) !== false && + ( \call_user_func(array($this->module, 'right_public')) || + \call_user_func(array($this->module, 'right_right')))){ + return \call_user_func(array($this->module, 'html_content'),array($this->post_get));} + } + + return "Could not find Module"; + } +} \ No newline at end of file diff --git a/sai/page/default_page/default_page.php b/sai/page/default_page/default_page.php index 852da55..bd4fc76 100644 --- a/sai/page/default_page/default_page.php +++ b/sai/page/default_page/default_page.php @@ -3,54 +3,32 @@ namespace SYSTEM\SAI; class default_page extends \SYSTEM\PAGE\Page { - - private $module = NULL; - private $pg = NULL; - - public function __construct($module = NULL, $pg = NULL){ - $this->module = \str_replace('.', '\\', $module); - $this->pg = $pg;} - - private function menu(){ - $mods = \SYSTEM\SAI\sai::getInstance()->getModules(); + + private function menu(){ + $result = ''; - $result = '
  • SAI
    • '; - foreach($mods as $mod){ - $result .= \call_user_func(array($mod, 'html_li_menu'));} + $mods = \SYSTEM\SAI\sai::getInstance()->getModules(); + foreach($mods as $mod){ + if(\call_user_func(array($mod, 'right_public')) || + \call_user_func(array($mod, 'right_right'))){ + $result .= \call_user_func(array($mod, 'html_li_menu'));} + } return $result.''; } - private function content(){ - $mods = \SYSTEM\SAI\sai::getInstance()->getModules(); - if( $this->module && - \array_search($this->module, $mods) !== false){ - return \call_user_func(array($this->module, 'html_content'),array($this->pg));} - - return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'page/default_page/carousel.tpl'), array()); - } - private function css(){ $result = ''. - ''; - - $mods = \SYSTEM\SAI\sai::getInstance()->getModules(); - if( $this->module && - \array_search($this->module, $mods) !== false){ - $result .= \call_user_func(array($this->module, 'html_css'));} - + ''; return $result; } private function js(){ + //if(!\SYSTEM\SECURITY\Security::check(\SYSTEM\system::getSystemDBInfo() , \SYSTEM\SECURITY\RIGHTS::SYS_SAI)){ + // $login = new \SYSTEM\SAI\login_page(); + // return $login->html();} $result = ''. ''. ''; - - $mods = \SYSTEM\SAI\sai::getInstance()->getModules(); - if( $this->module && - \array_search($this->module, $mods) !== false){ - $result .= \call_user_func(array($this->module, 'html_js'));} - return $result; } @@ -62,11 +40,7 @@ class default_page extends \SYSTEM\PAGE\Page { $vars['menu'] = $this->menu(); $vars['navimg'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_NAVIMG); - - //TODO - new \SYSTEM\LOG\DEPRECATED(); - if($this->module != NULL){ - return $this->content();} + //$vars['PATH_IMG'] = SYSTEM\WEBPATH(new PPAGE(),'default_developer/img/'); //$vars['PATH_LIB'] = SYSTEM\WEBPATH(new PLIB()); diff --git a/sai/page/default_page/js/index.js b/sai/page/default_page/js/index.js index 34ac71a..ba1b17f 100644 --- a/sai/page/default_page/js/index.js +++ b/sai/page/default_page/js/index.js @@ -3,7 +3,7 @@ $(document).ready(function() { // initialize content - $('div#content-wrapper').load('./?action=developer&sai_mod=SAI', function() { + $('div#content-wrapper').load('./?action=developer&sai_mod=.SYSTEM.SAI.saimod_sys_sai', function() { $('.carousel').carousel(); }); diff --git a/sai/page/default_page/modules/apireference/account/login.html b/sai/page/default_page/modules/apireference/account/login.html deleted file mode 100644 index beb39ca..0000000 --- a/sai/page/default_page/modules/apireference/account/login.html +++ /dev/null @@ -1,65 +0,0 @@ -
    - Account: Login - ahfgjasdgh sdgs igh sdghso dghjsghjs ghoishg oij - shguioh sowigh sioghsiogh sdghisd ghsg sdbfhgsjdfhgaiosöhfgaOGasdg - asdgoshgdhsdghsudfzhgiedjhioerergr - herheioghweoirgöioeroihgeoi -

    -
    - 

    ?ctrl=account&mthd=login
    -
    -

    -

    Required parameters

    - - - - - - - - - - - - - - - - - - - - - - - - - -
    ParameterTypeDescription
    usernamestringUsername
    passwordSHA1(string)SHA1 encoded password
    pswdoldMD5(string)(Deprecated)
    - MD5 encoded password
    - -

    Optional parameters

    - - - - - - - - - - - - - - - -
    ParameterTypeDescription
    localestringUpdate user's default locale.
    - Available locales: [de,en] -
    - -
    -
    - Example -
    - diff --git a/sai/page/default_page/modules/apireference/account/push.html b/sai/page/default_page/modules/apireference/account/push.html deleted file mode 100644 index 9589076..0000000 --- a/sai/page/default_page/modules/apireference/account/push.html +++ /dev/null @@ -1,64 +0,0 @@ -
    - Account: Push Message - ahfgjasdgh sdgs igh sdghso dghjsghjs ghoishg oij - shguioh sowigh sioghsiogh sdghisd ghsg sdbfhgsjdfhgaiosöhfgaOGasdg - asdgoshgdhsdghsudfzhgiedjhioerergr - herheioghweoirgöioeroihgeoi -

    -
    - 

    ?ctrl=account&mthd=login
    -
    -

    -

    Required parameters

    - - - - - - - - - - - - - - - - - - - - - - - - - -
    ParameterTypeDescription
    usernamestringUsername
    passwordSHA1(string)SHA1 encoded password
    pswdoldMD5(string)(Deprecated)
    - MD5 encoded password
    - -

    Optional parameters

    - - - - - - - - - - - - - - - -
    ParameterTypeDescription
    localestringUpdate user's default locale.
    - Available locales: [de,en] -
    - -
    -
    - Example -
    \ No newline at end of file diff --git a/sai/page/default_page/modules/apireference/account/registration.html b/sai/page/default_page/modules/apireference/account/registration.html deleted file mode 100644 index 6a4e5cb..0000000 --- a/sai/page/default_page/modules/apireference/account/registration.html +++ /dev/null @@ -1,64 +0,0 @@ -
    - Account: Registration - ahfgjasdgh sdgs igh sdghso dghjsghjs ghoishg oij - shguioh sowigh sioghsiogh sdghisd ghsg sdbfhgsjdfhgaiosöhfgaOGasdg - asdgoshgdhsdghsudfzhgiedjhioerergr - herheioghweoirgöioeroihgeoi -

    -
    - 

    ?ctrl=account&mthd=login
    -
    -

    -

    Required parameters

    - - - - - - - - - - - - - - - - - - - - - - - - - -
    ParameterTypeDescription
    usernamestringUsername
    passwordSHA1(string)SHA1 encoded password
    pswdoldMD5(string)(Deprecated)
    - MD5 encoded password
    - -

    Optional parameters

    - - - - - - - - - - - - - - - -
    ParameterTypeDescription
    localestringUpdate user's default locale.
    - Available locales: [de,en] -
    - -
    -
    - Example -
    \ No newline at end of file diff --git a/sai/page/default_page/modules/apireference/data/acquisition.html b/sai/page/default_page/modules/apireference/data/acquisition.html deleted file mode 100644 index 71c5d74..0000000 --- a/sai/page/default_page/modules/apireference/data/acquisition.html +++ /dev/null @@ -1,64 +0,0 @@ -
    - Data: Upload - ahfgjasdgh sdgs igh sdghso dghjsghjs ghoishg oij - shguioh sowigh sioghsiogh sdghisd ghsg sdbfhgsjdfhgaiosöhfgaOGasdg - asdgoshgdhsdghsudfzhgiedjhioerergr - herheioghweoirgöioeroihgeoi -

    -
    - 

    ?ctrl=account&mthd=login
    -
    -

    -

    Required parameters

    - - - - - - - - - - - - - - - - - - - - - - - - - -
    ParameterTypeDescription
    usernamestringUsername
    passwordSHA1(string)SHA1 encoded password
    pswdoldMD5(string)(Deprecated)
    - MD5 encoded password
    - -

    Optional parameters

    - - - - - - - - - - - - - - - -
    ParameterTypeDescription
    localestringUpdate user's default locale.
    - Available locales: [de,en] -
    - -
    -
    - Example -
    \ No newline at end of file diff --git a/sai/page/default_page/modules/apireference/data/series.html b/sai/page/default_page/modules/apireference/data/series.html deleted file mode 100644 index 5e70890..0000000 --- a/sai/page/default_page/modules/apireference/data/series.html +++ /dev/null @@ -1,64 +0,0 @@ -
    - Data: Series - ahfgjasdgh sdgs igh sdghso dghjsghjs ghoishg oij - shguioh sowigh sioghsiogh sdghisd ghsg sdbfhgsjdfhgaiosöhfgaOGasdg - asdgoshgdhsdghsudfzhgiedjhioerergr - herheioghweoirgöioeroihgeoi -

    -
    - 

    ?ctrl=account&mthd=login
    -
    -

    -

    Required parameters

    - - - - - - - - - - - - - - - - - - - - - - - - - -
    ParameterTypeDescription
    usernamestringUsername
    passwordSHA1(string)SHA1 encoded password
    pswdoldMD5(string)(Deprecated)
    - MD5 encoded password
    - -

    Optional parameters

    - - - - - - - - - - - - - - - -
    ParameterTypeDescription
    localestringUpdate user's default locale.
    - Available locales: [de,en] -
    - -
    -
    - Example -
    \ No newline at end of file diff --git a/sai/page/default_page/modules/apireference/incentive/achievements.html b/sai/page/default_page/modules/apireference/incentive/achievements.html deleted file mode 100644 index 78c2138..0000000 --- a/sai/page/default_page/modules/apireference/incentive/achievements.html +++ /dev/null @@ -1,64 +0,0 @@ -
    - Incentive systems: Achievements - ahfgjasdgh sdgs igh sdghso dghjsghjs ghoishg oij - shguioh sowigh sioghsiogh sdghisd ghsg sdbfhgsjdfhgaiosöhfgaOGasdg - asdgoshgdhsdghsudfzhgiedjhioerergr - herheioghweoirgöioeroihgeoi -

    -
    - 

    ?ctrl=account&mthd=login
    -
    -

    -

    Required parameters

    - - - - - - - - - - - - - - - - - - - - - - - - - -
    ParameterTypeDescription
    usernamestringUsername
    passwordSHA1(string)SHA1 encoded password
    pswdoldMD5(string)(Deprecated)
    - MD5 encoded password
    - -

    Optional parameters

    - - - - - - - - - - - - - - - -
    ParameterTypeDescription
    localestringUpdate user's default locale.
    - Available locales: [de,en] -
    - -
    -
    - Example -
    \ No newline at end of file diff --git a/sai/page/default_page/modules/apireference/incentive/badges.html b/sai/page/default_page/modules/apireference/incentive/badges.html deleted file mode 100644 index e28cbc9..0000000 --- a/sai/page/default_page/modules/apireference/incentive/badges.html +++ /dev/null @@ -1,64 +0,0 @@ -
    - Incentive systems: Badges - ahfgjasdgh sdgs igh sdghso dghjsghjs ghoishg oij - shguioh sowigh sioghsiogh sdghisd ghsg sdbfhgsjdfhgaiosöhfgaOGasdg - asdgoshgdhsdghsudfzhgiedjhioerergr - herheioghweoirgöioeroihgeoi -

    -
    - 

    ?ctrl=account&mthd=login
    -
    -

    -

    Required parameters

    - - - - - - - - - - - - - - - - - - - - - - - - - -
    ParameterTypeDescription
    usernamestringUsername
    passwordSHA1(string)SHA1 encoded password
    pswdoldMD5(string)(Deprecated)
    - MD5 encoded password
    - -

    Optional parameters

    - - - - - - - - - - - - - - - -
    ParameterTypeDescription
    localestringUpdate user's default locale.
    - Available locales: [de,en] -
    - -
    -
    - Example -
    \ No newline at end of file diff --git a/sai/page/default_page/modules/apireference/incentive/bonusareas.html b/sai/page/default_page/modules/apireference/incentive/bonusareas.html deleted file mode 100644 index c67d3ed..0000000 --- a/sai/page/default_page/modules/apireference/incentive/bonusareas.html +++ /dev/null @@ -1,64 +0,0 @@ -
    - Incentive systems: Bonus Areas - ahfgjasdgh sdgs igh sdghso dghjsghjs ghoishg oij - shguioh sowigh sioghsiogh sdghisd ghsg sdbfhgsjdfhgaiosöhfgaOGasdg - asdgoshgdhsdghsudfzhgiedjhioerergr - herheioghweoirgöioeroihgeoi -

    -
    - 

    ?ctrl=account&mthd=login
    -
    -

    -

    Required parameters

    - - - - - - - - - - - - - - - - - - - - - - - - - -
    ParameterTypeDescription
    usernamestringUsername
    passwordSHA1(string)SHA1 encoded password
    pswdoldMD5(string)(Deprecated)
    - MD5 encoded password
    - -

    Optional parameters

    - - - - - - - - - - - - - - - -
    ParameterTypeDescription
    localestringUpdate user's default locale.
    - Available locales: [de,en] -
    - -
    -
    - Example -
    \ No newline at end of file diff --git a/sai/page/default_page/modules/apireference/incentive/ranking.html b/sai/page/default_page/modules/apireference/incentive/ranking.html deleted file mode 100644 index f418cbb..0000000 --- a/sai/page/default_page/modules/apireference/incentive/ranking.html +++ /dev/null @@ -1,64 +0,0 @@ -
    - Incentive systems: Ranking - ahfgjasdgh sdgs igh sdghso dghjsghjs ghoishg oij - shguioh sowigh sioghsiogh sdghisd ghsg sdbfhgsjdfhgaiosöhfgaOGasdg - asdgoshgdhsdghsudfzhgiedjhioerergr - herheioghweoirgöioeroihgeoi -

    -
    - 

    ?ctrl=account&mthd=login
    -
    -

    -

    Required parameters

    - - - - - - - - - - - - - - - - - - - - - - - - - -
    ParameterTypeDescription
    usernamestringUsername
    passwordSHA1(string)SHA1 encoded password
    pswdoldMD5(string)(Deprecated)
    - MD5 encoded password
    - -

    Optional parameters

    - - - - - - - - - - - - - - - -
    ParameterTypeDescription
    localestringUpdate user's default locale.
    - Available locales: [de,en] -
    - -
    -
    - Example -
    \ No newline at end of file diff --git a/sai/page/default_page/modules/apireference/incentive/statistics.html b/sai/page/default_page/modules/apireference/incentive/statistics.html deleted file mode 100644 index 7260d64..0000000 --- a/sai/page/default_page/modules/apireference/incentive/statistics.html +++ /dev/null @@ -1,64 +0,0 @@ -
    - Incentive systems: Statistics - ahfgjasdgh sdgs igh sdghso dghjsghjs ghoishg oij - shguioh sowigh sioghsiogh sdghisd ghsg sdbfhgsjdfhgaiosöhfgaOGasdg - asdgoshgdhsdghsudfzhgiedjhioerergr - herheioghweoirgöioeroihgeoi -

    -
    - 

    ?ctrl=account&mthd=login
    -
    -

    -

    Required parameters

    - - - - - - - - - - - - - - - - - - - - - - - - - -
    ParameterTypeDescription
    usernamestringUsername
    passwordSHA1(string)SHA1 encoded password
    pswdoldMD5(string)(Deprecated)
    - MD5 encoded password
    - -

    Optional parameters

    - - - - - - - - - - - - - - - -
    ParameterTypeDescription
    localestringUpdate user's default locale.
    - Available locales: [de,en] -
    - -
    -
    - Example -
    \ No newline at end of file diff --git a/sai/page/default_page/modules/apireference/incentive/titles.html b/sai/page/default_page/modules/apireference/incentive/titles.html deleted file mode 100644 index efad431..0000000 --- a/sai/page/default_page/modules/apireference/incentive/titles.html +++ /dev/null @@ -1,64 +0,0 @@ -
    - Incentive systems: Titles - ahfgjasdgh sdgs igh sdghso dghjsghjs ghoishg oij - shguioh sowigh sioghsiogh sdghisd ghsg sdbfhgsjdfhgaiosöhfgaOGasdg - asdgoshgdhsdghsudfzhgiedjhioerergr - herheioghweoirgöioeroihgeoi -

    -
    - 

    ?ctrl=account&mthd=login
    -
    -

    -

    Required parameters

    - - - - - - - - - - - - - - - - - - - - - - - - - -
    ParameterTypeDescription
    usernamestringUsername
    passwordSHA1(string)SHA1 encoded password
    pswdoldMD5(string)(Deprecated)
    - MD5 encoded password
    - -

    Optional parameters

    - - - - - - - - - - - - - - - -
    ParameterTypeDescription
    localestringUpdate user's default locale.
    - Available locales: [de,en] -
    - -
    -
    - Example -
    \ No newline at end of file diff --git a/sai/page/default_page/modules/apireference/main.html b/sai/page/default_page/modules/apireference/main.html deleted file mode 100644 index 173b61f..0000000 --- a/sai/page/default_page/modules/apireference/main.html +++ /dev/null @@ -1,58 +0,0 @@ - - - - - da_sense | REST API Reference 3.0 - - - - - - -
    -
    -

    REST API Reference 3.0

    -
    - -
    - -
    -
    -
    - - - -
    -
    -
    -
    -
    - - - - diff --git a/sai/page/default_page/modules/apireference/overview/request.html b/sai/page/default_page/modules/apireference/overview/request.html deleted file mode 100644 index f8a87cd..0000000 --- a/sai/page/default_page/modules/apireference/overview/request.html +++ /dev/null @@ -1,64 +0,0 @@ -
    - Overview: Request format - ahfgjasdgh sdgs igh sdghso dghjsghjs ghoishg oij - shguioh sowigh sioghsiogh sdghisd ghsg sdbfhgsjdfhgaiosöhfgaOGasdg - asdgoshgdhsdghsudfzhgiedjhioerergr - herheioghweoirgöioeroihgeoi -

    -
    - 

    ?ctrl=account&mthd=login
    -
    -

    -

    Required parameters

    - - - - - - - - - - - - - - - - - - - - - - - - - -
    ParameterTypeDescription
    usernamestringUsername
    passwordSHA1(string)SHA1 encoded password
    pswdoldMD5(string)(Deprecated)
    - MD5 encoded password
    - -

    Optional parameters

    - - - - - - - - - - - - - - - -
    ParameterTypeDescription
    localestringUpdate user's default locale.
    - Available locales: [de,en] -
    - -
    -
    - Example -
    \ No newline at end of file diff --git a/sai/page/default_page/modules/apireference/overview/response.html b/sai/page/default_page/modules/apireference/overview/response.html deleted file mode 100644 index b857647..0000000 --- a/sai/page/default_page/modules/apireference/overview/response.html +++ /dev/null @@ -1,64 +0,0 @@ -
    - Overview: Response format - ahfgjasdgh sdgs igh sdghso dghjsghjs ghoishg oij - shguioh sowigh sioghsiogh sdghisd ghsg sdbfhgsjdfhgaiosöhfgaOGasdg - asdgoshgdhsdghsudfzhgiedjhioerergr - herheioghweoirgöioeroihgeoi -

    -
    - 

    ?ctrl=account&mthd=login
    -
    -

    -

    Required parameters

    - - - - - - - - - - - - - - - - - - - - - - - - - -
    ParameterTypeDescription
    usernamestringUsername
    passwordSHA1(string)SHA1 encoded password
    pswdoldMD5(string)(Deprecated)
    - MD5 encoded password
    - -

    Optional parameters

    - - - - - - - - - - - - - - - -
    ParameterTypeDescription
    localestringUpdate user's default locale.
    - Available locales: [de,en] -
    - -
    -
    - Example -
    \ No newline at end of file diff --git a/sai/page/default_page/modules/apireference/overview/statuscode.html b/sai/page/default_page/modules/apireference/overview/statuscode.html deleted file mode 100644 index d523348..0000000 --- a/sai/page/default_page/modules/apireference/overview/statuscode.html +++ /dev/null @@ -1,64 +0,0 @@ -
    - Overview: Status codes - ahfgjasdgh sdgs igh sdghso dghjsghjs ghoishg oij - shguioh sowigh sioghsiogh sdghisd ghsg sdbfhgsjdfhgaiosöhfgaOGasdg - asdgoshgdhsdghsudfzhgiedjhioerergr - herheioghweoirgöioeroihgeoi -

    -
    - 

    ?ctrl=account&mthd=login
    -
    -

    -

    Required parameters

    - - - - - - - - - - - - - - - - - - - - - - - - - -
    ParameterTypeDescription
    usernamestringUsername
    passwordSHA1(string)SHA1 encoded password
    pswdoldMD5(string)(Deprecated)
    - MD5 encoded password
    - -

    Optional parameters

    - - - - - - - - - - - - - - - -
    ParameterTypeDescription
    localestringUpdate user's default locale.
    - Available locales: [de,en] -
    - -
    -
    - Example -
    \ No newline at end of file diff --git a/sai/page/default_page/modules/bonusareacreator/main.html b/sai/page/default_page/modules/bonusareacreator/main.html deleted file mode 100644 index 33e28b7..0000000 --- a/sai/page/default_page/modules/bonusareacreator/main.html +++ /dev/null @@ -1,110 +0,0 @@ - - - - - da_sense | Bonus Area Creator - - - - - - - -
    -
    -

    Bonus Area Creator 2.0

    -
    -
    -
    -
    -
    -
    -
    - Bonus Area -
    -
    - - (49.123123, 8.123125) -
    -
    - - 500.00 m -
    -
    - - 34.90 % -
    -
    - - Luisenplatz, Darmstadt -
    -
    - -
    - -
    -
    -
    - -
    - - x -
    -
    -
    - -
    -
    -
    - - -
    -
    -
    -
    - - -
    -
    -
    -
    -
    - -
    -
    - - d -
    -
    - - h -
    -
    -
    -
    - -
    - -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    -
    - - - - - - - - diff --git a/sai/page/default_page/modules/documentation/client/empty.html b/sai/page/default_page/modules/documentation/client/empty.html deleted file mode 100644 index a0ba5a9..0000000 --- a/sai/page/default_page/modules/documentation/client/empty.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - -
    TODO client stuff
    - - diff --git a/sai/page/default_page/modules/documentation/main.html b/sai/page/default_page/modules/documentation/main.html deleted file mode 100644 index e87d188..0000000 --- a/sai/page/default_page/modules/documentation/main.html +++ /dev/null @@ -1,48 +0,0 @@ - - - - - da_sense | Documentation - - - - -
    -
    -

    Documentation

    -
    -
    - -
    -
    -
    - - -
    - - -
    -
    -
    -
    - -
    - - - - diff --git a/sai/page/default_page/modules/documentation/server/architecture.html b/sai/page/default_page/modules/documentation/server/architecture.html deleted file mode 100644 index d537d16..0000000 --- a/sai/page/default_page/modules/documentation/server/architecture.html +++ /dev/null @@ -1,3 +0,0 @@ -Architecture - - \ No newline at end of file diff --git a/sai/page/default_page/modules/documentation/server/barea.html b/sai/page/default_page/modules/documentation/server/barea.html deleted file mode 100644 index 93aa720..0000000 --- a/sai/page/default_page/modules/documentation/server/barea.html +++ /dev/null @@ -1,29 +0,0 @@ -  Cronjob: Bonus Area Creator - -
    -
    Version
    -
    1.2
    -
    - -
    -
    Language
    -
    Java 1.6
    -
    - -
    -
    Execution time
    -
    Daily: 9 a.m., 3 p.m.
    -
    - -
    -
    Paths
    -
    /home/dasense/cron/bonusarea_cronjob.jar (jar)
    - /home/dasense/cron/bonusarea_cronjob.sh (shell script)
    - /... (config) -
    -
    - -
    -
    Algorithm
    -
    ?? Random, based on POIs, around measurement areas of active users ??
    -
    \ No newline at end of file diff --git a/sai/page/default_page/modules/documentation/server/database.html b/sai/page/default_page/modules/documentation/server/database.html deleted file mode 100644 index cc9d924..0000000 --- a/sai/page/default_page/modules/documentation/server/database.html +++ /dev/null @@ -1,78 +0,0 @@ -  Database -
    -
    Server
    -
    PostgreSQL 9.2.2
    Spatial: PostGIS 2.0.2
    -
    -
    -
    Host
    -
    212.72.183.108
    -
    -
    -
    Port
    -
    5432
    -
    -
    -
    Database
    -
    dasense (spatial enabled)
    -
    -
    -
    User
    -
    dasense
    -
    -
    -
    Website
    -
    http://www.postgresql.org
    -
    http://postgis.net
    -
    - -Schemata - -

    -

    -
    dasense_system
    -
    ...
    -
    - - @todo: UML-Diagram - -

    -
    -

    -

    -
    dasense_todo
    -
    ...
    -
    - - @todo: UML-Diagram - -

    -
    -

    -

    -
    dasense_data
    -
    ...
    -
    - - @todo: UML-Diagram - -

    -
    -

    -

    -
    dasense_data_processed
    -
    ...
    -
    - - @todo: UML-Diagram - -

    -
    -

    -

    -
    dasense_definitions
    -
    ...
    -
    - - @todo: UML-Diagram - -

    \ No newline at end of file diff --git a/sai/page/default_page/modules/documentation/server/incentive.html b/sai/page/default_page/modules/documentation/server/incentive.html deleted file mode 100644 index 701f7de..0000000 --- a/sai/page/default_page/modules/documentation/server/incentive.html +++ /dev/null @@ -1,220 +0,0 @@ -Incentive systems -

    Incentive systems are features with the aim to motivate user to use Noisemap and increase data quantity. But some of them also influence data quality. -


    -Statistics -Statistics give a complete feedback of user's measurement behaviour. -
    -
    # Data
    -
    ...
    -
    - -
    -
    # Series
    -
    ...
    -
    - -
    -
    Total time
    -
    ...
    -
    - -
    -
    Total distance
    -
    ...
    -
    - -
    -
    Avg. Speed
    -
    ...
    -
    - -
    -
    Bonus Areas
    -
    ...
    -
    - -
    -
    Exploration factor
    -
    ...
    -
    - -
    -
    Daytime behaviour
    -
    ... + graph sample
    -
    -
    -Achievements -Achievements are level-based honours for specific measurement behaviour of users.
    -@todo: generate from database - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    ExpertTravelerRoutinierFollower
    Description# datadistance# consecutive days# data within bonus area
    > 100> 1000m> 2d> 50
    ...
    - -
    -Badges -Badges are unique honours for special measurement activities.
    -@todo: generate from database - - - - - - - - - - - - - - - - - - - - - - - - - - -
    BadgeNameDescription
    NewbieFirst measurement series
    TouristVisit more than two countries
    ......
    - -
    -Point system -

    Measurement data will be rewarded by points. These points are used for temporal (cf. global ranking) and -location-based (cf. Titles) ranking.

    - -Data points -
    P = 1 + 1
    - -Series points -
    P = 1 + 1
    - -Exploration factor -
    P = 1 + 1
    - -Bonus Area multiplier -
    P = 1 + 1
    - -Accuracy factor -
    P = 1 + 1
    - -
    -Ranking -The ranking shows the best global "Noisemappers" in a specific time range. - -
    -
    Criterium
    -
    Points (descending)
    -
    -
    -
    Time range
    -
    Total
    -
    Monthly
    -
    Weekly
    -
    Daily
    -
    -
    -
    Location
    -
    Worldwide
    -
    - - -
    -Titles -Titles are location-based incentive ranking system, i.e. users get points for specific locality (e.g. countries, cities) when they measured inside the corresponding locality. -The best "Noisemappers" of a locality obtain a special title (e.g. Mayor, President). -
    -
    Criterium
    -
    Points (descending)
    -
    -
    -
    Ranking
    -
    Top 5
    -
    -
    -
    Locality
    -
    World
    -
    Continents
    -
    Countries
    -
    Cities with more than 100.000 inhabitants
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    WorldContinentCountryCity (> 100.000 pop.)
    Available TitleGod?President,
    Vice-President    		Mayor
    Polygon Coverage100%100%100%92%
    - -Polygon data based on OSM: - -Locality hierarchy, capitals, population based on - - -
    -Bonus Areas -Bonus areas are pre-defined circular areas. If a user measures inside these areas, his points for the measurement data will be multiplied with a specific factor defining by the bonus area. diff --git a/sai/page/default_page/modules/documentation/server/nodejs.html b/sai/page/default_page/modules/documentation/server/nodejs.html deleted file mode 100644 index 3dc914b..0000000 --- a/sai/page/default_page/modules/documentation/server/nodejs.html +++ /dev/null @@ -1,62 +0,0 @@ - - -
    -
    Server
    -
    Node.js 0.8.18
    -
    - -
    -
    Description
    -
    Node.js is a platform built on Chrome's JavaScript runtime for easily building fast, scalable network applications. Node.js uses an event-driven, non-blocking I/O model that makes it lightweight and efficient, perfect for data-intensive real-time applications that run across distributed devices.
    -
    - -
    -
    Website
    -
    http://nodejs.org
    -
    - -Plugins - -
    -
    AMQP
    -
    amqp
    -
    - -
    -
    PostgreSQL
    -
    pg
    -
    - -
    -
    GCM
    -
    node-gcm
    -
    - -
    -
    APNS
    -
    apn
    -
    - -Modules - -
    -
    Points
    -
    Evaluate points
    -
    - -
    -
    Titles
    -
    Evaluate titles
    -
    - -
    -
    Push Msg
    -
    Send push notification to specified users
    -
    - -
    -
    ...
    -
    -
    - -Scripts \ No newline at end of file diff --git a/sai/page/default_page/modules/documentation/server/push.html b/sai/page/default_page/modules/documentation/server/push.html deleted file mode 100644 index 29a375f..0000000 --- a/sai/page/default_page/modules/documentation/server/push.html +++ /dev/null @@ -1,67 +0,0 @@ -  GCM - -
    -
    Name
    -
    Google Cloud Messaging
    -
    - -
    -
    OS
    -
    Android
    -
    - -
    -
    Account
    -
    smartcivilsecurity@googlemail.com
    -
    - -
    -
    API-Key
    -
    #####
    -
    - -
    -
    Website
    -
    http://developer.android.com/google/gcm/index.html
    -
    - -
    -    @todo: Message formats
-
    -
    -  APNS - -
    -
    Name
    -
    Apple Push Notification Service
    -
    - -
    -
    OS
    -
    iOS
    -
    - -
    -
    Account
    -
    smartcivilsecurity@googlemail.com
    -
    - -
    -
    Certificate
    -
    #####
    -
    - -
    -
    Key
    -
    #####
    -
    - -
    -
    Website
    -
    - http://developer.apple.com/library/mac/#documentation/NetworkingInternet/Conceptual/RemoteNotificationsPG/ApplePushService/ApplePushService.html
    -
    - -
    -    @todo: Message formats
-
    diff --git a/sai/page/default_page/modules/documentation/server/queue.html b/sai/page/default_page/modules/documentation/server/queue.html deleted file mode 100644 index 36d9101..0000000 --- a/sai/page/default_page/modules/documentation/server/queue.html +++ /dev/null @@ -1,60 +0,0 @@ -  Message Queue -
    -
    Server
    -
    RabbitMQ 3.0.2
    -
    -
    -
    Protocol
    -
    AMQP
    -
    -
    -
    URL
    -
    amqp://<user>:<password>@212.72.183.108:5672/
    -
    -
    -
    Virtual host
    -
    /
    -
    -
    -
    User
    -
    guest (default)
    -
    -
    -
    WebUI
    -
    http://212.72.183.108:15672
    -
    -
    -
    Website
    -
    http://www.rabbitmq.com
    -
    - -Queues -

    -

    -
    incentive
    -
    Incentive stuff
    -
    - 
    -    @todo: Message format
-
    -

    -
    -

    -

    -
    pushmsg
    -
    Push messages
    -
    - 
    -    @todo: Message format
-
    -

    -
    -

    -

    -
    imggen
    -
    Image generation (Map preview with user's measured values)
    -
    - 
    -    @todo: Message format
-
    -

    \ No newline at end of file diff --git a/sai/page/default_page/modules/monitoring/main.html b/sai/page/default_page/modules/monitoring/main.html deleted file mode 100644 index 072e1e9..0000000 --- a/sai/page/default_page/modules/monitoring/main.html +++ /dev/null @@ -1,73 +0,0 @@ - - - - - da_sense | Monitoring - - - - -
    -
    -

    Monitoring

    -
    -
    - -
    - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - -
    Registrated users345
    OSAndroid: 200 (58%)
    iOS: 145 (42%)
    Measurements
    Series    		123.456
    456
    Continent
    Country
    City    		2
    12
    123
    .....
    -
    - -
    - -
    - -
    - Errors -
    - -
    - Logs -
    -
    -
    - -
    - - - - \ No newline at end of file diff --git a/sai/page/default_page/modules/pushmessage/main.html b/sai/page/default_page/modules/pushmessage/main.html deleted file mode 100644 index 43a026d..0000000 --- a/sai/page/default_page/modules/pushmessage/main.html +++ /dev/null @@ -1,148 +0,0 @@ - - - - - da_sense | Push Message - - - - -
    -
    -

    Push Message

    -
    -
    - -
    - -
    - -
    - -
    -
    - -
    - -
    - - All receivers with specified OS will received this message. -
    -
    - -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    #UsernameOSE-Mail
    1ChrisAndroidchristian.meurisch@googlemail.com
    2Sam SamplemaniOSsam.sampleman@googlemail.com
    3.........
    -
    -
    - -
    - -
    -
    - -
    -
    -
    -
    - de - -
    -
    - en - -
    -
    -
    -
    -
    - de - -
    -
    - en - -
    -
    -
    -
    - ... some other message ... -
    -
    -
    -
    -
    - -
    - -
    - - - Here you can specify delivery settings. -
    -
    -
    -
    -
    - -
    -
    -
    -
    - - - - diff --git a/sai/page/default_page/modules/texthandler/export.html b/sai/page/default_page/modules/texthandler/export.html deleted file mode 100644 index 869734c..0000000 --- a/sai/page/default_page/modules/texthandler/export.html +++ /dev/null @@ -1,25 +0,0 @@ -
    -
    - -
    - -
    -
    - -
    - -
    -
    -
    -
    -
    - -
    -
    -
    \ No newline at end of file diff --git a/sai/page/default_page/modules/texthandler/import.html b/sai/page/default_page/modules/texthandler/import.html deleted file mode 100644 index 77b07c3..0000000 --- a/sai/page/default_page/modules/texthandler/import.html +++ /dev/null @@ -1,45 +0,0 @@ -
    -
    - -
    - - General database identifier. No space allowed. -
    -
    -
    -
    - -
    - -
    -
    -
    -
    - -
    - -
    -
    -
    -
    - -
    - - Android identifier. No space allowed.
    If you fill out the field, this entry will be exported for Android XML.     -
    -
    -
    -
    - -
    - - iOS identifier. No space allowed.
    If you fill out the field, this entry will be exported for iOS XML.     -
    -
    -
    -
    -
    - -
    -
    -
    diff --git a/sai/page/default_page/modules/texthandler/main.html b/sai/page/default_page/modules/texthandler/main.html deleted file mode 100644 index 4c6f5ec..0000000 --- a/sai/page/default_page/modules/texthandler/main.html +++ /dev/null @@ -1,28 +0,0 @@ - - - - - da_sense | Text Handler - - - - -
    -
    -

    Text Handler

    -
    -
    -
    - -
    -
    -
    - - - diff --git a/sai/page/login_page/login.tpl b/sai/page/login_page/login.tpl deleted file mode 100644 index 8b6fdba..0000000 --- a/sai/page/login_page/login.tpl +++ /dev/null @@ -1,45 +0,0 @@ - - - - da_sense | Developer Center - - - ${css} - ${js} - - - - -
    -
    - Not logged in or missing rights. Please login a valid account! - -
    -
    - Login - - - - - - - - - -
    -
    -
    -
    -
    -

    © da_sense, TU Darmstadt 2013

    -
    -
    - - \ No newline at end of file diff --git a/sai/page/login_page/login_page.php b/sai/page/login_page/login_page.php deleted file mode 100644 index 161bcf4..0000000 --- a/sai/page/login_page/login_page.php +++ /dev/null @@ -1,24 +0,0 @@ -html(); - } - - $vars = array(); - $vars['js'] = ''. - ''; - $vars['css'] = ''. - ''; - $vars['navimg'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_NAVIMG); - return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'page/login_page/login.tpl'), $vars); - } -} \ No newline at end of file diff --git a/sai/sai/SaiModule.php b/sai/sai/SaiModule.php index 5fb2244..d717ad3 100644 --- a/sai/sai/SaiModule.php +++ b/sai/sai/SaiModule.php @@ -2,17 +2,15 @@ namespace SYSTEM\SAI; -abstract class SaiModule { - public static function html_js(){ - throw new RuntimeException("Unimplemented!");} - public static function html_css(){ - throw new RuntimeException("Unimplemented!");} +abstract class SaiModule { public static function html_content(){ throw new RuntimeException("Unimplemented!");} public static function html_li_menu(){ throw new RuntimeException("Unimplemented!");} + //true or false -> if true no call to right_right() public static function right_public(){ throw new RuntimeException("Unimplemented!");} + //check your rights here -> returns true or false public static function right_right(){ throw new RuntimeException("Unimplemented!");} diff --git a/sai/sai/sai.php b/sai/sai/sai.php index b701265..a5f9b75 100644 --- a/sai/sai/sai.php +++ b/sai/sai/sai.php @@ -16,7 +16,7 @@ class sai { private function __construct(){} private function __clone(){} - public function register($module){ + public function register($module){ if( !\class_exists($module) || !\is_array($parents = \class_parents($module)) || !\array_search('SYSTEM\SAI\SaiModule', $parents)){ diff --git a/sai/sai/saigui.php b/sai/sai/saigui.php index 13c6906..b9902b2 100644 --- a/sai/sai/saigui.php +++ b/sai/sai/saigui.php @@ -1,16 +1,17 @@ html();} - $pg = array_merge($_POST,$_GET); - $sai = new \SYSTEM\SAI\default_page ((isset($pg['sai_mod']) ? $pg['sai_mod'] : null),$pg); + if(isset($pg[SAI_MOD_POSTFIELD])){ + $mod = new \SYSTEM\SAI\default_module(\str_replace('.', '\\', $pg[SAI_MOD_POSTFIELD]),$pg); + return $mod->html();} + + $sai = new \SYSTEM\SAI\default_page(); return $sai->html(); } } \ No newline at end of file