included system reference, updated to new system, missing files, corrected page, included impressum
This commit is contained in:
parent
d6d6375978
commit
67048a28bd
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
/nbproject/private
|
||||||
3
.gitmodules
vendored
Normal file
3
.gitmodules
vendored
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
[submodule "lib/system"]
|
||||||
|
path = lib/system
|
||||||
|
url = git@mojotrollz.eu:system.git
|
||||||
12
api.php
12
api.php
@ -1,13 +1,13 @@
|
|||||||
<?php
|
<?php
|
||||||
require_once 'system/autoload.inc'; //SYSTEM Classes
|
require_once 'lib/system/autoload.inc'; //SYSTEM Classes
|
||||||
\SYSTEM\system::register_errorhandler_dbwriter();
|
require_once 'redestoff/autoload.inc'; //Project Classes
|
||||||
\SYSTEM\system::register_errorhandler_jsonoutput();
|
require_once '/home/web/web/config/get_config.php';
|
||||||
require_once 'redestoff/autoload.inc.php'; //Project Classes
|
|
||||||
|
|
||||||
require_once 'config.php';
|
\SYSTEM\system::start(\WEBCRAFT\get_config(dirname(__FILE__)));
|
||||||
\SYSTEM\system::start($redestoff_config);
|
|
||||||
\SYSTEM\system::include_ExceptionShortcut();
|
\SYSTEM\system::include_ExceptionShortcut();
|
||||||
\SYSTEM\system::include_ResultShortcut();
|
\SYSTEM\system::include_ResultShortcut();
|
||||||
|
\SYSTEM\system::register_errorhandler_dbwriter();
|
||||||
|
\SYSTEM\system::register_errorhandler_jsonoutput();
|
||||||
|
|
||||||
echo \SYSTEM\API\api::run('\SYSTEM\API\verify','\SYSTEM\API\api_system',array_merge($_POST,$_GET));
|
echo \SYSTEM\API\api::run('\SYSTEM\API\verify','\SYSTEM\API\api_system',array_merge($_POST,$_GET));
|
||||||
new \SYSTEM\LOG\COUNTER("API was called sucessfully.");
|
new \SYSTEM\LOG\COUNTER("API was called sucessfully.");
|
||||||
17
config.php
17
config.php
@ -1,17 +0,0 @@
|
|||||||
<?php
|
|
||||||
$redestoff_config = array( array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_ERRORREPORTING, E_ALL | E_STRICT),
|
|
||||||
array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL, 'http://www.redestoffmusik.de/'),
|
|
||||||
array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEPATH, '/home/web/webdir/Redestoffmusik/'),
|
|
||||||
array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_TYPE, SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_TYPE_MYS),
|
|
||||||
array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_HOST, '127.0.0.1'),
|
|
||||||
array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_PORT, ''),
|
|
||||||
array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_USER, 'mojotrolls_mysql'),
|
|
||||||
array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_PASSWORD, 'dajsabeaisvd345'),
|
|
||||||
array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_DBNAME, 'host_redestoff'),
|
|
||||||
array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_NAVIMG, '/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(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_BASEURL, 'http://www.redestoffmusik.de/sai.php?'),
|
|
||||||
array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_TITLE, 'redestoff - Admin Area'),
|
|
||||||
array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_COPYRIGHT, '<a href="http://www.redestoffmusik.de/" target="_blank">redestoff</a>, © WebCraft Media 2013'),
|
|
||||||
array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_SYSTEMPATHREL, 'system/'),
|
|
||||||
array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_LANGS, array('deDE', 'enUS')),
|
|
||||||
array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_LANG, 'deDE'));
|
|
||||||
12
index.php
12
index.php
@ -1,13 +1,13 @@
|
|||||||
<?php
|
<?php
|
||||||
|
require_once 'lib/system/autoload.inc'; //SYSTEM Classes
|
||||||
|
require_once 'redestoff/autoload.inc'; //Project Classes
|
||||||
|
require_once '/home/web/web/config/get_config.php';
|
||||||
|
|
||||||
require_once 'system/autoload.inc'; //SYSTEM Classes
|
\SYSTEM\system::start(\WEBCRAFT\get_config(dirname(__FILE__)));
|
||||||
require_once 'redestoff/autoload.inc.php'; //Project Classes
|
|
||||||
|
|
||||||
require_once 'config.php';
|
|
||||||
\SYSTEM\system::start($redestoff_config);
|
|
||||||
\SYSTEM\system::include_ExceptionShortcut();
|
\SYSTEM\system::include_ExceptionShortcut();
|
||||||
\SYSTEM\system::include_ResultShortcut();
|
\SYSTEM\system::include_ResultShortcut();
|
||||||
\SYSTEM\system::register_errorhandler_dbwriter();
|
\SYSTEM\system::register_errorhandler_dbwriter();
|
||||||
\SYSTEM\system::register_errorhandler_jsonoutput();
|
\SYSTEM\system::register_errorhandler_jsonoutput();
|
||||||
|
|
||||||
echo \SYSTEM\API\api::run('\SYSTEM\API\verify','page_redestoff',array_merge($_POST,$_GET),1,false,true)->html();
|
echo \SYSTEM\API\api::run('\SYSTEM\API\verify', 'page_redestoff', array_merge($_POST,$_GET), 1, false, true);
|
||||||
|
new \SYSTEM\LOG\COUNTER("Page was called sucessfully.");
|
||||||
1
lib/system
Submodule
1
lib/system
Submodule
@ -0,0 +1 @@
|
|||||||
|
Subproject commit 90ce83ba36c6081b1395b555575260cb13358693
|
||||||
@ -1,5 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
require_once dirname(__FILE__).'/path/register_path_classes.php';
|
require_once dirname(__FILE__).'/path/register_path_classes.php';
|
||||||
require_once dirname(__FILE__).'/page/register_page_classes.php';
|
require_once dirname(__FILE__).'/page/autoload.inc';
|
||||||
require_once dirname(__FILE__).'/files/register_files.php';
|
require_once dirname(__FILE__).'/files/register_files.php';
|
||||||
BIN
redestoff/files/alben/Flexibel_im_Niveau.zip
Normal file
BIN
redestoff/files/alben/Flexibel_im_Niveau.zip
Normal file
Binary file not shown.
BIN
redestoff/files/alben/Redestoff_EP.zip
Normal file
BIN
redestoff/files/alben/Redestoff_EP.zip
Normal file
Binary file not shown.
BIN
redestoff/files/alben/Scheiß_auf_die_Idioten.zip
Normal file
BIN
redestoff/files/alben/Scheiß_auf_die_Idioten.zip
Normal file
Binary file not shown.
BIN
redestoff/files/alben/X-Mas_Sound.zip
Normal file
BIN
redestoff/files/alben/X-Mas_Sound.zip
Normal file
Binary file not shown.
@ -4,7 +4,7 @@ class default_impressum extends SYSTEM\PAGE\Page {
|
|||||||
|
|
||||||
|
|
||||||
public function html() {
|
public function html() {
|
||||||
$vars["redestoff_impressum"] = \SYSTEM\locale::getStrings(\DBD\locale_string::CATEGORY_REDSTOFF_TEXT);
|
$vars["redestoff_impressum"] = \SYSTEM\PAGE\text::get('impressum');
|
||||||
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_impressum/impressum.tpl'), $vars);
|
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_impressum/impressum.tpl'), $vars);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1,11 +1,5 @@
|
|||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
console.log("fu");
|
|
||||||
$("#impressum_link").click(function(){
|
$("#impressum_link").click(function(){
|
||||||
console.log("bla");
|
$("#midframe").load("./?page=impressum");
|
||||||
$("#midframe").load("./?action=load&id=redestoff_impressum");
|
|
||||||
});
|
|
||||||
$("#test").click(function(){
|
|
||||||
console.log("bla");
|
|
||||||
$("#midframe").load("./?action=load&id=redestoff_impressum");
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@ -3,12 +3,15 @@
|
|||||||
class default_page extends SYSTEM\PAGE\Page {
|
class default_page extends SYSTEM\PAGE\Page {
|
||||||
|
|
||||||
private function js(){
|
private function js(){
|
||||||
return '<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/default_page.js').'"></script>';
|
return '<script type="text/javascript" language="JavaScript" src="http://code.jquery.com/jquery.js"></script>'.
|
||||||
|
'<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/default_page.js').'"></script>';
|
||||||
|
|
||||||
}
|
}
|
||||||
public function html(){
|
public function html($_escaped_fragment_ = NULL){
|
||||||
$vars = array();
|
$vars = array();
|
||||||
$vars['js'] = $this->js();
|
$vars['js'] = '';
|
||||||
|
if(!$_escaped_fragment_){
|
||||||
|
$vars['js'] = $this->js();}
|
||||||
$vars['IMG_PATH'] = SYSTEM\WEBPATH(new PPAGE(),'default_page/img/');
|
$vars['IMG_PATH'] = SYSTEM\WEBPATH(new PPAGE(),'default_page/img/');
|
||||||
$vars['BT_PATH'] = SYSTEM\WEBPATH(new PPAGE(),'default_page/bootstrap/');
|
$vars['BT_PATH'] = SYSTEM\WEBPATH(new PPAGE(),'default_page/bootstrap/');
|
||||||
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/redestoff.tpl'), $vars);
|
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/redestoff.tpl'), $vars);
|
||||||
|
|||||||
@ -88,7 +88,7 @@
|
|||||||
<div class="hero-unit" style="background-color: black; margin-top: 0px; margin-left: 20px; padding:7px; width:150px; background: url(${IMG_PATH}affen_top.jpg);">
|
<div class="hero-unit" style="background-color: black; margin-top: 0px; margin-left: 20px; padding:7px; width:150px; background: url(${IMG_PATH}affen_top.jpg);">
|
||||||
<img src="${IMG_PATH}REP_Cover.jpg" width="200" height="150" />
|
<img src="${IMG_PATH}REP_Cover.jpg" width="200" height="150" />
|
||||||
<!-- <iframe width="200" height="150" src="http://www.youtube.com/embed/kpavxOgpNkY?rel=0" frameborder="0" ></iframe>-->
|
<!-- <iframe width="200" height="150" src="http://www.youtube.com/embed/kpavxOgpNkY?rel=0" frameborder="0" ></iframe>-->
|
||||||
<div style="padding-top: 5px;"><a class="btn" style="font-size: 9px;" href="/.api.php?call=files&cat=alben&id=Redestoff_EP.zip">DOWNLOAD »</a>
|
<div style="padding-top: 5px;"><a class="btn" style="font-size: 9px;" href="./api.php?call=files&cat=alben&id=Redestoff_EP.zip">DOWNLOAD »</a>
|
||||||
<img src="${IMG_PATH}LOGO2011!!!.png" width="30" height="30" style="margin-left: 23px;" />
|
<img src="${IMG_PATH}LOGO2011!!!.png" width="30" height="30" style="margin-left: 23px;" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -109,7 +109,6 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script src="http://code.jquery.com/jquery.js"></script>
|
|
||||||
<script src="${BT_PATH}js/bootstrap.min.js"></script>
|
<script src="${BT_PATH}js/bootstrap.min.js"></script>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
@ -2,7 +2,10 @@
|
|||||||
|
|
||||||
class page_redestoff extends \SYSTEM\API\api_default {
|
class page_redestoff extends \SYSTEM\API\api_default {
|
||||||
|
|
||||||
public static function default_page(){
|
public static function default_page($_escaped_fragment_ = NULL){
|
||||||
return new default_page();
|
return (new default_page())->html($_escaped_fragment_);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static function page_impressum(){
|
||||||
|
return (new default_impressum())->html();}
|
||||||
}
|
}
|
||||||
8
sai.php
8
sai.php
@ -1,9 +1,9 @@
|
|||||||
<?php
|
<?php
|
||||||
require_once 'system/autoload.inc'; //SYSTEM Classes
|
require_once 'lib/system/autoload.inc'; //SYSTEM Classes
|
||||||
require_once 'redestoff/autoload.inc.php'; //Project Classes
|
require_once 'redestoff/autoload.inc'; //Project Classes
|
||||||
|
require_once '/home/web/web/config/get_config.php';
|
||||||
|
|
||||||
require_once 'config.php'; //Server config
|
\SYSTEM\system::start(\WEBCRAFT\get_config(dirname(__FILE__)));
|
||||||
SYSTEM\system::start($redestoff_config); //Start System time + config
|
|
||||||
SYSTEM\system::include_ExceptionShortcut(); //allow ERROR() instead of \SYSTEM\LOG\ERROR()
|
SYSTEM\system::include_ExceptionShortcut(); //allow ERROR() instead of \SYSTEM\LOG\ERROR()
|
||||||
SYSTEM\system::include_ResultShortcut(); //allow JsonResult() instead of \SYSTEM\LOG\JsonResult()
|
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)
|
SYSTEM\system::register_errorhandler_dbwriter(); //write errors to database (must be first errorhandler to register)
|
||||||
|
|||||||
1
system
1
system
@ -1 +0,0 @@
|
|||||||
Subproject commit 18a6cd5cdfc2e6a1be71d0d1861c7a0775f3ea8d
|
|
||||||
Loading…
x
Reference in New Issue
Block a user