From deb3ad8649cecc03bf9c4f7dc14be388b1456afd Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sat, 1 Apr 2017 00:45:47 +0200
Subject: [PATCH] started danube fixup

---
 .htaccess                                              |  2 ++
 api.php                                                |  4 ----
 .../page/default_certificates/default_certificates.php | 10 +++++++++-
 danube/page/default_contact/default_contact.php        |  9 ++++++++-
 .../page/default_impressions/default_impressions.php   | 10 +++++++++-
 .../page/default_introduction/default_introduction.php | 10 +++++++++-
 danube/page/default_page/default_page.php              |  6 +++---
 danube/page/default_page/tpl/danube.tpl                |  2 +-
 danube/page/default_partners/default_partners.php      | 10 +++++++++-
 danube/page/default_prices/default_prices.php          | 10 +++++++++-
 danube/page/page_danube.php                            |  8 +++++++-
 index.php                                              | 10 +++-------
 sai.php                                                |  7 +------
 13 files changed, 70 insertions(+), 28 deletions(-)
 create mode 100644 .htaccess

diff --git a/.htaccess b/.htaccess
new file mode 100644
index 0000000..497b9dd
--- /dev/null
+++ b/.htaccess
@@ -0,0 +1,2 @@
+RewriteEngine On
+RewriteRule ^files/([^/]+)/([^/]+)$ api.php?call=files&cat=$1&id=$2
\ No newline at end of file
diff --git a/api.php b/api.php
index 26313a2..a3f6160 100644
--- a/api.php
+++ b/api.php
@@ -4,10 +4,6 @@ require_once 'danube/autoload.inc';
 require_once '/home/web/web/config/get_config.php';
 
 \SYSTEM\system::start(\WEBCRAFT\get_config(dirname(__FILE__)));
-\SYSTEM\system::include_ExceptionShortcut();
-\SYSTEM\system::include_ResultShortcut();
-\SYSTEM\system::register_errorhandler_dbwriter();
-\SYSTEM\system::register_errorhandler_jsonoutput();
 
 echo \SYSTEM\API\api::run('\SYSTEM\API\verify','api_danube',array_merge($_POST,$_GET));
 new \SYSTEM\LOG\COUNTER("API was called sucessfully.");
\ No newline at end of file
diff --git a/danube/page/default_certificates/default_certificates.php b/danube/page/default_certificates/default_certificates.php
index e8017ec..9cbf358 100644
--- a/danube/page/default_certificates/default_certificates.php
+++ b/danube/page/default_certificates/default_certificates.php
@@ -1,5 +1,13 @@
 <?php
