Merge branch 'master' of mojotrollz.eu:hosting

This commit is contained in:
messerbill 2014-05-29 15:24:28 +02:00
commit 4c5c1d0b6d
12 changed files with 56 additions and 8 deletions

View File

@ -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';

View File

@ -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'));

View File

@ -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';

View File

@ -205,4 +205,7 @@ li {
text-align: center;
max-width: 500px;
max-height: 420px;
}
}
#map {
border: 1px solid black;}

View File

@ -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"),

View File

@ -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');

View File

@ -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');

View File

@ -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>

View File

@ -0,0 +1 @@
function init_saistart_rhein_sai() {init__SYSTEM_SAI_saistart_sys_sai();};

View File

@ -0,0 +1,26 @@
<?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'),
\SYSTEM\WEBPATH(new PSAI(),'saistart_rhein_sai/saistart_rhein_sai.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());}
}

View File

@ -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

1
system Submodule

@ -0,0 +1 @@
Subproject commit 18a6cd5cdfc2e6a1be71d0d1861c7a0775f3ea8d