From f0813e28a9f1117b6d660d5e9b6a731ec0ab293c Mon Sep 17 00:00:00 2001
From: rylon <rylon@web.de>
Date: Wed, 28 May 2014 01:39:38 +0200
Subject: [PATCH 1/3] rhein: saistart

---
 rhein/sai/autoload.inc.php                    |  1 +
 rhein/sai/register_modules.php                |  1 +
 rhein/sai/saistart_rhein_sai/content.tpl      | 14 +++++++++++
 .../saistart_rhein_sai/saistart_rhein_sai.php | 25 +++++++++++++++++++
 4 files changed, 41 insertions(+)
 create mode 100644 rhein/sai/saistart_rhein_sai/content.tpl
 create mode 100644 rhein/sai/saistart_rhein_sai/saistart_rhein_sai.php

diff --git a/rhein/sai/autoload.inc.php b/rhein/sai/autoload.inc.php
index eaf57b4..5cf2e47 100644
--- a/rhein/sai/autoload.inc.php
+++ b/rhein/sai/autoload.inc.php
@@ -1,4 +1,5 @@
 <?php
+SYSTEM\autoload::registerFolder(dirname(__FILE__).'/saistart_rhein_sai','');
 SYSTEM\autoload::registerFolder(dirname(__FILE__).'/saimod_webcraft_billing_satelite','');
 SYSTEM\autoload::registerFolder(dirname(__FILE__).'/saimod_webcraft_gallery','');
 SYSTEM\autoload::registerFolder(dirname(__FILE__).'/saimod_webcraft_gallery/qq','DBD');
diff --git a/rhein/sai/register_modules.php b/rhein/sai/register_modules.php
index c6973e3..7888acc 100644
--- a/rhein/sai/register_modules.php
+++ b/rhein/sai/register_modules.php
@@ -1,3 +1,4 @@
 <?php
+\SYSTEM\SAI\sai::register_start('saistart_rhein_sai');
 \SYSTEM\SAI\sai::register('saimod_webcraft_billing_satelite');
 \SYSTEM\SAI\sai::register('saimod_webcraft_gallery');
\ No newline at end of file
diff --git a/rhein/sai/saistart_rhein_sai/content.tpl b/rhein/sai/saistart_rhein_sai/content.tpl
new file mode 100644
index 0000000..c503f4e
--- /dev/null
+++ b/rhein/sai/saistart_rhein_sai/content.tpl
@@ -0,0 +1,14 @@
+Willkommen zum SYSTEM Admin Interface - kurz SAI.</br>
+Von hier aus kann die Seite verwaltet und kontrolliert werden.
+<div id="myCarousel" class="carousel slide" style="margin-right: 300px;">    
+    <div class="carousel-inner">        
+        <div class="item active">
+            <img class="carousel-img" src="http://mojotrollz.eu/web/rhein/api.php?call=files&cat=page&id=house_overview.jpg" alt="">
+            <div class="carousel-caption">
+                <h4>Ferienwohnung Rhein</h4>
+            </div>
+        </div>      
+    </div>        
+    <a class="carousel-control left" href="#myCarousel" data-slide="prev">&lsaquo;</a>
+    <a class="carousel-control right" href="#myCarousel" data-slide="next">&rsaquo;</a>
+</div>
\ No newline at end of file
diff --git a/rhein/sai/saistart_rhein_sai/saistart_rhein_sai.php b/rhein/sai/saistart_rhein_sai/saistart_rhein_sai.php
new file mode 100644
index 0000000..12c12c6
--- /dev/null
+++ b/rhein/sai/saistart_rhein_sai/saistart_rhein_sai.php
@@ -0,0 +1,25 @@
+<?php
+class saistart_rhein_sai extends \SYSTEM\SAI\saistart_sys_sai {    
+    protected static function html_content(){
+        return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\WEBPATH(new PSAI(),'saistart_rhein_sai/content.tpl'), array());}
+        
+    //changed func names & menu
+    public static function sai_mod_saistart_rhein_sai(){
+        return \SYSTEM\PAGE\replace::replaceFile(   \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/saistart.tpl'),
+                                                    array('content' => self::html_content(), 'login' => self::html_login()));}
+    public static function html_li_menu(){return '<li class="active"><a href="#" saimenu="saistart_rhein_sai">'.\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_TITLE).'</a></li>';}
+    public static function right_public(){return true;}    
+    public static function right_right(){return true;}
+    
+    public static function sai_mod_saistart_rhein_sai_flag_css(){}
+    public static function sai_mod_saistart_rhein_sai_flag_js(){
+        return \SYSTEM\LOG\JsonResult::toString(
+            array(  \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'js/jqBootstrapValidation.js'),
+                    \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/saistart_sys_sai.js'),
+                    \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'js/crypto/jquery.md5.js'),
+                    \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'js/crypto/jquery.sha1.js')
+                 ));}
+    
+    protected static function html_login(){        
+        return \SYSTEM\SECURITY\Security::isLoggedIn() ? \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/logout.tpl'), array()) : \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/login.tpl'), array());}        
+}
\ No newline at end of file

