diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..8220a5c --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "lib/system"] + path = lib/system + url = git@mojotrollz.eu:system.git diff --git a/api.php b/api.php index 6c9e50a..6f4f33f 100644 --- a/api.php +++ b/api.php @@ -1,9 +1,9 @@ fewo rhein © 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/')); \ No newline at end of file diff --git a/index.php b/index.php index 4002339..e52475d 100644 --- a/index.php +++ b/index.php @@ -1,13 +1,13 @@ 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."); \ No newline at end of file diff --git a/lib/system b/lib/system new file mode 160000 index 0000000..a1f4459 --- /dev/null +++ b/lib/system @@ -0,0 +1 @@ +Subproject commit a1f44597a70dcd1d5ce74c35a8ce824159e9e3a2 diff --git a/rhein/files/gallery/(5)-Kirche-Winter.jpg b/rhein/files/gallery/(5)-Kirche-Winter.jpg new file mode 100644 index 0000000..0895b5b Binary files /dev/null and b/rhein/files/gallery/(5)-Kirche-Winter.jpg differ diff --git a/rhein/files/gallery/Aul.JPG b/rhein/files/gallery/Aul.JPG new file mode 100644 index 0000000..2c11c2a Binary files /dev/null and b/rhein/files/gallery/Aul.JPG differ diff --git a/rhein/files/gallery/CIMG5435.JPG b/rhein/files/gallery/CIMG5435.JPG new file mode 100644 index 0000000..3a17a4a Binary files /dev/null and b/rhein/files/gallery/CIMG5435.JPG differ diff --git a/rhein/files/gallery/HPIM0049.JPG b/rhein/files/gallery/HPIM0049.JPG new file mode 100644 index 0000000..d1e2558 Binary files /dev/null and b/rhein/files/gallery/HPIM0049.JPG differ diff --git a/rhein/files/gallery/HPIM0162.JPG b/rhein/files/gallery/HPIM0162.JPG new file mode 100644 index 0000000..15419de Binary files /dev/null and b/rhein/files/gallery/HPIM0162.JPG differ diff --git a/rhein/files/gallery/HPIM0169.JPG b/rhein/files/gallery/HPIM0169.JPG new file mode 100644 index 0000000..8731477 Binary files /dev/null and b/rhein/files/gallery/HPIM0169.JPG differ diff --git a/rhein/files/gallery/Mohnbl.2009-4.JPG b/rhein/files/gallery/Mohnbl.2009-4.JPG new file mode 100644 index 0000000..150b1d6 Binary files /dev/null and b/rhein/files/gallery/Mohnbl.2009-4.JPG differ diff --git a/rhein/files/gallery/OAUTO1~1.JPG b/rhein/files/gallery/OAUTO1~1.JPG new file mode 100644 index 0000000..5067f5c Binary files /dev/null and b/rhein/files/gallery/OAUTO1~1.JPG differ diff --git a/rhein/files/gallery/Zwbg.Karte- (61).JPG b/rhein/files/gallery/Zwbg.Karte- (61).JPG new file mode 100644 index 0000000..f33a1f5 Binary files /dev/null and b/rhein/files/gallery/Zwbg.Karte- (61).JPG differ diff --git a/rhein/files/house/HPIM0139.JPG b/rhein/files/house/HPIM0139.JPG new file mode 100644 index 0000000..055e2f9 Binary files /dev/null and b/rhein/files/house/HPIM0139.JPG differ diff --git a/rhein/page/default_agbs/default_agbs.php b/rhein/page/default_agbs/default_agbs.php index 3f0f015..bafaf35 100644 --- a/rhein/page/default_agbs/default_agbs.php +++ b/rhein/page/default_agbs/default_agbs.php @@ -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']; } } \ No newline at end of file diff --git a/rhein/page/default_anfrage/default_anfrage.php b/rhein/page/default_anfrage/default_anfrage.php index c6df0f0..55b09ec 100644 --- a/rhein/page/default_anfrage/default_anfrage.php +++ b/rhein/page/default_anfrage/default_anfrage.php @@ -1,6 +1,6 @@ '. ''; } - 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); } } \ No newline at end of file diff --git a/rhein/page/default_page/index.css b/rhein/page/default_page/index.css index 1d63db0..2edcd01 100644 --- a/rhein/page/default_page/index.css +++ b/rhein/page/default_page/index.css @@ -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; diff --git a/rhein/page/default_page/rhein.tpl b/rhein/page/default_page/rhein.tpl index bd8fb55..c682265 100644 --- a/rhein/page/default_page/rhein.tpl +++ b/rhein/page/default_page/rhein.tpl @@ -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; + } diff --git a/rhein/page/default_preise/default_preise.php b/rhein/page/default_preise/default_preise.php index c8c5435..3010068 100644 --- a/rhein/page/default_preise/default_preise.php +++ b/rhein/page/default_preise/default_preise.php @@ -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']; } } \ No newline at end of file diff --git a/rhein/page/default_referenzen/default_referenzen.php b/rhein/page/default_referenzen/default_referenzen.php index f3c155c..f5c1f2f 100644 --- a/rhein/page/default_referenzen/default_referenzen.php +++ b/rhein/page/default_referenzen/default_referenzen.php @@ -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']; } } \ No newline at end of file diff --git a/rhein/page/default_wohnung/default_wohnung.php b/rhein/page/default_wohnung/default_wohnung.php index 2506263..7c31d91 100644 --- a/rhein/page/default_wohnung/default_wohnung.php +++ b/rhein/page/default_wohnung/default_wohnung.php @@ -1,7 +1,7 @@ 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();} } \ No newline at end of file diff --git a/rhein/sai/register_modules.php b/rhein/sai/register_modules.php index 7888acc..72d3c4a 100644 --- a/rhein/sai/register_modules.php +++ b/rhein/sai/register_modules.php @@ -1,4 +1,4 @@ '.\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_TITLE).'';} + public static function html_li_menu(){return '
  • ${sai_menu_start}
    • ';} public static function right_public(){return true;} public static function right_right(){return true;} diff --git a/sai.php b/sai.php index f4e8c9f..c9f44a1 100644 --- a/sai.php +++ b/sai.php @@ -1,9 +1,9 @@