From 6a8ae5479a64b3afab68ccd70e28f7da99f3dc33 Mon Sep 17 00:00:00 2001 From: rylon Date: Thu, 16 May 2013 05:28:21 +0200 Subject: [PATCH] fixed several login/security related sql problems, fixed dbd definitions, sai update --- api/apiloginclass.php | 6 +-- config/config_ids.php | 3 ++ dbd/tbl/UserRightsTable.php | 3 +- dbd/tbl/UserTable.php | 3 +- sai/SaiModule.php | 10 ---- sai/{sai => }/autoload.inc.php | 2 +- sai/index.php | 9 ---- .../modules/badge_creator/badgecreator.js | 0 .../modules/badge_creator/badgecreator.tpl | 0 .../saimod_dasense_badge_creator.php | 0 sai/{sai => }/modules/register_modules.php | 0 .../modules/saimod_dasense_api_reference.php | 0 .../saimod_dasense_bonusarea_creator.php | 0 .../modules/saimod_dasense_monitoring.php | 0 .../modules/saimod_dasense_push_message.php | 0 .../modules/saimod_dasense_text_handler.php | 0 sai/{sai => }/modules/saimod_sys_api.php | 0 sai/{sai => }/modules/saimod_sys_docu.php | 0 sai/{sai => }/modules/saimod_sys_error.php | 0 sai/{sai => }/modules/saimod_sys_page.php | 0 sai/{sai => }/modules/saimod_sys_security.php | 0 sai/{sai => }/modules/saimod_sys_sys.php | 0 sai/{sai => }/page/default_page/carousel.tpl | 0 .../page/default_page/css/apireference.css | 0 .../css/img/glyphicons-halflings-white.png | Bin .../css/img/glyphicons-halflings.png | Bin sai/{sai => }/page/default_page/css/index.css | 0 .../css/libs/bootstrap-responsive.css | 0 .../css/libs/bootstrap-responsive.min.css | 0 .../css/libs/bootstrap-switch.css | 0 .../css/libs/bootstrap-timepicker.min.css | 0 .../page/default_page/css/libs/bootstrap.css | 0 .../default_page/css/libs/bootstrap.min.css | 0 .../page/default_page/css/libs/datepicker.css | 0 .../css/libs/jquery.miniColors.css | 0 .../css/libs/jquery.minicolors.png | Bin .../page/default_page/default_page.php | 15 +++--- sai/{sai => }/page/default_page/img/apns.png | Bin sai/{sai => }/page/default_page/img/badge.png | Bin .../default_page/img/carousel/webseite.jpg | Bin .../page/default_page/img/cronjob-logo.png | Bin .../page/default_page/img/flag_de.png | Bin .../page/default_page/img/flag_en.png | Bin .../page/default_page/img/flow_upload.png | Bin .../page/default_page/img/gcm-logo.png | Bin .../page/default_page/img/geo_point.png | Bin .../page/default_page/img/geo_resize.png | Bin sai/{sai => }/page/default_page/img/logo.png | Bin .../page/default_page/img/nodejs-logo.png | Bin .../page/default_page/img/postgresql-logo.png | Bin .../page/default_page/img/rabbitmq-logo.jpg | Bin .../page/default_page/js/apireference.js | 0 .../page/default_page/js/bonusareacreator.js | 0 .../page/default_page/js/documentation.js | 0 sai/{sai => }/page/default_page/js/index.js | 4 +- .../js/libs/bootstrap-datepicker.js | 0 .../js/libs/bootstrap-timepicker.min.js | 0 .../page/default_page/js/libs/bootstrap.js | 0 .../default_page/js/libs/bootstrap.min.js | 0 .../page/default_page/js/libs/geoFunctions.js | 0 .../page/default_page/js/libs/jquery.min.js | 0 .../default_page/js/libs/jquery.miniColors.js | 0 .../default_page/js/libs/jquery.switch.js | 0 .../page/default_page/js/monitoring.js | 0 .../page/default_page/js/pushmessage.js | 0 .../page/default_page/js/texthandler.js | 0 .../modules/apireference/account/login.html | 0 .../modules/apireference/account/push.html | 0 .../apireference/account/registration.html | 0 .../apireference/data/acquisition.html | 0 .../modules/apireference/data/series.html | 0 .../apireference/incentive/achievements.html | 0 .../apireference/incentive/badges.html | 0 .../apireference/incentive/bonusareas.html | 0 .../apireference/incentive/ranking.html | 0 .../apireference/incentive/statistics.html | 0 .../apireference/incentive/titles.html | 0 .../modules/apireference/main.html | 0 .../apireference/overview/request.html | 0 .../apireference/overview/response.html | 0 .../apireference/overview/statuscode.html | 0 .../modules/bonusareacreator/main.html | 0 .../modules/documentation/client/empty.html | 0 .../modules/documentation/main.html | 0 .../documentation/server/architecture.html | 0 .../modules/documentation/server/barea.html | 0 .../documentation/server/database.html | 0 .../documentation/server/incentive.html | 0 .../modules/documentation/server/nodejs.html | 0 .../modules/documentation/server/push.html | 0 .../modules/documentation/server/queue.html | 0 .../default_page/modules/monitoring/main.html | 0 .../modules/pushmessage/main.html | 0 .../modules/texthandler/export.html | 0 .../modules/texthandler/import.html | 0 .../modules/texthandler/main.html | 0 sai/{sai => }/page/default_page/sai.tpl | 8 +--- sai/page/login_page/login.tpl | 45 ++++++++++++++++++ sai/page/login_page/login_page.php | 24 ++++++++++ sai/sai/SaiModule.php | 19 ++++++++ sai/sai/page/login_page/login.tpl | 17 ------- sai/sai/page/login_page/login_page.php | 19 -------- sai/{ => sai}/sai.php | 0 sai/sai/saigui.php | 16 +++++++ sai/saigui.php | 26 ---------- security/Security.php | 9 ++-- 106 files changed, 132 insertions(+), 106 deletions(-) delete mode 100644 sai/SaiModule.php rename sai/{sai => }/autoload.inc.php (88%) delete mode 100644 sai/index.php rename sai/{sai => }/modules/badge_creator/badgecreator.js (100%) rename sai/{sai => }/modules/badge_creator/badgecreator.tpl (100%) rename sai/{sai => }/modules/badge_creator/saimod_dasense_badge_creator.php (100%) rename sai/{sai => }/modules/register_modules.php (100%) rename sai/{sai => }/modules/saimod_dasense_api_reference.php (100%) rename sai/{sai => }/modules/saimod_dasense_bonusarea_creator.php (100%) rename sai/{sai => }/modules/saimod_dasense_monitoring.php (100%) rename sai/{sai => }/modules/saimod_dasense_push_message.php (100%) rename sai/{sai => }/modules/saimod_dasense_text_handler.php (100%) rename sai/{sai => }/modules/saimod_sys_api.php (100%) rename sai/{sai => }/modules/saimod_sys_docu.php (100%) rename sai/{sai => }/modules/saimod_sys_error.php (100%) rename sai/{sai => }/modules/saimod_sys_page.php (100%) rename sai/{sai => }/modules/saimod_sys_security.php (100%) rename sai/{sai => }/modules/saimod_sys_sys.php (100%) rename sai/{sai => }/page/default_page/carousel.tpl (100%) rename sai/{sai => }/page/default_page/css/apireference.css (100%) rename sai/{sai => }/page/default_page/css/img/glyphicons-halflings-white.png (100%) rename sai/{sai => }/page/default_page/css/img/glyphicons-halflings.png (100%) rename sai/{sai => }/page/default_page/css/index.css (100%) rename sai/{sai => }/page/default_page/css/libs/bootstrap-responsive.css (100%) rename sai/{sai => }/page/default_page/css/libs/bootstrap-responsive.min.css (100%) rename sai/{sai => }/page/default_page/css/libs/bootstrap-switch.css (100%) rename sai/{sai => }/page/default_page/css/libs/bootstrap-timepicker.min.css (100%) rename sai/{sai => }/page/default_page/css/libs/bootstrap.css (100%) rename sai/{sai => }/page/default_page/css/libs/bootstrap.min.css (100%) rename sai/{sai => }/page/default_page/css/libs/datepicker.css (100%) rename sai/{sai => }/page/default_page/css/libs/jquery.miniColors.css (100%) rename sai/{sai => }/page/default_page/css/libs/jquery.minicolors.png (100%) rename sai/{sai => }/page/default_page/default_page.php (79%) rename sai/{sai => }/page/default_page/img/apns.png (100%) rename sai/{sai => }/page/default_page/img/badge.png (100%) rename sai/{sai => }/page/default_page/img/carousel/webseite.jpg (100%) rename sai/{sai => }/page/default_page/img/cronjob-logo.png (100%) rename sai/{sai => }/page/default_page/img/flag_de.png (100%) rename sai/{sai => }/page/default_page/img/flag_en.png (100%) rename sai/{sai => }/page/default_page/img/flow_upload.png (100%) rename sai/{sai => }/page/default_page/img/gcm-logo.png (100%) rename sai/{sai => }/page/default_page/img/geo_point.png (100%) rename sai/{sai => }/page/default_page/img/geo_resize.png (100%) rename sai/{sai => }/page/default_page/img/logo.png (100%) rename sai/{sai => }/page/default_page/img/nodejs-logo.png (100%) rename sai/{sai => }/page/default_page/img/postgresql-logo.png (100%) rename sai/{sai => }/page/default_page/img/rabbitmq-logo.jpg (100%) rename sai/{sai => }/page/default_page/js/apireference.js (100%) rename sai/{sai => }/page/default_page/js/bonusareacreator.js (100%) rename sai/{sai => }/page/default_page/js/documentation.js (100%) rename sai/{sai => }/page/default_page/js/index.js (81%) rename sai/{sai => }/page/default_page/js/libs/bootstrap-datepicker.js (100%) rename sai/{sai => }/page/default_page/js/libs/bootstrap-timepicker.min.js (100%) rename sai/{sai => }/page/default_page/js/libs/bootstrap.js (100%) rename sai/{sai => }/page/default_page/js/libs/bootstrap.min.js (100%) rename sai/{sai => }/page/default_page/js/libs/geoFunctions.js (100%) rename sai/{sai => }/page/default_page/js/libs/jquery.min.js (100%) rename sai/{sai => }/page/default_page/js/libs/jquery.miniColors.js (100%) rename sai/{sai => }/page/default_page/js/libs/jquery.switch.js (100%) rename sai/{sai => }/page/default_page/js/monitoring.js (100%) rename sai/{sai => }/page/default_page/js/pushmessage.js (100%) rename sai/{sai => }/page/default_page/js/texthandler.js (100%) rename sai/{sai => }/page/default_page/modules/apireference/account/login.html (100%) rename sai/{sai => }/page/default_page/modules/apireference/account/push.html (100%) rename sai/{sai => }/page/default_page/modules/apireference/account/registration.html (100%) rename sai/{sai => }/page/default_page/modules/apireference/data/acquisition.html (100%) rename sai/{sai => }/page/default_page/modules/apireference/data/series.html (100%) rename sai/{sai => }/page/default_page/modules/apireference/incentive/achievements.html (100%) rename sai/{sai => }/page/default_page/modules/apireference/incentive/badges.html (100%) rename sai/{sai => }/page/default_page/modules/apireference/incentive/bonusareas.html (100%) rename sai/{sai => }/page/default_page/modules/apireference/incentive/ranking.html (100%) rename sai/{sai => }/page/default_page/modules/apireference/incentive/statistics.html (100%) rename sai/{sai => }/page/default_page/modules/apireference/incentive/titles.html (100%) rename sai/{sai => }/page/default_page/modules/apireference/main.html (100%) rename sai/{sai => }/page/default_page/modules/apireference/overview/request.html (100%) rename sai/{sai => }/page/default_page/modules/apireference/overview/response.html (100%) rename sai/{sai => }/page/default_page/modules/apireference/overview/statuscode.html (100%) rename sai/{sai => }/page/default_page/modules/bonusareacreator/main.html (100%) rename sai/{sai => }/page/default_page/modules/documentation/client/empty.html (100%) rename sai/{sai => }/page/default_page/modules/documentation/main.html (100%) rename sai/{sai => }/page/default_page/modules/documentation/server/architecture.html (100%) rename sai/{sai => }/page/default_page/modules/documentation/server/barea.html (100%) rename sai/{sai => }/page/default_page/modules/documentation/server/database.html (100%) rename sai/{sai => }/page/default_page/modules/documentation/server/incentive.html (100%) rename sai/{sai => }/page/default_page/modules/documentation/server/nodejs.html (100%) rename sai/{sai => }/page/default_page/modules/documentation/server/push.html (100%) rename sai/{sai => }/page/default_page/modules/documentation/server/queue.html (100%) rename sai/{sai => }/page/default_page/modules/monitoring/main.html (100%) rename sai/{sai => }/page/default_page/modules/pushmessage/main.html (100%) rename sai/{sai => }/page/default_page/modules/texthandler/export.html (100%) rename sai/{sai => }/page/default_page/modules/texthandler/import.html (100%) rename sai/{sai => }/page/default_page/modules/texthandler/main.html (100%) rename sai/{sai => }/page/default_page/sai.tpl (77%) create mode 100644 sai/page/login_page/login.tpl create mode 100644 sai/page/login_page/login_page.php create mode 100644 sai/sai/SaiModule.php delete mode 100644 sai/sai/page/login_page/login.tpl delete mode 100644 sai/sai/page/login_page/login_page.php rename sai/{ => sai}/sai.php (100%) create mode 100644 sai/sai/saigui.php delete mode 100644 sai/saigui.php diff --git a/api/apiloginclass.php b/api/apiloginclass.php index 4e7c3aa..82d41f6 100644 --- a/api/apiloginclass.php +++ b/api/apiloginclass.php @@ -20,13 +20,13 @@ class apiloginclass extends \SYSTEM\API\apiclass { */ public static function call_account_action_login($username, $password_sha, $password_md5){ - return \SYSTEM\SECURITY\Security::login(new \SYSTEM\DBD\systemPostgres(), $username, $password_sha, $password_md5);} + return \SYSTEM\SECURITY\Security::login(\SYSTEM\system::getSystemDBInfo(), $username, $password_sha, $password_md5);} public static function call_account_action_logout(){ return \SYSTEM\SECURITY\Security::logout();} public static function call_account_action_isloggedin(){ return \SYSTEM\SECURITY\Security::isLoggedIn();} public static function call_account_action_check($rightid){ - return \SYSTEM\SECURITY\Security::check(new \SYSTEM\DBD\systemPostgres(),$rightid);} + return \SYSTEM\SECURITY\Security::check(\SYSTEM\system::getSystemDBInfo(),$rightid);} public static function call_account_action_create($username, $password_sha, $email, $locale){ - return \SYSTEM\SECURITY\Security::create(new \SYSTEM\DBD\systemPostgres(), $username, $password_sha, $email, $locale);} + return \SYSTEM\SECURITY\Security::create(\SYSTEM\system::getSystemDBInfo(), $username, $password_sha, $email, $locale);} } \ No newline at end of file diff --git a/config/config_ids.php b/config/config_ids.php index 2a53381..a30a567 100644 --- a/config/config_ids.php +++ b/config/config_ids.php @@ -16,4 +16,7 @@ class config_ids { const SYS_CONFIG_DB_USER = 14; const SYS_CONFIG_DB_PASSWORD = 15; const SYS_CONFIG_DB_DBNAME = 16; + + const SYS_SAI_CONFIG_BASEURL = 50; + const SYS_SAI_CONFIG_NAVIMG = 51; } \ No newline at end of file diff --git a/dbd/tbl/UserRightsTable.php b/dbd/tbl/UserRightsTable.php index ce1497c..b39277c 100644 --- a/dbd/tbl/UserRightsTable.php +++ b/dbd/tbl/UserRightsTable.php @@ -4,7 +4,8 @@ namespace SYSTEM\DBD; class UserRightsTable { - const NAME = 'system_user_to_rights'; + const NAME_PG = 'system.user_to_rights'; + const NAME_MYS = 'system_user_to_rights'; const FIELD_USERID = 'userID'; const FIELD_RIGHTID = 'rightID'; diff --git a/dbd/tbl/UserTable.php b/dbd/tbl/UserTable.php index 45c15d5..4785fc4 100644 --- a/dbd/tbl/UserTable.php +++ b/dbd/tbl/UserTable.php @@ -4,7 +4,8 @@ namespace SYSTEM\DBD; class UserTable { - const NAME = 'system_user'; + const NAME_PG = 'system.user'; + const NAME_MYS = 'system_user'; const FIELD_ID = 'id'; const FIELD_USERNAME = 'username'; diff --git a/sai/SaiModule.php b/sai/SaiModule.php deleted file mode 100644 index f1af4af..0000000 --- a/sai/SaiModule.php +++ /dev/null @@ -1,10 +0,0 @@ -registerFolder(dirname(__FILE__),'SYSTEM\SAI'); +$autoload->registerFolder(dirname(__FILE__).'/sai','SYSTEM\SAI'); $autoload->registerFolder(dirname(__FILE__).'/page','SYSTEM\SAI'); $autoload->registerFolder(dirname(__FILE__).'/page/default_page','SYSTEM\SAI'); diff --git a/sai/index.php b/sai/index.php deleted file mode 100644 index c1143f8..0000000 --- a/sai/index.php +++ /dev/null @@ -1,9 +0,0 @@ -html(); \ No newline at end of file diff --git a/sai/sai/modules/badge_creator/badgecreator.js b/sai/modules/badge_creator/badgecreator.js similarity index 100% rename from sai/sai/modules/badge_creator/badgecreator.js rename to sai/modules/badge_creator/badgecreator.js diff --git a/sai/sai/modules/badge_creator/badgecreator.tpl b/sai/modules/badge_creator/badgecreator.tpl similarity index 100% rename from sai/sai/modules/badge_creator/badgecreator.tpl rename to sai/modules/badge_creator/badgecreator.tpl diff --git a/sai/sai/modules/badge_creator/saimod_dasense_badge_creator.php b/sai/modules/badge_creator/saimod_dasense_badge_creator.php similarity index 100% rename from sai/sai/modules/badge_creator/saimod_dasense_badge_creator.php rename to sai/modules/badge_creator/saimod_dasense_badge_creator.php diff --git a/sai/sai/modules/register_modules.php b/sai/modules/register_modules.php similarity index 100% rename from sai/sai/modules/register_modules.php rename to sai/modules/register_modules.php diff --git a/sai/sai/modules/saimod_dasense_api_reference.php b/sai/modules/saimod_dasense_api_reference.php similarity index 100% rename from sai/sai/modules/saimod_dasense_api_reference.php rename to sai/modules/saimod_dasense_api_reference.php diff --git a/sai/sai/modules/saimod_dasense_bonusarea_creator.php b/sai/modules/saimod_dasense_bonusarea_creator.php similarity index 100% rename from sai/sai/modules/saimod_dasense_bonusarea_creator.php rename to sai/modules/saimod_dasense_bonusarea_creator.php diff --git a/sai/sai/modules/saimod_dasense_monitoring.php b/sai/modules/saimod_dasense_monitoring.php similarity index 100% rename from sai/sai/modules/saimod_dasense_monitoring.php rename to sai/modules/saimod_dasense_monitoring.php diff --git a/sai/sai/modules/saimod_dasense_push_message.php b/sai/modules/saimod_dasense_push_message.php similarity index 100% rename from sai/sai/modules/saimod_dasense_push_message.php rename to sai/modules/saimod_dasense_push_message.php diff --git a/sai/sai/modules/saimod_dasense_text_handler.php b/sai/modules/saimod_dasense_text_handler.php similarity index 100% rename from sai/sai/modules/saimod_dasense_text_handler.php rename to sai/modules/saimod_dasense_text_handler.php diff --git a/sai/sai/modules/saimod_sys_api.php b/sai/modules/saimod_sys_api.php similarity index 100% rename from sai/sai/modules/saimod_sys_api.php rename to sai/modules/saimod_sys_api.php diff --git a/sai/sai/modules/saimod_sys_docu.php b/sai/modules/saimod_sys_docu.php similarity index 100% rename from sai/sai/modules/saimod_sys_docu.php rename to sai/modules/saimod_sys_docu.php diff --git a/sai/sai/modules/saimod_sys_error.php b/sai/modules/saimod_sys_error.php similarity index 100% rename from sai/sai/modules/saimod_sys_error.php rename to sai/modules/saimod_sys_error.php diff --git a/sai/sai/modules/saimod_sys_page.php b/sai/modules/saimod_sys_page.php similarity index 100% rename from sai/sai/modules/saimod_sys_page.php rename to sai/modules/saimod_sys_page.php diff --git a/sai/sai/modules/saimod_sys_security.php b/sai/modules/saimod_sys_security.php similarity index 100% rename from sai/sai/modules/saimod_sys_security.php rename to sai/modules/saimod_sys_security.php diff --git a/sai/sai/modules/saimod_sys_sys.php b/sai/modules/saimod_sys_sys.php similarity index 100% rename from sai/sai/modules/saimod_sys_sys.php rename to sai/modules/saimod_sys_sys.php diff --git a/sai/sai/page/default_page/carousel.tpl b/sai/page/default_page/carousel.tpl similarity index 100% rename from sai/sai/page/default_page/carousel.tpl rename to sai/page/default_page/carousel.tpl diff --git a/sai/sai/page/default_page/css/apireference.css b/sai/page/default_page/css/apireference.css similarity index 100% rename from sai/sai/page/default_page/css/apireference.css rename to sai/page/default_page/css/apireference.css diff --git a/sai/sai/page/default_page/css/img/glyphicons-halflings-white.png b/sai/page/default_page/css/img/glyphicons-halflings-white.png similarity index 100% rename from sai/sai/page/default_page/css/img/glyphicons-halflings-white.png rename to sai/page/default_page/css/img/glyphicons-halflings-white.png diff --git a/sai/sai/page/default_page/css/img/glyphicons-halflings.png b/sai/page/default_page/css/img/glyphicons-halflings.png similarity index 100% rename from sai/sai/page/default_page/css/img/glyphicons-halflings.png rename to sai/page/default_page/css/img/glyphicons-halflings.png diff --git a/sai/sai/page/default_page/css/index.css b/sai/page/default_page/css/index.css similarity index 100% rename from sai/sai/page/default_page/css/index.css rename to sai/page/default_page/css/index.css diff --git a/sai/sai/page/default_page/css/libs/bootstrap-responsive.css b/sai/page/default_page/css/libs/bootstrap-responsive.css similarity index 100% rename from sai/sai/page/default_page/css/libs/bootstrap-responsive.css rename to sai/page/default_page/css/libs/bootstrap-responsive.css diff --git a/sai/sai/page/default_page/css/libs/bootstrap-responsive.min.css b/sai/page/default_page/css/libs/bootstrap-responsive.min.css similarity index 100% rename from sai/sai/page/default_page/css/libs/bootstrap-responsive.min.css rename to sai/page/default_page/css/libs/bootstrap-responsive.min.css diff --git a/sai/sai/page/default_page/css/libs/bootstrap-switch.css b/sai/page/default_page/css/libs/bootstrap-switch.css similarity index 100% rename from sai/sai/page/default_page/css/libs/bootstrap-switch.css rename to sai/page/default_page/css/libs/bootstrap-switch.css diff --git a/sai/sai/page/default_page/css/libs/bootstrap-timepicker.min.css b/sai/page/default_page/css/libs/bootstrap-timepicker.min.css similarity index 100% rename from sai/sai/page/default_page/css/libs/bootstrap-timepicker.min.css rename to sai/page/default_page/css/libs/bootstrap-timepicker.min.css diff --git a/sai/sai/page/default_page/css/libs/bootstrap.css b/sai/page/default_page/css/libs/bootstrap.css similarity index 100% rename from sai/sai/page/default_page/css/libs/bootstrap.css rename to sai/page/default_page/css/libs/bootstrap.css diff --git a/sai/sai/page/default_page/css/libs/bootstrap.min.css b/sai/page/default_page/css/libs/bootstrap.min.css similarity index 100% rename from sai/sai/page/default_page/css/libs/bootstrap.min.css rename to sai/page/default_page/css/libs/bootstrap.min.css diff --git a/sai/sai/page/default_page/css/libs/datepicker.css b/sai/page/default_page/css/libs/datepicker.css similarity index 100% rename from sai/sai/page/default_page/css/libs/datepicker.css rename to sai/page/default_page/css/libs/datepicker.css diff --git a/sai/sai/page/default_page/css/libs/jquery.miniColors.css b/sai/page/default_page/css/libs/jquery.miniColors.css similarity index 100% rename from sai/sai/page/default_page/css/libs/jquery.miniColors.css rename to sai/page/default_page/css/libs/jquery.miniColors.css diff --git a/sai/sai/page/default_page/css/libs/jquery.minicolors.png b/sai/page/default_page/css/libs/jquery.minicolors.png similarity index 100% rename from sai/sai/page/default_page/css/libs/jquery.minicolors.png rename to sai/page/default_page/css/libs/jquery.minicolors.png diff --git a/sai/sai/page/default_page/default_page.php b/sai/page/default_page/default_page.php similarity index 79% rename from sai/sai/page/default_page/default_page.php rename to sai/page/default_page/default_page.php index 61c6f59..852da55 100644 --- a/sai/sai/page/default_page/default_page.php +++ b/sai/page/default_page/default_page.php @@ -26,12 +26,12 @@ class default_page extends \SYSTEM\PAGE\Page { \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(),'sai/page/default_page/carousel.tpl'), array()); + return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'page/default_page/carousel.tpl'), array()); } private function css(){ - $result = ''. - '';; + $result = ''. + ''; $mods = \SYSTEM\SAI\sai::getInstance()->getModules(); if( $this->module && @@ -42,9 +42,9 @@ class default_page extends \SYSTEM\PAGE\Page { } private function js(){ - $result = ''. - ''. - ''; + $result = ''. + ''. + ''; $mods = \SYSTEM\SAI\sai::getInstance()->getModules(); if( $this->module && @@ -61,6 +61,7 @@ class default_page extends \SYSTEM\PAGE\Page { $vars['js'] = $this->js(); $vars['menu'] = $this->menu(); + $vars['navimg'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_NAVIMG); //TODO new \SYSTEM\LOG\DEPRECATED(); @@ -71,6 +72,6 @@ class default_page extends \SYSTEM\PAGE\Page { //$vars['PATH_LIB'] = SYSTEM\WEBPATH(new PLIB()); //$vars['PATH_JS'] = SYSTEM\WEBPATH(new PJS()); //$vars = array_merge($vars, SYSTEM\locale::getStrings(\SYSTEM\DBD\locale_string::VALUE_CATEGORY_DASENSE)); - return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'sai/page/default_page/sai.tpl'), $vars); + return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'page/default_page/sai.tpl'), $vars); } } \ No newline at end of file diff --git a/sai/sai/page/default_page/img/apns.png b/sai/page/default_page/img/apns.png similarity index 100% rename from sai/sai/page/default_page/img/apns.png rename to sai/page/default_page/img/apns.png diff --git a/sai/sai/page/default_page/img/badge.png b/sai/page/default_page/img/badge.png similarity index 100% rename from sai/sai/page/default_page/img/badge.png rename to sai/page/default_page/img/badge.png diff --git a/sai/sai/page/default_page/img/carousel/webseite.jpg b/sai/page/default_page/img/carousel/webseite.jpg similarity index 100% rename from sai/sai/page/default_page/img/carousel/webseite.jpg rename to sai/page/default_page/img/carousel/webseite.jpg diff --git a/sai/sai/page/default_page/img/cronjob-logo.png b/sai/page/default_page/img/cronjob-logo.png similarity index 100% rename from sai/sai/page/default_page/img/cronjob-logo.png rename to sai/page/default_page/img/cronjob-logo.png diff --git a/sai/sai/page/default_page/img/flag_de.png b/sai/page/default_page/img/flag_de.png similarity index 100% rename from sai/sai/page/default_page/img/flag_de.png rename to sai/page/default_page/img/flag_de.png diff --git a/sai/sai/page/default_page/img/flag_en.png b/sai/page/default_page/img/flag_en.png similarity index 100% rename from sai/sai/page/default_page/img/flag_en.png rename to sai/page/default_page/img/flag_en.png diff --git a/sai/sai/page/default_page/img/flow_upload.png b/sai/page/default_page/img/flow_upload.png similarity index 100% rename from sai/sai/page/default_page/img/flow_upload.png rename to sai/page/default_page/img/flow_upload.png diff --git a/sai/sai/page/default_page/img/gcm-logo.png b/sai/page/default_page/img/gcm-logo.png similarity index 100% rename from sai/sai/page/default_page/img/gcm-logo.png rename to sai/page/default_page/img/gcm-logo.png diff --git a/sai/sai/page/default_page/img/geo_point.png b/sai/page/default_page/img/geo_point.png similarity index 100% rename from sai/sai/page/default_page/img/geo_point.png rename to sai/page/default_page/img/geo_point.png diff --git a/sai/sai/page/default_page/img/geo_resize.png b/sai/page/default_page/img/geo_resize.png similarity index 100% rename from sai/sai/page/default_page/img/geo_resize.png rename to sai/page/default_page/img/geo_resize.png diff --git a/sai/sai/page/default_page/img/logo.png b/sai/page/default_page/img/logo.png similarity index 100% rename from sai/sai/page/default_page/img/logo.png rename to sai/page/default_page/img/logo.png diff --git a/sai/sai/page/default_page/img/nodejs-logo.png b/sai/page/default_page/img/nodejs-logo.png similarity index 100% rename from sai/sai/page/default_page/img/nodejs-logo.png rename to sai/page/default_page/img/nodejs-logo.png diff --git a/sai/sai/page/default_page/img/postgresql-logo.png b/sai/page/default_page/img/postgresql-logo.png similarity index 100% rename from sai/sai/page/default_page/img/postgresql-logo.png rename to sai/page/default_page/img/postgresql-logo.png diff --git a/sai/sai/page/default_page/img/rabbitmq-logo.jpg b/sai/page/default_page/img/rabbitmq-logo.jpg similarity index 100% rename from sai/sai/page/default_page/img/rabbitmq-logo.jpg rename to sai/page/default_page/img/rabbitmq-logo.jpg diff --git a/sai/sai/page/default_page/js/apireference.js b/sai/page/default_page/js/apireference.js similarity index 100% rename from sai/sai/page/default_page/js/apireference.js rename to sai/page/default_page/js/apireference.js diff --git a/sai/sai/page/default_page/js/bonusareacreator.js b/sai/page/default_page/js/bonusareacreator.js similarity index 100% rename from sai/sai/page/default_page/js/bonusareacreator.js rename to sai/page/default_page/js/bonusareacreator.js diff --git a/sai/sai/page/default_page/js/documentation.js b/sai/page/default_page/js/documentation.js similarity index 100% rename from sai/sai/page/default_page/js/documentation.js rename to sai/page/default_page/js/documentation.js diff --git a/sai/sai/page/default_page/js/index.js b/sai/page/default_page/js/index.js similarity index 81% rename from sai/sai/page/default_page/js/index.js rename to sai/page/default_page/js/index.js index 2759a71..34ac71a 100644 --- a/sai/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=module&module=SAI', function() { + $('div#content-wrapper').load('./?action=developer&sai_mod=SAI', function() { $('.carousel').carousel(); }); @@ -30,7 +30,7 @@ $(document).ready(function() { }); function loadModuleContent(id){ - $('div#content-wrapper').load('./?action=module&module='+id, function(){ + $('div#content-wrapper').load('./?action=developer&sai_mod='+id, function(){ init(); }); } \ No newline at end of file diff --git a/sai/sai/page/default_page/js/libs/bootstrap-datepicker.js b/sai/page/default_page/js/libs/bootstrap-datepicker.js similarity index 100% rename from sai/sai/page/default_page/js/libs/bootstrap-datepicker.js rename to sai/page/default_page/js/libs/bootstrap-datepicker.js diff --git a/sai/sai/page/default_page/js/libs/bootstrap-timepicker.min.js b/sai/page/default_page/js/libs/bootstrap-timepicker.min.js similarity index 100% rename from sai/sai/page/default_page/js/libs/bootstrap-timepicker.min.js rename to sai/page/default_page/js/libs/bootstrap-timepicker.min.js diff --git a/sai/sai/page/default_page/js/libs/bootstrap.js b/sai/page/default_page/js/libs/bootstrap.js similarity index 100% rename from sai/sai/page/default_page/js/libs/bootstrap.js rename to sai/page/default_page/js/libs/bootstrap.js diff --git a/sai/sai/page/default_page/js/libs/bootstrap.min.js b/sai/page/default_page/js/libs/bootstrap.min.js similarity index 100% rename from sai/sai/page/default_page/js/libs/bootstrap.min.js rename to sai/page/default_page/js/libs/bootstrap.min.js diff --git a/sai/sai/page/default_page/js/libs/geoFunctions.js b/sai/page/default_page/js/libs/geoFunctions.js similarity index 100% rename from sai/sai/page/default_page/js/libs/geoFunctions.js rename to sai/page/default_page/js/libs/geoFunctions.js diff --git a/sai/sai/page/default_page/js/libs/jquery.min.js b/sai/page/default_page/js/libs/jquery.min.js similarity index 100% rename from sai/sai/page/default_page/js/libs/jquery.min.js rename to sai/page/default_page/js/libs/jquery.min.js diff --git a/sai/sai/page/default_page/js/libs/jquery.miniColors.js b/sai/page/default_page/js/libs/jquery.miniColors.js similarity index 100% rename from sai/sai/page/default_page/js/libs/jquery.miniColors.js rename to sai/page/default_page/js/libs/jquery.miniColors.js diff --git a/sai/sai/page/default_page/js/libs/jquery.switch.js b/sai/page/default_page/js/libs/jquery.switch.js similarity index 100% rename from sai/sai/page/default_page/js/libs/jquery.switch.js rename to sai/page/default_page/js/libs/jquery.switch.js diff --git a/sai/sai/page/default_page/js/monitoring.js b/sai/page/default_page/js/monitoring.js similarity index 100% rename from sai/sai/page/default_page/js/monitoring.js rename to sai/page/default_page/js/monitoring.js diff --git a/sai/sai/page/default_page/js/pushmessage.js b/sai/page/default_page/js/pushmessage.js similarity index 100% rename from sai/sai/page/default_page/js/pushmessage.js rename to sai/page/default_page/js/pushmessage.js diff --git a/sai/sai/page/default_page/js/texthandler.js b/sai/page/default_page/js/texthandler.js similarity index 100% rename from sai/sai/page/default_page/js/texthandler.js rename to sai/page/default_page/js/texthandler.js diff --git a/sai/sai/page/default_page/modules/apireference/account/login.html b/sai/page/default_page/modules/apireference/account/login.html similarity index 100% rename from sai/sai/page/default_page/modules/apireference/account/login.html rename to sai/page/default_page/modules/apireference/account/login.html diff --git a/sai/sai/page/default_page/modules/apireference/account/push.html b/sai/page/default_page/modules/apireference/account/push.html similarity index 100% rename from sai/sai/page/default_page/modules/apireference/account/push.html rename to sai/page/default_page/modules/apireference/account/push.html diff --git a/sai/sai/page/default_page/modules/apireference/account/registration.html b/sai/page/default_page/modules/apireference/account/registration.html similarity index 100% rename from sai/sai/page/default_page/modules/apireference/account/registration.html rename to sai/page/default_page/modules/apireference/account/registration.html diff --git a/sai/sai/page/default_page/modules/apireference/data/acquisition.html b/sai/page/default_page/modules/apireference/data/acquisition.html similarity index 100% rename from sai/sai/page/default_page/modules/apireference/data/acquisition.html rename to sai/page/default_page/modules/apireference/data/acquisition.html diff --git a/sai/sai/page/default_page/modules/apireference/data/series.html b/sai/page/default_page/modules/apireference/data/series.html similarity index 100% rename from sai/sai/page/default_page/modules/apireference/data/series.html rename to sai/page/default_page/modules/apireference/data/series.html diff --git a/sai/sai/page/default_page/modules/apireference/incentive/achievements.html b/sai/page/default_page/modules/apireference/incentive/achievements.html similarity index 100% rename from sai/sai/page/default_page/modules/apireference/incentive/achievements.html rename to sai/page/default_page/modules/apireference/incentive/achievements.html diff --git a/sai/sai/page/default_page/modules/apireference/incentive/badges.html b/sai/page/default_page/modules/apireference/incentive/badges.html similarity index 100% rename from sai/sai/page/default_page/modules/apireference/incentive/badges.html rename to sai/page/default_page/modules/apireference/incentive/badges.html diff --git a/sai/sai/page/default_page/modules/apireference/incentive/bonusareas.html b/sai/page/default_page/modules/apireference/incentive/bonusareas.html similarity index 100% rename from sai/sai/page/default_page/modules/apireference/incentive/bonusareas.html rename to sai/page/default_page/modules/apireference/incentive/bonusareas.html diff --git a/sai/sai/page/default_page/modules/apireference/incentive/ranking.html b/sai/page/default_page/modules/apireference/incentive/ranking.html similarity index 100% rename from sai/sai/page/default_page/modules/apireference/incentive/ranking.html rename to sai/page/default_page/modules/apireference/incentive/ranking.html diff --git a/sai/sai/page/default_page/modules/apireference/incentive/statistics.html b/sai/page/default_page/modules/apireference/incentive/statistics.html similarity index 100% rename from sai/sai/page/default_page/modules/apireference/incentive/statistics.html rename to sai/page/default_page/modules/apireference/incentive/statistics.html diff --git a/sai/sai/page/default_page/modules/apireference/incentive/titles.html b/sai/page/default_page/modules/apireference/incentive/titles.html similarity index 100% rename from sai/sai/page/default_page/modules/apireference/incentive/titles.html rename to sai/page/default_page/modules/apireference/incentive/titles.html diff --git a/sai/sai/page/default_page/modules/apireference/main.html b/sai/page/default_page/modules/apireference/main.html similarity index 100% rename from sai/sai/page/default_page/modules/apireference/main.html rename to sai/page/default_page/modules/apireference/main.html diff --git a/sai/sai/page/default_page/modules/apireference/overview/request.html b/sai/page/default_page/modules/apireference/overview/request.html similarity index 100% rename from sai/sai/page/default_page/modules/apireference/overview/request.html rename to sai/page/default_page/modules/apireference/overview/request.html diff --git a/sai/sai/page/default_page/modules/apireference/overview/response.html b/sai/page/default_page/modules/apireference/overview/response.html similarity index 100% rename from sai/sai/page/default_page/modules/apireference/overview/response.html rename to sai/page/default_page/modules/apireference/overview/response.html diff --git a/sai/sai/page/default_page/modules/apireference/overview/statuscode.html b/sai/page/default_page/modules/apireference/overview/statuscode.html similarity index 100% rename from sai/sai/page/default_page/modules/apireference/overview/statuscode.html rename to sai/page/default_page/modules/apireference/overview/statuscode.html diff --git a/sai/sai/page/default_page/modules/bonusareacreator/main.html b/sai/page/default_page/modules/bonusareacreator/main.html similarity index 100% rename from sai/sai/page/default_page/modules/bonusareacreator/main.html rename to sai/page/default_page/modules/bonusareacreator/main.html diff --git a/sai/sai/page/default_page/modules/documentation/client/empty.html b/sai/page/default_page/modules/documentation/client/empty.html similarity index 100% rename from sai/sai/page/default_page/modules/documentation/client/empty.html rename to sai/page/default_page/modules/documentation/client/empty.html diff --git a/sai/sai/page/default_page/modules/documentation/main.html b/sai/page/default_page/modules/documentation/main.html similarity index 100% rename from sai/sai/page/default_page/modules/documentation/main.html rename to sai/page/default_page/modules/documentation/main.html diff --git a/sai/sai/page/default_page/modules/documentation/server/architecture.html b/sai/page/default_page/modules/documentation/server/architecture.html similarity index 100% rename from sai/sai/page/default_page/modules/documentation/server/architecture.html rename to sai/page/default_page/modules/documentation/server/architecture.html diff --git a/sai/sai/page/default_page/modules/documentation/server/barea.html b/sai/page/default_page/modules/documentation/server/barea.html similarity index 100% rename from sai/sai/page/default_page/modules/documentation/server/barea.html rename to sai/page/default_page/modules/documentation/server/barea.html diff --git a/sai/sai/page/default_page/modules/documentation/server/database.html b/sai/page/default_page/modules/documentation/server/database.html similarity index 100% rename from sai/sai/page/default_page/modules/documentation/server/database.html rename to sai/page/default_page/modules/documentation/server/database.html diff --git a/sai/sai/page/default_page/modules/documentation/server/incentive.html b/sai/page/default_page/modules/documentation/server/incentive.html similarity index 100% rename from sai/sai/page/default_page/modules/documentation/server/incentive.html rename to sai/page/default_page/modules/documentation/server/incentive.html diff --git a/sai/sai/page/default_page/modules/documentation/server/nodejs.html b/sai/page/default_page/modules/documentation/server/nodejs.html similarity index 100% rename from sai/sai/page/default_page/modules/documentation/server/nodejs.html rename to sai/page/default_page/modules/documentation/server/nodejs.html diff --git a/sai/sai/page/default_page/modules/documentation/server/push.html b/sai/page/default_page/modules/documentation/server/push.html similarity index 100% rename from sai/sai/page/default_page/modules/documentation/server/push.html rename to sai/page/default_page/modules/documentation/server/push.html diff --git a/sai/sai/page/default_page/modules/documentation/server/queue.html b/sai/page/default_page/modules/documentation/server/queue.html similarity index 100% rename from sai/sai/page/default_page/modules/documentation/server/queue.html rename to sai/page/default_page/modules/documentation/server/queue.html diff --git a/sai/sai/page/default_page/modules/monitoring/main.html b/sai/page/default_page/modules/monitoring/main.html similarity index 100% rename from sai/sai/page/default_page/modules/monitoring/main.html rename to sai/page/default_page/modules/monitoring/main.html diff --git a/sai/sai/page/default_page/modules/pushmessage/main.html b/sai/page/default_page/modules/pushmessage/main.html similarity index 100% rename from sai/sai/page/default_page/modules/pushmessage/main.html rename to sai/page/default_page/modules/pushmessage/main.html diff --git a/sai/sai/page/default_page/modules/texthandler/export.html b/sai/page/default_page/modules/texthandler/export.html similarity index 100% rename from sai/sai/page/default_page/modules/texthandler/export.html rename to sai/page/default_page/modules/texthandler/export.html diff --git a/sai/sai/page/default_page/modules/texthandler/import.html b/sai/page/default_page/modules/texthandler/import.html similarity index 100% rename from sai/sai/page/default_page/modules/texthandler/import.html rename to sai/page/default_page/modules/texthandler/import.html diff --git a/sai/sai/page/default_page/modules/texthandler/main.html b/sai/page/default_page/modules/texthandler/main.html similarity index 100% rename from sai/sai/page/default_page/modules/texthandler/main.html rename to sai/page/default_page/modules/texthandler/main.html diff --git a/sai/sai/page/default_page/sai.tpl b/sai/page/default_page/sai.tpl similarity index 77% rename from sai/sai/page/default_page/sai.tpl rename to sai/page/default_page/sai.tpl index 1dd10b1..66117c9 100644 --- a/sai/sai/page/default_page/sai.tpl +++ b/sai/page/default_page/sai.tpl @@ -1,14 +1,10 @@ - da_sense | Developer Center - + ${css} ${js} @@ -17,7 +13,7 @@ and open the template in the editor.