github
/
phpservermon
mirror of https://github.com/phpservermon/phpservermon
1
0
Fork 0
Code Issues Releases Wiki Activity

3.5.0 

-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEoQY/Hc/mmBVC5OarTYJo3GjoM50FAl6rbxoACgkQTYJo3Gjo
 M52HGA//cNnwdejAT1S1EHvAyt1oz5tihifeq5PEVTrYD9wzRuoKBMvlE/8dhfzP
 5qwjgBAdmUgLxKhLt5Zi1DjCjBmyZIH2of0cs9TUinBsRerBLuPNQj9VtdoD5aiY
 bj1doiCQRQQ4LGL2LdRDUWmTKmPJprsajlg+RKiTvHEQKJQ8cXDcn3PzosCQqR82
 /Hpf1mApirqPhVkh5LQuKLpEc6l0c2vYIvPaqUVdxZJXFTGDHU4TIBPljfdXk363
 tCyJzLq1cDum7kPRlyEOPewVQt4fAaifSfUaqDB1pdBrL9Pu/Ee8XCnJKRXl53FT
 ogTVBBQURvY4Cee5cigUYeBYSH17dnLlZ4piOupCd2dtzbjC6cfNuvYUOezGBE13
 lMwib1r/qEpU9CLUqsltaH9VQNdyKuLSOv4YBAfT9OFw0gi2Nsbd7PsS8/ymXfz0
 pqL4S0g8l4zSJX+w136Yoc67gvZuobsSwwKEdD6C8At7Li6Pp1yzUxq6+pFlpNPA
 i9ltpHl8UGZlgjTnK3OPowabVadKiFmagUidP5Eeg9hPJqF7may0020r/lehH0/G
 VMPQxoWxbR+xiSspQez/TZ0J7AkZgfAvt/+MLKIwtIvu3J1XlGQiw9yDkSe/vIAM
 OMOaKusmLHjvvSYLFUc336QA6LaBv22PVfG2S/g1JfHbB5MBMeY=
 =Cj+n
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEoQY/Hc/mmBVC5OarTYJo3GjoM50FAl6rb00ACgkQTYJo3Gjo
 M518GRAA3b6JIbqpGEPTTlQhBzOwxqlvzfeOtOU75Z4cdq7en0QNX/NZ0De7yi0u
 8UOQXs9i5zfbWnAnaf0wHCZTN5YvzP7ZRKel96S7v15oOOz362JC9UVfbfiI7n6f
 oavWqXVfGweJk4o7Rs9odB5QJttEPGHk15MYrqWOyKqnRS7zyqzZrDPIPT+uG9o+
 b6PJ4egE+lQVTrRABmrsNlY7ydyEe9+NHIl3Sn/cUXbncDAIqzo89OxK5g43Mdzr
 XDAOgTitCimzXI+7DLCgXoBzpaMCinhmYCMihTLSYWs+I46eiqbLD+Ce/W9wIeSE
 Sm/XKH8a9yUXWlWrbzwl3YvwDIPDhoRSgh++9y4DnZohBmePcnMC7zKlFVEh36sy
 8/swcglEUcSJ3fe1+D2VetseeQDWTFARxDtAUL0iuHrwx5HwL7zTrB8tboth/t5X
 xSb367zWPsWRmgBkQF8yYHJWSQ3lJ38YbrE3qCRTiW+HfRsNMuy/QMRqT3tyBo9D
 0PJvjEwtZUI83e4nEPwCilJ3hgLmCsZgbHDQ6BRYyFQv/j/NWMa77zhdd1rWCXEX
 1bkCR4B9K+FBjBmoLk3Jke934L5mARfWK/i9P/TXYsssRmIhrUGrG3yRGzX0qxgX
 7ZvGx69Qy17+V3udgtH4ulXd9MguYaxtUJtJ5ciNIP3Uem8nsbA=
 =4ytI
 -----END PGP SIGNATURE-----

Merge tag 'v3.5.0' into develop

# gpg: Signature made Fri May  1 02:36:42 2020 CEST
# gpg:                using RSA key A1063F1DCFE6981542E4E6AB4D8268DC68E8339D
# gpg: Good signature from "Tim Zandbergen <TimZ99@users.noreply.github.com>" [ultimate]
pull/900/head
TimZ99 2020-05-01 02:36:42 +02:00
parent 02c746ae41 5e4413bb2e
commit 9d0f8982b5
5 changed files with 192 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.rst
View File

