From 8efc15a5dc3688b235326a1e30c3f69df37951aa Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Thu, 22 Aug 2019 13:46:40 +0200
Subject: [PATCH] updated files to fit to new system

---
 .htaccess                                          |  7 +++++--
 api.php                                            |  6 +-----
 index.inc                                          |  6 ++++++
 index.php                                          |  6 +-----
 sai.php                                            |  8 ++------
 setup.php                                          |  6 +-----
 yeminy/page/default_article/default_article.php    | 12 +++++++++++-
 .../page/default_impressum/default_impressum.php   | 10 +++++++++-
 yeminy/page/default_list/default_list.php          | 14 +++++++++++++-
 yeminy/page/default_page/default_page.php          |  6 +++---
 10 files changed, 52 insertions(+), 29 deletions(-)
 create mode 100644 index.inc

diff --git a/.htaccess b/.htaccess
index 3f78c44..b64f5d0 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,3 +1,6 @@
 RewriteEngine On
-RewriteCond %{HTTP_HOST} !^www\.yeminy\.org [NC]
-RewriteRule ^(.*)$ http://www.yeminy.org/$1 [R=301,L]
\ No newline at end of file
+RewriteRule ^(.*)/fonts/fontawesome-webfont(.*)$ lib/system/lib/font_awesome/lib/fonts/fontawesome-webfont$2 [L]
+RewriteRule ^sai$ sai.php$1 [L]
+
+RewriteRule ^(.*)/files/([^/]+)/([^/]+)$ api.php?call=files&cat=$2&id=$3 [L]
+RewriteRule ^cache/([^/]+)/([^/]+)$ api.php?call=cache&id=$1&ident=$2 [L]
\ No newline at end of file
diff --git a/api.php b/api.php
index de2e785..4c0a2d9 100644
--- a/api.php
+++ b/api.php
@@ -1,9 +1,5 @@
 <?php
-require_once 'lib/autoload.inc';                                                //SYSTEM Classes
-require_once 'yeminy/autoload.inc';                                         //Project Classes
-require_once '/home/web/web/config/get_config.php';
-
-\SYSTEM\system::start(\WEBCRAFT\get_config(dirname(__FILE__)));
+require_once 'index.inc';
 
 echo \SYSTEM\API\api::run('\SYSTEM\API\verify','api_yeminy',array_merge($_POST,$_GET));
 new \SYSTEM\LOG\COUNTER("API was called sucessfully.");
\ No newline at end of file
diff --git a/index.inc b/index.inc
new file mode 100644
index 0000000..b6f1283
--- /dev/null
+++ b/index.inc
@@ -0,0 +1,6 @@
+<?php
+require_once 'lib/autoload.inc';            // SYSTEM Classes
+require_once 'yeminy/autoload.inc';         // Project Classes
+require_once '../../config/get_config.php'; // Config
+
+\SYSTEM\system::start(\WEBCRAFT\get_config(dirname(__FILE__)));
\ No newline at end of file
diff --git a/index.php b/index.php
index 141a6fb..270a587 100644
--- a/index.php
+++ b/index.php
@@ -1,9 +1,5 @@
 <?php
