From 13f4ba492ef488b7183fb7437bb5741a964531aa Mon Sep 17 00:00:00 2001 From: TimZ99 Date: Sun, 9 Feb 2020 17:11:57 +0100 Subject: [PATCH] Refactor --- src/includes/functions.inc.php | 5 ++- .../Config/Controller/ConfigController.php | 41 ++++++++++--------- src/psm/Util/Install/Installer.php | 22 +++++----- 3 files changed, 37 insertions(+), 31 deletions(-) diff --git a/src/includes/functions.inc.php b/src/includes/functions.inc.php index fbe8aadd..ab264942 100644 --- a/src/includes/functions.inc.php +++ b/src/includes/functions.inc.php @@ -595,7 +595,10 @@ namespace { $phpmailer->SMTPSecure = psm_get_conf('email_smtp_security'); $smtp_user = psm_get_conf('email_smtp_username'); - $smtp_pass = psm_password_decrypt(psm_get_conf('password_encrypt_key'), psm_get_conf('email_smtp_password')); + $smtp_pass = psm_password_decrypt( + psm_get_conf('password_encrypt_key'), + psm_get_conf('email_smtp_password') + ); if ($smtp_user != '' && $smtp_pass != '') { $phpmailer->SMTPAuth = true; diff --git a/src/psm/Module/Config/Controller/ConfigController.php b/src/psm/Module/Config/Controller/ConfigController.php index c1690a00..5602abee 100644 --- a/src/psm/Module/Config/Controller/ConfigController.php +++ b/src/psm/Module/Config/Controller/ConfigController.php @@ -74,12 +74,12 @@ class ConfigController extends AbstractController 'telegram_api_token', ); - /** - * Fields for saving encrypted. - * @var array - */ + /** + * Fields for saving encrypted. + * @var array + */ protected $encryptedFields = [ - 'email_smtp_password' + 'email_smtp_password' ]; private $default_tab = 'general'; @@ -185,12 +185,15 @@ class ConfigController extends AbstractController $tpl_data[$input_key] = (isset($config[$input_key])) ? $config[$input_key] : ''; } // encrypted fields - foreach ($this->encryptedFields as $encryptedField) { - if (true === isset($config[$encryptedField]) && trim($config[$encryptedField])) { - $tpl_data[$encryptedField] = psm_password_decrypt($config['password_encrypt_key'], $config[$encryptedField]); - } else { - $tpl_data[$encryptedField] = ''; - } + foreach ($this->encryptedFields as $encryptedField) { + if (true === isset($config[$encryptedField]) && trim($config[$encryptedField])) { + $tpl_data[$encryptedField] = psm_password_decrypt( + $config['password_encrypt_key'], + $config[$encryptedField] + ); + } else { + $tpl_data[$encryptedField] = ''; + } } $tpl_data[$this->default_tab . '_active'] = 'active'; @@ -219,7 +222,7 @@ class ConfigController extends AbstractController { if (!empty($_POST)) { // save new config - $clean = array( + $clean = array( 'language' => $_POST['language'], 'sms_gateway' => $_POST['sms_gateway'], 'alert_type' => $_POST['alert_type'], @@ -231,7 +234,7 @@ class ConfigController extends AbstractController 'log_retention_period' => intval(psm_POST('log_retention_period', 365)), 'password_encrypt_key' => psm_POST('password_encrypt_key', sha1(microtime())), ); - foreach ($this->checkboxes as $input_key) { + foreach ($this->checkboxes as $input_key) { $clean[$input_key] = (isset($_POST[$input_key])) ? '1' : '0'; } foreach ($this->fields as $input_key) { @@ -240,12 +243,12 @@ class ConfigController extends AbstractController } } foreach ($this->encryptedFields as $encryptedField) { - $value = filter_input(INPUT_POST, $encryptedField); - if ($value !== null && $value !== '') { - $clean[$encryptedField] = psm_password_encrypt(psm_get_conf('password_encrypt_key'), $value); - } else { - $clean[$encryptedField] = ''; - } + $value = filter_input(INPUT_POST, $encryptedField); + if ($value !== null && $value !== '') { + $clean[$encryptedField] = psm_password_encrypt(psm_get_conf('password_encrypt_key'), $value); + } else { + $clean[$encryptedField] = ''; + } } $language_refresh = ($clean['language'] != psm_get_conf('language')); foreach ($clean as $key => $value) { diff --git a/src/psm/Util/Install/Installer.php b/src/psm/Util/Install/Installer.php index 78f078c9..e266889b 100644 --- a/src/psm/Util/Install/Installer.php +++ b/src/psm/Util/Install/Installer.php @@ -190,12 +190,12 @@ class Installer protected function installTables() { $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, `value` varchar(255) NOT NULL, PRIMARY KEY (`key`) ) 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_name` varchar(64) NOT NULL COMMENT 'user''s name, unique', `password` varchar(255) NOT NULL COMMENT 'user''s password in salted and hashed format', @@ -212,19 +212,19 @@ class Installer PRIMARY KEY (`user_id`), UNIQUE KEY `unique_username` (`user_name`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8;", - PSM_DB_PREFIX . - 'users_preferences' => "CREATE TABLE IF NOT EXISTS `" . PSM_DB_PREFIX . "users_preferences` ( + PSM_DB_PREFIX . + 'users_preferences' => "CREATE TABLE IF NOT EXISTS `" . PSM_DB_PREFIX . "users_preferences` ( `user_id` int(11) unsigned NOT NULL, `key` varchar(255) NOT NULL, `value` varchar(255) NOT NULL, PRIMARY KEY (`user_id`, `key`) ) 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 , `server_id` INT( 11 ) UNSIGNED NOT NULL , PRIMARY KEY ( `user_id` , `server_id` ) ) 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, `server_id` int(11) unsigned NOT NULL, `type` enum('status','email','sms','pushover','telegram') NOT NULL, @@ -232,12 +232,12 @@ class Installer `datetime` timestamp NOT NULL default CURRENT_TIMESTAMP, PRIMARY KEY (`log_id`) ) 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` ( `log_id` int(11) UNSIGNED NOT NULL , `user_id` int(11) UNSIGNED NOT NULL , PRIMARY KEY (`log_id`, `user_id`) ) 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, `ip` varchar(500) NOT NULL, `port` int(5) NOT NULL, @@ -275,7 +275,7 @@ class Installer `last_output` TEXT, PRIMARY KEY (`server_id`) ) 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, `server_id` int(11) unsigned NOT NULL, `date` datetime NOT NULL, @@ -284,7 +284,7 @@ class Installer PRIMARY KEY (`servers_uptime_id`), KEY `server_id` (`server_id`) ) 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, `server_id` int(11) unsigned NOT NULL, `date` date NOT NULL, @@ -671,7 +671,7 @@ class Installer $queries = array(); $queries[] = "ALTER TABLE `" . PSM_DB_PREFIX . "servers` ADD `ssl_cert_expiry_days` MEDIUMINT(1) UNSIGNED NOT NULL DEFAULT '0' AFTER `warning_threshold_counter`"; - $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`"; $this->execSQL($queries); }