echosystem.fr
/
phpservermon
mirror of https://github.com/phpservermon/phpservermon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

3.4.7 to 3.4.6-beta.3

This commit is contained in:
TimZ99 2020-02-09 21:00:56 +01:00
parent f2d14bfd1f
commit 71df5bf3da
No known key found for this signature in database
GPG Key ID: 4D8268DC68E8339D
2 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/includes/psmconfig.inc.php
View File

@ -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);
}

13
src/psm/Util/Install/Installer.php
View File

@ -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' )