From f9df0815daa1a86ab2320f93117fea00d8f6c146 Mon Sep 17 00:00:00 2001 From: Ulrich Block Date: Sun, 24 Nov 2013 13:46:33 +0100 Subject: [PATCH] #189 + #193: enhance modules/imprint --- web/index.php | 7 +- web/install/update_410-411.php | 1 - web/install/update_411-420.php | 100 +++++ web/lend.php | 7 +- web/stuff/admin_modules.php | 7 +- web/stuff/init_admin.php | 23 +- web/stuff/init_page.php | 400 +++++++++--------- web/stuff/lendserver.php | 7 +- web/stuff/page_settings.php | 73 ++-- web/stuff/settings.php | 9 +- web/stuff/tables_add.php | 4 +- web/stuff/tables_repair.php | 4 +- web/template/default/admin_header.tpl | 8 +- .../default/admin_lendserver_settings.tpl | 9 - web/template/default/admin_page_settings.tpl | 9 - web/template/default/page_header.tpl | 81 ++-- web/template/default/page_protectioncheck.tpl | 2 +- web/template/default/page_sitemap.tpl | 2 +- web/template/default/protectioncheck.tpl | 10 +- 19 files changed, 446 insertions(+), 317 deletions(-) create mode 100644 web/install/update_411-420.php diff --git a/web/index.php b/web/index.php index 94023bea..3ce61bce 100644 --- a/web/index.php +++ b/web/index.php @@ -47,10 +47,11 @@ include(EASYWIDIR . '/stuff/vorlage.php'); include(EASYWIDIR . '/stuff/class_validator.php'); include(EASYWIDIR . '/stuff/functions.php'); include(EASYWIDIR . '/stuff/settings.php'); +include(EASYWIDIR . '/stuff/class_page_settings.php'); +include(EASYWIDIR . '/stuff/init_page.php'); -if (isset ($page_active) and $page_active == 'Y') { - include(EASYWIDIR . '/stuff/init_page.php'); +if (isset($page_active) and $page_active == 'Y') { if (isset($throw404)) { $template_file = 'page_404.tpl'; } else if (isset($what_to_be_included_array[$s]) and is_file(EASYWIDIR . '/stuff/' . $what_to_be_included_array[$s])) { @@ -79,6 +80,6 @@ if (isset ($page_active) and $page_active == 'Y') { include(IncludeTemplate($template_to_use,'page_footer.tpl')); } else { - redirect('login.php'); + redirect($page_data->pageurl . '/login.php'); } $sql = null; \ No newline at end of file diff --git a/web/install/update_410-411.php b/web/install/update_410-411.php index 7b5c401f..4c2af5f4 100644 --- a/web/install/update_410-411.php +++ b/web/install/update_410-411.php @@ -37,7 +37,6 @@ * Programm erhalten haben. Wenn nicht, siehe . */ - if (isset($include) and $include == true) { $query = $sql->prepare("INSERT INTO `easywi_version` (`version`,`de`,`en`) VALUES ('4.11','
23.10.2013
diff --git a/web/install/update_411-420.php b/web/install/update_411-420.php new file mode 100644 index 00000000..a38a59af --- /dev/null +++ b/web/install/update_411-420.php @@ -0,0 +1,100 @@ + + * + * This file is part of Easy-WI. + * + * Easy-WI is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Easy-WI is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Easy-WI. If not, see . + * + * Diese Datei ist Teil von Easy-WI. + * + * Easy-WI ist Freie Software: Sie koennen es unter den Bedingungen + * der GNU General Public License, wie von der Free Software Foundation, + * Version 3 der Lizenz oder (nach Ihrer Wahl) jeder spaeteren + * veroeffentlichten Version, weiterverbreiten und/oder modifizieren. + * + * Easy-WI wird in der Hoffnung, dass es nuetzlich sein wird, aber + * OHNE JEDE GEWAEHELEISTUNG, bereitgestellt; sogar ohne die implizite + * Gewaehrleistung der MARKTFAEHIGKEIT oder EIGNUNG FUER EINEN BESTIMMTEN ZWECK. + * Siehe die GNU General Public License fuer weitere Details. + * + * Sie sollten eine Kopie der GNU General Public License zusammen mit diesem + * Programm erhalten haben. Wenn nicht, siehe . + */ + +if (isset($include) and $include == true) { + $query = $sql->prepare("INSERT INTO `easywi_version` (`version`,`de`,`en`) VALUES +('4.11','
23.10.2013
+Leider haben sich in der 4.10 einige Fehler eingeschlichen. Dazu hat sie deutlich aufgezeigt, das viele Admins noch alte PHP Versionen nutzen und Easy-WI inkompatibel geworden ist.
+
+4.11 ist ein Hotfix Release, dass diese Probleme addressiert.
+
+Änderungen:
+
    +
  • Passwort Hash Fallback from Fallback
    • +
  • register_globals wird deaktiviert wenn an
    • +
+

+Bugfixes:
+
    +
  • Vertreter Login schlägt fehl.
    • +
  • GS Backup Templates enthalten falsche Variable server_id
    • +
  • Falscher Link im Adminpanel für ESXI Host
    • +
  • Minecraft Query funktioniert nicht
    • +
  • Falscher tsdns_settings.ini Syntax
    • +
+','
10.23.2013
+Unfortunately errors have slipped in 4.10. In addition the update revealed that there are still admins with old PHP versions around. Those admins could not login anymore since.
+
+4.11 is a hotfix release which addresses these problems.
+
+Changes:
+
    +
  • password hash fallback from fallback
    • +
  • deaktivate register_globals if on
    • +
+

+Bugfixes:
+
    +
  • Substitute login failing
    • +
  • gs backup templates with incorrect variable server_id
    • +
  • incorrect link at esxi host link
    • +
  • Minecraft Query not working
    • +
  • wrong tsdns_settings.ini syntax
    • +
+')"); + $query->execute(); + $response->add('Action: insert_easywi_version done: '); + $query->closecursor(); + + $query = $sql->prepare("SELECT `active` FROM `page_settings` LIMIT 1"); + $query->execute(); + if ($query->fetchColumn() == 'N') { + $query = $sql->prepare("INSERT INTO `modules` (`id`,`file`,`get`,`sub`,`type`,`active`) VALUES (9,'','pn','','C','N') ON DUPLICATE KEY UPDATE `active`=VALUES(`active`)"); + $query->execute(); + } + $query = $sql->prepare("SELECT `active` FROM `lendsettings` WHERE `resellerid`=0 LIMIT 1"); + $query->execute(); + if ($query->fetchColumn() == 'N') { + $query = $sql->prepare("INSERT INTO `modules` (`id`,`file`,`get`,`sub`,`type`,`active`) VALUES (5,'','le','','C','N') ON DUPLICATE KEY UPDATE `active`=VALUES(`active`)"); + $query->execute(); + } +} else { + echo "Error: this file needs to be included by the updater!
"; +} \ No newline at end of file diff --git a/web/lend.php b/web/lend.php index d970f2f7..bf3f62b0 100644 --- a/web/lend.php +++ b/web/lend.php @@ -119,10 +119,15 @@ $slotselect = array(); $votimeselect = array(); $voslotselect = array(); + +$query = $sql->prepare("SELECT `active` FROM `modules` WHERE `id`=5 LIMIT 1"); +$query->execute(); +$active = $query->fetchColumn(); +$active = (active_check($active)) ? $active : 'Y'; + $query = $sql->prepare("SELECT *,AES_DECRYPT(`ftpuploadpath`,?) AS `decyptedftpuploadpath` FROM `lendsettings` WHERE `resellerid`=? LIMIT 1"); $query->execute(array($aeskey, $reseller_id)); foreach ($query->fetchall(PDO::FETCH_ASSOC) as $row) { - $active = $row['active']; $activeGS = ($row['activeGS'] == 'B' or ($row['activeGS'] != 'N' and (isset($admin_id) or ($row['activeGS'] != 'N' and $ui->username('shorten', 50, 'get') == 'api'))) or ($row['activeGS'] == 'R' and isset($user_id)) or ($row['activeGS'] == 'A' and !isset($user_id))) ? 'Y' : 'N'; $activeVS = ($row['activeVS'] == 'B' or ($row['activeVS'] != 'N' and (isset($admin_id) or ($row['activeVS'] != 'N' and $ui->username('shorten', 50, 'get') == 'api'))) or ($row['activeVS'] == 'R' and isset($user_id)) or ($row['activeVS'] == 'A' and !isset($user_id))) ? 'Y' : 'N'; $ftpupload = ($row['ftpupload'] == 'Y' or ($row['ftpupload'] != 'N' and (isset($admin_id) or ($row['ftpupload'] != 'N' and $ui->username('shorten', 50, 'get') == 'api'))) or ($row['ftpupload'] == 'R' and isset($user_id)) or ($row['ftpupload'] == 'A' and !isset($user_id))) ? 'Y' : 'N'; diff --git a/web/stuff/admin_modules.php b/web/stuff/admin_modules.php index d0e09b79..60412451 100644 --- a/web/stuff/admin_modules.php +++ b/web/stuff/admin_modules.php @@ -60,13 +60,17 @@ $table = array( 4 => array('id' =>4, 'active' => 'Y', 'name' => $gsprache->voiceserver, 'sub' => 'vo', 'type' => $sprache->type_core), 5 => array('id' =>5, 'active' => 'Y', 'name' => $gsprache->lendserver, 'sub' => 'le', 'type' => $sprache->type_core), 6 => array('id' =>6, 'active' => 'Y', 'name' => $gsprache->support, 'sub' => 'ti', 'type' => $sprache->type_core), - 7 => array('id' =>7, 'active' => 'Y', 'name' => 'Rootserver', 'sub' => 'ro', 'type' => $sprache->type_core) + 7 => array('id' =>7, 'active' => 'Y', 'name' => 'Rootserver', 'sub' => 'ro', 'type' => $sprache->type_core), + 8 => array('id' =>8, 'active' => 'Y', 'name' => $gsprache->imprint, 'sub' => 'ip', 'type' => $sprache->type_core), + 9 => array('id' =>9, 'active' => 'Y', 'name' => 'CMS', 'sub' => 'pn', 'type' => $sprache->type_core) ); if ($ui->st('action', 'post') and !token(true)) { $template_file = $spracheResponse->token; } else if ($ui->st('d', 'get') == 'ad' or $ui->st('d', 'get') == 'md') { + $errors = array(); + $id = $ui->id('id', 10, 'get'); $active = ($ui->active('active', 'post')) ? $ui->active('active', 'post') : 'Y'; $langAvailable = getlanguages($template_to_use); @@ -93,7 +97,6 @@ if ($ui->st('action', 'post') and !token(true)) { // Custom Modules } else if ($id > 1000 or $id === null) { - $errors = array(); $dbSuccess = false; $file = $ui->config('file', 'post'); $sub = $ui->st('sub', 'post'); diff --git a/web/stuff/init_admin.php b/web/stuff/init_admin.php index bc63b8f9..68d2140a 100644 --- a/web/stuff/init_admin.php +++ b/web/stuff/init_admin.php @@ -95,16 +95,7 @@ $what_to_be_included_array = array( 'su' => 'global_userdata.php' ); -if ($reseller_id == 0) { - $what_to_be_included_array['mo'] = 'admin_modules.php'; - $what_to_be_included_array['ps'] = 'page_settings.php'; - $what_to_be_included_array['pp'] = 'page_pages.php'; - $what_to_be_included_array['pn'] = 'page_news_edit.php'; - $what_to_be_included_array['pc'] = 'page_comments.php'; - $what_to_be_included_array['pd'] = 'page_downloads.php'; -} - -$easywiModules = array('gs' => true, 'ip' => true, 'ea' => true, 'my' => true, 'ro' => true, 'ti' => true, 'le' => true, 'vo' => true); +$easywiModules = array('gs' => true, 'ip' => true, 'ea' => true, 'my' => true, 'pn' => true, 'ro' => true, 'ti' => true, 'le' => true, 'vo' => true); $customModules = array('gs' => array(), 'mo' => array(), 'my' => array(), 'ro' => array(), 'ti' => array(), 'us' => array(), 'vo' => array(), 'pa' => array()); $query = $sql->prepare("SELECT * FROM `modules` WHERE `type` IN ('A','C')"); @@ -131,6 +122,18 @@ foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) { } } +if ($reseller_id == 0) { + $what_to_be_included_array['mo'] = 'admin_modules.php'; + + if ($easywiModules['pn'] === true) { + $what_to_be_included_array['ps'] = 'page_settings.php'; + $what_to_be_included_array['pp'] = 'page_pages.php'; + $what_to_be_included_array['pn'] = 'page_news_edit.php'; + $what_to_be_included_array['pc'] = 'page_comments.php'; + $what_to_be_included_array['pd'] = 'page_downloads.php'; + } +} + if ($easywiModules['gs'] === true) { $what_to_be_included_array['ro'] = 'roots.php'; $what_to_be_included_array['ma'] = 'masterserver.php'; diff --git a/web/stuff/init_page.php b/web/stuff/init_page.php index 0367ef12..c5f7db2d 100644 --- a/web/stuff/init_page.php +++ b/web/stuff/init_page.php @@ -37,9 +37,6 @@ * Programm erhalten haben. Wenn nicht, siehe . */ - -include(EASYWIDIR . '/stuff/class_page_settings.php'); - $pages = array(); if (!isset($user_language)) { @@ -53,221 +50,234 @@ if (!isurl($pageurl) or (!isdomain($pageurl) and (!isurl($pageurl)))) { $page_sprache = getlanguagefile('page', $user_language, 0); $page_data = new PageSettings($user_language, $pageurl, $seo); +if (isset($page_active) and $page_active == 'Y') { + $easywiModules = array('gs' => true, 'ip' => true, 'ea' => true, 'my' => true, 'ro' => true, 'ti' => true, 'le' => true, 'vo' => true); + $customModules = array('gs' => array(), 'mo' => array(), 'my' => array(), 'ro' => array(), 'ti' => array(), 'us' => array(), 'vo' => array(), 'pa' => array()); - - -$easywiModules = array('gs' => true, 'ip' => true, 'ea' => true, 'my' => true, 'ro' => true, 'ti' => true, 'le' => true, 'vo' => true); -$customModules = array('gs' => array(), 'mo' => array(), 'my' => array(), 'ro' => array(), 'ti' => array(), 'us' => array(), 'vo' => array(), 'pa' => array()); - -$query = $sql->prepare("SELECT * FROM `modules` WHERE `type` IN ('P','C')"); -$query2 = $sql->prepare("SELECT `text` FROM `translations` WHERE `type`='mo' AND `transID`=? AND `lang`=? LIMIT 1"); -$query->execute(); -foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) { - if ($row['active'] == 'Y' and $row['type'] == 'A' and is_file(EASYWIDIR . '/stuff/' . $row['file'])) { - $query2->execute(array($row['id'], $user_language)); - $name = $query2->fetchColumn(); - - if (strlen($name) == 0) { - $query2->execute(array($row['id'], $rSA['language'])); + $query = $sql->prepare("SELECT * FROM `modules` WHERE `type` IN ('P','C')"); + $query2 = $sql->prepare("SELECT `text` FROM `translations` WHERE `type`='mo' AND `transID`=? AND `lang`=? LIMIT 1"); + $query->execute(); + foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) { + if ($row['active'] == 'Y' and $row['type'] == 'A' and is_file(EASYWIDIR . '/stuff/' . $row['file'])) { + $query2->execute(array($row['id'], $user_language)); $name = $query2->fetchColumn(); + + if (strlen($name) == 0) { + $query2->execute(array($row['id'], $rSA['language'])); + $name = $query2->fetchColumn(); + } + if (strlen($name) == 0) { + $name = $row['file']; + } + + $customModules[$row['sub']][$row['get']] = $name; + $what_to_be_included_array[$row['get']] = $row['file']; + + } else if ($row['type'] == 'C' and $row['active'] == 'N') { + $easywiModules[$row['get']] = false; } - if (strlen($name) == 0) { - $name = $row['file']; - } - - $customModules[$row['sub']][$row['get']] = $name; - $what_to_be_included_array[$row['get']] = $row['file']; - - } else if ($row['type'] == 'C' and $row['active'] == 'N') { - $easywiModules[$row['get']] = false; - } -} - -$what_to_be_included_array = array('news' => 'page_news.php','contact' => 'page_contact.php', - 'page' => 'page_page.php','home' => 'page_page.php','about' => 'page_page.php','gallery' => 'page_page.php','sitemap' => 'page_page.php','search' => 'page_page.php', - 'tag' => 'page_tag.php','categories' => 'page_tag.php','downloads' => 'page_download.php', - 'lendserver' => 'lend.php', - 'protectioncheck' => 'protectioncheck.php', - 'register' => 'page_register.php' -); - -if ($easywiModules['ip'] === true) { - $what_to_be_included_array['ip'] = 'imprint.php'; -} - -$query = $sql->prepare("SELECT `active`,`activeGS`,`activeVS` FROM `lendsettings` WHERE `resellerid`=0 LIMIT 1"); -$query->execute(); -foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) { - $page_data->SetData('lendactive', $row['active']); - $page_data->SetData('lendactiveGS', $row['activeGS']); - $page_data->SetData('lendactiveVS', $row['activeVS']); -} - -$page_data->SetData('protectioncheck', $protectioncheck); -$page_data->SetData('title', $title); - -$query = $sql->prepare("SELECT p.`id`,p.`subpage`,p.`naviDisplay`,t.`title` FROM `page_pages` p LEFT JOIN `page_pages_text` t ON p.`id`=t.`pageid` WHERE p.`released`='1' AND p.`type`='page' AND t.`language`=? AND p.`resellerid`='0' ORDER BY `subpage`,`sort`"); -$query->execute(array($user_language)); -if ($seo == 'Y') { - $page_data->SetMenu($gsprache->news, $gsprache->news,'news'); - - if ($protectioncheck == 'Y') { - $page_data->SetMenu($page_sprache->protectioncheck, $page_sprache->protectioncheck,'protectioncheck'); } - if ($page_data->lendactive == 'Y') { - if ($page_data->showLend((isset($admin_id)) ? true : false,(isset($user_id)) ? true : false, 'g')) { - $page_data->SetMenu($gsprache->gameserver, array($gsprache->lendserver, $gsprache->gameserver), 'lendservergs'); - } - - if ($page_data->showLend((isset($admin_id)) ? true : false,(isset($user_id)) ? true : false, 'v')) { - $page_data->SetMenu($gsprache->voiceserver, array($gsprache->lendserver, $gsprache->voiceserver), 'lendservervoice'); - } - - if ($page_data->lendGS !== false or $page_data->lendVS !== false) { - $page_data->SetMenu($gsprache->lendserver, $gsprache->lendserver, 'lendserver'); - } else { - $page_data->SetData('lendactive', 'N'); - } + $what_to_be_included_array = array('news' => 'page_news.php','contact' => 'page_contact.php', + 'page' => 'page_page.php','home' => 'page_page.php','about' => 'page_page.php','gallery' => 'page_page.php','sitemap' => 'page_page.php','search' => 'page_page.php', + 'tag' => 'page_tag.php','categories' => 'page_tag.php','downloads' => 'page_download.php', + 'protectioncheck' => 'protectioncheck.php', + 'register' => 'page_register.php' + ); + if ($easywiModules['ip'] === true) { + $what_to_be_included_array['imprint'] = 'imprint.php'; + } + if ($easywiModules['le'] === true) { + $what_to_be_included_array['lendserver'] = 'lendserver.php'; } - $page_data->SetMenu($gsprache->downloads, $gsprache->downloads,'downloads'); - $page_data->SetMenu($page_sprache->about, $page_sprache->about,'about'); - $page_data->SetMenu($page_sprache->sitemap, $page_sprache->sitemap,'sitemap'); - $page_data->SetMenu($page_sprache->gallery, $page_sprache->gallery,'gallery'); - $page_data->SetMenu($gsprache->imprint, $gsprache->imprint,'imprint'); - $page_data->SetMenu($page_sprache->contact, $page_sprache->contact,'contact'); - $page_data->SetMenu($page_sprache->search, $page_sprache->search,'search'); - $page_data->SetMenu($page_sprache->register, $page_sprache->register,'register'); + $query = $sql->prepare("SELECT `activeGS`,`activeVS` FROM `lendsettings` WHERE `resellerid`=0 LIMIT 1"); + $query->execute(); foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) { - if ($row['naviDisplay'] == 'Y') { - $page_data->SetMenu($row['title'], $row['title'], $row['subpage'], $row['id']); - } else { - $page_data->SetMenu($row['title'], $row['title'], $row['subpage'], $row['id'], false); + $page_data->SetData('lendactiveGS', $row['activeGS']); + $page_data->SetData('lendactiveVS', $row['activeVS']); + } + $query = $sql->prepare("SELECT `active` FROM `modules` WHERE `id`=5 LIMIT 1"); + $query->execute(); + $lendActive = $query->fetchColumn(); + $lendActive = (active_check($lendActive)) ? $lendActive : 'Y'; + $page_data->SetData('lendactive', $lendActive); + + $page_data->SetData('protectioncheck', $protectioncheck); + $page_data->SetData('title', $title); + + $query = $sql->prepare("SELECT p.`id`,p.`subpage`,p.`naviDisplay`,t.`title` FROM `page_pages` p LEFT JOIN `page_pages_text` t ON p.`id`=t.`pageid` WHERE p.`released`='1' AND p.`type`='page' AND t.`language`=? AND p.`resellerid`='0' ORDER BY `subpage`,`sort`"); + $query->execute(array($user_language)); + if ($seo == 'Y') { + $page_data->SetMenu($gsprache->news, $gsprache->news,'news'); + + if ($protectioncheck == 'Y') { + $page_data->SetMenu($page_sprache->protectioncheck, $page_sprache->protectioncheck,'protectioncheck'); + } + + if ($page_data->lendactive == 'Y') { + if ($page_data->showLend((isset($admin_id)) ? true : false,(isset($user_id)) ? true : false, 'g')) { + $page_data->SetMenu($gsprache->gameserver, array($gsprache->lendserver, $gsprache->gameserver), 'lendservergs'); + } + + if ($page_data->showLend((isset($admin_id)) ? true : false,(isset($user_id)) ? true : false, 'v')) { + $page_data->SetMenu($gsprache->voiceserver, array($gsprache->lendserver, $gsprache->voiceserver), 'lendservervoice'); + } + + if ($page_data->lendGS !== false or $page_data->lendVS !== false) { + $page_data->SetMenu($gsprache->lendserver, $gsprache->lendserver, 'lendserver'); + } else { + $page_data->SetData('lendactive', 'N'); + } + + } + + if ($easywiModules['ip'] === true) { + $page_data->SetMenu($gsprache->imprint, $gsprache->imprint,'imprint'); + } + + $page_data->SetMenu($gsprache->downloads, $gsprache->downloads,'downloads'); + $page_data->SetMenu($page_sprache->about, $page_sprache->about,'about'); + $page_data->SetMenu($page_sprache->sitemap, $page_sprache->sitemap,'sitemap'); + $page_data->SetMenu($page_sprache->gallery, $page_sprache->gallery,'gallery'); + $page_data->SetMenu($page_sprache->contact, $page_sprache->contact,'contact'); + $page_data->SetMenu($page_sprache->search, $page_sprache->search,'search'); + $page_data->SetMenu($page_sprache->register, $page_sprache->register,'register'); + + foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) { + if ($row['naviDisplay'] == 'Y') { + $page_data->SetMenu($row['title'], $row['title'], $row['subpage'], $row['id']); + } else { + $page_data->SetMenu($row['title'], $row['title'], $row['subpage'], $row['id'], false); + } + } + + if (isset($admin_id) and $ui->smallletters('preview',4, 'get') == 'true') { + $preview = 1; + + } else if (count($ui->get)>0 and isset($s) and isset($page_data->pages[$s])) { + redirect($page_data->pages[$s]['link']); + + } else if (count($ui->get)>0) { + redirect('/'); + } + + } else { + $page_data->SetMenu($gsprache->news, array('site' => 'news'), 'news'); + + if ($protectioncheck== 'Y') { + $page_data->SetMenu($page_sprache->protectioncheck, array('site' => 'protectioncheck'), 'protectioncheck'); + } + + if ($page_data->lendactive == 'Y') { + $page_data->SetMenu($gsprache->lendserver, array('site' => 'lendserver'), 'lendserver'); + $page_data->SetMenu($gsprache->gameserver, array('site' => 'lendserver', 'd' => 'gs'), 'lendservergs'); + $page_data->SetMenu($gsprache->voiceserver, array('site' => 'lendserver', 'd' => 'vo'), 'lendservervoice'); + } + + if ($easywiModules['ip'] === true) { + $page_data->SetMenu($gsprache->imprint, array('site' => 'imprint'), 'imprint'); + } + + $page_data->SetMenu($gsprache->downloads, array('site' => 'downloads'), 'downloads'); + $page_data->SetMenu($page_sprache->about, array('site' => 'about'), 'about'); + $page_data->SetMenu($page_sprache->sitemap, array('site' => 'sitemap'), 'sitemap'); + $page_data->SetMenu($page_sprache->gallery, array('site' => 'gallery'), 'gallery'); + $page_data->SetMenu($page_sprache->contact, array('site' => 'contact'), 'contact'); + $page_data->SetMenu($page_sprache->search, array('site' => 'search'), 'search'); + $page_data->SetMenu($page_sprache->register, array('site' => 'register'), 'register'); + + foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) { + if ($row['naviDisplay'] == 'Y') { + $page_data->SetMenu($row['title'], $row['id'], $row['subpage'], $row['id']); + + } else { + $page_data->SetMenu($row['title'], $row['id'], $row['subpage'], $row['id'], false); + } } } - if (isset($admin_id) and $ui->smallletters('preview',4, 'get') == 'true') { - $preview = 1; - - } else if (count($ui->get)>0 and isset($s) and isset($page_data->pages[$s])) { - redirect($page_data->pages[$s]['link']); - - } else if (count($ui->get)>0) { - redirect('/'); - } - -} else { - $page_data->SetMenu($gsprache->news, array('site' => 'news'), 'news'); - - if ($protectioncheck== 'Y') { - $page_data->SetMenu($page_sprache->protectioncheck, array('site' => 'protectioncheck'), 'protectioncheck'); - } - - if ($page_data->lendactive == 'Y') { - $page_data->SetMenu($gsprache->lendserver, array('site' => 'lendserver'), 'lendserver'); - $page_data->SetMenu($gsprache->gameserver, array('site' => 'lendserver', 'd' => 'gs'), 'lendservergs'); - $page_data->SetMenu($gsprache->voiceserver, array('site' => 'lendserver', 'd' => 'vo'), 'lendservervoice'); - } - $page_data->SetMenu($gsprache->downloads, array('site' => 'downloads'), 'downloads'); - $page_data->SetMenu($page_sprache->about, array('site' => 'about'), 'about'); - $page_data->SetMenu($page_sprache->sitemap, array('site' => 'sitemap'), 'sitemap'); - $page_data->SetMenu($page_sprache->gallery, array('site' => 'gallery'), 'gallery'); - $page_data->SetMenu($gsprache->imprint, array('site' => 'imprint'), 'imprint'); - $page_data->SetMenu($page_sprache->contact, array('site' => 'contact'), 'contact'); - $page_data->SetMenu($page_sprache->search, array('site' => 'search'), 'search'); - $page_data->SetMenu($page_sprache->register, array('site' => 'register'), 'register'); + $query = $sql->prepare("SELECT t.`text` FROM `page_pages` p LEFT JOIN `page_pages_text` t ON p.`id`=t.`pageid` AND t.`language`=? WHERE p.`type`='about' AND p.`resellerid`=0 LIMIT 1"); + $query->execute(array($user_language)); + $page_data->SetData('about', $query->fetchColumn()); + $query = $sql->prepare("SELECT p.`id`,p.`subpage`,t.`title`,t.`text` FROM `page_pages` p LEFT JOIN `page_pages_text` t ON p.`id`=t.`pageid` AND t.`language`=? WHERE p.`released`='1' AND p.`type`='news' AND p.`resellerid`=0 ORDER BY `id` DESC LIMIT $maxnews_sidebar"); + $query->execute(array($user_language)); foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) { - if ($row['naviDisplay'] == 'Y') { - $page_data->SetMenu($row['title'], $row['id'], $row['subpage'], $row['id']); + $page_data->SetNewsPost($row['id'], $row['title'], $row['text'], $newssidebar_textlength); + } - } else { - $page_data->SetMenu($row['title'], $row['id'], $row['subpage'], $row['id'], false); + if (strpos($ui->escaped('HTTP_USER_AGENT', 'server'), ' MSIE ') !== false) { + $page_data->SetData('MSIE',(string)$page_sprache->MSIE); + } + + if (isset($page_category)) { + if ($page_category == szrp($gsprache->imprint)) { + $s='imprint'; + } else if ($page_category == szrp($page_sprache->contact)) { + $s='contact'; + } else if ($page_category == szrp($gsprache->downloads)) { + $s='downloads'; + } else if ($page_category == szrp($page_sprache->protectioncheck)) { + $s='protectioncheck'; + } else if ($page_category == szrp($page_sprache->tag)) { + $s='tag'; + } else if ($page_category == szrp($page_sprache->categories)) { + $s='categories'; + } else if ($page_category == szrp($page_sprache->about)) { + $s='about'; + } else if ($page_category == szrp($gsprache->lendserver)) { + $s='lendserver'; + } else if ($page_category == szrp($gsprache->news)) { + $s='news'; + } else if ($page_category == szrp($page_sprache->sitemap)) { + $s='sitemap'; + } else if ($page_category == szrp($page_sprache->search)) { + $s='search'; + } else if ($page_category == szrp($page_sprache->gallery)) { + $s='gallery'; + } else if ($page_category == szrp($page_sprache->sitemap)) { + $s='sitemap'; + } else if ($page_category == szrp($page_sprache->search)) { + $s='search'; + } else if ($page_category == szrp($page_sprache->register)) { + $s='register'; + } else if (isset($page_data->pages_array['pages']) and in_array($page_category, $page_data->pages_array['pages'])) { + $s='page'; } } -} -$query = $sql->prepare("SELECT t.`text` FROM `page_pages` p LEFT JOIN `page_pages_text` t ON p.`id`=t.`pageid` AND t.`language`=? WHERE p.`type`='about' AND p.`resellerid`=0 LIMIT 1"); -$query->execute(array($user_language)); -$page_data->SetData('about', $query->fetchColumn()); + if (isset($admin_id)) { + $page_lookupid = $admin_id; -$query = $sql->prepare("SELECT p.`id`,p.`subpage`,t.`title`,t.`text` FROM `page_pages` p LEFT JOIN `page_pages_text` t ON p.`id`=t.`pageid` AND t.`language`=? WHERE p.`released`='1' AND p.`type`='news' AND p.`resellerid`=0 ORDER BY `id` DESC LIMIT $maxnews_sidebar"); -$query->execute(array($user_language)); -foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) { - $page_data->SetNewsPost($row['id'], $row['title'], $row['text'], $newssidebar_textlength); -} - -if (strpos($ui->escaped('HTTP_USER_AGENT', 'server'), ' MSIE ') !== false) { - $page_data->SetData('MSIE',(string)$page_sprache->MSIE); -} - -if (isset($page_category)) { - if ($page_category == szrp($gsprache->imprint)) { - $s='imprint'; - } else if ($page_category == szrp($page_sprache->contact)) { - $s='contact'; - } else if ($page_category == szrp($gsprache->downloads)) { - $s='downloads'; - } else if ($page_category == szrp($page_sprache->protectioncheck)) { - $s='protectioncheck'; - } else if ($page_category == szrp($page_sprache->tag)) { - $s='tag'; - } else if ($page_category == szrp($page_sprache->categories)) { - $s='categories'; - } else if ($page_category == szrp($page_sprache->about)) { - $s='about'; - } else if ($page_category == szrp($gsprache->lendserver)) { - $s='lendserver'; - } else if ($page_category == szrp($gsprache->news)) { - $s='news'; - } else if ($page_category == szrp($page_sprache->sitemap)) { - $s='sitemap'; - } else if ($page_category == szrp($page_sprache->search)) { - $s='search'; - } else if ($page_category == szrp($page_sprache->gallery)) { - $s='gallery'; - } else if ($page_category == szrp($page_sprache->sitemap)) { - $s='sitemap'; - } else if ($page_category == szrp($page_sprache->search)) { - $s='search'; - } else if ($page_category == szrp($page_sprache->register)) { - $s='register'; - } else if (isset($page_data->pages_array['pages']) and in_array($page_category, $page_data->pages_array['pages'])) { - $s='page'; + } else if (isset($user_id)) { + $page_lookupid = $user_id; } -} -if (isset($admin_id)) { - $page_lookupid = $admin_id; + if (isset($page_lookupid)) { + $query = $sql->prepare("SELECT `cname`,`name`,`vname`,`lastlogin` FROM `userdata` WHERE `id`=? LIMIT 1"); + $query->execute(array($page_lookupid)); + foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) { + $great_name = $row['name']; + $great_vname = $row['vname']; -} else if (isset($user_id)) { - $page_lookupid = $user_id; -} + $great_user = ($row['name'] != '' or $row['vname'] != '') ? trim ($row['vname'] . ' ' . $row['name']) : $row['cname']; -if (isset($page_lookupid)) { - $query = $sql->prepare("SELECT `cname`,`name`,`vname`,`lastlogin` FROM `userdata` WHERE `id`=? LIMIT 1"); - $query->execute(array($page_lookupid)); - foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) { - $great_name = $row['name']; - $great_vname = $row['vname']; - - $great_user = ($row['name'] != '' or $row['vname'] != '') ? trim ($row['vname'] . ' ' . $row['name']) : $row['cname']; - - if ($row['lastlogin'] != null and $row['lastlogin'] != '0000-00-00 00:00:00') { - $great_last=($user_language == 'de') ? date('d.m.Y H:m:s', strtotime($row['lastlogin'])) : $row['lastlogin']; - } else { - $great_last=($user_language == 'de') ? 'Niemals' : 'Never'; + if ($row['lastlogin'] != null and $row['lastlogin'] != '0000-00-00 00:00:00') { + $great_last=($user_language == 'de') ? date('d.m.Y H:m:s', strtotime($row['lastlogin'])) : $row['lastlogin']; + } else { + $great_last=($user_language == 'de') ? 'Niemals' : 'Never'; + } } } -} -if (!isset($s) and !isset($page_category) and isset($page_default) and isid($page_default,19)) { - $s = 'page'; - $default_page_id = $page_default; -} else if (!isset($s) and !isset($page_category) and isset($page_default)) { - $s = $page_default; -} else if (!isset($s) and isset($page_category) and $page_category != '' and $page_category != null) { - $s = 404; - $throw404 = true; + if (!isset($s) and !isset($page_category) and isset($page_default) and isid($page_default,19)) { + $s = 'page'; + $default_page_id = $page_default; + } else if (!isset($s) and !isset($page_category) and isset($page_default)) { + $s = $page_default; + } else if (!isset($s) and isset($page_category) and $page_category != '' and $page_category != null) { + $s = 404; + $throw404 = true; + } } \ No newline at end of file diff --git a/web/stuff/lendserver.php b/web/stuff/lendserver.php index cd91af40..5258f5c7 100644 --- a/web/stuff/lendserver.php +++ b/web/stuff/lendserver.php @@ -62,10 +62,10 @@ if ($ui->w('action', 4, 'post') and !token(true)) { $template_file = $spracheResponse->token; } else if ($ui->st('d', 'get')=="se" and $pa['lendserverSettings']) { - if ($ui->active('active', 'post')) { + if ($ui->w('activeGS', 1, 'post') or $ui->w('activeVS', 1, 'post')) { - $query = $sql->prepare("UPDATE `lendsettings` SET `active`=?,`activeGS`=?,`activeVS`=?,`mintime`=?,`maxtime`=?,`timesteps`=?,`minplayer`=?,`maxplayer`=?,`playersteps`=?,`mintimeRegistered`=?,`maxtimeRegistered`=?,`timestepsRegistered`=?,`minplayerRegistered`=?,`maxplayerRegistered`=?,`playerstepsRegistered`=?,`vomintime`=?,`vomaxtime`=?,`votimesteps`=?,`vominplayer`=?,`vomaxplayer`=?,`voplayersteps`=?,`vomintimeRegistered`=?,`vomaxtimeRegistered`=?,`votimestepsRegistered`=?,`vominplayerRegistered`=?,`vomaxplayerRegistered`=?,`voplayerstepsRegistered`=?,`shutdownempty`=?,`shutdownemptytime`=?,`ftpupload`=?,`ftpuploadpath`=AES_ENCRYPT(?,?),`lendaccess`=? WHERE `resellerid`=? LIMIT 1"); - $query->execute(array($ui->active('active', 'post'), $ui->w('activeGS',1, 'post'), $ui->w('activeVS',1, 'post'), $ui->id('mintime',3, 'post'), $ui->id('maxtime',4, 'post'), $ui->id('timesteps',3, 'post'), $ui->id('minplayer',3, 'post'), $maxplayer = $ui->id('maxplayer',3, 'post'), $ui->id('playersteps',3, 'post'), $ui->id('mintimeRegistered',3, 'post'), $ui->id('maxtimeRegistered',4, 'post'), $ui->id('timestepsRegistered',3, 'post'), $ui->id('minplayerRegistered',3, 'post'), $ui->id('maxplayerRegistered',3, 'post'), $ui->id('playerstepsRegistered',3, 'post'), $vomintime = $ui->id('vomintime',3, 'post'), $ui->id('vomaxtime',4, 'post'), $ui->id('votimesteps',3, 'post'), $ui->id('vominplayer',3, 'post'), $ui->id('vomaxplayer',3, 'post'), $ui->id('voplayersteps',3, 'post'), $ui->id('vomintimeRegistered',3, 'post'), $ui->id('vomaxtimeRegistered',4, 'post'), $ui->id('votimestepsRegistered',3, 'post'), $ui->id('vominplayerRegistered',3, 'post'), $ui->id('vomaxplayerRegistered',3, 'post'), $ui->id('voplayerstepsRegistered',3, 'post'), $ui->active('shutdownempty', 'post'), $ui->id('shutdownemptytime',4, 'post'), $ui->w('ftpupload',1, 'post'), $ui->url('ftpuploadpath', 'post'), $aeskey, $ui->id('lendaccess',1, 'post'), $reseller_id)); + $query = $sql->prepare("UPDATE `lendsettings` SET `activeGS`=?,`activeVS`=?,`mintime`=?,`maxtime`=?,`timesteps`=?,`minplayer`=?,`maxplayer`=?,`playersteps`=?,`mintimeRegistered`=?,`maxtimeRegistered`=?,`timestepsRegistered`=?,`minplayerRegistered`=?,`maxplayerRegistered`=?,`playerstepsRegistered`=?,`vomintime`=?,`vomaxtime`=?,`votimesteps`=?,`vominplayer`=?,`vomaxplayer`=?,`voplayersteps`=?,`vomintimeRegistered`=?,`vomaxtimeRegistered`=?,`votimestepsRegistered`=?,`vominplayerRegistered`=?,`vomaxplayerRegistered`=?,`voplayerstepsRegistered`=?,`shutdownempty`=?,`shutdownemptytime`=?,`ftpupload`=?,`ftpuploadpath`=AES_ENCRYPT(?,?),`lendaccess`=? WHERE `resellerid`=? LIMIT 1"); + $query->execute(array($ui->w('activeGS', 1, 'post'), $ui->w('activeVS', 1, 'post'), $ui->id('mintime',3, 'post'), $ui->id('maxtime',4, 'post'), $ui->id('timesteps',3, 'post'), $ui->id('minplayer',3, 'post'), $maxplayer = $ui->id('maxplayer',3, 'post'), $ui->id('playersteps',3, 'post'), $ui->id('mintimeRegistered',3, 'post'), $ui->id('maxtimeRegistered',4, 'post'), $ui->id('timestepsRegistered',3, 'post'), $ui->id('minplayerRegistered',3, 'post'), $ui->id('maxplayerRegistered',3, 'post'), $ui->id('playerstepsRegistered',3, 'post'), $vomintime = $ui->id('vomintime',3, 'post'), $ui->id('vomaxtime',4, 'post'), $ui->id('votimesteps',3, 'post'), $ui->id('vominplayer',3, 'post'), $ui->id('vomaxplayer',3, 'post'), $ui->id('voplayersteps',3, 'post'), $ui->id('vomintimeRegistered',3, 'post'), $ui->id('vomaxtimeRegistered',4, 'post'), $ui->id('votimestepsRegistered',3, 'post'), $ui->id('vominplayerRegistered',3, 'post'), $ui->id('vomaxplayerRegistered',3, 'post'), $ui->id('voplayerstepsRegistered',3, 'post'), $ui->active('shutdownempty', 'post'), $ui->id('shutdownemptytime',4, 'post'), $ui->w('ftpupload',1, 'post'), $ui->url('ftpuploadpath', 'post'), $aeskey, $ui->id('lendaccess',1, 'post'), $reseller_id)); $template_file = ($query->rowCount() > 0) ? $spracheResponse->table_add : $spracheResponse->error_table;; @@ -73,7 +73,6 @@ if ($ui->w('action', 4, 'post') and !token(true)) { $query = $sql->prepare("SELECT *,AES_DECRYPT(`ftpuploadpath`,?) AS `decyptedftpuploadpath` FROM `lendsettings` WHERE `resellerid`=? LIMIT 1"); $query->execute(array($aeskey, $reseller_id)); foreach ($query->fetchall(PDO::FETCH_ASSOC) as $row) { - $active = $row['active']; $activeGS = $row['activeGS']; $activeVS = $row['activeVS']; $mintime = (int) $row['mintime']; diff --git a/web/stuff/page_settings.php b/web/stuff/page_settings.php index d39afd5e..fe110545 100644 --- a/web/stuff/page_settings.php +++ b/web/stuff/page_settings.php @@ -49,6 +49,7 @@ $logsubuser = 0; if ($ui->w('action', 4, 'post') and !token(true)) { $template_file = $spracheResponse->token; } else if ($ui->smallletters('action',2, 'post') == 'md' and $ui->id('maxnews',19, 'post')) { + if ($ui->smallletters('defaultpage','255', 'post')) { $defaultpage = $ui->smallletters('defaultpage','255', 'post'); } else if ($ui->id('defaultpage','30', 'post')) { @@ -56,23 +57,42 @@ if ($ui->w('action', 4, 'post') and !token(true)) { } else { $defaultpage='home'; } + $queryAffected = 0; $registerBlockMails = ''; - foreach(explode("\r\n",$ui->escaped('registrationBadEmail', 'post')) as $row)if (preg_match("/^[a-z0-9@\_\-\.]+$/",strtolower($row))) $registerBlockMails.=strtolower($row)."\r\n"; $registrationBadIP = ''; - foreach(explode("\r\n",$ui->escaped('registrationBadIP', 'post')) as $row) if (isips($row)) $registrationBadIP.=strtolower($row)."\r\n"; - $registration=(in_array($ui->escaped('registration', 'post'), array('N','A','M','D'))) ? $ui->escaped('registration', 'post') : 'N'; - $query = $sql->prepare("UPDATE `page_settings` SET `registration`=?,`registrationBadIP`=?,`registrationBadEmail`=?,`active`=?,`seo`=?,`rssfeed`=?,`rssfeed_fulltext`=?,`rssfeed_textlength`=?,`maxnews`=?,`defaultpage`=?,`protectioncheck`=?,`maxnews_sidebar`=?,`newssidebar_textlength`=?,`spamFilter`=?,`languageFilter`=?,`blockLinks`=?,`blockWords`=?,`mailRequired`=?,`commentMinLength`=?,`commentsModerated`=?,`honeyPotKey`=?,`dnsbl`=?,`pageurl`=? WHERE `resellerid`=? LIMIT 1"); - $query->execute(array($registration,$registrationBadIP,$registerBlockMails,$ui->active('active', 'post'),$ui->active('seo', 'post'),$ui->active('rssfeed', 'post'),$ui->active('rssfeed_fulltext', 'post'),$ui->id('rssfeed_textlength',11, 'post'),$ui->id('maxnews',30, 'post'),$defaultpage,$ui->active('protectioncheck', 'post'),$ui->id('maxnews_sidebar',11, 'post'),$ui->id('newssidebar_textlength',11, 'post'),$ui->active('spamFilter', 'post'),$ui->active('languageFilter', 'post'),$ui->active('blockLinks', 'post'),$ui->escaped('blockWords', 'post'),$ui->active('mailRequired', 'post'),$ui->id('commentMinLength',11, 'post'),$ui->active('commentsModerated', 'post'),$ui->w('honeyPotKey',255, 'post'),$ui->active('dnsbl', 'post'),$ui->url('pageurl', 'post'),$reseller_id)); - $queryAffected+=$query->rowCount(); $posted_languages = array(); - if (is_object($ui->st('language', 'post'))) { - foreach ($ui->st('language', 'post') as $key=>$lg) $posted_languages[$key] = $lg; + $posted_touLanguages = array(); + + foreach(explode("\r\n",$ui->escaped('registrationBadEmail', 'post')) as $row) { + if (preg_match("/^[a-z0-9@\_\-\.]+$/",strtolower($row))) { + $registerBlockMails .= strtolower($row) . "\r\n"; + } } + + foreach(explode("\r\n",$ui->escaped('registrationBadIP', 'post')) as $row) { + if (isips($row)) { + $registrationBadIP .= strtolower($row)."\r\n"; + } + } + + $registration = (in_array($ui->escaped('registration', 'post'), array('N','A','M','D'))) ? $ui->escaped('registration', 'post') : 'N'; + + $query = $sql->prepare("UPDATE `page_settings` SET `registration`=?,`registrationBadIP`=?,`registrationBadEmail`=?,`seo`=?,`rssfeed`=?,`rssfeed_fulltext`=?,`rssfeed_textlength`=?,`maxnews`=?,`defaultpage`=?,`protectioncheck`=?,`maxnews_sidebar`=?,`newssidebar_textlength`=?,`spamFilter`=?,`languageFilter`=?,`blockLinks`=?,`blockWords`=?,`mailRequired`=?,`commentMinLength`=?,`commentsModerated`=?,`honeyPotKey`=?,`dnsbl`=?,`pageurl`=? WHERE `resellerid`=? LIMIT 1"); + $query->execute(array($registration,$registrationBadIP,$registerBlockMails,$ui->active('seo', 'post'),$ui->active('rssfeed', 'post'),$ui->active('rssfeed_fulltext', 'post'),$ui->id('rssfeed_textlength',11, 'post'),$ui->id('maxnews',30, 'post'),$defaultpage,$ui->active('protectioncheck', 'post'),$ui->id('maxnews_sidebar',11, 'post'),$ui->id('newssidebar_textlength',11, 'post'),$ui->active('spamFilter', 'post'),$ui->active('languageFilter', 'post'),$ui->active('blockLinks', 'post'),$ui->escaped('blockWords', 'post'),$ui->active('mailRequired', 'post'),$ui->id('commentMinLength',11, 'post'),$ui->active('commentsModerated', 'post'),$ui->w('honeyPotKey',255, 'post'),$ui->active('dnsbl', 'post'),$ui->url('pageurl', 'post'),$reseller_id)); + $queryAffected += $query->rowCount(); + + if (is_object($ui->st('language', 'post'))) { + foreach ($ui->st('language', 'post') as $key=>$lg) { + $posted_languages[$key] = $lg; + } + } + $query = $sql->prepare("SELECT `id` FROM `page_pages` WHERE `type`='about' AND `resellerid`=? LIMIT 1"); $query->execute(array($reseller_id)); $about_id = $query->fetchColumn(); - if (count($posted_languages)>0) { + + if (count($posted_languages) > 0) { $query = $sql->prepare("SELECT `language` FROM `page_pages_text` WHERE `pageid`=? AND `resellerid`=?"); $query2 = $sql->prepare("UPDATE `page_pages_text` SET `text`=? WHERE `pageid`=? AND `language`=? AND `resellerid`=? LIMIT 1"); $query3 = $sql->prepare("DELETE FROM `page_pages_text` WHERE `pageid`=? AND `language`=? AND `resellerid`=? LIMIT 1"); @@ -82,25 +102,29 @@ if ($ui->w('action', 4, 'post') and !token(true)) { $lang_exist[] = $row['language']; if (in_array($row['language'],$posted_languages)) { $query2->execute(array($ui->escaped('about', 'post', $row['language']),$about_id, $row['language'],$reseller_id)); + $queryAffected += $query2->rowCount(); } else { $query3->execute(array($about_id, $row['language'],$reseller_id)); + $queryAffected += $query3->rowCount(); } } - $queryAffected+=$query->rowCount(); $query = $sql->prepare("INSERT INTO `page_pages_text` (`pageid`,`language`,`text`,`resellerid`) VALUES (?,?,?,?)"); - $queryAffected+=$query->rowCount(); + $queryAffected += $query->rowCount(); foreach ($posted_languages as $lg) { - if (!in_array($lg,$lang_exist)) $query->execute(array($about_id,$lg,nl2br($ui->escaped('about', 'post',$lg)),$reseller_id)); + if (!in_array($lg,$lang_exist)) { + $query->execute(array($about_id,$lg,nl2br($ui->escaped('about', 'post',$lg)),$reseller_id)); + } } } else { $query = $sql->prepare("DELETE FROM `page_pages_text` WHERE `pageid`=? AND `resellerid`=?"); $query->execute(array($about_id,$reseller_id)); - $queryAffected+=$query->rowCount(); + $queryAffected += $query->rowCount(); } - $posted_touLanguages = array(); + if (is_object($ui->st('touLanguages', 'post'))) { foreach ($ui->st('touLanguages', 'post') as $key=>$lg) $posted_touLanguages[$key] = $lg; } + if (count($posted_touLanguages)>0) { $query = $sql->prepare("SELECT `lang` FROM `translations` WHERE `type`='to' AND `resellerID`=?"); $query2 = $sql->prepare("UPDATE `translations` SET `text`=? WHERE `type`='to' AND `lang`=? AND `resellerID`=? LIMIT 1"); @@ -111,28 +135,30 @@ if ($ui->w('action', 4, 'post') and !token(true)) { $lang_exist[] = $row['lang']; if (in_array($row['lang'],$posted_touLanguages)) { $query2->execute(array($ui->escaped('tou', 'post', $row['lang']), $row['lang'],$reseller_id)); + $queryAffected += $query2->rowCount(); } else { $query3->execute(array($row['lang'],$reseller_id)); + $queryAffected += $query3->rowCount(); } } - $queryAffected+=$query->rowCount(); + + $query = $sql->prepare("INSERT INTO `translations` (`transID`,`type`,`lang`,`text`,`resellerID`) VALUES (1,'to',?,?,?)"); - $queryAffected+=$query->rowCount(); + $queryAffected += $query->rowCount(); foreach ($posted_touLanguages as $lg) { - if (!in_array($lg,$lang_exist)) $query->execute(array($lg,$ui->escaped('tou', 'post',$lg),$reseller_id)); + if (!in_array($lg,$lang_exist)) { + $query->execute(array($lg,$ui->escaped('tou', 'post',$lg),$reseller_id)); + } } } else { $query = $sql->prepare("DELETE FROM `translations` WHERE `type`='to' AND `resellerID`=?"); $query->execute(array($reseller_id)); - $queryAffected+=$query->rowCount(); + $queryAffected += $query->rowCount(); } $loguseraction="%mod% CMS Settings"; $insertlog->execute(); - if ($queryAffected>0) { - $template_file = $spracheResponse->table_add; - } else { - $template_file = $spracheResponse->error_table; - } + $template_file = ($queryAffected > 0) ? $spracheResponse->table_add : $spracheResponse->error_table; + } else { $lang_avail=getlanguages($template_to_use); $about_text = array(); @@ -140,7 +166,6 @@ if ($ui->w('action', 4, 'post') and !token(true)) { $query = $sql->prepare("SELECT * FROM `page_settings` WHERE `resellerid`=? LIMIT 1"); $query->execute(array($reseller_id)); foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) { - $active = $row['active']; $seo = $row['seo']; $rssfeed = $row['rssfeed']; $rssfeed_fulltext = $row['rssfeed_fulltext']; diff --git a/web/stuff/settings.php b/web/stuff/settings.php index 20847b24..ce792024 100644 --- a/web/stuff/settings.php +++ b/web/stuff/settings.php @@ -211,7 +211,7 @@ if ($loguserip!='localhost') { $query = $sql->prepare("SELECT * FROM `page_settings` WHERE `resellerid`='0' LIMIT 1"); $query->execute(); foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) { - $page_active = $row['active']; + $seo = $row['seo']; $rssfeed = $row['rssfeed']; $maxnews=(isid($row['maxnews'],11)) ? $row['maxnews'] : 10; @@ -234,9 +234,14 @@ if ($loguserip!='localhost') { } } + $query = $sql->prepare("SELECT `active` FROM `modules` WHERE `id`=9 LIMIT 1"); + $query->execute(); + $page_active = $query->fetchColumn(); + $page_active = (active_check($page_active)) ? $page_active : 'Y'; + $ewInstallPath = EASYWIDIR; - $elements=(!empty($ewInstallPath) and strpos($ui->escaped('REQUEST_URI', 'server'), $ewInstallPath) === false) ? preg_split('/\//', $ui->escaped('REQUEST_URI', 'server'),-1,PREG_SPLIT_NO_EMPTY) : preg_split('/\//',substr($ui->escaped('REQUEST_URI', 'server'),strlen($ewInstallPath)),-1,PREG_SPLIT_NO_EMPTY); + $elements = (!empty($ewInstallPath) and strpos($ui->escaped('REQUEST_URI', 'server'), $ewInstallPath) === false) ? preg_split('/\//', $ui->escaped('REQUEST_URI', 'server'),-1,PREG_SPLIT_NO_EMPTY) : preg_split('/\//',substr($ui->escaped('REQUEST_URI', 'server'),strlen($ewInstallPath)),-1,PREG_SPLIT_NO_EMPTY); if (isset($seo) and $seo== 'Y' and isset($elements[0])) { diff --git a/web/stuff/tables_add.php b/web/stuff/tables_add.php index d36f8ea7..86c74b40 100644 --- a/web/stuff/tables_add.php +++ b/web/stuff/tables_add.php @@ -368,7 +368,6 @@ $add->execute(); $query = "CREATE TABLE IF NOT EXISTS `lendsettings` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `active` enum('Y','N') NOT NULL DEFAULT 'N', `userGame` enum('A','B','R') NOT NULL DEFAULT 'B', `gameVoice` enum('A','B','R') NOT NULL DEFAULT 'B', `mintime` smallint(3) NOT NULL DEFAULT '20', @@ -575,7 +574,6 @@ $add->execute(); $query = "CREATE TABLE IF NOT EXISTS `page_settings` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `active` enum('Y','N') DEFAULT 'Y', `seo` enum('Y','N') DEFAULT 'N', `rssfeed` enum('Y','N') DEFAULT 'Y', `rssfeed_fulltext` enum('Y','N') DEFAULT 'Y', @@ -683,7 +681,7 @@ $query = "CREATE TABLE IF NOT EXISTS `rserverdata` ( `steamPassword` BLOB, `os` enum('W','L') DEFAULT 'L', `bitversion` varchar(255) NOT NULL, - `ram` smallint(5), + `ram` int(5) unsigned, `description` varchar(255) DEFAULT NULL, `ftpport` smallint(5) unsigned NOT NULL DEFAULT '21', `publickey` enum('Y','N') NOT NULL, diff --git a/web/stuff/tables_repair.php b/web/stuff/tables_repair.php index 05f0fd6f..5f86a772 100644 --- a/web/stuff/tables_repair.php +++ b/web/stuff/tables_repair.php @@ -347,7 +347,6 @@ $defined['lendedserver'] = array('id' => array("Type"=>"bigint(19) unsigned","Nu ); $defined['lendsettings'] = array('id' => array("Type"=>"int(10) unsigned","Null"=>"NO","Key"=>"PRI","Default"=>"","Extra"=>"auto_increment"), - 'active' => array("Type"=>"enum('Y','N')","Null"=>"NO","Key"=>"","Default"=>"N","Extra"=>""), 'activeGS' => array("Type"=>"enum('A','R','B','N')","Null"=>"NO","Key"=>"","Default"=>"N","Extra"=>""), 'activeVS' => array("Type"=>"enum('A','R','B','N')","Null"=>"NO","Key"=>"","Default"=>"N","Extra"=>""), 'userGame' => array("Type"=>"enum('A','B','R')","Null"=>"NO","Key"=>"","Default"=>"B","Extra"=>""), @@ -508,7 +507,6 @@ $defined['page_register_questions'] = array('id' => array("Type"=>"int(10) unsig ); $defined['page_settings'] = array('id' => array("Type"=>"int(10) unsigned","Null"=>"NO","Key"=>"PRI","Default"=>"","Extra"=>"auto_increment"), - 'active' => array("Type"=>"enum('Y','N')","Null"=>"YES","Key"=>"","Default"=>"Y","Extra"=>""), 'seo' => array("Type"=>"enum('Y','N')","Null"=>"YES","Key"=>"","Default"=>"N","Extra"=>""), 'rssfeed' => array("Type"=>"enum('Y','N')","Null"=>"YES","Key"=>"","Default"=>"Y","Extra"=>""), 'rssfeed_fulltext' => array("Type"=>"enum('Y','N')","Null"=>"YES","Key"=>"","Default"=>"Y","Extra"=>""), @@ -592,7 +590,7 @@ $defined['rserverdata'] = array('id' => array("Type"=>"int(10) unsigned","Null"= 'steamPassword' => array("Type"=>"blob","Null"=>"YES","Key"=>"","Default"=>"","Extra"=>""), 'os' => array("Type"=>"enum('W','L')","Null"=>"YES","Key"=>"L","Default"=>"","Extra"=>""), 'bitversion' => array("Type"=>"varchar(255)","Null"=>"NO","Key"=>"","Default"=>"","Extra"=>""), - 'ram' => array("Type"=>"smallint(5) unsigned","Null"=>"","Key"=>"","Default"=>"","Extra"=>""), + 'ram' => array("Type"=>"int(5) unsigned","Null"=>"YES","Key"=>"","Default"=>"","Extra"=>""), 'description' => array("Type"=>"varchar(255)","Null"=>"YES","Key"=>"","Default"=>"","Extra"=>""), 'ftpport' => array("Type"=>"smallint(5) unsigned","Null"=>"NO","Key"=>"","Default"=>"21","Extra"=>""), 'publickey' => array("Type"=>"enum('Y','N')","Null"=>"NO","Key"=>"","Default"=>"","Extra"=>""), diff --git a/web/template/default/admin_header.tpl b/web/template/default/admin_header.tpl index f0681e03..fb535c85 100644 --- a/web/template/default/admin_header.tpl +++ b/web/template/default/admin_header.tpl @@ -56,7 +56,7 @@ Easy-WI.com - +    @@ -99,7 +99,7 @@
  • smallletters('w',255,'get')=='lo') echo 'class="active"';?>>logs;?>
  • smallletters('w',255,'get')=='ml') echo 'class="active"';?>>Mail logs;?>
    • -
  • smallletters('w',255,'get')=='ip') echo 'class="active"';?>>imprint;?>
    • +
  • smallletters('w',255,'get')=='ip') echo 'class="active"';?>>imprint;?>
    • @@ -119,7 +119,7 @@
  • smallletters('w',255,'get')=='se') echo 'class="active"';?>>settings;?>
  • smallletters('w',255,'get')=='sm') echo 'class="active"';?>>E-Mail settings;?>
    • -
  • smallletters('w',255,'get')=='si') echo 'class="active"';?>>imprint.' '.$gsprache->settings;?>
    • +
  • smallletters('w',255,'get')=='si') echo 'class="active"';?>>imprint.' '.$gsprache->settings;?>
  • smallletters('w',255,'get')=='vc') echo 'class="active"';?>>versioncheck;?>
    • @@ -168,7 +168,7 @@ - +
    CMS diff --git a/web/template/default/admin_lendserver_settings.tpl b/web/template/default/admin_lendserver_settings.tpl index 18ca73a3..a23e1ffe 100644 --- a/web/template/default/admin_lendserver_settings.tpl +++ b/web/template/default/admin_lendserver_settings.tpl @@ -12,15 +12,6 @@
    -
    - -
    - -
    -
    diff --git a/web/template/default/admin_page_settings.tpl b/web/template/default/admin_page_settings.tpl index 2798b73c..13335737 100644 --- a/web/template/default/admin_page_settings.tpl +++ b/web/template/default/admin_page_settings.tpl @@ -11,15 +11,6 @@ -
    - -
    - -
    -
    diff --git a/web/template/default/page_header.tpl b/web/template/default/page_header.tpl index 4d634af0..3a3ff5c4 100644 --- a/web/template/default/page_header.tpl +++ b/web/template/default/page_header.tpl @@ -26,48 +26,49 @@
    -
    -
    - +
    + +

    +    getLangLinks() as $l=>$v) { echo 'Flag: '.$l.'.png.';}?> +   

    -
    - - - - - - -
    + + Easy-WI.com + + + +    + + + + + + +
    @@ -131,7 +132,7 @@
  • >pages['news']['href'];?>
  • >pages['about']['href'];?>
  • >pages['gallery']['href'];?>
    • -
  • >pages['imprint']['href'];?>
    • +
  • >pages['imprint']['href'];?>
  • >pages['contact']['href'];?>
  • >pages['downloads']['href'];?>
    • protectioncheck=='Y'){ ?>
  • >pages['protectioncheck']['href'];?>
    • diff --git a/web/template/default/page_protectioncheck.tpl b/web/template/default/page_protectioncheck.tpl index 58709d7e..1f969782 100644 --- a/web/template/default/page_protectioncheck.tpl +++ b/web/template/default/page_protectioncheck.tpl @@ -14,7 +14,7 @@
    - +
    diff --git a/web/template/default/page_sitemap.tpl b/web/template/default/page_sitemap.tpl index 5cb36056..b7b2f1e8 100644 --- a/web/template/default/page_sitemap.tpl +++ b/web/template/default/page_sitemap.tpl @@ -52,7 +52,7 @@ function getSubLinks2($getamount,$pagelist,$id,$sub=1){
  • pages['contact']['href'];?>
      -
    • pages['imprint']['href'];?>
      • +
    • pages['imprint']['href'];?>
    • pages['contact']['href'];?>
    • diff --git a/web/template/default/protectioncheck.tpl b/web/template/default/protectioncheck.tpl index 887b63a9..687e37fb 100644 --- a/web/template/default/protectioncheck.tpl +++ b/web/template/default/protectioncheck.tpl @@ -9,7 +9,10 @@ - + + + + -