-class default_certificates extends SYSTEM\PAGE\Page {
+class default_certificates implements SYSTEM\PAGE\Page {
+    public static function title(){
+        return \SYSTEM\PAGE\text::get('title_certificates');}
+    public static function meta(){
+        return \SYSTEM\PAGE\text::tag('meta_certificates');}
+
+    public static function css() {return array();}
+    public static function js() {return array();}
+    
     public function html(){
         $vars = array();                 
         $vars['gallery_certifictes'] = $this->gallery();
diff --git a/danube/page/default_contact/default_contact.php b/danube/page/default_contact/default_contact.php
index 6f45941..abeb9b8 100644
--- a/danube/page/default_contact/default_contact.php
+++ b/danube/page/default_contact/default_contact.php
@@ -1,6 +1,13 @@
 <?php
+class default_contact implements SYSTEM\PAGE\Page {
+    public static function title(){
+        return \SYSTEM\PAGE\text::get('title_contact');}
+    public static function meta(){
+        return \SYSTEM\PAGE\text::tag('meta_contact');}
 
-class default_contact extends SYSTEM\PAGE\Page {
+    public static function css() {return array();}
+    public static function js() {return array();}
+    
     public function html(){
         $vars = array();                        
         $vars['content'] = '';
diff --git a/danube/page/default_impressions/default_impressions.php b/danube/page/default_impressions/default_impressions.php
index 224c531..c8a6db8 100644
--- a/danube/page/default_impressions/default_impressions.php
+++ b/danube/page/default_impressions/default_impressions.php
@@ -1,5 +1,13 @@
 <?php
-class default_impressions extends SYSTEM\PAGE\Page {
+class default_impressions implements SYSTEM\PAGE\Page {
+    public static function title(){
+        return \SYSTEM\PAGE\text::get('title_impressions');}
+    public static function meta(){
+        return \SYSTEM\PAGE\text::tag('meta_impressions');}
+
+    public static function css() {return array();}
+    public static function js() {return array();}
+    
     public function html(){
         $vars = array();                 
         $vars['gallery_impressions'] = $this->gallery();
diff --git a/danube/page/default_introduction/default_introduction.php b/danube/page/default_introduction/default_introduction.php
index cba742e..a65dc57 100644
--- a/danube/page/default_introduction/default_introduction.php
+++ b/danube/page/default_introduction/default_introduction.php
@@ -1,5 +1,13 @@
 <?php
-class default_introduction extends SYSTEM\PAGE\Page {
+class default_introduction implements SYSTEM\PAGE\Page {
+    public static function title(){
+        return \SYSTEM\PAGE\text::get('title_introduction');}
+    public static function meta(){
+        return \SYSTEM\PAGE\text::tag('meta_introduction');}
+
+    public static function css() {return array();}
+    public static function js() {return array();}
+    
     public function html(){
         $vars = \SYSTEM\PAGE\text::tag('danube');
         return SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_introduction/tpl/introduction.tpl'))->SERVERPATH(), $vars);
diff --git a/danube/page/default_page/default_page.php b/danube/page/default_page/default_page.php
index 8d82b6f..59f323d 100644
--- a/danube/page/default_page/default_page.php
+++ b/danube/page/default_page/default_page.php
@@ -1,6 +1,6 @@
 <?php
-class default_page extends SYSTEM\PAGE\Page {
-    private function js(){        
+class default_page implements SYSTEM\PAGE\DefaultPage {
+    public static function js(){        
         return  \SYSTEM\HTML\html::script(\LIB\lib_jquery::js()->WEBPATH()).
                 \SYSTEM\HTML\html::script(\LIB\lib_bootstrap::js()->WEBPATH()).
                 \SYSTEM\HTML\html::script('https://cdnjs.cloudflare.com/ajax/libs/openlayers/2.13.1/OpenLayers.js').
@@ -10,7 +10,7 @@ class default_page extends SYSTEM\PAGE\Page {
                 \SYSTEM\HTML\html::script((new PPAGE('default_page/js/galleria/galleria-1.2.9.min.js'))->WEBPATH());
     }
     
-    private function css(){
+    public static function css(){
         return  \SYSTEM\HTML\html::link(\LIB\lib_bootstrap::css()->WEBPATH(false));}
         
     private function languageFlags(){
diff --git a/danube/page/default_page/tpl/danube.tpl b/danube/page/default_page/tpl/danube.tpl
index 9a6fa76..af5a727 100644
--- a/danube/page/default_page/tpl/danube.tpl
+++ b/danube/page/default_page/tpl/danube.tpl
@@ -18,7 +18,7 @@
         <div style="width: 900px; margin-right: auto; margin-left: auto;"><img src="danube/page/default_page/pics/css/font.png" /></div>
         <div class="hero-unit" style=" border: 1px solid black; border-top: 0px solid black; box-shadow: 5px 5px 3px; background: url(danube/page/default_page/pics/css/verlauf_bg.png); width: 934px; padding: 0px; margin: 0; margin-bottom: 15px; padding-bottom: -10px; margin-left: auto; margin-right: auto; margin-top: -2px;">
             <div class="hero-unit" style="background: url(danube/page/default_page/pics/css/verlauf_bg.png); margin: 0; padding: 0; border-top-left-radius: 5px; border-top-right-radius: 5px; -moz-border-bottom-left-radius: 0; -moz-border-bottom-right-radius: 0; border-bottom-left-radius: 5px; border-bottom-right-radius: 5px;">
-                <nav id="danube_menu" class="navbar navbar-inverse">
+                <nav id="danube_menu" class="navbar navbar-inverse" style="background: none;">
                     <div class="container-fluid">
                         <!-- Brand and toggle get grouped for better mobile display -->
                         <div class="navbar-header">
diff --git a/danube/page/default_partners/default_partners.php b/danube/page/default_partners/default_partners.php
index 64dcd3d..0830533 100644
--- a/danube/page/default_partners/default_partners.php
+++ b/danube/page/default_partners/default_partners.php
@@ -1,5 +1,13 @@
 <?php
-class default_partners extends SYSTEM\PAGE\Page {
+class default_partners implements SYSTEM\PAGE\Page {
+    public static function title(){
+        return \SYSTEM\PAGE\text::get('title_partners');}
+    public static function meta(){
+        return \SYSTEM\PAGE\text::tag('meta_partners');}
+
+    public static function css() {return array();}
+    public static function js() {return array();}
+    
     public function html(){
         $vars = array();                 
         $vars['gallery_partners'] = $this->gallery();
diff --git a/danube/page/default_prices/default_prices.php b/danube/page/default_prices/default_prices.php
index d8ec4fb..794c1fc 100644
--- a/danube/page/default_prices/default_prices.php
+++ b/danube/page/default_prices/default_prices.php
@@ -1,5 +1,13 @@
 <?php
-class default_prices extends SYSTEM\PAGE\Page {
+class default_prices implements SYSTEM\PAGE\Page {
+    public static function title(){
+        return \SYSTEM\PAGE\text::get('title_prices');}
+    public static function meta(){
+        return \SYSTEM\PAGE\text::tag('meta_prices');}
+
+    public static function css() {return array();}
+    public static function js() {return array();}
+    
     public function html(){
         $vars = \SYSTEM\PAGE\text::tag('danube');
         return SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_prices/tpl/prices.tpl'))->SERVERPATH(), $vars);
diff --git a/danube/page/page_danube.php b/danube/page/page_danube.php
index 44ca047..db7954d 100644
--- a/danube/page/page_danube.php
+++ b/danube/page/page_danube.php
@@ -1,7 +1,13 @@
 <?php
 
 class page_danube extends \SYSTEM\API\api_default {
-
+    public static function get_apigroup(){
+        return 1;}
+    public static function get_class($params = null){
+        return self::class;}
+    public static function get_default_state(){
+        return 'start';}
+        
     public static function default_page($_escaped_fragment_ = NULL){
         return (new default_page($_escaped_fragment_))->html();}
     
diff --git a/index.php b/index.php
index 6e7c83b..aecb5ce 100644
--- a/index.php
+++ b/index.php
@@ -1,13 +1,9 @@
 <?php
-require_once 'lib/system/autoload.inc';                                         //SYSTEM Classes
+require_once 'lib/autoload.inc';                                                //SYSTEM Classes
 require_once 'danube/autoload.inc';                                             //Project Classes
 require_once '/home/web/web/config/get_config.php';
 
 \SYSTEM\system::start(\WEBCRAFT\get_config(dirname(__FILE__)));
-\SYSTEM\system::include_ExceptionShortcut();
-\SYSTEM\system::include_ResultShortcut();
-\SYSTEM\system::register_errorhandler_dbwriter();
-\SYSTEM\system::register_errorhandler_jsonoutput();
 
-echo \SYSTEM\API\api::run('\SYSTEM\API\verify','page_danube',array_merge($_POST,$_GET), 1, true, true);
-new \SYSTEM\LOG\COUNTER("API was called sucessfully.");
\ No newline at end of file
+echo \SYSTEM\API\api::run('\SYSTEM\API\verify', 'page_danube', array_merge($_POST,$_GET), 1, false, true);
+new \SYSTEM\LOG\COUNTER("Page was called sucessfully.");
\ No newline at end of file
diff --git a/sai.php b/sai.php
index faef1c8..e3488e2 100644
--- a/sai.php
+++ b/sai.php
@@ -4,10 +4,5 @@ require_once 'danube/autoload.inc';
 require_once '/home/web/web/config/get_config.php';
 
 \SYSTEM\system::start(\WEBCRAFT\get_config(dirname(__FILE__)));
-\SYSTEM\system::include_ExceptionShortcut();                                    //allow ERROR() instead of \SYSTEM\LOG\ERROR()
-\SYSTEM\system::include_ResultShortcut();                                       //allow JsonResult() instead of \SYSTEM\LOG\JsonResult()
-\SYSTEM\system::register_errorhandler_dbwriter();                               //write errors to database (must be first errorhandler to register)
-\SYSTEM\system::register_errorhandler_jsonoutput();                             //print errors as json to caller
 
-$sai = new SYSTEM\SAI\saigui();
-echo $sai->html();
\ No newline at end of file
+echo (new SYSTEM\SAI\saigui())->html();
\ No newline at end of file