updated rhein, so it works properly on the frontend - sai is accessable, added system reference, missing files added
3
.gitmodules
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
[submodule "lib/system"]
|
||||
path = lib/system
|
||||
url = git@mojotrollz.eu:system.git
|
||||
8
api.php
@ -1,9 +1,9 @@
|
||||
<?php
|
||||
require_once 'system/autoload.inc.php'; //SYSTEM Classes
|
||||
require_once 'rhein/autoload.inc.php'; //Project Classes
|
||||
require_once 'lib/system/autoload.inc'; //SYSTEM Classes
|
||||
require_once 'rhein/autoload.inc.php'; //Project Classes
|
||||
require_once '/home/web/web/config/get_config.php';
|
||||
|
||||
require_once 'config.php';
|
||||
SYSTEM\system::start($rhein_config);
|
||||
\SYSTEM\system::start(\WEBCRAFT\get_config(dirname(__FILE__)));
|
||||
\SYSTEM\system::include_ExceptionShortcut();
|
||||
\SYSTEM\system::include_ResultShortcut();
|
||||
\SYSTEM\system::register_errorhandler_dbwriter();
|
||||
|
||||
19
config.php
@ -1,19 +0,0 @@
|
||||
<?php
|
||||
$rhein_config = array( array(config_ids::SYS_CONFIG_ERRORREPORTING, E_ALL | E_STRICT),
|
||||
array(config_ids::SYS_CONFIG_PATH_BASEURL, 'http://www.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'),
|
||||
array(config_ids::SYS_CONFIG_DB_PORT, ''),
|
||||
array(config_ids::SYS_CONFIG_DB_USER, 'mojotrolls_mysql'),
|
||||
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://www.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://www.fewo-rhein-zwbg.de/" target="_blank">fewo rhein</a> © 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'),
|
||||
array(config_ids::SYS_CRON_LOG2SQLITE_PATH, '/home/web/webdir/rhein/rhein/files/log/'));
|
||||
10
index.php
@ -1,13 +1,13 @@
|
||||
<?php
|
||||
require_once 'system/autoload.inc.php'; //SYSTEM Classes
|
||||
require_once 'rhein/autoload.inc.php'; //Project Classes
|
||||
require_once 'lib/system/autoload.inc'; //SYSTEM Classes
|
||||
require_once 'rhein/autoload.inc.php'; //Project Classes
|
||||
require_once '/home/web/web/config/get_config.php';
|
||||
|
||||
require_once 'config.php';
|
||||
\SYSTEM\system::start($rhein_config);
|
||||
\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_rhein', array_merge($_POST,$_GET), 1, false, true)->html();
|
||||
echo \SYSTEM\API\api::run('\SYSTEM\API\verify', 'page_rhein', array_merge($_POST,$_GET), 1, false, true);
|
||||
new \SYSTEM\LOG\COUNTER("Page was called sucessfully.");
|
||||
1
lib/system
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit a1f44597a70dcd1d5ce74c35a8ce824159e9e3a2
|
||||
BIN
rhein/files/gallery/(5)-Kirche-Winter.jpg
Normal file
|
After Width: | Height: | Size: 88 KiB |
BIN
rhein/files/gallery/Aul.JPG
Normal file
|
After Width: | Height: | Size: 1.9 MiB |
BIN
rhein/files/gallery/CIMG5435.JPG
Normal file
|
After Width: | Height: | Size: 1.2 MiB |
BIN
rhein/files/gallery/HPIM0049.JPG
Normal file
|
After Width: | Height: | Size: 1.9 MiB |
BIN
rhein/files/gallery/HPIM0162.JPG
Normal file
|
After Width: | Height: | Size: 1.2 MiB |
BIN
rhein/files/gallery/HPIM0169.JPG
Normal file
|
After Width: | Height: | Size: 1.7 MiB |
BIN
rhein/files/gallery/Mohnbl.2009-4.JPG
Normal file
|
After Width: | Height: | Size: 2.2 MiB |
BIN
rhein/files/gallery/OAUTO1~1.JPG
Normal file
|
After Width: | Height: | Size: 163 KiB |
BIN
rhein/files/gallery/Zwbg.Karte- (61).JPG
Normal file
|
After Width: | Height: | Size: 2.2 MiB |
BIN
rhein/files/house/HPIM0139.JPG
Normal file
|
After Width: | Height: | Size: 649 KiB |
@ -2,7 +2,7 @@
|
||||
|
||||
class default_agbs extends SYSTEM\PAGE\Page {
|
||||
public function html() {
|
||||
$vars = \SYSTEM\locale::getStrings(\DBD\locale_string::CATEGORY_RHEIN_TEXT);
|
||||
$vars = \SYSTEM\PAGE\text::tag('rhein');
|
||||
return $vars['rhein_agbs'];
|
||||
}
|
||||
}
|
||||
@ -1,6 +1,6 @@
|
||||
<?php
|
||||
class default_anfrage extends SYSTEM\PAGE\Page {
|
||||
public function html() {
|
||||
$vars = \SYSTEM\locale::getStrings(DBD\locale_string::CATEGORY_RHEIN_TEXT);
|
||||
$vars = \SYSTEM\PAGE\text::tag('rhein');
|
||||
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PPAGE(), 'default_anfrage/default_anfrage.tpl'), $vars);}
|
||||
}
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
class default_anreise extends SYSTEM\PAGE\Page {
|
||||
public function html() {
|
||||
$vars = \SYSTEM\locale::getStrings(\DBD\locale_string::CATEGORY_RHEIN_TEXT);
|
||||
$vars = \SYSTEM\PAGE\text::tag('rhein');
|
||||
return $vars['rhein_anreise'];
|
||||
}
|
||||
}
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
class default_impressum extends SYSTEM\PAGE\Page {
|
||||
public function html() {
|
||||
$vars = \SYSTEM\locale::getStrings(\DBD\locale_string::CATEGORY_RHEIN_TEXT);
|
||||
$vars = \SYSTEM\PAGE\text::tag('rhein');
|
||||
return $vars['rhein_impressum'];
|
||||
}
|
||||
}
|
||||
@ -5,7 +5,7 @@ $(document).ready(function() {
|
||||
$(this).addClass('aktmenulink');
|
||||
$(this).parent().addClass('aktmenuitem');
|
||||
page = $(this).attr('page');
|
||||
$('#content').load('http://www.fewo-rhein-zwbg.de/index.php?page='+page,function(){
|
||||
$('#content').load('./?page='+page,function(){
|
||||
if(page === 'anreise'){
|
||||
drawmap();}
|
||||
if(page === 'wohnung'){
|
||||
@ -28,7 +28,7 @@ function register_anfrage(){
|
||||
$('#message_fail').show();
|
||||
} else {
|
||||
$.ajax({
|
||||
url: 'http://www.fewo-rhein-zwbg.de/api.php?call=anfrage',
|
||||
url: './api.php?call=anfrage',
|
||||
type: 'GET',
|
||||
data: { name : name,
|
||||
telefon : telefon,
|
||||
|
||||
@ -14,13 +14,15 @@ class default_page extends SYSTEM\PAGE\Page {
|
||||
return '<link rel="stylesheet" href="'.\SYSTEM\WEBPATH(new PLIB(),'bootstrap/css/bootstrap.min.css').'" type="text/css" />'.
|
||||
'<link rel="stylesheet" href="'.\SYSTEM\WEBPATH(new PPAGE(),'default_page/index.css').'" type="text/css" />';
|
||||
}
|
||||
public function html() {
|
||||
public function html($_escaped_fragment_ = NULL) {
|
||||
$vars = array();
|
||||
$vars['js'] = self::js();
|
||||
$vars['js'] = '';
|
||||
if(!$_escaped_fragment_){
|
||||
$vars['js'] = self::js();}
|
||||
$vars['css'] = self::css();
|
||||
$vars['default_gallery'] = saimod_webcraft_gallery::getGalleryGalleria(3);
|
||||
$vars = array_merge($vars, \SYSTEM\locale::getStrings(\DBD\locale_string::CATEGORY_RHEIN_TEXT));
|
||||
$vars = array_merge($vars, \SYSTEM\locale::getStrings(\DBD\locale_string::CATEGORY_RHEIN_OTHER));
|
||||
$vars = array_merge($vars, \SYSTEM\PAGE\text::tag('rhein'));
|
||||
$vars = array_merge($vars, \SYSTEM\PAGE\text::tag('rhein_other'));
|
||||
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PPAGE(),'default_page/rhein.tpl'), $vars);
|
||||
}
|
||||
}
|
||||
@ -40,7 +40,6 @@ body {
|
||||
font-family: Arial, Verdana, SunSans-Regular, Sans-Serif;
|
||||
font-family: Arial, serif;
|
||||
color: #000000;
|
||||
background: url(/api.php?call=files&cat=page&id=rhein_background.jpg) no-repeat center center fixed;
|
||||
-webkit-background-size: cover;
|
||||
-moz-background-size: cover;
|
||||
-o-background-size: cover;
|
||||
|
||||
@ -15,6 +15,9 @@
|
||||
height: 80px;
|
||||
background: url(./api.php?call=files&cat=page&id=header.png) no-repeat;
|
||||
}
|
||||
body {
|
||||
background: url(./api.php?call=files&cat=page&id=rhein_background.jpg) no-repeat center center fixed;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
class default_preise extends SYSTEM\PAGE\Page {
|
||||
public function html() {
|
||||
$vars = \SYSTEM\locale::getStrings(\DBD\locale_string::CATEGORY_RHEIN_TEXT);
|
||||
$vars = \SYSTEM\PAGE\text::tag('rhein');
|
||||
return $vars['rhein_preise'];
|
||||
}
|
||||
}
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
class default_referenzen extends SYSTEM\PAGE\Page {
|
||||
public function html() {
|
||||
$vars = \SYSTEM\locale::getStrings(\DBD\locale_string::CATEGORY_RHEIN_TEXT);
|
||||
$vars = \SYSTEM\PAGE\text::tag('rhein');
|
||||
return $vars['rhein_referenzen'];
|
||||
}
|
||||
}
|
||||
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
class default_wohnung extends SYSTEM\PAGE\Page {
|
||||
public function html() {
|
||||
$vars = \SYSTEM\locale::getStrings(\DBD\locale_string::CATEGORY_RHEIN_TEXT);
|
||||
$vars = \SYSTEM\PAGE\text::tag('rhein');
|
||||
$vars['gallery_house'] = saimod_webcraft_gallery::getGalleryGalleria(2);
|
||||
//$vars['gallery_house'] = saimod_webcraft_gallery::getGalleryBootstrap(2);
|
||||
return SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PPAGE(),'default_wohnung/default_wohnung.tpl'), $vars);
|
||||
|
||||
@ -1,22 +1,22 @@
|
||||
<?php
|
||||
|
||||
class page_rhein extends \SYSTEM\API\api_default {
|
||||
public static function default_page(){
|
||||
return new default_page();}
|
||||
public static function default_page($_escaped_fragment_ = NULL){
|
||||
return (new default_page())->html($_escaped_fragment_);}
|
||||
public static function page_wohnung(){
|
||||
return new default_wohnung();}
|
||||
return (new default_wohnung())->html();}
|
||||
public static function page_anreise(){
|
||||
return new default_anreise();}
|
||||
return (new default_anreise())->html();}
|
||||
public static function page_preise(){
|
||||
return new default_preise();}
|
||||
return (new default_preise())->html();}
|
||||
public static function page_agbs(){
|
||||
return new default_agbs();}
|
||||
return (new default_agbs())->html();}
|
||||
public static function page_impressum(){
|
||||
return new default_impressum();}
|
||||
return (new default_impressum())->html();}
|
||||
public static function page_referenzen(){
|
||||
return new default_referenzen();}
|
||||
return (new default_referenzen())->html();}
|
||||
public static function page_anfrage(){
|
||||
return new default_anfrage();}
|
||||
return (new default_anfrage())->html();}
|
||||
public static function page_galerie(){
|
||||
return new default_galerie();}
|
||||
return (new default_galerie())->html();}
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
<?php
|
||||
\SYSTEM\SAI\sai::register_start('saistart_rhein_sai');
|
||||
//\SYSTEM\SAI\sai::register_start('saistart_rhein_sai');
|
||||
\SYSTEM\SAI\sai::register('saimod_webcraft_billing_satelite');
|
||||
\SYSTEM\SAI\sai::register('saimod_webcraft_gallery');
|
||||
@ -10,7 +10,7 @@ class saistart_rhein_sai extends \SYSTEM\SAI\saistart_sys_sai {
|
||||
\SYSTEM\locale::getStrings(\SYSTEM\DBD\system_locale_string::VALUE_CATEGORY_SYSTEM_SAI),
|
||||
\SYSTEM\locale::getStrings(\SYSTEM\DBD\system_locale_string::VALUE_CATEGORY_SYSTEM_SAI_ERROR));
|
||||
return \SYSTEM\PAGE\replace::replaceFile( \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/tpl/saistart.tpl'),$vars);}
|
||||
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 html_li_menu(){return '<li class="active"><a href="#" saimenu="saistart_rhein_sai">${sai_menu_start}</a></li>';}
|
||||
public static function right_public(){return true;}
|
||||
public static function right_right(){return true;}
|
||||
|
||||
|
||||
8
sai.php
@ -1,9 +1,9 @@
|
||||
<?php
|
||||
require_once 'system/autoload.inc.php'; //SYSTEM Classes
|
||||
require_once 'rhein/autoload.inc.php'; //Project Classes
|
||||
require_once 'lib/system/autoload.inc'; //SYSTEM Classes
|
||||
require_once 'rhein/autoload.inc.php'; //Project Classes
|
||||
require_once '/home/web/web/config/get_config.php';
|
||||
|
||||
require_once 'config.php'; //Server config
|
||||
SYSTEM\system::start($rhein_config); //Start System time + config
|
||||
\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)
|
||||
|
||||
1
system
@ -1 +0,0 @@
|
||||
Subproject commit c2f295374bcd0bc149d608534032e786285af799
|
||||