diff --git a/install/update_616-617.php b/install/update_616-617.php
index ac4b3b24..f48ee104 100644
--- a/install/update_616-617.php
+++ b/install/update_616-617.php
@@ -41,37 +41,40 @@
if (isset($include) and $include == true) {
$query = $sql->prepare("INSERT INTO `easywi_version` (`version`,`de`,`en`) VALUES
-('6.1.7','
19.07.2020
+('6.1.7','
21.07.2020
Änderungen:
General
+
Update Email-Template Hinzugefügt
Beispiel Modul Hinzugefügt
kosmetische Fehler behoben
Ticketsystem überarbeitet
Modul Liste geupdatet -> Example Modules
PhpMailer auf version 6 geupdated
-
+
Bugfixes:
+
Updater Bug Behoben
Sendmail Bug Behoben
Ticketsystem unterkategorie Bug behoben
Masterapps MC update Bug Behoben
DNS bei der Gameserver Anzeige Bug Behoben
-
','
19.07.2020
+','
21.07.2020
Changes:
General
+
Update Email-Template Added
Exemple Module Added
cosmetic errors fixed
Ticketsystem upgraded
Modul List Updated -> Example Modules
Upgrade PhpMailer to version 6
-
-
+
Bugfixes:
+
Updater Bug Fixed
Sendmail Bug Fixed
Supportsystem Subcategory Bug Fixed
Masterapps Minecraft update Bug Fixed
@@ -100,7 +103,7 @@ if (isset($include) and $include == true) {
];
if($modulesid != 0){
- $query4 = $sql->prepare("SELECT `id` FROM `translations` WHERE `type`='mo' AND `lang`=? And `transID`=? LIMIT 1");
+ $query4 = $sql->prepare("SELECT `transID` FROM `translations` WHERE `type`='mo' AND `lang`=? And `transID`=? LIMIT 1");
$query5 = $sql->prepare("INSERT INTO `translations` (`type`, `lang`, `transID`, `resellerID`, `text`) VALUES (?,?,?,?,?) ON DUPLICATE KEY UPDATE `text`=VALUES(`text`)");
foreach ($modullanguage as $lang){
$query4->execute(array($lang["lang"], $modulesid));
diff --git a/languages/default/de/general.xml b/languages/default/de/general.xml
index dffd67ff..071a4d70 100644
--- a/languages/default/de/general.xml
+++ b/languages/default/de/general.xml
@@ -118,6 +118,7 @@
Images/TemplatesTrafficAktualisieren
+ Easy-Wi UpdateUploadBelegt
diff --git a/languages/default/dk/general.xml b/languages/default/dk/general.xml
index 27063120..fa22e8ad 100644
--- a/languages/default/dk/general.xml
+++ b/languages/default/dk/general.xml
@@ -98,6 +98,7 @@
Images/TemplatesTrafikOpdater
+ Easy-Wi OpdaterUpload
diff --git a/languages/default/it/general.xml b/languages/default/it/general.xml
index 911a018d..874bfd1f 100644
--- a/languages/default/it/general.xml
+++ b/languages/default/it/general.xml
@@ -122,6 +122,7 @@
ModelliTrafficoAggiorna
+ Easy-Wi AggiornaCaricaIn uso
diff --git a/languages/default/pt/general.xml b/languages/default/pt/general.xml
index ffa7c76f..c21530d9 100644
--- a/languages/default/pt/general.xml
+++ b/languages/default/pt/general.xml
@@ -122,6 +122,7 @@
Imagems/ModelosTráfegoUpdate
+ Easy-Wi UpdateEnviarUsado
diff --git a/languages/default/ru/general.xml b/languages/default/ru/general.xml
index c38c1782..8a490c20 100644
--- a/languages/default/ru/general.xml
+++ b/languages/default/ru/general.xml
@@ -120,6 +120,7 @@
Картинки/ШаблоныТраффикОбновить
+ Easy-Wi ОбновитьЗагрузитьИспользовано
diff --git a/languages/default/uk/general.xml b/languages/default/uk/general.xml
index 4af3ff02..d39b9eac 100644
--- a/languages/default/uk/general.xml
+++ b/languages/default/uk/general.xml
@@ -122,6 +122,7 @@
Images/TemplatesTrafficUpdate
+ Easy-Wi UpdateUploadUsed
diff --git a/reboot.php b/reboot.php
index 8b584715..7a09356c 100644
--- a/reboot.php
+++ b/reboot.php
@@ -88,21 +88,20 @@ if (!isset($ip) or $ui->escaped('SERVER_ADDR', 'server') == $ip or in_array($ip,
echo "
New Easy-Wi{$developerVersion} version available: {$rSA['version']}\r\n";
- if (date('G') == 5) {
- $updateMail = "A new Easy-Wi{$developerVersion} version is available. The version is {$rSA['version']}.\r\nYou can download it at https://github.com/easy-wi/developer/releases/tag/{$rSA['version']}";
+ $updateMail = "A new Easy-Wi{$developerVersion} version is available. The version is {$rSA['version']}.\r\nYou can download it at https://github.com/easy-wi/developer/releases/tag/{$rSA['version']}";
- $query = $sql->prepare("SELECT `id`,`cname`,`mail` FROM `userdata` WHERE `accounttype`='a' AND `active`='Y'");
- $query->execute();
- while ($row = $query->fetch(PDO::FETCH_ASSOC)) {
- if (sendmail('easy-wi-update', $row['id'], $updateMail, 'Y')) {
- echo " Update notification send to user {$row['cname']} ({$row['mail']})\r\n";
- } else {
- echo " Sending update notification to user {$row['cname']} ({$row['mail']}) failed\r\n";
- }
+ $query = $sql->prepare("SELECT `id`,`cname`,`mail` FROM `userdata` WHERE `accounttype`='a' AND `active`='Y'");
+ $query->execute();
+ while ($row = $query->fetch(PDO::FETCH_ASSOC)) {
+ if (sendmail('emaileasyupdate', $row['id'], $updateMail, 'Y')) {
+ echo " Update notification send to user {$row['cname']} ({$row['mail']})\r\n";
+ } else {
+ echo " Sending update notification to user {$row['cname']} ({$row['mail']}) failed\r\n";
}
}
+
} else {
echo " You are running the latest Easy-Wi{$developerVersion} version: {$installedEasyWiVersion}.\r\n";
}
diff --git a/stuff/data/email_templates.php b/stuff/data/email_templates.php
index b54e2a89..70566561 100644
--- a/stuff/data/email_templates.php
+++ b/stuff/data/email_templates.php
@@ -85,6 +85,9 @@ $emailTemplates = array(
),
'emailgserverupdate' => array(
'query' => "INSERT INTO `settings_email_template` (`id`, `reseller_id`, `language`, `active`, `category`, `email_setting_name`, `subject`, `email_body`, `ccmailing`, `bccmailing`, `attachments`) VALUES (16, ?, 'de', '1', '6', 'emailgserverupdate', 'Game Server wurde upgedatet!', '
\r\n
\r\n \r\n
\r\n
\r\n
\r\n \r\n
\r\n
\r\n
\r\n \r\n
\r\n
\r\n
%topic%
\r\n
\r\n
\r\n
\r\n
%topic%\r\n
%salutation% %fullname%,
\r\n\r\n
eine veraltete Version wurde an Ihrem Game Master Server entdeckt. Diese wurde nun erfolgreich upgedatet. Alle Ihre Server sollten weiterhin erreichbar sein.