From e4edef87cf69c2ee215e096e8241f266d7fc3ac0 Mon Sep 17 00:00:00 2001 From: rylon Date: Sun, 5 Apr 2015 02:05:21 +0200 Subject: [PATCH 01/14] slingit lang switcher problem "solved", updated system reference, fixes and cleanup --- lib/system | 2 +- .../page/default_page/css/default_page.css | 6 ++-- slingit/page/default_page/default_page.php | 17 ++++------ slingit/page/default_page/js/lang_switcher.js | 30 ---------------- .../page/default_page/tpl/default_page.tpl | 4 +-- .../page/default_start/css/default_start.css | 10 +----- slingit/page/default_start/default_start.php | 2 +- .../page/default_start/js/default_start.js | 34 ++++++++----------- slingit/page/page_slingit.php | 2 +- 9 files changed, 31 insertions(+), 76 deletions(-) delete mode 100644 slingit/page/default_page/js/lang_switcher.js diff --git a/lib/system b/lib/system index 49e18f1..9b30021 160000 --- a/lib/system +++ b/lib/system @@ -1 +1 @@ -Subproject commit 49e18f1c3cf61c62952a3be957f1093a88cb1782 +Subproject commit 9b300210290eb0d7234b10ce84831a9b92800b2e diff --git a/slingit/page/default_page/css/default_page.css b/slingit/page/default_page/css/default_page.css index 3eae595..5154dc9 100644 --- a/slingit/page/default_page/css/default_page.css +++ b/slingit/page/default_page/css/default_page.css @@ -14,10 +14,12 @@ body{} #content {} -#footer { +#footer { position: absolute; height: 20px; - bottom: 0; + bottom: 0px; + left: 0; + right: 0; text-align: center; width: 100%; background: whitesmoke; diff --git a/slingit/page/default_page/default_page.php b/slingit/page/default_page/default_page.php index 2da6b9b..a123f67 100644 --- a/slingit/page/default_page/default_page.php +++ b/slingit/page/default_page/default_page.php @@ -1,19 +1,14 @@ '. ''. - ''. - //''. - //''. - //''. + ''. ''. - ''. - ''; - + ''; } - private function css(){ + private static function css(){ return ''. ''. ''. @@ -22,8 +17,8 @@ class default_page extends \SYSTEM\PAGE\Page { public function html(){ $vars = array(); - $vars['js'] = $this->js(); - $vars['css'] = $this->css(); + $vars['js'] = self::js(); + $vars['css'] = self::css(); $vars['PATH_LOCAL_IMG'] = \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'page/img/'); return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/tpl/default_page.tpl'), $vars); diff --git a/slingit/page/default_page/js/lang_switcher.js b/slingit/page/default_page/js/lang_switcher.js deleted file mode 100644 index 07164fc..0000000 --- a/slingit/page/default_page/js/lang_switcher.js +++ /dev/null @@ -1,30 +0,0 @@ -function switchLocale(locale){ - reloadWithQueryStringVars({"_lang": locale}); -} - -function reloadWithQueryStringVars (queryStringVars) { - var existingQueryVars = location.search ? location.search.substring(1).split("&") : [], - //currentUrl = location.search ? location.href.replace(location.search,"") : location.href, - newQueryVars = {}, - newUrl = "http://www.slingit.org/?_lang="+queryStringVars._lang+"#"; - if(existingQueryVars.length > 0) { - for (var i = 0; i < existingQueryVars.length; i++) { - var pair = existingQueryVars[i].split("="); - newQueryVars[pair[0]] = pair[1]; - } - } - if(queryStringVars) { - for (var queryStringVar in queryStringVars) { - newQueryVars[queryStringVar] = queryStringVars[queryStringVar]; - } - } - if(newQueryVars) { - for (var newQueryVar in newQueryVars) { - newUrl += newQueryVar + "=" + newQueryVars[newQueryVar] + "&"; - } - newUrl = newUrl.substring(0, newUrl.length-1); - window.location.href = newUrl; - } else { - window.location.href = location.href; - } -} diff --git a/slingit/page/default_page/tpl/default_page.tpl b/slingit/page/default_page/tpl/default_page.tpl index 00936d7..a1c70a8 100644 --- a/slingit/page/default_page/tpl/default_page.tpl +++ b/slingit/page/default_page/tpl/default_page.tpl @@ -24,8 +24,8 @@ \ No newline at end of file diff --git a/slingit/page/default_start/css/default_start.css b/slingit/page/default_start/css/default_start.css index 4fd6cbc..9682fc2 100644 --- a/slingit/page/default_start/css/default_start.css +++ b/slingit/page/default_start/css/default_start.css @@ -14,7 +14,7 @@ list-style-type: none; } -#dropZone p, #pullZone p{ +#dropZone p{ position:relative; top:45%; left:0; @@ -22,14 +22,6 @@ text-align: center; } -#pullZone{ - width: 400px; - height: 400px; - float: left; - outline: 3px solid #eee; - margin-left: 15px; -} - #link_container { padding-top: 40px; font-size: 8pt; diff --git a/slingit/page/default_start/default_start.php b/slingit/page/default_start/default_start.php index 7c661e0..4c220aa 100644 --- a/slingit/page/default_start/default_start.php +++ b/slingit/page/default_start/default_start.php @@ -11,7 +11,7 @@ class default_start extends SYSTEM\PAGE\Page { return array( \SYSTEM\WEBPATH(new PPAGE(),'default_start/css/default_start.css'));} public function html(){ $vars = array(); - $vars['hash'] = $this->hash == '${hash}' ? '' : $this->hash; + $vars['hash'] = $this->hash ? $this->hash : ''; $vars = array_merge($vars, \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE), \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_TEXT)); return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_start/tpl/default_start.tpl'), $vars); diff --git a/slingit/page/default_start/js/default_start.js b/slingit/page/default_start/js/default_start.js index 2e34f7f..8e1bbef 100644 --- a/slingit/page/default_start/js/default_start.js +++ b/slingit/page/default_start/js/default_start.js @@ -1,8 +1,6 @@ var client = new WebTorrent({ - rtcConfig: { iceServers: - [{url: "stun:23.21.150.121"}, - {url: "stun:stun.1.google.com:19302"}] - } + rtcConfig: { iceServers: [ {url: "stun:23.21.150.121"}, + {url: "stun:stun.1.google.com:19302"}]} }); function init_start(){ @@ -28,7 +26,7 @@ function init_start(){ slingit_download(client,$('#input_load_infohash').val());}); //start download if hash provided - if($('#input_load_infohash').val() != ''){ + if($('#input_load_infohash').val() !== ''){ slingit_download(client,$('#input_load_infohash').val());} } function handleFileSelect(evt) { @@ -67,7 +65,7 @@ function log_file_start(torrent){ } function log_file_add(torrent){ - var progress = (100 * torrent.downloaded / torrent.parsedTorrent.length).toFixed(1) + var progress = (100 * torrent.downloaded / torrent.parsedTorrent.length).toFixed(1); $('#link_container tr:last').after( '' + '' + @@ -91,7 +89,7 @@ $.getScript("http://platform.twitter.com/widgets.js"); function log_file_upd(torrent){ if($('#'+torrent.infoHash).length){ - var progress = (100 * torrent.downloaded / torrent.parsedTorrent.length).toFixed(1) + var progress = (100 * torrent.downloaded / torrent.parsedTorrent.length).toFixed(1); $('#'+torrent.infoHash).html( '' + progress + '%' + @@ -105,9 +103,7 @@ function log_file_upd(torrent){ 'direct link: ' + '' + '' + - '   ' + - 'Tweet' + - '') + ''); } else { log_file_add(torrent); } @@ -147,20 +143,20 @@ function log_file_done(torrent,url,file){ 'Tweet' + '' + ''); + $.getScript("http://platform.twitter.com/widgets.js"); } function slingit_upload(client,files){ log_initialize(); var fileStore = new Array(); - console.log(files) + console.log(files); for (var i=0, file; file=files[i]; i++) { var reader = new FileReader(); - reader.onload = function(e2) { // finished reading file data. - } + reader.onload = function(e2) {}; // finished reading file data. reader.readAsDataURL(file); // start reading the file data. fileStore.push(file); console.log(file); - var fname = file.name + var fname = file.name; client.seed(file,onTorrent); } } @@ -171,11 +167,11 @@ function onTorrent (torrent) { torrent.swarm.on('download', function () { log_file_upd(torrent); - }) + }); torrent.swarm.on('upload', function () { log_file_upd(torrent); - }) + }); torrent.files.forEach(function (file) { /*var extname = path.extname(file.name) @@ -191,11 +187,11 @@ function onTorrent (torrent) { file.createReadStream().pipe(audio) } else {*/ file.getBlobURL(function (err, url) { - if (err) throw err + if (err) throw err; log_file_done(torrent,url,file); - }) + }); //} - }) + }); } function slingit_download(client,hash){ diff --git a/slingit/page/page_slingit.php b/slingit/page/page_slingit.php index 9b55fa4..618a806 100644 --- a/slingit/page/page_slingit.php +++ b/slingit/page/page_slingit.php @@ -6,7 +6,7 @@ class page_slingit extends \SYSTEM\API\api_default { public static function default_page(){ return new default_page();} - public static function page_start($hash){ + public static function page_start($hash = null){ return new default_start($hash);} public static function page_about(){ From b24d8d9d9ae30af7651933e37e2bdc937a282068 Mon Sep 17 00:00:00 2001 From: rylon Date: Sun, 5 Apr 2015 05:09:33 +0200 Subject: [PATCH 02/14] google search implementation, updated system reference --- lib/system | 2 +- slingit/page/default_page/default_page.php | 8 +++++--- slingit/page/page_slingit.php | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/system b/lib/system index 9b30021..852e26d 160000 --- a/lib/system +++ b/lib/system @@ -1 +1 @@ -Subproject commit 9b300210290eb0d7234b10ce84831a9b92800b2e +Subproject commit 852e26dd2fa35da08f488632c646bedc2131a9a2 diff --git a/slingit/page/default_page/default_page.php b/slingit/page/default_page/default_page.php index a123f67..1738cd7 100644 --- a/slingit/page/default_page/default_page.php +++ b/slingit/page/default_page/default_page.php @@ -15,9 +15,11 @@ class default_page extends \SYSTEM\PAGE\Page { ''; } - public function html(){ - $vars = array(); - $vars['js'] = self::js(); + public function html($_escaped_fragment_ = null){ + $vars = array(); + $vars['js'] = ''; + if(!$_escaped_fragment_){ + $vars['js'] = self::js();} $vars['css'] = self::css(); $vars['PATH_LOCAL_IMG'] = \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'page/img/'); diff --git a/slingit/page/page_slingit.php b/slingit/page/page_slingit.php index 618a806..3f49042 100644 --- a/slingit/page/page_slingit.php +++ b/slingit/page/page_slingit.php @@ -3,8 +3,8 @@ class page_slingit extends \SYSTEM\API\api_default { public static function get_class(){ return self::class;} - public static function default_page(){ - return new default_page();} + public static function default_page($_escaped_fragment_ = null){ + return new default_page($_escaped_fragment_);} public static function page_start($hash = null){ return new default_start($hash);} From 5363c355aa3625419602995e4e40392f3c1fc9f0 Mon Sep 17 00:00:00 2001 From: rylon Date: Sun, 5 Apr 2015 05:35:09 +0200 Subject: [PATCH 03/14] updated system reference --- lib/system | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/system b/lib/system index 852e26d..bc4f004 160000 --- a/lib/system +++ b/lib/system @@ -1 +1 @@ -Subproject commit 852e26dd2fa35da08f488632c646bedc2131a9a2 +Subproject commit bc4f004fa4f359a1d993d3a7008f1fbed8716a31 From 21438cfa1d3be98468eff78801e33ded8dfbd515 Mon Sep 17 00:00:00 2001 From: rylon Date: Sun, 5 Apr 2015 16:08:05 +0200 Subject: [PATCH 04/14] loading animation --- slingit/files/img/loader.gif | Bin 0 -> 673 bytes slingit/page/default_start/js/default_start.js | 5 +++++ 2 files changed, 5 insertions(+) create mode 100644 slingit/files/img/loader.gif diff --git a/slingit/files/img/loader.gif b/slingit/files/img/loader.gif new file mode 100644 index 0000000000000000000000000000000000000000..d0bce1542342e912da81a2c260562df172f30d73 GIT binary patch literal 673 zcmZ?wbhEHb6krfw_{6~Q|Nnmm28Kh24mmkF0U1e2Nli^nlO|14{Lk&@8WQa67~pE8 zXTZz|lvDgC+Z`3#dv5h=E26FfcG1 zbL_hF&)}42ws10s6^G;;cE1^EoUR)U5A70}d2pLv!jVIT7j&Z~EblI3x0K*v_sV|m z0kj3v921Z^em#l`(k(o@H$3ZdDRc@9NidXDNbqrumReCGv$gd8+e8WW28HVqkJ_9i zH>s*<31KtHjANIPvi2#*6BEu%3Dak5O_t&NBI)H?V$TxT}#l{vOTn5naXTfF^&~Hhq+NX@#Ccc>y7T?;vjI&jdhsDsPJyAw*m0Qz>i}K7# zL9w50Ng{fT}A5JUe8lRK1h7_Y2;BWJDd=c6f&i?Wv5(5q?6|P zQw{>maxZP<537OA37Uk}7@%_$4o$EWe_Zl>&#id|lE-BpDC#+Fn|msJ%_2h{Hg1vP z#N8WAzfWasG}yq|xqE)DrWaOofX=z|?*pgc%{ig5vl!pqDlC|q&~Z0$&Rvsft&VO- z4MZj+%-+Vx%W}v;V76hyp=;+R;x+~t^Q%*xuFTQAF2})fSfTHDAs>sO!OBw`)&)o$ c0!CNZt))x~rAZP^^P&YOFfdqy5)K#u0POD40{{R3 literal 0 HcmV?d00001 diff --git a/slingit/page/default_start/js/default_start.js b/slingit/page/default_start/js/default_start.js index 8e1bbef..a09ce97 100644 --- a/slingit/page/default_start/js/default_start.js +++ b/slingit/page/default_start/js/default_start.js @@ -44,6 +44,7 @@ function handleFileSelect(evt) { } function log_file_start(torrent){ + $('#init_loader').hide(); $('#link_container tr:last').after( '' + '' + @@ -65,6 +66,7 @@ function log_file_start(torrent){ } function log_file_add(torrent){ + $('#init_loader').hide(); var progress = (100 * torrent.downloaded / torrent.parsedTorrent.length).toFixed(1); $('#link_container tr:last').after( '' + @@ -88,6 +90,7 @@ $.getScript("http://platform.twitter.com/widgets.js"); } function log_file_upd(torrent){ + $('#init_loader').hide(); if($('#'+torrent.infoHash).length){ var progress = (100 * torrent.downloaded / torrent.parsedTorrent.length).toFixed(1); $('#'+torrent.infoHash).html( @@ -112,6 +115,7 @@ function log_initialize() { $('#link_container tr:last').after( '' + '' + + '... '+ 'initializing' + '' + '' + '' + @@ -121,6 +125,7 @@ function log_initialize() { } function log_file_done(torrent,url,file){ + $('#init_loader').hide(); log_file_upd(torrent); $('#link_container tr:last').after( '' + From 2ad2589d5cbf529a09192b4c09a526ae07968101 Mon Sep 17 00:00:00 2001 From: rylon Date: Sun, 5 Apr 2015 16:18:46 +0200 Subject: [PATCH 05/14] speed optimization --- slingit/page/default_page/tpl/default_page.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/slingit/page/default_page/tpl/default_page.tpl b/slingit/page/default_page/tpl/default_page.tpl index a1c70a8..f04c6a3 100644 --- a/slingit/page/default_page/tpl/default_page.tpl +++ b/slingit/page/default_page/tpl/default_page.tpl @@ -24,8 +24,8 @@ \ No newline at end of file From 6cc191b88b6e235b931f90262abf216b8fa450be Mon Sep 17 00:00:00 2001 From: rylon Date: Mon, 6 Apr 2015 04:05:42 +0200 Subject: [PATCH 06/14] updated system reference --- lib/system | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/system b/lib/system index bc4f004..733ed25 160000 --- a/lib/system +++ b/lib/system @@ -1 +1 @@ -Subproject commit bc4f004fa4f359a1d993d3a7008f1fbed8716a31 +Subproject commit 733ed25138006f6c60ca192e8d95603ed504c540 From 7f7978165e337798e3e166b48141e7e517944510 Mon Sep 17 00:00:00 2001 From: rylon Date: Mon, 6 Apr 2015 04:41:48 +0200 Subject: [PATCH 07/14] fixed copyright date of config, updated system reference --- config.php | 2 +- lib/system | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config.php b/config.php index 6ef1d96..9eaca02 100644 --- a/config.php +++ b/config.php @@ -11,7 +11,7 @@ $slingit_config=array(array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_ERRORREPORTING array(\SYSTEM\CONFIG\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(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_BASEURL, 'http://www.slingit.org/sai.php?'), array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_TITLE, 'Slingit - Admin Bereich'), - array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_COPYRIGHT, ' © WebCraft Media 2013'), + array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_COPYRIGHT, ' © WebCraft Media 2015'), array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_SYSTEMPATHREL, 'lib/system/'), array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_LANGS, array('deDE','enUS', 'frFR', 'esES', 'trTR', 'jaJA')), array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_LANG, 'deDE'), diff --git a/lib/system b/lib/system index 733ed25..c4bab4a 160000 --- a/lib/system +++ b/lib/system @@ -1 +1 @@ -Subproject commit 733ed25138006f6c60ca192e8d95603ed504c540 +Subproject commit c4bab4a85b1a68590d84402825906cd503c5f6ac From af39bd2847fb602742edae3398c4a5aaf9d5b087 Mon Sep 17 00:00:00 2001 From: rylon Date: Mon, 6 Apr 2015 05:01:46 +0200 Subject: [PATCH 08/14] page title slingit, updated system reference --- lib/system | 2 +- slingit/page/default_page/tpl/default_page.tpl | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/system b/lib/system index c4bab4a..e3849f9 160000 --- a/lib/system +++ b/lib/system @@ -1 +1 @@ -Subproject commit c4bab4a85b1a68590d84402825906cd503c5f6ac +Subproject commit e3849f9a2eeb1f6a4d1d5b44ae9d9164c99af767 diff --git a/slingit/page/default_page/tpl/default_page.tpl b/slingit/page/default_page/tpl/default_page.tpl index f04c6a3..10aca5e 100644 --- a/slingit/page/default_page/tpl/default_page.tpl +++ b/slingit/page/default_page/tpl/default_page.tpl @@ -4,6 +4,7 @@ + SlingiT ${css} ${js} From 4006547c6915250c4b5bbf4621f7ea2fe0662fe5 Mon Sep 17 00:00:00 2001 From: rylon Date: Mon, 6 Apr 2015 06:24:12 +0200 Subject: [PATCH 09/14] updated system reference --- lib/system | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/system b/lib/system index e3849f9..bab2188 160000 --- a/lib/system +++ b/lib/system @@ -1 +1 @@ -Subproject commit e3849f9a2eeb1f6a4d1d5b44ae9d9164c99af767 +Subproject commit bab21887c3a33b500f7c0723db35479133f225d6 From 32747c81e6f1290e4d321ac489bd4b1163397db4 Mon Sep 17 00:00:00 2001 From: rylon Date: Mon, 6 Apr 2015 17:23:36 +0200 Subject: [PATCH 10/14] about and impressum repopup on double tap the link works now,meta tags, updated system reference --- lib/system | 2 +- slingit/page/default_page/js/default_page.js | 4 ++++ slingit/page/default_page/tpl/default_page.tpl | 5 +++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/system b/lib/system index bab2188..9b74439 160000 --- a/lib/system +++ b/lib/system @@ -1 +1 @@ -Subproject commit bab21887c3a33b500f7c0723db35479133f225d6 +Subproject commit 9b74439f85a36232ddf553f35dd0cdc672682477 diff --git a/slingit/page/default_page/js/default_page.js b/slingit/page/default_page/js/default_page.js index fb963ae..eea5eab 100644 --- a/slingit/page/default_page/js/default_page.js +++ b/slingit/page/default_page/js/default_page.js @@ -1,3 +1,7 @@ $(document).ready(function() { new SYSTEM('./api.php',1,'start'); + $('#about').click(function(){ + $('#modal_text').modal('show');}); + $('#impressum').click(function(){ + $('#modal_text').modal('show');}); }); \ No newline at end of file diff --git a/slingit/page/default_page/tpl/default_page.tpl b/slingit/page/default_page/tpl/default_page.tpl index 10aca5e..9cba726 100644 --- a/slingit/page/default_page/tpl/default_page.tpl +++ b/slingit/page/default_page/tpl/default_page.tpl @@ -2,8 +2,9 @@ - - + + + SlingiT ${css} ${js} From 9135f6a32c08aede0cb0a5bdc820394f327c16d3 Mon Sep 17 00:00:00 2001 From: rylon Date: Mon, 6 Apr 2015 20:38:32 +0200 Subject: [PATCH 11/14] updated system reference, adjustments for _escaped_fragment --- index.php | 2 +- lib/system | 2 +- slingit/page/page_slingit.php | 14 ++++++++------ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/index.php b/index.php index 29f4a57..564344d 100644 --- a/index.php +++ b/index.php @@ -9,5 +9,5 @@ require_once 'config.php'; \SYSTEM\system::register_errorhandler_dbwriter(); \SYSTEM\system::register_errorhandler_jsonoutput(); -echo \SYSTEM\API\api::run('\SYSTEM\API\verify', 'page_slingit', array_merge($_POST,$_GET), 1, true, true)->html(); +echo \SYSTEM\API\api::run('\SYSTEM\API\verify', 'page_slingit', array_merge($_POST,$_GET), 1, true, true); new \SYSTEM\LOG\COUNTER("Page was called sucessfully."); \ No newline at end of file diff --git a/lib/system b/lib/system index 9b74439..45fd16f 160000 --- a/lib/system +++ b/lib/system @@ -1 +1 @@ -Subproject commit 9b74439f85a36232ddf553f35dd0cdc672682477 +Subproject commit 45fd16f2a6347ec9389ac9a027c9eb70d5e7768d diff --git a/slingit/page/page_slingit.php b/slingit/page/page_slingit.php index 3f49042..ebfec6b 100644 --- a/slingit/page/page_slingit.php +++ b/slingit/page/page_slingit.php @@ -1,17 +1,19 @@ html($_escaped_fragment_);} public static function page_start($hash = null){ - return new default_start($hash);} + return (new default_start($hash))->html();} public static function page_about(){ - return new default_about('');} + return (new default_about(''))->html();} public static function page_impressum(){ - return new default_impressum('');} + return (new default_impressum(''))->html();} } \ No newline at end of file From 02990e12ee1fed00cc8ab742b6fc686a2e5a321f Mon Sep 17 00:00:00 2001 From: rylon Date: Mon, 6 Apr 2015 22:53:28 +0200 Subject: [PATCH 12/14] updated system reference, updated config --- config.php | 1 + lib/system | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/config.php b/config.php index 9eaca02..2185838 100644 --- a/config.php +++ b/config.php @@ -12,6 +12,7 @@ $slingit_config=array(array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_ERRORREPORTING array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_BASEURL, 'http://www.slingit.org/sai.php?'), array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_TITLE, 'Slingit - Admin Bereich'), array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_COPYRIGHT, ' © WebCraft Media 2015'), + array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_PROJECT, 'slingit'), array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_SYSTEMPATHREL, 'lib/system/'), array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_LANGS, array('deDE','enUS', 'frFR', 'esES', 'trTR', 'jaJA')), array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_LANG, 'deDE'), diff --git a/lib/system b/lib/system index 45fd16f..919b339 160000 --- a/lib/system +++ b/lib/system @@ -1 +1 @@ -Subproject commit 45fd16f2a6347ec9389ac9a027c9eb70d5e7768d +Subproject commit 919b3392cdb802afb16142c50f8f455faadabf56 From 10ca8afbf2f3e1d9a318fa9424da21d5a53a991f Mon Sep 17 00:00:00 2001 From: rylon Date: Wed, 8 Apr 2015 04:39:14 +0200 Subject: [PATCH 13/14] updated system reference --- lib/system | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/system b/lib/system index 919b339..9f63eb4 160000 --- a/lib/system +++ b/lib/system @@ -1 +1 @@ -Subproject commit 919b3392cdb802afb16142c50f8f455faadabf56 +Subproject commit 9f63eb434f2cadc8f1ccd440a7b40feb5841de10 From 80e688437c26baea127ecab5b1e1ffa67628ebc3 Mon Sep 17 00:00:00 2001 From: rylon Date: Wed, 8 Apr 2015 04:59:39 +0200 Subject: [PATCH 14/14] fixed config, updated system reference --- config.php | 2 -- lib/system | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/config.php b/config.php index 2185838..2ebedfd 100644 --- a/config.php +++ b/config.php @@ -8,8 +8,6 @@ $slingit_config=array(array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_ERRORREPORTING 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_slingit'), - array(\SYSTEM\CONFIG\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(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_BASEURL, 'http://www.slingit.org/sai.php?'), array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_TITLE, 'Slingit - Admin Bereich'), array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_COPYRIGHT, ' © WebCraft Media 2015'), array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_PROJECT, 'slingit'), diff --git a/lib/system b/lib/system index 9f63eb4..5532693 160000 --- a/lib/system +++ b/lib/system @@ -1 +1 @@ -Subproject commit 9f63eb434f2cadc8f1ccd440a7b40feb5841de10 +Subproject commit 55326931b30f8cea3ec8909f88f77c05de238a0a