From 5dca80b5e408f43c0bbca8a230ef3118d6187dbf Mon Sep 17 00:00:00 2001
From: rylon <rylon@web.de>
Date: Wed, 28 May 2014 11:23:49 +0200
Subject: [PATCH 2/3] rhein: saistart js fix

---
 rhein/sai/saistart_rhein_sai/saistart_rhein_sai.js  | 1 +
 rhein/sai/saistart_rhein_sai/saistart_rhein_sai.php | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 rhein/sai/saistart_rhein_sai/saistart_rhein_sai.js

diff --git a/rhein/sai/saistart_rhein_sai/saistart_rhein_sai.js b/rhein/sai/saistart_rhein_sai/saistart_rhein_sai.js
new file mode 100644
index 0000000..9052615
--- /dev/null
+++ b/rhein/sai/saistart_rhein_sai/saistart_rhein_sai.js
@@ -0,0 +1 @@
+function init_saistart_rhein_sai() {init__SYSTEM_SAI_saistart_sys_sai();};
\ No newline at end of file
diff --git a/rhein/sai/saistart_rhein_sai/saistart_rhein_sai.php b/rhein/sai/saistart_rhein_sai/saistart_rhein_sai.php
index 12c12c6..1a20543 100644
--- a/rhein/sai/saistart_rhein_sai/saistart_rhein_sai.php
+++ b/rhein/sai/saistart_rhein_sai/saistart_rhein_sai.php
@@ -17,7 +17,8 @@ class saistart_rhein_sai extends \SYSTEM\SAI\saistart_sys_sai {
             array(  \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'js/jqBootstrapValidation.js'),
                     \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/saistart_sys_sai.js'),
                     \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'js/crypto/jquery.md5.js'),
