From c488e0422ebece24696fe14bd492f4cd79b20cc9 Mon Sep 17 00:00:00 2001 From: Nexus633 Date: Sun, 2 Aug 2020 22:55:19 +0200 Subject: [PATCH] UPDATE DEV VERSION 6.2.0.1, Add config Variable $examplemodule, Installversion is 6.2.0 / 6.2.0.1, --- install/install.php | 4 +- install/update.php | 8 ++- install/update_dev_620-6201.php | 112 ++++++++++++++++++++++++++++++++ stuff/admin/admin_modules.php | 52 ++++++++------- 4 files changed, 149 insertions(+), 27 deletions(-) create mode 100644 install/update_dev_620-6201.php diff --git a/install/install.php b/install/install.php index 8e5eb6df..48f67e94 100644 --- a/install/install.php +++ b/install/install.php @@ -71,7 +71,7 @@ $languageObject = simplexml_load_file(EASYWIDIR . '/install/' . $menuLanguage . $displayToUser = ''; $systemCheckOk = array(); $systemCheckError = array(); -$easyWiVersion = ($developer == 'Y') ? '6.1.6' : '6.1.6'; +$easyWiVersion = ($developer == 'Y') ? '6.2.0.1' : '6.2.0'; if ($currentStep == 0) { @@ -302,6 +302,7 @@ if ($currentStep == 2 and count($systemCheckError) == 0) { " . '$timezone' . " = 'Europe/Berlin'; " . '$coloreddashboard' . " = false; " . '$easywitweets' . " = true; +" . '$examplemodule' . " = true; "; @fwrite($configFp, $configdata); @@ -791,6 +792,7 @@ if ($currentStep == 7 and count($systemCheckError) == 0) { " . '$timezone' . " = '" . $_POST['timezone'] . "'; " . '$coloreddashboard' . " = false; " . '$easywitweets' . " = true; +" . '$examplemodule' . " = true; "; @fwrite($configFp, $configdata); diff --git a/install/update.php b/install/update.php index 396d5a55..c0375d7c 100644 --- a/install/update.php +++ b/install/update.php @@ -206,6 +206,7 @@ if (versioncheck($version, '6.2.0', 'update_618-620.php', $response)) { $version = '6.2.0'; } + try { $query = $sql->prepare("SELECT `developer` FROM `settings` WHERE `resellerid`=0 LIMIT 1"); @@ -213,10 +214,15 @@ try { if ($query->fetchColumn() == 'Y') { - $devVersion = '6.2.0'; + $devVersion = '6.2.0.1'; + /* if (versioncheck($version, $devVersion, 'update_developer.php', $response, true)) { $version = $devVersion; + }*/ + + if (versioncheck($version, $devVersion, 'update_dev_618-6201.php', $response, true)) { + $version = $devVersion; } } diff --git a/install/update_dev_620-6201.php b/install/update_dev_620-6201.php new file mode 100644 index 00000000..8997bbd9 --- /dev/null +++ b/install/update_dev_620-6201.php @@ -0,0 +1,112 @@ + + * + * 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 and isset($devVersion)) { + + $query = $sql->prepare("INSERT INTO `easywi_version` (`version`,`de`,`en`) VALUES +('6.2.0.1','
02.08.2020
+Änderungen:
+
    +
  • General +
      +
    • Config Variable \$coloreddashboard Hinzugefügt
      • +
    • Config Variable \$easywitweets Hinzugefügt
      • +
    • Config Variable \$examplemodule Hinzugefügt
      • +
    • Updated Socialmedia links in allen Templates
      • +
    • Entfernung des Dedicated Server module vom New Theme
      • +
    • Fontaweasome 5 Support/li> +
    • Twitter Header button kann nun entfernt werden
      • +
+Bugfixes: +
    +
  • Speichernutzung auf dem Masterserver Workaround Fix
    • +
  • Spieletemplate: Left4Dead und Modfolder Fix
    • +
  • Discord Icons Fix
    • +
  • E-Mail Sende Bug Fix
    • +
  • Logout im New Theme Fix
    • +
  • Socialmedia Login Fix fürs New Theme
    • +
  • Mobile Navigation Workaround für New Theme
    • +
+','
02.08.2020
+Changes:
+
    +
  • General +
      +
    • Add Config Variable \$coloreddashboard
      • +
    • Add Config Variable \$easywitweets
      • +
    • Add Config Variable \$examplemodule
      • +
    • Updated Socialmedia links in all Templates
      • +
    • Removed Dedicated Server module from New Theme
      • +
    • Added Fontaweasome 5 Support
      • +
    • Twitter Headline button can be disabled aswell now
      • +
+Bugfixes: +
    +
  • Fix of Fix for Diskspace View on Masterserver/li> +
  • Gametemplate: Fix for Left4Dead and Modfolder
    • +
  • Fix for Discord Icons
    • +
  • Fix for Email send Issue
    • +
  • Log-out loop Fix for New Theme
    • +
  • Socialmedia Auth Fix for New Theme/li> +
  • Mobile Navigation Workaround for New Theme
    • +
+')"); + $query->execute(); + $response->add('Action: insert_easywi_version done: '); + @copy(EASYWIDIR . '/stuff/config.php',EASYWIDIR . '/tmp/config.php.bak'); + $configFp = @fopen(EASYWIDIR . '/stuff/config.php', "a"); + if ($configFp) { + $configdata = ""; + if(!isset($coloreddashboard)){ + $configdata .= "" . '$coloreddashboard' . " = false;" . PHP_EOL; + } + if(!isset($easywitweets)){ + $configdata .= "" . '$easywitweets' . " = true;" . PHP_EOL; + } + if(!isset($examplemodule)){ + $configdata .= "" . '$examplemodule' . " = false;" . PHP_EOL; + } + @fwrite($configFp, $configdata); + fclose($configFp); + } + +} else { + echo "Error: this file needs to be included by the updater!
"; +} diff --git a/stuff/admin/admin_modules.php b/stuff/admin/admin_modules.php index 0d6b99c8..8ad2ee03 100644 --- a/stuff/admin/admin_modules.php +++ b/stuff/admin/admin_modules.php @@ -88,38 +88,40 @@ foreach ($coreModules as $module) { } } -$query4 = $sql->prepare("SELECT `id` FROM `modules` WHERE `type`='A' AND `get`=? LIMIT 1"); -$query4->execute(array('ex')); -$modulesid = (int) $query4->fetchColumn(); -if($modulesid == 0){ - $query5 = $sql->prepare("INSERT INTO `modules` (`get`,`file`,`sub`,`active`, `type`) VALUES(?,?,?,?,?) ON DUPLICATE KEY UPDATE `active`=VALUES(`active`)"); - $query5->execute(array('ex', 'example.php', 'mo', 'Y', 'A')); - $modulesid = $sql->lastInsertId(); -} +if(isset($examplemodule) && $examplemodule){ + $query4 = $sql->prepare("SELECT `id` FROM `modules` WHERE `type`='A' AND `get`=? LIMIT 1"); + $query4->execute(array('ex')); + $modulesid = (int) $query4->fetchColumn(); -$modullanguage = [ - ["type" => "mo", "lang" => "de", "transID" => $modulesid, "resellerID" => 0, "text" => "Beispiel Modul"], - ["type" => "mo", "lang" => "dk", "transID" => $modulesid, "resellerID" => 0, "text" => "Example Module"], - ["type" => "mo", "lang" => "it", "transID" => $modulesid, "resellerID" => 0, "text" => "Example Module"], - ["type" => "mo", "lang" => "pt", "transID" => $modulesid, "resellerID" => 0, "text" => "Example Module"], - ["type" => "mo", "lang" => "ru", "transID" => $modulesid, "resellerID" => 0, "text" => "Example Module"], - ["type" => "mo", "lang" => "uk", "transID" => $modulesid, "resellerID" => 0, "text" => "Example Module"], -]; + if($modulesid == 0){ + $query5 = $sql->prepare("INSERT INTO `modules` (`get`,`file`,`sub`,`active`, `type`) VALUES(?,?,?,?,?) ON DUPLICATE KEY UPDATE `active`=VALUES(`active`)"); + $query5->execute(array('ex', 'example.php', 'mo', 'Y', 'A')); + $modulesid = $sql->lastInsertId(); + } -if($modulesid != 0){ - $query6 = $sql->prepare("SELECT `transID` FROM `translations` WHERE `type`='mo' AND `lang`=? And `transID`=? LIMIT 1"); - $query7 = $sql->prepare("INSERT INTO `translations` (`type`, `lang`, `transID`, `resellerID`, `text`) VALUES (?,?,?,?,?) ON DUPLICATE KEY UPDATE `text`=VALUES(`text`)"); - foreach ($modullanguage as $lang){ - $query6->execute(array($lang["lang"], $modulesid)); - $transID = (int)$query6->fetchColumn(); - if($transID == 0){ - $query7->execute(array($lang["type"], $lang["lang"], $lang["transID"], $lang["resellerID"], $lang["text"])); + $modullanguage = [ + ["type" => "mo", "lang" => "de", "transID" => $modulesid, "resellerID" => 0, "text" => "Beispiel Modul"], + ["type" => "mo", "lang" => "dk", "transID" => $modulesid, "resellerID" => 0, "text" => "Example Module"], + ["type" => "mo", "lang" => "it", "transID" => $modulesid, "resellerID" => 0, "text" => "Example Module"], + ["type" => "mo", "lang" => "pt", "transID" => $modulesid, "resellerID" => 0, "text" => "Example Module"], + ["type" => "mo", "lang" => "ru", "transID" => $modulesid, "resellerID" => 0, "text" => "Example Module"], + ["type" => "mo", "lang" => "uk", "transID" => $modulesid, "resellerID" => 0, "text" => "Example Module"], + ]; + + if($modulesid != 0){ + $query6 = $sql->prepare("SELECT `transID` FROM `translations` WHERE `type`='mo' AND `lang`=? And `transID`=? LIMIT 1"); + $query7 = $sql->prepare("INSERT INTO `translations` (`type`, `lang`, `transID`, `resellerID`, `text`) VALUES (?,?,?,?,?) ON DUPLICATE KEY UPDATE `text`=VALUES(`text`)"); + foreach ($modullanguage as $lang){ + $query6->execute(array($lang["lang"], $modulesid)); + $transID = (int)$query6->fetchColumn(); + if($transID == 0){ + $query7->execute(array($lang["type"], $lang["lang"], $lang["transID"], $lang["resellerID"], $lang["text"])); + } } } } - if ($ui->st('action', 'post') and !token(true)) { unset($header, $text);