@ -6,6 +6,11 @@ Not yet released
---------------- ----------------
\- \-
v3.5.0 (released May 1, 2020)
-----------------------------
* See https://github.com/phpservermon/phpservermon/compare/v3.4.5...v3.5.0
v3.4.5 (released September 30, 2019) v3.4.5 (released September 30, 2019)
------------------------------------ ------------------------------------

2
README.rst
View File

@ -5,7 +5,7 @@ PHP Server Monitor
:alt: Join the chat at https://gitter.im/erickrf/nlpnet :alt: Join the chat at https://gitter.im/erickrf/nlpnet
:target: https://gitter.im/phpservermon/phpservermon :target: https://gitter.im/phpservermon/phpservermon
Version 3.4.5 Version 3.5.0
PHP Server Monitor is a script that checks whether your websites and servers are up and running. PHP Server Monitor is a script that checks whether your websites and servers are up and running.
It comes with a web based user interface where you can manage your services and websites, It comes with a web based user interface where you can manage your services and websites,

4
docs/conf.py
View File

@ -51,9 +51,9 @@ copyright = u'2008-2017, Pepijn Over'
# built documents. # built documents.
# #
# The short X.Y version. # The short X.Y version.
version = '3.4.6' version = '3.5.0'
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = '3.4.6-beta.3' release = '3.5.0'
# The language for content autogenerated by Sphinx. Refer to documentation # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.

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