-                    \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'js/crypto/jquery.sha1.js')
+                    \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'js/crypto/jquery.sha1.js'),
+                    \SYSTEM\WEBPATH(new PSAI(),'saistart_rhein_sai/saistart_rhein_sai.js')
                  ));}
     
     protected static function html_login(){        

From e1b248dbcef564f86b90c2015ddb2f3248a08d52 Mon Sep 17 00:00:00 2001
From: rylon <rylon@web.de>
Date: Thu, 29 May 2014 14:29:16 +0200
Subject: [PATCH 3/3] rhein: saifix, system submodule, map border + sytlefix

---
 api.php                           | 2 +-
 config.php                        | 8 ++++----
 index.php                         | 2 +-
 rhein/page/default_page/index.css | 5 ++++-
 rhein/page/default_page/map.js    | 1 +
 sai.php                           | 2 +-
 system                            | 1 +
 7 files changed, 13 insertions(+), 8 deletions(-)
 create mode 160000 system

diff --git a/api.php b/api.php
index cdb19c7..6c9e50a 100644
--- a/api.php
+++ b/api.php
@@ -1,5 +1,5 @@
 <?php
-require_once '../system/autoload.inc.php';                                      //SYSTEM Classes
+require_once 'system/autoload.inc.php';                                      //SYSTEM Classes
 require_once 'rhein/autoload.inc.php';                                       //Project Classes
 
 require_once 'config.php';
diff --git a/config.php b/config.php
index bd740e6..b8b4216 100644
--- a/config.php
+++ b/config.php
@@ -1,6 +1,6 @@
 <?php
 $rhein_config =    array(   array(config_ids::SYS_CONFIG_ERRORREPORTING,        E_ALL | E_STRICT),
-                            array(config_ids::SYS_CONFIG_PATH_BASEURL,          'http://mojotrollz.eu/web/rhein/'),
+                            array(config_ids::SYS_CONFIG_PATH_BASEURL,          'http://fewo-rhein-zwbg.de/'),
                             array(config_ids::SYS_CONFIG_PATH_BASEPATH,         '/home/web/webdir/rhein/'),
                             array(config_ids::SYS_CONFIG_DB_TYPE,               SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_TYPE_MYS),
                             array(config_ids::SYS_CONFIG_DB_HOST,               '127.0.0.1'),
@@ -9,10 +9,10 @@ $rhein_config =    array(   array(config_ids::SYS_CONFIG_ERRORREPORTING,
                             array(config_ids::SYS_CONFIG_DB_PASSWORD,           'dajsabeaisvd345'),
                             array(config_ids::SYS_CONFIG_DB_DBNAME,             'host_rhein'),
                             array(config_ids::SYS_SAI_CONFIG_NAVIMG,            '/web/system/sai/page/img/logo.png'),//not working, cuz paths are not set yet! \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'page/default_page/img/logo.png')),
-                            array(config_ids::SYS_SAI_CONFIG_BASEURL,           'http://mojotrollz.eu/web/rhein/sai.php?'),
+                            array(config_ids::SYS_SAI_CONFIG_BASEURL,           'http://fewo-rhein-zwbg.de/sai.php?'),
                             array(config_ids::SYS_SAI_CONFIG_TITLE,             'Fewo Rhein - Admin Bereich'),
-                            array(config_ids::SYS_SAI_CONFIG_COPYRIGHT,         '<a href="http://mojotrollz.eu/web/rhein/" target="_blank">fewo rhein</a> &copy; WebCraft Media 2013'),
-                            array(config_ids::SYS_CONFIG_PATH_SYSTEMPATHREL,    '../system/'),
+                            array(config_ids::SYS_SAI_CONFIG_COPYRIGHT,         '<a href="http://fewo-rhein-zwbg.de/" target="_blank">fewo rhein</a> &copy; WebCraft Media 2013'),
+                            array(config_ids::SYS_CONFIG_PATH_SYSTEMPATHREL,    'system/'),
                             array(config_ids::SYS_CONFIG_LANGS,                 array('deDE')),
                             array(config_ids::SYS_CONFIG_DEFAULT_LANG,          'deDE'),
                             array(config_ids::WEBCRAFT_BILLING_TOKEN,           'RHEINadasdbcahdscjhd213'));
\ No newline at end of file
diff --git a/index.php b/index.php
index e36d594..4b8c71f 100644
--- a/index.php
+++ b/index.php
@@ -1,5 +1,5 @@
 <?php
-require_once '../system/autoload.inc.php';                                         //SYSTEM Classes
+require_once 'system/autoload.inc.php';                                         //SYSTEM Classes
 require_once 'rhein/autoload.inc.php';                                           //Project Classes
 
 require_once 'config.php';
diff --git a/rhein/page/default_page/index.css b/rhein/page/default_page/index.css
index ab3943f..7a5e751 100644
--- a/rhein/page/default_page/index.css
+++ b/rhein/page/default_page/index.css
@@ -191,4 +191,7 @@ li {
   text-align: 		center;
   max-width: 		500px;
   max-height: 		420px;
-}
\ No newline at end of file
+}
+
+#map {
+    border: 1px solid black;}
\ No newline at end of file
diff --git a/rhein/page/default_page/map.js b/rhein/page/default_page/map.js
index 0e5b7a1..00fb596 100644
--- a/rhein/page/default_page/map.js
+++ b/rhein/page/default_page/map.js
@@ -33,6 +33,7 @@ function drawmap() {
     var lat = 49.73296614;
     var zoom = 17;
 
+    $('#map').empty();
     map = new OpenLayers.Map('map', {
         projection: new OpenLayers.Projection("EPSG:900913"),
         displayProjection: new OpenLayers.Projection("EPSG:4326"),
diff --git a/sai.php b/sai.php
index 63c7613..4fd3c65 100644
--- a/sai.php
+++ b/sai.php
@@ -1,5 +1,5 @@
 <?php
-require_once '../system/autoload.inc.php';                                         //SYSTEM Classes
+require_once 'system/autoload.inc.php';                                         //SYSTEM Classes
 require_once 'rhein/autoload.inc.php';                                        //Project Classes
 
 require_once 'config.php';                                                      //Server config
diff --git a/system b/system
new file mode 160000
index 0000000..18a6cd5
--- /dev/null
+++ b/system
@@ -0,0 +1 @@
+Subproject commit 18a6cd5cdfc2e6a1be71d0d1861c7a0775f3ea8d