-require_once 'lib/autoload.inc';                                                //SYSTEM Classes
-require_once 'yeminy/autoload.inc';                                         //Project Classes
-require_once '/home/web/web/config/get_config.php';
-
-\SYSTEM\system::start(\WEBCRAFT\get_config(dirname(__FILE__)));
+require_once 'index.inc';
 
 echo \SYSTEM\API\api::run('\SYSTEM\API\verify', 'page_yeminy', 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 efbc48c..9b8f14b 100644
--- a/sai.php
+++ b/sai.php
@@ -1,8 +1,4 @@
 <?php
-require_once 'lib/autoload.inc';                                                //SYSTEM Classes
-require_once 'yeminy/autoload.inc';                                         //Project Classes
-require_once '/home/web/web/config/get_config.php';
+require_once 'index.inc';
 
-\SYSTEM\system::start(\WEBCRAFT\get_config(dirname(__FILE__)));
-
-echo (new SYSTEM\SAI\saigui())->html();
\ No newline at end of file
+echo (new SYSTEM\SAI\sai_gui())->html();
\ No newline at end of file
diff --git a/setup.php b/setup.php
index 6d926bc..8636f5e 100644
--- a/setup.php
+++ b/setup.php
@@ -1,8 +1,4 @@
 <?php
-require_once 'lib/autoload.inc';                                                //SYSTEM Classes
-require_once 'yeminy/autoload.inc';                                         //Project Classes
-require_once '/home/web/web/config/get_config.php';
-
-\SYSTEM\system::start(\WEBCRAFT\get_config(dirname(__FILE__)));
+require_once 'index.inc';
 
 echo \SYSTEM\SQL\setup::install();
\ No newline at end of file
diff --git a/yeminy/page/default_article/default_article.php b/yeminy/page/default_article/default_article.php
index a7e0b96..c21001d 100644
--- a/yeminy/page/default_article/default_article.php
+++ b/yeminy/page/default_article/default_article.php
@@ -1,8 +1,18 @@
 <?php
-class default_article extends \SYSTEM\PAGE\Page {
+class default_article implements \SYSTEM\PAGE\Page {
     var $id = null;
     public function __construct($id) {
         $this->id = $id;}
+    
+    public static function title(){
+        return null;}
+    public static function meta(){
+        return array();}
+
+    public static function js(){
+        return array();}
+    public static function css(){
+        return array();}
 
     public function html(){
         return SYSTEM\PAGE\replace::replace(article::full($this->id), \SYSTEM\PAGE\text::tag('time'));
diff --git a/yeminy/page/default_impressum/default_impressum.php b/yeminy/page/default_impressum/default_impressum.php
index ea01ff4..9a33aee 100644
--- a/yeminy/page/default_impressum/default_impressum.php
+++ b/yeminy/page/default_impressum/default_impressum.php
@@ -1,5 +1,13 @@
 <?php
-class default_impressum extends \SYSTEM\PAGE\Page {
+class default_impressum implements \SYSTEM\PAGE\Page {
+    public static function title(){
+        return null;}
+    public static function meta(){
+        return array();}
+    public static function js(){
+        return array();}
+    public static function css(){
+        return array();}
     public function html(){
         $vars = \SYSTEM\PAGE\text::tag('webcraft');
         return SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_impressum/tpl/impressum.tpl'))->SERVERPATH(), $vars);
diff --git a/yeminy/page/default_list/default_list.php b/yeminy/page/default_list/default_list.php
index 9d80403..a205edf 100644
--- a/yeminy/page/default_list/default_list.php
+++ b/yeminy/page/default_list/default_list.php
@@ -1,11 +1,23 @@
 <?php
-class default_list extends \SYSTEM\PAGE\Page {
+class default_list implements \SYSTEM\PAGE\Page {
     var $tag = null;
     public function __construct($tag = null) {
         $this->tag = $tag;}
+
+    public static function title(){
+        return null;
+    }
+    public static function meta(){
+        return array();
+    }
+
     public static function js(){
         return array(   new PPAGE('default_list/js/default_list.js'));}
     
+    public static function css(){
+        return array();
+    }
+
     public function html(){
         $vars = array();
         $vars['title'] = $this->tag ? ucfirst($this->tag) : 'Neuheiten';
diff --git a/yeminy/page/default_page/default_page.php b/yeminy/page/default_page/default_page.php
index d1f8370..5ea75de 100644
--- a/yeminy/page/default_page/default_page.php
+++ b/yeminy/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(\LIB\lib_system::js()->WEBPATH()).
@@ -8,7 +8,7 @@ class default_page extends \SYSTEM\PAGE\Page {
                 \SYSTEM\HTML\html::script((new PPAGE('default_page/js/default_page.js'))->WEBPATH());
     }
     
-    private function css(){  
+    public static function css(){  
         return  \SYSTEM\HTML\html::link(\LIB\lib_bootstrap::css()->WEBPATH()).
                 \SYSTEM\HTML\html::link(\LIB\lib_animate::css()->WEBPATH()).
                 \SYSTEM\HTML\html::link(\LIB\lib_system::css()->WEBPATH()).