@ -30,7 +30,7 @@
/** /**
* Current PSM version * Current PSM version
*/ */
define('PSM_VERSION', '3.4.6-beta.3'); define('PSM_VERSION', '3.5.0');
/** /**
* URL to check for updates. Will not be checked if turned off on config page. * URL to check for updates. Will not be checked if turned off on config page.

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

@ -141,53 +141,53 @@ class Installer
'yes', 'bad','on', '0.0000000', 'yes', 'yes', 'yes', 'yes', 'yes', 'yes')"; 'yes', 'bad','on', '0.0000000', 'yes', 'yes', 'yes', 'yes', 'yes', 'yes')";
$queries[] = "INSERT INTO `" . PSM_DB_PREFIX . "users_servers` (`user_id`,`server_id`) VALUES (1, 1), (1, 2);"; $queries[] = "INSERT INTO `" . PSM_DB_PREFIX . "users_servers` (`user_id`,`server_id`) VALUES (1, 1), (1, 2);";
$queries[] = "INSERT INTO `" . PSM_DB_PREFIX . "config` (`key`, `value`) VALUE $queries[] = "INSERT INTO `" . PSM_DB_PREFIX . "config` (`key`, `value`) VALUE
('language', 'en_US'), ('language', 'en_US'),
('proxy', '0'), ('proxy', '0'),
('proxy_url', ''), ('proxy_url', ''),
('proxy_user', ''), ('proxy_user', ''),
('proxy_password', ''), ('proxy_password', ''),
('email_status', '1'), ('email_status', '1'),
('email_from_email', 'monitor@example.org'), ('email_from_email', 'monitor@example.org'),
('email_from_name', 'Server Monitor'), ('email_from_name', 'Server Monitor'),
('email_smtp', ''), ('email_smtp', ''),
('email_smtp_host', ''), ('email_smtp_host', ''),
('email_smtp_port', ''), ('email_smtp_port', ''),
('email_smtp_security', ''), ('email_smtp_security', ''),
('email_smtp_username', ''), ('email_smtp_username', ''),
('email_smtp_password', ''), ('email_smtp_password', ''),
('sms_status', '0'), ('sms_status', '0'),
('sms_gateway', 'messagebird'), ('sms_gateway', 'messagebird'),
('sms_gateway_username', 'username'), ('sms_gateway_username', 'username'),
('sms_gateway_password', 'password'), ('sms_gateway_password', 'password'),
('sms_from', '1234567890'), ('sms_from', '1234567890'),
('pushover_status', '0'), ('pushover_status', '0'),
('pushover_api_token', ''), ('pushover_api_token', ''),
('telegram_status', '0'), ('telegram_status', '0'),
('telegram_api_token', ''), ('telegram_api_token', ''),
('jabber_status', '1'), ('jabber_status', '1'),
('jabber_host', ''), ('jabber_host', ''),
('jabber_port', ''), ('jabber_port', ''),
('jabber_username', ''), ('jabber_username', ''),
('jabber_domain', ''), ('jabber_domain', ''),
('jabber_password', ''), ('jabber_password', ''),
('password_encrypt_key', '" . sha1(microtime()) . "'), ('password_encrypt_key', '" . sha1(microtime()) . "'),
('alert_type', 'status'), ('alert_type', 'status'),
('log_status', '1'), ('log_status', '1'),
('log_email', '1'), ('log_email', '1'),
('log_sms', '1'), ('log_sms', '1'),
('log_pushover', '1'), ('log_pushover', '1'),
('log_telegram', '1'), ('log_telegram', '1'),
('log_jabber', '1'), ('log_jabber', '1'),
('log_retention_period', '365'), ('log_retention_period', '365'),
('version', '" . PSM_VERSION . "'), ('version', '" . PSM_VERSION . "'),
('version_update_check', '" . PSM_VERSION . "'), ('version_update_check', '" . PSM_VERSION . "'),
('auto_refresh_servers', '0'), ('auto_refresh_servers', '0'),
('show_update', '1'), ('show_update', '1'),
('last_update_check', '0'), ('last_update_check', '0'),
('cron_running', '0'), ('cron_running', '0'),
('cron_running_time', '0'), ('cron_running_time', '0'),
('cron_off_running', '0'), ('cron_off_running', '0'),
('cron_off_running_time', '0');"; ('cron_off_running_time', '0');";
$this->execSQL($queries); $this->execSQL($queries);
} }
@ -198,46 +198,46 @@ class Installer
{ {
$tables = array( $tables = array(
PSM_DB_PREFIX . 'config' => "CREATE TABLE `" . PSM_DB_PREFIX . "config` ( PSM_DB_PREFIX . 'config' => "CREATE TABLE `" . PSM_DB_PREFIX . "config` (
`key` varchar(255) NOT NULL, `key` varchar(255) NOT NULL,
`value` varchar(255) NOT NULL, `value` varchar(255) NOT NULL,
PRIMARY KEY (`key`) PRIMARY KEY (`key`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;", ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
PSM_DB_PREFIX . 'users' => "CREATE TABLE IF NOT EXISTS `" . PSM_DB_PREFIX . "users` ( PSM_DB_PREFIX . 'users' => "CREATE TABLE IF NOT EXISTS `" . PSM_DB_PREFIX . "users` (
`user_id` int(11) unsigned NOT NULL AUTO_INCREMENT, `user_id` int(11) unsigned NOT NULL AUTO_INCREMENT,
`user_name` varchar(64) NOT NULL COMMENT 'user''s name, unique', `user_name` varchar(64) NOT NULL COMMENT 'user''s name, unique',
`password` varchar(255) NOT NULL COMMENT 'user''s password in salted and hashed format', `password` varchar(255) NOT NULL COMMENT 'user''s password in salted and hashed format',
`password_reset_hash` char(40) DEFAULT NULL COMMENT 'user''s password reset code', `password_reset_hash` char(40) DEFAULT NULL COMMENT 'user''s password reset code',
`password_reset_timestamp` bigint(20) DEFAULT NULL COMMENT 'timestamp of the password reset request', `password_reset_timestamp` bigint(20) DEFAULT NULL COMMENT 'timestamp of the password reset request',
`rememberme_token` varchar(64) DEFAULT NULL COMMENT 'user''s remember-me cookie token', `rememberme_token` varchar(64) DEFAULT NULL COMMENT 'user''s remember-me cookie token',
`level` tinyint(2) unsigned NOT NULL DEFAULT '20', `level` tinyint(2) unsigned NOT NULL DEFAULT '20',
`name` varchar(255) NOT NULL, `name` varchar(255) NOT NULL,
`mobile` varchar(15) NOT NULL, `mobile` varchar(15) NOT NULL,
`pushover_key` varchar(255) NOT NULL, `pushover_key` varchar(255) NOT NULL,
`pushover_device` varchar(255) NOT NULL, `pushover_device` varchar(255) NOT NULL,
`telegram_id` varchar(255) NOT NULL, `telegram_id` varchar(255) NOT NULL,
`jabber` varchar(255) NOT NULL, `jabber` varchar(255) NOT NULL,
`email` varchar(255) NOT NULL, `email` varchar(255) NOT NULL,
PRIMARY KEY (`user_id`), PRIMARY KEY (`user_id`),
UNIQUE KEY `unique_username` (`user_name`) UNIQUE KEY `unique_username` (`user_name`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;", ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
PSM_DB_PREFIX . PSM_DB_PREFIX .
'users_preferences' => "CREATE TABLE IF NOT EXISTS `" . PSM_DB_PREFIX . "users_preferences` ( 'users_preferences' => "CREATE TABLE IF NOT EXISTS `" . PSM_DB_PREFIX . "users_preferences` (
`user_id` int(11) unsigned NOT NULL, `user_id` int(11) unsigned NOT NULL,
`key` varchar(255) NOT NULL, `key` varchar(255) NOT NULL,
`value` varchar(255) NOT NULL, `value` varchar(255) NOT NULL,
PRIMARY KEY (`user_id`, `key`) PRIMARY KEY (`user_id`, `key`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;", ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
PSM_DB_PREFIX . 'users_servers' => "CREATE TABLE `" . PSM_DB_PREFIX . "users_servers` ( PSM_DB_PREFIX . 'users_servers' => "CREATE TABLE `" . PSM_DB_PREFIX . "users_servers` (
`user_id` INT( 11 ) UNSIGNED NOT NULL , `user_id` INT( 11 ) UNSIGNED NOT NULL ,
`server_id` INT( 11 ) UNSIGNED NOT NULL , `server_id` INT( 11 ) UNSIGNED NOT NULL ,
PRIMARY KEY ( `user_id` , `server_id` ) PRIMARY KEY ( `user_id` , `server_id` )
) ENGINE = MyISAM DEFAULT CHARSET=utf8;", ) ENGINE = MyISAM DEFAULT CHARSET=utf8;",
PSM_DB_PREFIX . 'log' => "CREATE TABLE `" . PSM_DB_PREFIX . "log` ( PSM_DB_PREFIX . 'log' => "CREATE TABLE `" . PSM_DB_PREFIX . "log` (
`log_id` int(11) unsigned NOT NULL AUTO_INCREMENT, `log_id` int(11) unsigned NOT NULL AUTO_INCREMENT,
`server_id` int(11) unsigned NOT NULL, `server_id` int(11) unsigned NOT NULL,
`type` enum('status','email','sms','pushover','telegram', 'jabber') NOT NULL, `type` enum('status','email','sms','pushover','telegram', 'jabber') NOT NULL,
`message` TEXT NOT NULL, `message` TEXT NOT NULL,
`datetime` timestamp NOT NULL default CURRENT_TIMESTAMP, `datetime` timestamp NOT NULL default CURRENT_TIMESTAMP,
PRIMARY KEY (`log_id`) PRIMARY KEY (`log_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;", ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
PSM_DB_PREFIX . 'log_users' => "CREATE TABLE `" . PSM_DB_PREFIX . "log_users` ( PSM_DB_PREFIX . 'log_users' => "CREATE TABLE `" . PSM_DB_PREFIX . "log_users` (
@ -246,44 +246,44 @@ class Installer
PRIMARY KEY (`log_id`, `user_id`) PRIMARY KEY (`log_id`, `user_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;", ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
PSM_DB_PREFIX . 'servers' => "CREATE TABLE `" . PSM_DB_PREFIX . "servers` ( PSM_DB_PREFIX . 'servers' => "CREATE TABLE `" . PSM_DB_PREFIX . "servers` (
`server_id` int(11) unsigned NOT NULL AUTO_INCREMENT, `server_id` int(11) unsigned NOT NULL AUTO_INCREMENT,
`ip` varchar(500) NOT NULL, `ip` varchar(500) NOT NULL,
`port` int(5) NOT NULL, `port` int(5) NOT NULL,
`request_method` varchar(50) NULL, `request_method` varchar(50) NULL,
`label` varchar(255) NOT NULL, `label` varchar(255) NOT NULL,
`type` enum('ping','service','website') NOT NULL default 'service', `type` enum('ping','service','website') NOT NULL default 'service',
`pattern` varchar(255) NOT NULL default '', `pattern` varchar(255) NOT NULL default '',
`pattern_online` enum('yes','no') NOT NULL default 'yes', `pattern_online` enum('yes','no') NOT NULL default 'yes',
`post_field` varchar(255) NULL, `post_field` varchar(255) NULL,
`redirect_check` enum('ok','bad') NOT NULL default 'bad', `redirect_check` enum('ok','bad') NOT NULL default 'bad',
`allow_http_status` varchar(255) NOT NULL default '', `allow_http_status` varchar(255) NOT NULL default '',
`header_name` varchar(255) NOT NULL default '', `header_name` varchar(255) NOT NULL default '',
`header_value` varchar(255) NOT NULL default '', `header_value` varchar(255) NOT NULL default '',
`status` enum('on','off') NOT NULL default 'on', `status` enum('on','off') NOT NULL default 'on',
`error` varchar(255) NULL, `error` varchar(255) NULL,
`rtime` FLOAT(9, 7) NULL, `rtime` FLOAT(9, 7) NULL,
`last_online` datetime NULL, `last_online` datetime NULL,
`last_offline` datetime NULL, `last_offline` datetime NULL,
`last_offline_duration` varchar(255) NULL, `last_offline_duration` varchar(255) NULL,
`last_check` datetime NULL, `last_check` datetime NULL,
`active` enum('yes','no') NOT NULL default 'yes', `active` enum('yes','no') NOT NULL default 'yes',
`email` enum('yes','no') NOT NULL default 'yes', `email` enum('yes','no') NOT NULL default 'yes',
`sms` enum('yes','no') NOT NULL default 'no', `sms` enum('yes','no') NOT NULL default 'no',
`pushover` enum('yes','no') NOT NULL default 'yes', `pushover` enum('yes','no') NOT NULL default 'yes',
`telegram` enum('yes','no') NOT NULL default 'yes', `telegram` enum('yes','no') NOT NULL default 'yes',
`jabber` enum('yes','no') NOT NULL default 'yes', `jabber` enum('yes','no') NOT NULL default 'yes',
`warning_threshold` mediumint(1) unsigned NOT NULL DEFAULT '1', `warning_threshold` mediumint(1) unsigned NOT NULL DEFAULT '1',
`warning_threshold_counter` mediumint(1) unsigned NOT NULL DEFAULT '0', `warning_threshold_counter` mediumint(1) unsigned NOT NULL DEFAULT '0',
`ssl_cert_expiry_days` mediumint(1) unsigned NOT NULL DEFAULT '0', `ssl_cert_expiry_days` mediumint(1) unsigned NOT NULL DEFAULT '0',
`ssl_cert_expired_time` varchar(255) NULL, `ssl_cert_expired_time` varchar(255) NULL,
`timeout` smallint(1) unsigned NULL DEFAULT NULL, `timeout` smallint(1) unsigned NULL DEFAULT NULL,
`website_username` varchar(255) DEFAULT NULL, `website_username` varchar(255) DEFAULT NULL,
`website_password` varchar(255) DEFAULT NULL, `website_password` varchar(255) DEFAULT NULL,
`last_error` varchar(255) DEFAULT NULL, `last_error` varchar(255) DEFAULT NULL,
`last_error_output` TEXT, `last_error_output` TEXT,
`last_output` TEXT, `last_output` TEXT,
PRIMARY KEY (`server_id`) PRIMARY KEY (`server_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;", ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
PSM_DB_PREFIX . 'servers_uptime' => "CREATE TABLE IF NOT EXISTS `" . PSM_DB_PREFIX . "servers_uptime` ( PSM_DB_PREFIX . 'servers_uptime' => "CREATE TABLE IF NOT EXISTS `" . PSM_DB_PREFIX . "servers_uptime` (
`servers_uptime_id` int(11) unsigned NOT NULL AUTO_INCREMENT, `servers_uptime_id` int(11) unsigned NOT NULL AUTO_INCREMENT,
`server_id` int(11) unsigned NOT NULL, `server_id` int(11) unsigned NOT NULL,
@ -294,14 +294,14 @@ class Installer
KEY `server_id` (`server_id`) KEY `server_id` (`server_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;", ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
PSM_DB_PREFIX . 'servers_history' => "CREATE TABLE IF NOT EXISTS `" . PSM_DB_PREFIX . "servers_history` ( PSM_DB_PREFIX . 'servers_history' => "CREATE TABLE IF NOT EXISTS `" . PSM_DB_PREFIX . "servers_history` (
`servers_history_id` int(11) unsigned NOT NULL AUTO_INCREMENT, `servers_history_id` int(11) unsigned NOT NULL AUTO_INCREMENT,
`server_id` int(11) unsigned NOT NULL, `server_id` int(11) unsigned NOT NULL,
`date` date NOT NULL, `date` date NOT NULL,
`latency_min` float(9,7) NOT NULL, `latency_min` float(9,7) NOT NULL,
`latency_avg` float(9,7) NOT NULL, `latency_avg` float(9,7) NOT NULL,
`latency_max` float(9,7) NOT NULL, `latency_max` float(9,7) NOT NULL,
`checks_total` int(11) unsigned NOT NULL, `checks_total` int(11) unsigned NOT NULL,
`checks_failed` int(11) unsigned NOT NULL, `checks_failed` int(11) unsigned NOT NULL,
PRIMARY KEY (`servers_history_id`), PRIMARY KEY (`servers_history_id`),
UNIQUE KEY `server_id_date` (`server_id`,`date`) UNIQUE KEY `server_id_date` (`server_id`,`date`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;", ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
@ -354,8 +354,8 @@ class Installer
if (version_compare($version_from, '3.4.2', '<')) { if (version_compare($version_from, '3.4.2', '<')) {
$this->upgrade342(); $this->upgrade342();
} }
if (version_compare($version_from, '3.4.6-beta.3', '<')) { if (version_compare($version_from, '3.5.0', '<')) {
$this->upgrade346(); $this->upgrade350();
} }
psm_update_conf('version', $version_to); psm_update_conf('version', $version_to);
} }
@ -431,49 +431,49 @@ class Installer
$queries[] = "ALTER TABLE `" . PSM_DB_PREFIX . "users` CHANGE `user_id` `user_id` INT( 11 ) $queries[] = "ALTER TABLE `" . PSM_DB_PREFIX . "users` CHANGE `user_id` `user_id` INT( 11 )
UNSIGNED NOT NULL AUTO_INCREMENT;"; UNSIGNED NOT NULL AUTO_INCREMENT;";
$queries[] = "ALTER TABLE `" . PSM_DB_PREFIX . "users` $queries[] = "ALTER TABLE `" . PSM_DB_PREFIX . "users`
ADD `user_name` varchar(64) COLLATE utf8_general_ci NOT NULL ADD `user_name` varchar(64) COLLATE utf8_general_ci NOT NULL
COMMENT 'user\'s name, unique' AFTER `user_id`, COMMENT 'user\'s name, unique' AFTER `user_id`,
ADD `password` varchar(255) COLLATE utf8_general_ci NOT NULL ADD `password` varchar(255) COLLATE utf8_general_ci NOT NULL
COMMENT 'user\'s password in salted and hashed format' AFTER `user_name`, COMMENT 'user\'s password in salted and hashed format' AFTER `user_name`,
ADD `password_reset_hash` char(40) COLLATE utf8_general_ci DEFAULT NULL ADD `password_reset_hash` char(40) COLLATE utf8_general_ci DEFAULT NULL
COMMENT 'user\'s password reset code' AFTER `password`, COMMENT 'user\'s password reset code' AFTER `password`,
ADD `password_reset_timestamp` bigint(20) DEFAULT NULL ADD `password_reset_timestamp` bigint(20) DEFAULT NULL
COMMENT 'timestamp of the password reset request' AFTER `password_reset_hash`, COMMENT 'timestamp of the password reset request' AFTER `password_reset_hash`,
ADD `rememberme_token` varchar(64) COLLATE utf8_general_ci DEFAULT NULL ADD `rememberme_token` varchar(64) COLLATE utf8_general_ci DEFAULT NULL
COMMENT 'user\'s remember-me cookie token' AFTER `password_reset_timestamp`, COMMENT 'user\'s remember-me cookie token' AFTER `password_reset_timestamp`,
ADD `level` TINYINT( 2 ) UNSIGNED NOT NULL DEFAULT '20' AFTER `rememberme_token`;"; ADD `level` TINYINT( 2 ) UNSIGNED NOT NULL DEFAULT '20' AFTER `rememberme_token`;";
// make sure all current users are admins (previously we didnt have non-admins): // make sure all current users are admins (previously we didnt have non-admins):
$queries[] = "UPDATE `" . PSM_DB_PREFIX . "users` SET `user_name`=`email`, `level`=10;"; $queries[] = "UPDATE `" . PSM_DB_PREFIX . "users` SET `user_name`=`email`, `level`=10;";
$queries[] = "ALTER TABLE `" . PSM_DB_PREFIX . "users` ADD UNIQUE `unique_username` ( `user_name` );"; $queries[] = "ALTER TABLE `" . PSM_DB_PREFIX . "users` ADD UNIQUE `unique_username` ( `user_name` );";
$queries[] = "CREATE TABLE IF NOT EXISTS `" . PSM_DB_PREFIX . "servers_uptime` ( $queries[] = "CREATE TABLE IF NOT EXISTS `" . PSM_DB_PREFIX . "servers_uptime` (
`servers_uptime_id` int(11) unsigned NOT NULL AUTO_INCREMENT, `servers_uptime_id` int(11) unsigned NOT NULL AUTO_INCREMENT,
`server_id` int(11) unsigned NOT NULL, `server_id` int(11) unsigned NOT NULL,
`date` datetime NOT NULL, `date` datetime NOT NULL,
`status` tinyint(1) unsigned NOT NULL, `status` tinyint(1) unsigned NOT NULL,
`latency` float(9,7) DEFAULT NULL, `latency` float(9,7) DEFAULT NULL,
PRIMARY KEY (`servers_uptime_id`), PRIMARY KEY (`servers_uptime_id`),
KEY `server_id` (`server_id`) KEY `server_id` (`server_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;"; ) ENGINE=MyISAM DEFAULT CHARSET=utf8;";
$queries[] = "CREATE TABLE IF NOT EXISTS `" . PSM_DB_PREFIX . "servers_history` ( $queries[] = "CREATE TABLE IF NOT EXISTS `" . PSM_DB_PREFIX . "servers_history` (
`servers_history_id` int(11) unsigned NOT NULL AUTO_INCREMENT, `servers_history_id` int(11) unsigned NOT NULL AUTO_INCREMENT,
`server_id` int(11) unsigned NOT NULL, `server_id` int(11) unsigned NOT NULL,
`date` date NOT NULL, `date` date NOT NULL,
`latency_min` float(9,7) NOT NULL, `latency_min` float(9,7) NOT NULL,
`latency_avg` float(9,7) NOT NULL, `latency_avg` float(9,7) NOT NULL,
`latency_max` float(9,7) NOT NULL, `latency_max` float(9,7) NOT NULL,
`checks_total` int(11) unsigned NOT NULL, `checks_total` int(11) unsigned NOT NULL,
`checks_failed` int(11) unsigned NOT NULL, `checks_failed` int(11) unsigned NOT NULL,
PRIMARY KEY (`servers_history_id`), PRIMARY KEY (`servers_history_id`),
UNIQUE KEY `server_id_date` (`server_id`,`date`) UNIQUE KEY `server_id_date` (`server_id`,`date`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;"; ) ENGINE=MyISAM DEFAULT CHARSET=utf8;";
$queries[] = "CREATE TABLE `" . PSM_DB_PREFIX . "users_servers` ( $queries[] = "CREATE TABLE `" . PSM_DB_PREFIX . "users_servers` (
`user_id` INT( 11 ) UNSIGNED NOT NULL , `user_id` INT( 11 ) UNSIGNED NOT NULL ,
`server_id` INT( 11 ) UNSIGNED NOT NULL , `server_id` INT( 11 ) UNSIGNED NOT NULL ,
PRIMARY KEY ( `user_id` , `server_id` ) PRIMARY KEY ( `user_id` , `server_id` )
) ENGINE = MYISAM ;"; ) ENGINE = MYISAM ;";
$this->execSQL($queries); $this->execSQL($queries);
// from 3.0 all user-server relations are in a separate table // from 3.0 all user-server relations are in a separate table
@ -525,11 +525,11 @@ class Installer
$queries[] = "ALTER TABLE `" . PSM_DB_PREFIX . "servers` ADD `last_offline_duration` varchar(255) NULL;"; $queries[] = "ALTER TABLE `" . PSM_DB_PREFIX . "servers` ADD `last_offline_duration` varchar(255) NULL;";
$queries[] = "CREATE TABLE IF NOT EXISTS `" . PSM_DB_PREFIX . "users_preferences` ( $queries[] = "CREATE TABLE IF NOT EXISTS `" . PSM_DB_PREFIX . "users_preferences` (
`user_id` int(11) unsigned NOT NULL, `user_id` int(11) unsigned NOT NULL,
`key` varchar(255) NOT NULL, `key` varchar(255) NOT NULL,
`value` varchar(255) NOT NULL, `value` varchar(255) NOT NULL,
PRIMARY KEY (`user_id`, `key`) PRIMARY KEY (`user_id`, `key`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;"; ) ENGINE=MyISAM DEFAULT CHARSET=utf8;";
$this->execSQL($queries); $this->execSQL($queries);
} }
@ -546,10 +546,10 @@ class Installer
$queries[] = "ALTER TABLE `" . PSM_DB_PREFIX . "servers` ADD `website_username` varchar(255) NULL, $queries[] = "ALTER TABLE `" . PSM_DB_PREFIX . "servers` ADD `website_username` varchar(255) NULL,
ADD `website_password` varchar(255) NULL AFTER `website_username`;"; ADD `website_password` varchar(255) NULL AFTER `website_username`;";
$queries[] = "INSERT INTO `" . PSM_DB_PREFIX . "config` (`key`, `value`) VALUE $queries[] = "INSERT INTO `" . PSM_DB_PREFIX . "config` (`key`, `value`) VALUE
('proxy', '0'), ('proxy', '0'),
('proxy_url', ''), ('proxy_url', ''),
('proxy_user', ''), ('proxy_user', ''),
('proxy_password', '');"; ('proxy_password', '');";
$this->execSQL($queries); $this->execSQL($queries);
@ -603,9 +603,9 @@ class Installer
"log` CHANGE `type` `type` ENUM( 'status', 'email', 'sms', 'pushover', 'telegram' ) "log` CHANGE `type` `type` ENUM( 'status', 'email', 'sms', 'pushover', 'telegram' )
CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;"; CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;";
$queries[] = "INSERT INTO `" . PSM_DB_PREFIX . "config` (`key`, `value`) VALUE $queries[] = "INSERT INTO `" . PSM_DB_PREFIX . "config` (`key`, `value`) VALUE
('telegram_status', '0'), ('telegram_status', '0'),
('log_telegram', '1'), ('log_telegram', '1'),
('telegram_api_token', '');"; ('telegram_api_token', '');";
$this->execSQL($queries); $this->execSQL($queries);
} }
@ -673,9 +673,9 @@ class Installer
} }
/** /**
* Upgrade for v3.4.6 release * Upgrade for v3.5.0 release
*/ */
protected function upgrade346() protected function upgrade350()
{ {
$queries = array(); $queries = array();
$queries[] = "ALTER TABLE `" . PSM_DB_PREFIX . "servers` $queries[] = "ALTER TABLE `" . PSM_DB_PREFIX . "servers`
@ -683,19 +683,19 @@ class Installer
$queries[] = "ALTER TABLE `" . PSM_DB_PREFIX . "servers` $queries[] = "ALTER TABLE `" . PSM_DB_PREFIX . "servers`
ADD `ssl_cert_expired_time` VARCHAR(255) NULL AFTER `ssl_cert_expiry_days`"; ADD `ssl_cert_expired_time` VARCHAR(255) NULL AFTER `ssl_cert_expiry_days`";
if ( if (
@psm_password_decrypt( @psm_password_decrypt(
psm_get_conf('password_encrypt_key'), psm_get_conf('password_encrypt_key'),
psm_get_conf('email_smtp_password') psm_get_conf('email_smtp_password')
) === false ) === false
) { ) {
// Prevents encrypting the password multiple times. // Prevents encrypting the password multiple times.
$queries[] = "UPDATE `" . PSM_DB_PREFIX . "config` $queries[] = "UPDATE `" . PSM_DB_PREFIX . "config`
SET `value` = '" . SET `value` = '" .
psm_password_encrypt(psm_get_conf('password_encrypt_key'), psm_get_conf('email_smtp_password')) . psm_password_encrypt(psm_get_conf('password_encrypt_key'), psm_get_conf('email_smtp_password')) .
"' WHERE `key` = 'email_smtp_password'"; "' WHERE `key` = 'email_smtp_password'";
$this->log('SMTP password is now encrypted.'); $this->log('SMTP password is now encrypted.');
} }
$queries[] = 'ALTER TABLE `' . PSM_DB_PREFIX . 'users` ADD `jabber` VARCHAR( 255 ) $queries[] = 'ALTER TABLE `' . PSM_DB_PREFIX . 'users` ADD `jabber` VARCHAR( 255 )
NOT NULL AFTER `telegram_id`;'; NOT NULL AFTER `telegram_id`;';
@ -705,13 +705,13 @@ class Installer
"log` CHANGE `type` `type` ENUM( 'status', 'email', 'sms', 'pushover', 'telegram', 'jabber' ) "log` CHANGE `type` `type` ENUM( 'status', 'email', 'sms', 'pushover', 'telegram', 'jabber' )
CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;"; CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;";
$queries[] = "INSERT INTO `" . PSM_DB_PREFIX . "config` (`key`, `value`) VALUE $queries[] = "INSERT INTO `" . PSM_DB_PREFIX . "config` (`key`, `value`) VALUE
('jabber_status', '0'), ('jabber_status', '0'),
('log_jabber', '1'), ('log_jabber', '1'),
('jabber_host', ''), ('jabber_host', ''),
('jabber_port', ''), ('jabber_port', ''),
('jabber_username', ''), ('jabber_username', ''),
('jabber_domain', ''), ('jabber_domain', ''),
('jabber_password', '');"; ('jabber_password', '');";
$this->execSQL($queries); $this->execSQL($queries);
} }