Skip to content

Commit 70f147f

Browse files
ulrichblockulrichblock
committed
#679 5.10 to 5.20 versioning changes
1 parent 5874a8d commit 70f147f

File tree

6 files changed

+142
-12
lines changed

6 files changed

+142
-12
lines changed

‎server/easy-wi_install.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ function checkInstall {
9898
fi
9999
}
100100

101-
INSTALLER_VERSION="1.1"
101+
INSTALLER_VERSION="1.2"
102102
OS=""
103103
USERADD=`which useradd`
104104
USERMOD=`which usermod`
@@ -136,7 +136,7 @@ fi
136136
if [ -f /etc/debian_version ]; then
137137

138138
cyanMessage " "
139-
okAndSleep "Update the system packages to the latest version?"
139+
okAndSleep "Update the system packages to the latest version? Required, as otherwise dependencies might brake!"
140140

141141
OPTIONS=("Yes" "Quit")
142142
select UPDATE_UPGRADE_SYSTEM in "${OPTIONS[@]}"; do

‎web/install/install.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ function __destruct() {
7676
$licencecode = cleanFsockOpenRequest($licencecode, '{', '}');
7777
$json = @json_decode($licencecode);
7878

79-
if (!$json or !property_exists($json, 'v') or '5.10' == $json->v) {
79+
if (!$json or !property_exists($json, 'v') or '5.20' == $json->v) {
8080
$displayToUser = "<div class='jumbotron'><h2>{$languageObject->welcome_header}</h2><p>{$languageObject->welcome_text}</p><div class='pager'><a href='?step=1${languageGetParameter}' class='pull-right'><span class='btn btn-primary btn-lg'>{$languageObject->continue}</span></a></div></div>";
8181
} else {
8282
$displayToUser = "<div class='alert alert-warning'><i class='fa fa-exclamation-triangle'></i> {$languageObject->welcome_old_version}<a href='https://easy-wi.com/uk/downloads/' target='_blank'>{$json->v}</a></div><div class='jumbotron'><h2>{$languageObject->welcome_header}</h2><p>{$languageObject->welcome_text}</p><div class='pager'><a href='?step=1${languageGetParameter}' class='pull-right'><span class='btn btn-primary btn-lg'>{$languageObject->continue}</span></a></div></div>";
@@ -759,7 +759,7 @@ function __destruct() {
759759
$query = $sql->prepare("INSERT INTO `traffic_settings` (`id`,`type`) VALUES (1,'mysql') ON DUPLICATE KEY UPDATE `type`=`type`");
760760
$query->execute();
761761

762-
$query = $sql->prepare("INSERT INTO `easywi_version` (`id`,`version`,`de`,`en`) VALUES (1,'5.10','','') ON DUPLICATE KEY UPDATE `id`=`id`");
762+
$query = $sql->prepare("INSERT INTO `easywi_version` (`id`,`version`,`de`,`en`) VALUES (1,'5.20','','') ON DUPLICATE KEY UPDATE `id`=`id`");
763763
$query->execute();
764764

765765
$query = $sql->prepare("INSERT INTO `page_pages` (`id`,`authorid`,`type`) VALUES (1,0,'about') ON DUPLICATE KEY UPDATE `id`=`id`");

‎web/install/update.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,9 @@ function versioncheck ($current, $new ,$file ,$response) {
254254
if (versioncheck($version, '5.10', 'update_500-510.php', $response)) {
255255
$version = '5.10';
256256
}
257+
if (versioncheck($version, '5.20', 'update_510-520.php', $response)) {
258+
$version = '5.20';
259+
}
257260

258261
$response->add('Repairing tables if needed.');
259262
$tables->correctExistingTables();

‎web/install/update_510-520.php‎

Lines changed: 133 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,27 +53,154 @@
5353
$query->execute();
5454

5555
$query = $sql->prepare("INSERT INTO `easywi_version` (`version`,`de`,`en`) VALUES
56-
('5.20','<div align=\"right\">20.12.2015</div>
56+
('5.20','<div align=\"right\">28.12.2015</div>
5757
<b>Änderungen:</b><br/>
5858
<ul>
59+
<li>CMS:
60+
<ul>
61+
<li>Standard sortierung der news geändert und sortieren nach Datum</li>
62+
</ul></li>
5963
<li>Gameserver:
60-
<ul></li>
64+
<ul>
65+
<li>Universelle Gameserver Konsole hinzugefügt</li>
66+
<li>Unreal Tournament 3/4 Support hinzugefügt</li>
67+
<li>Versionsnummer bezüglich Ark Survival Evolved Version wird von arkdedicated.com an Stelle der Steam API bezogen</li>
68+
<li>Verbesserter Ark Survival Evolved Restart Prozess</li>
69+
<li>Steam Server Token support hinzugefügt</li>
70+
<li>Standard Imageserver ist nicht mehr hard coded.</li>
71+
<li>Standard Start Updates Minute ist nun 10</li>
72+
<li>Optionale Parameter all_root und force_update zu startupdates.php hinzugefügt </li>
73+
<li>Auf aktuellste GameQ v3 Version aktualisiert</li>
74+
<li>Zusätzliche Spiele zu GameQ v3 hinzugefügt</li>
75+
<li>Fallback auf GameQ v2 erstellt</li>
76+
<li>Logging in der job.php hinzugefügt</li>
77+
<li>Gameserver werden nach einem Master Update neu gestartet</li>
78+
<li>Fallbacks für den Minecraft Download Pfad eingeführt</li>
79+
<li>File Extension lang wird kopiert</li>
80+
<li>Verbesserte Fehler Behandlung beim Image Import</li>
81+
<li>Online Modus den MC Templates hinzugefügt</li>
82+
<li>Templates Arma3, Rust, Spigot, Hexxit hinzugefügt</li>
83+
</ul></li>
84+
<li>Voiceserver:
85+
<ul>
86+
<li>Flexible Konfigurationen möglich</li>
87+
</ul></li>
88+
<li>Webspace:
89+
<ul>
90+
<li>Apache Vhost Template um Versionsprüfung erweitert</li>
91+
</ul></li>
92+
<li>Allgemeines:
93+
<ul>
94+
<li>Neues Tabellen Konfigurationsmanagement</li>
95+
<li>BB Code unterstützung im News Fedd</li>
96+
<li>Zusätzliche neue Light Skins für alle bereits verfügbaren Farben</li>
97+
<li>Alle eingesetzten UI frameworks auf aktuellste Version aktualisiert</li>
98+
<li>Minimale PHP Version ist nun 5.4</li>
99+
<li>Anzeige des letztmaligen Ausführens der Cronjobs</li>
100+
<li>CMS standardmäßig deaktiviert</li>
101+
<li>Root Modul Code auskommentiert</li>
61102
</ul></li>
62103
</ul>
63104
<b>Bugfixes:</b>
64105
<ul>
65-
<li></li>
66-
</ul>','<div align=\"right\">12.20.2015</div>
106+
<li>CMS Frontend aktiv, obwohl im Backend deaktiviert</li>
107+
<li>FastDL zeigt Benutzername an Stelle der Domain</li>
108+
<li>Installer funktioniert nicht mit dem MySQL Paket von Oracle</li>
109+
<li>Liste der zugelassenen Dateien in der .htaccess korrigiert</li>
110+
<li>.htaccess an Apache 2.4 angepasst</li>
111+
<li>Webmaster: Falscher Redirect zur Übersiccht im Falle eines Fehlers</li>
112+
<li>% Zeichen nicht innerhalb einer span Gruppe bei mehreren Template Dateien</li>
113+
<li>Falscher standard MB Wert beim Web Master</li>
114+
<li>Falsche URL beim Installer</li>
115+
<li>Csgo Template veraltet</li>
116+
<li>DataTables funktionieren nicht, wenn Upper Case Character verwendet werden</li>
117+
<li>Voice API Hinzufügen Methode funktioniert beim aktivierten Debugger nicht</li>
118+
<li>Admin GS Reinstall: Gebrauch nicht existierender Variable</li>
119+
<li>Falscher Gebrauch von ID bei Web Master Hinzufügen</li>
120+
<li>Falscher Gebrauch von array im ajax App Details Template</li>
121+
<li>Folsche rechtschreibung von access</li>
122+
<li>False Positive bezüglicher veralterter Voice Server Versionen</li>
123+
<li>Fehlende queryPassword Spalte bei Voice Servern</li>
124+
<li>Gameserver Easy Config und Special Character, wie Newline</li>
125+
<li>cloud.php kann nicht mit external Cronjob genutzt werden</li>
126+
<li>Game Server file copy exclude Pattern nicht angewendet</li>
127+
<li>On error, \"My Voiceserver\" is prepended on the voice master servers default name</li>
128+
<li>Falsches open_basedir im Template</li>
129+
<li>Falscher Default apache2 reload Befehl</li>
130+
</ul>','<div align=\"right\">12.28.2015</div>
67131
<b>Changes:</b><br/>
68132
<ul>
133+
<li>CMS:
134+
<ul>
135+
<li>Default order of news and date as sort option</li>
136+
</ul></li>
69137
<li>Gameserver:
70138
<ul>
71-
<li></li>
139+
<li>Added universal game server console</li>
140+
<li>Added Unreal Tournament 3/4 support</li>
141+
<li>Fetch Ark Survival Evolved Version from arkdedicated.com instead of steam API</li>
142+
<li>Improved Ark Survival Evolved restart process</li>
143+
<li>Added Steam Server Token support</li>
144+
<li>Default imageserver is not hard coded anymore</li>
145+
<li>Set default start updates at to minute 10</li>
146+
<li>Added optional parameter at startupdates.php all_root and force_update</li>
147+
<li>Upgrade to latest GameQ v3 version</li>
148+
<li>Added additional games to GameQ v3</li>
149+
<li>Added fallback to GameQ v2</li>
150+
<li>Added logging at job.php</li>
151+
<li>Restart all gameserver after master update in any case</li>
152+
<li>Ensure MC download path is set</li>
153+
<li>File extension lang is copied</li>
154+
<li>Better error handling at image import</li>
155+
<li>Added online mode to MC templates</li>
156+
<li>Added templates Arma3, Rust, Spigot, Hexxit</li>
157+
</ul></li>
158+
<li>Voiceserver:
159+
<ul>
160+
<li>Flexible configurations possible</li>
161+
</ul></li>
162+
<li>Webspace:
163+
<ul>
164+
<li>Added version check in Apache Vhost</li>
165+
</ul></li>
166+
<li>General:
167+
<ul>
168+
<li>New table version and configuration management</li>
169+
<li>BB code at feed news display added</li>
170+
<li>Added new skins light skins for all existing colours</li>
171+
<li>Upgraded UI frameworks to latest versions</li>
172+
<li>Increased minimum PHP to 5.4</li>
173+
<li>Display last cron run at system overview</li>
174+
<li>Deactivate CMS module by default</li>
175+
<li>Deactivate root module</li>
176+
<li>Incorrect default open_basedir template</li>
177+
<li>Incorrect default apache2 reload command</li>
72178
</ul></li>
73179
</ul>
74180
<b>Bugfixes:</b>
75181
<ul>
76-
<li</li>
182+
<li>CMS frontend still active when deactivated in backend</li>
183+
<li>FastDL is showing username instead of domain</li>
184+
<li>Installer does not work with MySQL package from Oracle</li>
185+
<li>Corrected list of allowed files at .htaccess</li>
186+
<li>Align .htaccess with 2.4</li>
187+
<li>Webmaster: Incorrect redirect to overview in case of error</li>
188+
<li>% character not within span group in some template files</li>
189+
<li>Incorrect default MB value at web master</li>
190+
<li>Wrong URL at installer</li>
191+
<li>Csgo template outdated</li>
192+
<li>DataTables not working without because of upper case parameters</li>
193+
<li>Voice API add method failing with debug on</li>
194+
<li>Admin GS reinstall: Usage of not existing variable</li>
195+
<li>Incorrect usage of ID at web master add</li>
196+
<li>Incorrect array used at ajax app details template</li>
197+
<li>Incorrect spelling of access</li>
198+
<li>False positive with outdated voice server version</li>
199+
<li>Missing queryPassword column at voice server</li>
200+
<li>Gameserver easy config and special character like newline</li>
201+
<li>cloud.php cannot be used via external cronjob</li>
202+
<li>Game Server file copy exclude pattern not applied</li>
203+
<li>Im Fehler Fall wird \"My Voiceserver\" erneut voran gestellt</li>
77204
</ul>')");
78205
$query->execute();
79206
$response->add('Action: insert_easywi_version done: ');

‎web/stuff/admin/init_admin.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
redirect('login.php');
5252
}
5353

54-
$ewVersions['files'] = '5.10';
54+
$ewVersions['files'] = '5.20';
5555

5656
$vcsprache = getlanguagefile('versioncheck', $user_language, $reseller_id);
5757
$query = $sql->prepare("SELECT `version` FROM `easywi_version` ORDER BY `id` DESC LIMIT 1");

‎web/stuff/data/table_settings.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
$defined['settings'] = array(
4141
'id' => array("Type"=>"int(10) unsigned","Null"=>"NO","Key"=>"PRI","Default"=>"","Extra"=>"auto_increment"),
42-
'version' => array("Type"=>"decimal(4,2)","Null"=>"YES","Key"=>"","Default"=>"5.10","Extra"=>""),
42+
'version' => array("Type"=>"decimal(4,2)","Null"=>"YES","Key"=>"","Default"=>"5.20","Extra"=>""),
4343
'releasenotesDE' => array("Type"=>"int(11) unsigned","Null"=>"YES","Key"=>"","Default"=>"","Extra"=>""),
4444
'releasenotesEN' => array("Type"=>"int(11) unsigned","Null"=>"YES","Key"=>"","Default"=>"","Extra"=>""),
4545
'header_icon' => array("Type"=>"varchar(100)","Null"=>"YES","Key"=>"","Default"=>"logo_180px.png","Extra"=>""),

0 commit comments

Comments
 (0)