From 71df5bf3daeffe503a7e391ae4f180807a0c4e73 Mon Sep 17 00:00:00 2001
From: TimZ99 <TimZ99@users.noreply.github.com>
Date: Sun, 9 Feb 2020 21:00:56 +0100
Subject: [PATCH] 3.4.7 to 3.4.6-beta.3

---
 src/includes/psmconfig.inc.php     | 12 ++++++------
 src/psm/Util/Install/Installer.php | 13 ++-----------
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/src/includes/psmconfig.inc.php b/src/includes/psmconfig.inc.php
index b48a0b8a..01101143 100644
--- a/src/includes/psmconfig.inc.php
+++ b/src/includes/psmconfig.inc.php
@@ -30,7 +30,7 @@
 /**
  * Current PSM version
  */
-define('PSM_VERSION', '3.4.7');
+define('PSM_VERSION', '3.4.6-beta.3');
 
 /**
  * URL to check for updates. Will not be checked if turned off on config page.
@@ -132,13 +132,13 @@ if (!defined('PSM_MODULE_DEFAULT')) {
 }
 
 if (defined('PSM_JABBER_FORCE_TLS') === false) {
-	define('PSM_JABBER_FORCE_TLS', true);
+    define('PSM_JABBER_FORCE_TLS', true);
 }
 if (defined('PSM_JABBER_AUTH_TYPE') === false) {
-	// possible values: PLAIN, X-OAUTH2, DIGEST-MD5, CRAM-MD5, SCRAM-SHA-1, ANONYMOUS, EXTERNAL
-	define('PSM_JABBER_AUTH_TYPE', 'PLAIN'); // default just plain because of google for example :(
+    // possible values: PLAIN, X-OAUTH2, DIGEST-MD5, CRAM-MD5, SCRAM-SHA-1, ANONYMOUS, EXTERNAL
+    define('PSM_JABBER_AUTH_TYPE', 'PLAIN'); // default just plain because of google for example :(
 }
 if (defined('PSM_JABBER_DEBUG_LEVEL') === false) {
-	// possible values: ERROR, WARNING, NOTICE, INFO, DEBUG
-	define('PSM_JABBER_DEBUG_LEVEL', JAXLLogger::WARNING);
+    // possible values: ERROR, WARNING, NOTICE, INFO, DEBUG
+    define('PSM_JABBER_DEBUG_LEVEL', JAXLLogger::WARNING);
 }
diff --git a/src/psm/Util/Install/Installer.php b/src/psm/Util/Install/Installer.php
index 7d1beb1b..28dcd691 100644
--- a/src/psm/Util/Install/Installer.php
+++ b/src/psm/Util/Install/Installer.php
@@ -357,8 +357,8 @@ class Installer
         if (version_compare($version_from, '3.4.6-beta.1', '<')) {
             $this->upgrade346();
         }
-        if (version_compare($version_from, '3.4.7', '<')) {
-            $this->upgrade347();
+        if (version_compare($version_from, '3.4.6-beta.3', '<')) {
+            $this->upgrade346();
         }
         psm_update_conf('version', $version_to);
     }
@@ -685,15 +685,6 @@ class Installer
             ADD `ssl_cert_expiry_days` MEDIUMINT(1) UNSIGNED NOT NULL DEFAULT '0' AFTER `warning_threshold_counter`";
             $queries[] = "ALTER TABLE `" . PSM_DB_PREFIX . "servers` 
             ADD `ssl_cert_expired_time` VARCHAR(255) NULL AFTER `ssl_cert_expiry_days`";
-        $this->execSQL($queries);
-    }
-
-    /**
-     * Upgrade for v3.4.7
-     */
-    protected function upgrade347()
-    {
-        $queries = [];
         $queries[] = 'ALTER TABLE `' . PSM_DB_PREFIX . 'users` ADD  `jabber` VARCHAR( 255 ) 
             NOT NULL AFTER `telegram_id`;';
         $queries[] = "ALTER TABLE `" . PSM_DB_PREFIX . "servers` ADD  `jabber` ENUM( 'yes','no' )