From 5e7a5951a7bde5b655204ab6b4f4b1e2b287e8e6 Mon Sep 17 00:00:00 2001 From: Alfredo Esteban Date: Thu, 1 Sep 2016 17:40:18 +0200 Subject: [PATCH 01/37] Add global proxy support --- src/includes/functions.inc.php | 10 +++++++ src/lang/en_US.lang.php | 7 +++++ .../Config/Controller/ConfigController.php | 11 ++++++++ src/psm/Util/Install/Installer.php | 9 +++++++ .../default/module/config/config.tpl.html | 26 +++++++++++++++++++ 5 files changed, 63 insertions(+) diff --git a/src/includes/functions.inc.php b/src/includes/functions.inc.php index ec725f67..7d39f9aa 100755 --- a/src/includes/functions.inc.php +++ b/src/includes/functions.inc.php @@ -335,6 +335,16 @@ function psm_curl_get($href, $header = false, $body = true, $timeout = null, $ad curl_setopt($ch, CURLOPT_URL, $href); + $proxy_url = psm_get_conf('proxy_url',''); + if (psm_get_conf('proxy','0') === '1') { + curl_setopt($ch, CURLOPT_PROXY, $proxy_url); + $proxy_user = psm_get_conf('proxy_user',''); + $proxy_password = psm_get_conf('proxy_password',''); + if (!empty($proxy_user) && !empty($proxy_password)) { + curl_setopt($ch, CURLOPT_PROXYUSERPWD, $proxy_user . ':' . $proxy_password); + } + } + if($add_agent) { curl_setopt ($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (compatible; phpservermon/'.PSM_VERSION.'; +http://www.phpservermonitor.org)'); } diff --git a/src/lang/en_US.lang.php b/src/lang/en_US.lang.php index 07c1d5d1..cf200819 100755 --- a/src/lang/en_US.lang.php +++ b/src/lang/en_US.lang.php @@ -188,6 +188,10 @@ $sm_lang = array( 'show_update' => 'Check for updates?', 'password_encrypt_key' => 'The encryption key password', 'password_encrypt_key_note' => 'This key is used to encrypt passwords that are stored on servers for access to websites. If the key will change the stored password is invalid!', + 'proxy' => 'Enable proxy', + 'proxy_url' => 'Proxy URL', + 'proxy_user' => 'Proxy username', + 'proxy_password' => 'Proxy password', 'email_status' => 'Allow sending email', 'email_from_email' => 'Email from address', 'email_from_name' => 'Email from name', @@ -234,6 +238,8 @@ $sm_lang = array( 'alert_type_status' => 'Status change', 'alert_type_offline' => 'Offline', 'alert_type_always' => 'Always', + 'alert_proxy' => 'Even if enabled, proxy is never used for services', + 'alert_proxy_url' => 'Format: Host:Port', 'log_status' => 'Log status', 'log_status_description' => 'If log status is set to TRUE, the monitor will log the event whenever the Notification settings are passed.', 'log_email' => 'Log emails sent by the script', @@ -248,6 +254,7 @@ $sm_lang = array( 'settings_pushover' => 'Pushover settings', 'settings_notification' => 'Notification settings', 'settings_log' => 'Log settings', + 'settings_proxy' => 'Proxy settings', 'auto_refresh' => 'Auto-refresh', 'auto_refresh_servers' => 'Auto-refresh servers page.
'. diff --git a/src/psm/Module/Config/Controller/ConfigController.php b/src/psm/Module/Config/Controller/ConfigController.php index d058de63..6961ce86 100644 --- a/src/psm/Module/Config/Controller/ConfigController.php +++ b/src/psm/Module/Config/Controller/ConfigController.php @@ -36,6 +36,7 @@ class ConfigController extends AbstractController { * @var array $checkboxes */ protected $checkboxes = array( + 'proxy', 'email_status', 'email_smtp', 'sms_status', @@ -52,6 +53,9 @@ class ConfigController extends AbstractController { * @var array $fields */ protected $fields = array( + 'proxy_url', + 'proxy_user', + 'proxy_password', 'email_from_name', 'email_from_email', 'email_smtp_host', @@ -293,11 +297,16 @@ class ConfigController extends AbstractController { 'label_settings_pushover' => psm_get_lang('config', 'settings_pushover'), 'label_settings_notification' => psm_get_lang('config', 'settings_notification'), 'label_settings_log' => psm_get_lang('config', 'settings_log'), + 'label_settings_proxy' => psm_get_lang('config', 'settings_proxy'), 'label_general' => psm_get_lang('config', 'general'), 'label_language' => psm_get_lang('config', 'language'), 'label_show_update' => psm_get_lang('config', 'show_update'), 'label_password_encrypt_key' => psm_get_lang('config', 'password_encrypt_key'), 'label_password_encrypt_key_note' => psm_get_lang('config', 'password_encrypt_key_note'), + 'label_proxy' => psm_get_lang('config', 'proxy'), + 'label_proxy_url' => psm_get_lang('config', 'proxy_url'), + 'label_proxy_user' => psm_get_lang('config', 'proxy_user'), + 'label_proxy_password' => psm_get_lang('config', 'proxy_password'), 'label_email_status' => psm_get_lang('config', 'email_status'), 'label_email_from_email' => psm_get_lang('config', 'email_from_email'), 'label_email_from_name' => psm_get_lang('config', 'email_from_name'), @@ -346,6 +355,8 @@ class ConfigController extends AbstractController { 'label_log_email' => psm_get_lang('config', 'log_email'), 'label_log_sms' => psm_get_lang('config', 'log_sms'), 'label_log_pushover' => psm_get_lang('config', 'log_pushover'), + 'label_alert_proxy' => psm_get_lang('config', 'alert_proxy'), + 'label_alert_proxy_url' => psm_get_lang('config', 'alert_proxy_url'), 'label_auto_refresh' => psm_get_lang('config', 'auto_refresh'), 'label_auto_refresh_servers' => psm_get_lang('config', 'auto_refresh_servers'), 'label_seconds' => psm_get_lang('config', 'seconds'), diff --git a/src/psm/Util/Install/Installer.php b/src/psm/Util/Install/Installer.php index 6c3ee490..aeb414c8 100644 --- a/src/psm/Util/Install/Installer.php +++ b/src/psm/Util/Install/Installer.php @@ -130,6 +130,10 @@ class Installer { $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 ('language', 'en_US'), + ('proxy', '0'), + ('proxy_url', ''), + ('proxy_user', ''), + ('proxy_password', ''), ('email_status', '1'), ('email_from_email', 'monitor@example.org'), ('email_from_name', 'Server Monitor'), @@ -442,6 +446,11 @@ class Installer { psm_update_conf('password_encrypt_key', sha1(microtime())); $queries[] = "ALTER TABLE `" . PSM_DB_PREFIX . "servers` CHANGE `ip` `ip` VARCHAR(500) NOT NULL;"; $queries[] = "ALTER TABLE `" . PSM_DB_PREFIX . "servers` ADD `website_username` varchar(255) NULL, ADD `website_password` varchar(255) NULL AFTER `website_username`;"; + $queries[] = "INSERT INTO `" . PSM_DB_PREFIX . "config` (`key`, `value`) VALUE + ('proxy', '0'), + ('proxy_url', ''), + ('proxy_user', ''), + ('proxy_password', '');"; $this->execSQL($queries); diff --git a/src/templates/default/module/config/config.tpl.html b/src/templates/default/module/config/config.tpl.html index 103c52a8..71617232 100644 --- a/src/templates/default/module/config/config.tpl.html +++ b/src/templates/default/module/config/config.tpl.html @@ -69,6 +69,32 @@  {{ label_log_retention_days }} + {{ label_settings_proxy }} +
+
+ +

{{ label_alert_proxy|raw }}

+
+
+
+ +
+ +

{{ label_alert_proxy_url|raw }}

+
+
+
+ +
+ +
+
+
+ +
+ +
+
From 0d8895b478e9f7e2d6d04c432419d8acf61f696f Mon Sep 17 00:00:00 2001 From: Quentin Varquet Date: Thu, 8 Sep 2016 14:58:37 +0200 Subject: [PATCH 02/37] Update README.rst --- README.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.rst b/README.rst index 6616e24e..f32f4fde 100755 --- a/README.rst +++ b/README.rst @@ -115,3 +115,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with PHP Server Monitor. If not, see http://www.gnu.org/licenses/. + +Docker +------- + +PHPServerMonitor is now available on Docker : https://hub.docker.com/r/quentinv/phpservermonitor/ From 940a7152f4320e7695d71569d0d21b641525892d Mon Sep 17 00:00:00 2001 From: pieter-groeneweg Date: Tue, 20 Sep 2016 13:37:58 +0200 Subject: [PATCH 03/37] update status.cron.php with added allowed IP check. to allow scheduled status updates over the web the commandline check is extended with a check on allowed IP address(es). In config.php add following line: define('PSM_CRON_ALLOW', array("xxx.xxx.xxx.xxx", "yyy.yyy.yyy.yyy")) Where the xxx's and yyy's represent the IP addresses of course --- cron/status.cron.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cron/status.cron.php b/cron/status.cron.php index 0905d8da..9e533a1a 100644 --- a/cron/status.cron.php +++ b/cron/status.cron.php @@ -29,7 +29,12 @@ require_once __DIR__ . '/../src/bootstrap.php'; if(!psm_is_cli()) { - die('This script can only be run from the command line.'); + // check if it's an allowed host + $allow = PSM_CRON_ALLOW; + if(!in_array($_SERVER['REMOTE_ADDR'], $allow) && !in_array($_SERVER["HTTP_X_FORWARDED_FOR"], $allow)) { + header('HTTP/1.0 404 Not Found'); + die('404 Not Found

Not Found

The requested URL /cron/status.cron.php was not found on this server.

'); + } } $cron_timeout = PSM_CRON_TIMEOUT; From 6ca9fa9ec944fcc8a2891802aa2e3bb3347f5b20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=98=E7=BC=98?= Date: Mon, 10 Oct 2016 20:11:59 +0800 Subject: [PATCH 04/37] use ajax to auto refresh server status page --- .../Module/Server/Controller/StatusController.php | 7 +++++++ src/templates/default/main/body.tpl.html | 3 --- .../default/module/server/status/index.tpl.html | 15 ++++++++++++++- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/psm/Module/Server/Controller/StatusController.php b/src/psm/Module/Server/Controller/StatusController.php index 4ef5aca9..5afde541 100644 --- a/src/psm/Module/Server/Controller/StatusController.php +++ b/src/psm/Module/Server/Controller/StatusController.php @@ -91,6 +91,13 @@ class StatusController extends AbstractServerController { $this->twig->addGlobal('auto_refresh', true); $this->twig->addGlobal('auto_refresh_seconds', $auto_refresh_seconds); } + + if($this->isXHR() || isset($_SERVER["HTTP_X_REQUESTED_WITH"])) { + $this->xhr = true; + //disable auto refresh in ajax return html + $layout_data["auto_refresh"] = 0; + } + return $this->twig->render('module/server/status/index.tpl.html', $layout_data); } diff --git a/src/templates/default/main/body.tpl.html b/src/templates/default/main/body.tpl.html index 2197ac9e..fa7d252a 100644 --- a/src/templates/default/main/body.tpl.html +++ b/src/templates/default/main/body.tpl.html @@ -11,9 +11,6 @@ - {% if auto_refresh %} - - {% endif %} diff --git a/src/templates/default/module/server/status/index.tpl.html b/src/templates/default/module/server/status/index.tpl.html index 4f579206..77fe4c89 100644 --- a/src/templates/default/module/server/status/index.tpl.html +++ b/src/templates/default/module/server/status/index.tpl.html @@ -57,4 +57,17 @@ - \ No newline at end of file + + +{% if auto_refresh %} + +{% endif %} \ No newline at end of file From 489edc933f197886be1665883c71e650bbd3b0d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=98=E7=BC=98?= Date: Wed, 19 Oct 2016 11:05:26 +0800 Subject: [PATCH 05/37] #367 fixed a csrf bug since 2014 --- src/psm/Module/Server/Controller/StatusController.php | 1 + src/templates/default/module/server/status/index.tpl.html | 1 + static/js/scripts.js | 1 + 3 files changed, 3 insertions(+) diff --git a/src/psm/Module/Server/Controller/StatusController.php b/src/psm/Module/Server/Controller/StatusController.php index 5afde541..600e9be1 100644 --- a/src/psm/Module/Server/Controller/StatusController.php +++ b/src/psm/Module/Server/Controller/StatusController.php @@ -37,6 +37,7 @@ class StatusController extends AbstractServerController { function __construct(Database $db, \Twig_Environment $twig) { parent::__construct($db, $twig); + $this->setCSRFKey('status'); $this->setActions(array('index', 'saveLayout'), 'index'); } diff --git a/src/templates/default/module/server/status/index.tpl.html b/src/templates/default/module/server/status/index.tpl.html index 77fe4c89..c66cde78 100644 --- a/src/templates/default/module/server/status/index.tpl.html +++ b/src/templates/default/module/server/status/index.tpl.html @@ -1,4 +1,5 @@
+
{% for server in servers_offline %} diff --git a/static/js/scripts.js b/static/js/scripts.js index fb29cb63..46669303 100755 --- a/static/js/scripts.js +++ b/static/js/scripts.js @@ -135,6 +135,7 @@ function psm_xhr(mod, params, method, on_complete, options) { function psm_saveLayout(layout) { var params = { action: 'saveLayout', + csrf: $("input[name=saveLayout_csrf]").val(), layout: layout }; psm_xhr('server_status', params, 'POST'); From 4abe0bdf4cc551cc1973f0d438dcd20569900669 Mon Sep 17 00:00:00 2001 From: Michael van Schaik Date: Fri, 21 Oct 2016 05:47:33 +0200 Subject: [PATCH 06/37] Update Mollie.php with new URL (Fixes #370) Mollie has changed their SMS api to api.messagebird.com They have been redirecting calls to www.mollie.com but will stop doing so from oct 24 2016 The API hasn't changed, this configuration is tested & working --- src/psm/Txtmsg/Mollie.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/psm/Txtmsg/Mollie.php b/src/psm/Txtmsg/Mollie.php index 7c173777..1824c802 100644 --- a/src/psm/Txtmsg/Mollie.php +++ b/src/psm/Txtmsg/Mollie.php @@ -61,7 +61,7 @@ class Mollie extends Core { public function sendSMS($message) { $recipients = implode(',', $this->recipients); - $result = $this->_auth_https_post('www.mollie.nl', '/xml/sms/', + $result = $this->_auth_https_post('api.messagebird.com', '/xml/sms/', 'gateway='.urlencode($this->gateway). '&username='.urlencode($this->username). '&password='.urlencode($this->password). @@ -97,4 +97,4 @@ class Mollie extends Core { } return $buf; } -} \ No newline at end of file +} From 15eabe1944de841ad4fbd47461295ed3a772b14a Mon Sep 17 00:00:00 2001 From: Samuel Denis-D'Ortun Date: Mon, 24 Oct 2016 20:48:18 -0400 Subject: [PATCH 07/37] Update README.rst --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index f32f4fde..29db5b68 100755 --- a/README.rst +++ b/README.rst @@ -119,4 +119,4 @@ along with PHP Server Monitor. If not, see http://www.gnu.org/licenses/. Docker ------- -PHPServerMonitor is now available on Docker : https://hub.docker.com/r/quentinv/phpservermonitor/ +PHPServerMonitor is now available on Docker : https://github.com/phpservermon/docker-phpservermonitor From 294e9e7adf81dbb694c3b389d0b79c841555737e Mon Sep 17 00:00:00 2001 From: Daif Alotaibi Date: Wed, 2 Nov 2016 00:40:05 +0300 Subject: [PATCH 08/37] Support for SMSgw provider http://smsgw.net --- src/includes/functions.inc.php | 6 +- src/lang/en_US.lang.php | 3 +- .../Config/Controller/ConfigController.php | 3 +- src/psm/Txtmsg/Smsgw.php | 61 +++++++++++++++++++ .../default/module/config/config.tpl.html | 1 + 5 files changed, 71 insertions(+), 3 deletions(-) create mode 100644 src/psm/Txtmsg/Smsgw.php diff --git a/src/includes/functions.inc.php b/src/includes/functions.inc.php index ec725f67..93604353 100755 --- a/src/includes/functions.inc.php +++ b/src/includes/functions.inc.php @@ -531,7 +531,11 @@ function psm_build_sms() { break; case 'octopush': $sms = new \psm\Txtmsg\Octopush(); - break; } + break; + case 'smsgw': + $sms = new \psm\Txtmsg\Smsgw(); + break; + } // copy login information from the config file if($sms) { diff --git a/src/lang/en_US.lang.php b/src/lang/en_US.lang.php index 07c1d5d1..51665f08 100755 --- a/src/lang/en_US.lang.php +++ b/src/lang/en_US.lang.php @@ -214,6 +214,7 @@ $sm_lang = array( 'sms_gateway_freemobilesms' => 'FreeMobileSMS', 'sms_gateway_clicksend' => 'ClickSend', 'sms_gateway_nexmo' => 'Nexmo', + 'sms_gateway_smsgw' => 'SMSgw', 'sms_gateway_username' => 'Gateway username', 'sms_gateway_password' => 'Gateway password', 'sms_from' => 'Sender\'s phone number', @@ -315,4 +316,4 @@ $sm_lang = array( '401_unauthorized' => 'Unauthorized', '401_unauthorized_description' => 'You do not have the privileges to view this page.', ), -); +); \ No newline at end of file diff --git a/src/psm/Module/Config/Controller/ConfigController.php b/src/psm/Module/Config/Controller/ConfigController.php index d058de63..84d6e80d 100644 --- a/src/psm/Module/Config/Controller/ConfigController.php +++ b/src/psm/Module/Config/Controller/ConfigController.php @@ -321,6 +321,7 @@ class ConfigController extends AbstractController { 'label_sms_gateway_freevoipdeal' => psm_get_lang('config', 'sms_gateway_freevoipdeal'), 'label_sms_gateway_smsglobal' => psm_get_lang('config', 'sms_gateway_smsglobal'), 'label_sms_gateway_nexmo' => psm_get_lang('config', 'sms_gateway_nexmo'), + 'label_sms_gateway_smsgw' => psm_get_lang('config', 'sms_gateway_smsgw'), 'label_sms_gateway_octopush' => psm_get_lang('config', 'sms_gateway_octopush'), 'label_sms_gateway_freemobilesms' => psm_get_lang('config', 'sms_gateway_freemobilesms'), 'label_sms_gateway_clicksend' => psm_get_lang('config', 'sms_gateway_clicksend'), @@ -356,4 +357,4 @@ class ConfigController extends AbstractController { 'label_log_retention_days' => psm_get_lang('config', 'log_retention_days'), ); } -} +} \ No newline at end of file diff --git a/src/psm/Txtmsg/Smsgw.php b/src/psm/Txtmsg/Smsgw.php new file mode 100644 index 00000000..5fafb937 --- /dev/null +++ b/src/psm/Txtmsg/Smsgw.php @@ -0,0 +1,61 @@ +. + * + * @package phpservermon + * @author Daif Alotaibi + * @copyright Copyright (c) 2008-2015 Pepijn Over + * @license http://www.gnu.org/licenses/gpl.txt GNU GPL v3 + * @version Release: @package_version@ + * @link http://www.phpservermonitor.org/ + **/ + +namespace psm\Txtmsg; + +class Smsgw extends Core { + + /** + * Send a text message to one or more recipients + * + * @param string $message + * @return boolean + */ + + public function sendSMS($message) { + $url = 'http://api.smsgw.net/SendBulkSMS'; + $post = array( + 'strUserName' => $this->username, + 'strPassword' => $this->password, + 'strTagName' => $this->originator, + 'strRecepientNumbers' => implode(';', $this->recipients), + 'strMessage' => $message, + ); + $ch = curl_init(); + curl_setopt($ch, CURLOPT_URL, $url); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, TRUE); + curl_setopt($ch, CURLOPT_HEADER, FALSE); + curl_setopt($ch, CURLOPT_POST, TRUE); + curl_setopt($ch, CURLOPT_POSTFIELDS, $post); + $data = curl_exec($ch); + if($data == '1') { + $this->success = true; + } + return $this->success; + } + +} diff --git a/src/templates/default/module/config/config.tpl.html b/src/templates/default/module/config/config.tpl.html index 103c52a8..0a80fcba 100644 --- a/src/templates/default/module/config/config.tpl.html +++ b/src/templates/default/module/config/config.tpl.html @@ -173,6 +173,7 @@ +
From e4bc315fd0831ee726f58b72a3ddf399531f98d9 Mon Sep 17 00:00:00 2001 From: Benjy Date: Sat, 5 Nov 2016 19:10:28 +0100 Subject: [PATCH 09/37] Add base URL configuration field in installer and in sample configuration file --- config.php.sample | 2 +- .../Install/Controller/InstallController.php | 27 ++++++++++--------- .../module/install/config_new.tpl.html | 19 ++++++++----- 3 files changed, 28 insertions(+), 20 deletions(-) diff --git a/config.php.sample b/config.php.sample index 667afe2e..42f6f9ec 100755 --- a/config.php.sample +++ b/config.php.sample @@ -4,4 +4,4 @@ define('PSM_DB_USER', 'db_user'); define('PSM_DB_PASS', 'db_pass'); define('PSM_DB_NAME', 'db_name'); define('PSM_DB_HOST', 'localhost'); - +define('PSM_BASE_URL', ''); diff --git a/src/psm/Module/Install/Controller/InstallController.php b/src/psm/Module/Install/Controller/InstallController.php index dad31b14..582f64aa 100644 --- a/src/psm/Module/Install/Controller/InstallController.php +++ b/src/psm/Module/Install/Controller/InstallController.php @@ -120,11 +120,12 @@ class InstallController extends AbstractController { } $config = array( - 'host' => 'localhost', - 'name' => '', - 'user' => '', - 'pass' => '', - 'prefix' => 'psm_', + 'db_host' => 'localhost', + 'db_name' => '', + 'db_user' => '', + 'db_pass' => '', + 'db_prefix' => 'psm_', + 'base_url' => '', ); $changed = false; @@ -140,10 +141,10 @@ class InstallController extends AbstractController { if($changed) { // test db connection $this->db = new \psm\Service\Database( - $config['host'], - $config['user'], - $config['pass'], - $config['name'] + $config['db_host'], + $config['db_user'], + $config['db_pass'], + $config['db_name'] ); if($this->db->status()) { @@ -275,11 +276,11 @@ class InstallController extends AbstractController { * @param array $db_vars prefix,user,pass,name,host * @return boolean|string TRUE on success, string with config otherwise */ - protected function writeConfigFile($db_vars) { + protected function writeConfigFile($array_config) { $config = " $value) { - $line = "define('PSM_DB_{key}', '{value}');".PHP_EOL; + foreach($array_config as $key => $value) { + $line = "define('PSM_{key}', '{value}');".PHP_EOL; $line = str_replace( array('{key}', '{value}'), array(strtoupper($key), $value), @@ -308,7 +309,7 @@ class InstallController extends AbstractController { 'name' => '', 'host' => '', ); - $pattern = "/define\('SM_DB_{key}', '(.*?)'/u"; + $pattern = "/define\('SM_{key}', '(.*?)'/u"; foreach($vars as $key => $value) { $pattern_key = str_replace('{key}', strtoupper($key), $pattern); diff --git a/src/templates/default/module/install/config_new.tpl.html b/src/templates/default/module/install/config_new.tpl.html index 64fe07ab..84be15c8 100644 --- a/src/templates/default/module/install/config_new.tpl.html +++ b/src/templates/default/module/install/config_new.tpl.html @@ -10,35 +10,42 @@
{{ macro.csrf_input() }} +

Please enter the application url:

+
+ +
+ +
+

Please enter your database info:

- +
- +
- +
- +
- +
@@ -60,4 +67,4 @@
{% endif %}
-{% endblock %} \ No newline at end of file +{% endblock %} From 7fc0110ac785c8ecea5ee1024db23e464c47ef32 Mon Sep 17 00:00:00 2001 From: Samuel Denis-D'Ortun Date: Tue, 15 Nov 2016 13:08:21 -0500 Subject: [PATCH 10/37] Update README.rst --- README.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/README.rst b/README.rst index fdfa4b39..e76cdaab 100755 --- a/README.rst +++ b/README.rst @@ -75,6 +75,7 @@ Requirements * PHP 5.3.7+ * PHP cURL package * PHP PDO mysql driver +* PHP-XML Install From 0a8416fba9bdfab8dbeafefd5cb955cfaa09f22f Mon Sep 17 00:00:00 2001 From: Tom Hatzer Date: Fri, 23 Dec 2016 11:12:07 +0100 Subject: [PATCH 11/37] Add RDP port to save method --- src/psm/Module/Server/Controller/ServerController.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/psm/Module/Server/Controller/ServerController.php b/src/psm/Module/Server/Controller/ServerController.php index c2c61db2..d2cdbba8 100644 --- a/src/psm/Module/Server/Controller/ServerController.php +++ b/src/psm/Module/Server/Controller/ServerController.php @@ -286,6 +286,8 @@ class ServerController extends AbstractServerController { $clean["port"] = 443; } elseif ($tmp["scheme"] === "http") { $clean["port"] = 80; + } elseif ($tmp["scheme"] === "rdp") { + $clean["port"] = 3389; } } From 3318787ee5c4ddbacae8c523289b9ad2e1080f30 Mon Sep 17 00:00:00 2001 From: Tom Hatzer Date: Fri, 23 Dec 2016 11:14:30 +0100 Subject: [PATCH 12/37] Add RDP to port list --- src/templates/default/module/server/server/update.tpl.html | 1 + 1 file changed, 1 insertion(+) diff --git a/src/templates/default/module/server/server/update.tpl.html b/src/templates/default/module/server/server/update.tpl.html index 2378d21e..96c4d098 100644 --- a/src/templates/default/module/server/server/update.tpl.html +++ b/src/templates/default/module/server/server/update.tpl.html @@ -47,6 +47,7 @@ +
From e403dea6eea3492e227d518330139bb17f8bf5ff Mon Sep 17 00:00:00 2001 From: Tom Hatzer Date: Fri, 23 Dec 2016 11:29:28 +0100 Subject: [PATCH 13/37] Add updatePing method to check if ip is pingable --- src/psm/Util/Server/Updater/StatusUpdater.php | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/src/psm/Util/Server/Updater/StatusUpdater.php b/src/psm/Util/Server/Updater/StatusUpdater.php index 84b147e1..06335127 100644 --- a/src/psm/Util/Server/Updater/StatusUpdater.php +++ b/src/psm/Util/Server/Updater/StatusUpdater.php @@ -90,6 +90,9 @@ class StatusUpdater { } switch($this->server['type']) { + case 'ping': + $this->status_new = $this->updatePing($max_runs); + break; case 'service': $this->status_new = $this->updateService($max_runs); break; @@ -134,6 +137,41 @@ class StatusUpdater { } + /** + * Check the current servers ping status + * @param int $max_runs + * @param int $run + * @return boolean + */ + protected function updatePing($max_runs, $run = 1) { + $errno = 0; + // save response time + $starttime = microtime(true); + // set ping payload + $package = "\x08\x00\x7d\x4b\x00\x00\x00\x00PingHost"; + + $fp = @fsockopen ($this->server['ip'], $this->server['port'], $errno, $this->error, 10); + $socket = socket_create(AF_INET, SOCK_RAW, 1); + socket_set_option($socket, SOL_SOCKET, SO_RCVTIMEO, array('sec' => 10, 'usec' => 0)); + socket_connect($socket, $this->server['ip'], null); + + socket_send($socket, $package, strLen($package), 0); + if (socket_read($socket, 255)) { + $this->rtime = microtime(true) - $starttime; + $status = true; + } else { + $status = false; + } + socket_close($socket); + + // check if server is available and rerun if asked. + if(!$status && $run < $max_runs) { + return $this->updatePing($max_runs, $run + 1); + } + + return $status; + } + /** * Check the current server as a service * @param int $max_runs From 2a9fae85413b24fd9ed539c9a61385f7faf0d629 Mon Sep 17 00:00:00 2001 From: Tom Hatzer Date: Fri, 23 Dec 2016 11:30:27 +0100 Subject: [PATCH 14/37] Add copyright notice to updatePing method --- src/psm/Util/Server/Updater/StatusUpdater.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/psm/Util/Server/Updater/StatusUpdater.php b/src/psm/Util/Server/Updater/StatusUpdater.php index 06335127..ad787b2f 100644 --- a/src/psm/Util/Server/Updater/StatusUpdater.php +++ b/src/psm/Util/Server/Updater/StatusUpdater.php @@ -138,7 +138,7 @@ class StatusUpdater { } /** - * Check the current servers ping status + * Check the current servers ping status - Code from http://stackoverflow.com/a/20467492 * @param int $max_runs * @param int $run * @return boolean From ce174f34b6d0259cbb5dc2a02a4eeaa32b5652f2 Mon Sep 17 00:00:00 2001 From: Tom Hatzer Date: Fri, 23 Dec 2016 11:33:55 +0100 Subject: [PATCH 15/37] Add server type ping to dropdown --- src/templates/default/module/server/server/update.tpl.html | 1 + 1 file changed, 1 insertion(+) diff --git a/src/templates/default/module/server/server/update.tpl.html b/src/templates/default/module/server/server/update.tpl.html index 96c4d098..4f26e357 100644 --- a/src/templates/default/module/server/server/update.tpl.html +++ b/src/templates/default/module/server/server/update.tpl.html @@ -20,6 +20,7 @@
From b10bc66e031beffdfb343789be31c7655b279ea5 Mon Sep 17 00:00:00 2001 From: Tom Hatzer Date: Fri, 23 Dec 2016 11:38:47 +0100 Subject: [PATCH 16/37] Add ping validation checks to ServerValidator --- src/psm/Util/Server/ServerValidator.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/psm/Util/Server/ServerValidator.php b/src/psm/Util/Server/ServerValidator.php index 8b23d14f..4c97333f 100644 --- a/src/psm/Util/Server/ServerValidator.php +++ b/src/psm/Util/Server/ServerValidator.php @@ -101,6 +101,11 @@ class ServerValidator { throw new \InvalidArgumentException('server_ip_bad_service'); } break; + case 'ping': + if(!filter_var($value, FILTER_VALIDATE_IP)) { + throw new \InvalidArgumentException('server_ip_bad_service'); + } + break; } return true; @@ -113,7 +118,7 @@ class ServerValidator { * @throws \InvalidArgumentException */ public function type($type) { - if(!in_array($type, array('service', 'website'))) { + if(!in_array($type, array('ping', 'service', 'website'))) { throw new \InvalidArgumentException('server_type_invalid'); } return true; From 78e095bb32d8c1c5e41312ecadaca1f579762338 Mon Sep 17 00:00:00 2001 From: Tom Hatzer Date: Fri, 23 Dec 2016 11:44:15 +0100 Subject: [PATCH 17/37] Add ping label to getLabels() --- src/psm/Module/Server/Controller/ServerController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/psm/Module/Server/Controller/ServerController.php b/src/psm/Module/Server/Controller/ServerController.php index d2cdbba8..748f5434 100644 --- a/src/psm/Module/Server/Controller/ServerController.php +++ b/src/psm/Module/Server/Controller/ServerController.php @@ -460,6 +460,7 @@ class ServerController extends AbstractServerController { 'label_type' => psm_get_lang('servers', 'type'), 'label_website' => psm_get_lang('servers', 'type_website'), 'label_service' => psm_get_lang('servers', 'type_service'), + 'label_ping' => psm_get_lang('servers', 'type_ping'), 'label_pattern' => psm_get_lang('servers', 'pattern'), 'label_pattern_description' => psm_get_lang('servers', 'pattern_description'), 'label_last_check' => psm_get_lang('servers', 'last_check'), From 82ec2c0bace249eadb283e735aae77df27b471bd Mon Sep 17 00:00:00 2001 From: Tom Hatzer Date: Fri, 23 Dec 2016 11:45:27 +0100 Subject: [PATCH 18/37] Add type_ping to lang file --- src/lang/de_DE.lang.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lang/de_DE.lang.php b/src/lang/de_DE.lang.php index fd8aee95..885d6199 100644 --- a/src/lang/de_DE.lang.php +++ b/src/lang/de_DE.lang.php @@ -125,6 +125,7 @@ $sm_lang = array( 'type' => 'Typ', 'type_website' => 'Webseite', 'type_service' => 'Service', + 'type_ping' => 'Ping', 'pattern' => 'Suchstring/-muster', 'pattern_description' => 'Wenn das gesuchte Muster nicht in der Webseite ist, wird die Seite als offline markiert. Reguläre Ausdrücke sind erlaubt.', 'last_check' => 'Letzter Check', From 7c5eeee701744f273d6f5ebd8833073c8de675b0 Mon Sep 17 00:00:00 2001 From: Tom Hatzer Date: Fri, 23 Dec 2016 14:13:11 +0100 Subject: [PATCH 19/37] Add type ping to lang file --- src/lang/en_US.lang.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lang/en_US.lang.php b/src/lang/en_US.lang.php index 51665f08..058c7919 100755 --- a/src/lang/en_US.lang.php +++ b/src/lang/en_US.lang.php @@ -135,6 +135,7 @@ $sm_lang = array( 'type' => 'Type', 'type_website' => 'Website', 'type_service' => 'Service', + 'type_ping' => 'Ping', 'pattern' => 'Search string/pattern', 'pattern_description' => 'If this pattern is not found on the website, the server will be marked offline. Regular expressions are allowed.', 'last_check' => 'Last check', @@ -316,4 +317,4 @@ $sm_lang = array( '401_unauthorized' => 'Unauthorized', '401_unauthorized_description' => 'You do not have the privileges to view this page.', ), -); \ No newline at end of file +); From e5c72d2cc576d31a30e726aad212f8b545715ae1 Mon Sep 17 00:00:00 2001 From: Tom Hatzer Date: Fri, 23 Dec 2016 14:29:57 +0100 Subject: [PATCH 20/37] Add ping to enum for type column in servers database table --- src/psm/Util/Install/Installer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/psm/Util/Install/Installer.php b/src/psm/Util/Install/Installer.php index 6c3ee490..612f7764 100644 --- a/src/psm/Util/Install/Installer.php +++ b/src/psm/Util/Install/Installer.php @@ -218,7 +218,7 @@ class Installer { `ip` varchar(500) NOT NULL, `port` int(5) unsigned NOT NULL, `label` varchar(255) NOT NULL, - `type` enum('service','website') NOT NULL default 'service', + `type` enum('ping','service','website') NOT NULL default 'service', `pattern` varchar(255) NOT NULL, `status` enum('on','off') NOT NULL default 'on', `error` varchar(255) NULL, From dcd8996bd5ae2bc224ab1dd2fdd8fe921cb941c0 Mon Sep 17 00:00:00 2001 From: Tom Hatzer Date: Fri, 23 Dec 2016 15:20:02 +0100 Subject: [PATCH 21/37] Add custom port to config options in db class --- src/psm/Service/Database.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/psm/Service/Database.php b/src/psm/Service/Database.php index c5296170..afb022a7 100644 --- a/src/psm/Service/Database.php +++ b/src/psm/Service/Database.php @@ -81,9 +81,10 @@ class Database { * @param string $pass * @param string $db */ - function __construct($host = null, $user = null, $pass = null, $db = null) { + function __construct($host = null, $user = null, $pass = null, $db = null, $port = null) { if($host != null && $user != null && $pass !== null && $db != null) { $this->db_host = $host; + $this->db_port = $port || 3306; $this->db_name = $db; $this->db_user = $user; $this->db_pass = $pass; @@ -498,7 +499,7 @@ class Database { // Initizale connection try { $this->pdo = new \PDO( - 'mysql:host='.$this->db_host.';dbname='.$this->db_name.';charset=utf8', + 'mysql:host='.$this->db_host.';port='.$this->db_port.';dbname='.$this->db_name.';charset=utf8', $this->db_user, $this->db_pass ); From 566cef7968f81ee217982c42bcbc99681caa56f2 Mon Sep 17 00:00:00 2001 From: Tom Hatzer Date: Fri, 23 Dec 2016 15:20:46 +0100 Subject: [PATCH 22/37] Add port static to config file --- config.php.sample | 1 + 1 file changed, 1 insertion(+) diff --git a/config.php.sample b/config.php.sample index 667afe2e..41b09247 100755 --- a/config.php.sample +++ b/config.php.sample @@ -4,4 +4,5 @@ define('PSM_DB_USER', 'db_user'); define('PSM_DB_PASS', 'db_pass'); define('PSM_DB_NAME', 'db_name'); define('PSM_DB_HOST', 'localhost'); +define('PSM_DB_PORT', '3306'); From e52775236ef3fb5ce5468aac22896811e167bd61 Mon Sep 17 00:00:00 2001 From: Tom Hatzer Date: Fri, 23 Dec 2016 15:22:24 +0100 Subject: [PATCH 23/37] Add port constant to psminstall --- puphpet/files/exec-once/psminstall.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/puphpet/files/exec-once/psminstall.sh b/puphpet/files/exec-once/psminstall.sh index 2ebd8b54..b115800f 100644 --- a/puphpet/files/exec-once/psminstall.sh +++ b/puphpet/files/exec-once/psminstall.sh @@ -6,8 +6,9 @@ define('PSM_DB_USER', 'psm'); \ define('PSM_DB_PASS', 'psm'); \ define('PSM_DB_NAME', 'psm'); \ define('PSM_DB_HOST', 'localhost'); \ +define('PSM_DB_PORT', '3306'); \ ?>" > /var/www/default/psm/config.php echo "" > /var/www/default/index.php \ No newline at end of file +?>" > /var/www/default/index.php From 4805bf858d9cac5d1bfd28a55f309d56c937500d Mon Sep 17 00:00:00 2001 From: Tom Hatzer Date: Fri, 23 Dec 2016 15:23:31 +0100 Subject: [PATCH 24/37] Add port param and argument --- src/config/services.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/config/services.xml b/src/config/services.xml index 5d3fbd1b..43446dcd 100644 --- a/src/config/services.xml +++ b/src/config/services.xml @@ -18,6 +18,7 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/sc %path.src%templates PSM_DB_HOST + PSM_DB_PORT PSM_DB_USER PSM_DB_PASS PSM_DB_NAME @@ -38,6 +39,7 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/sc %db.user% %db.pass% %db.name% + %db.port% From 3a4fe02e3d244cb7ffaaf7d7db6c5a2401346735 Mon Sep 17 00:00:00 2001 From: Tom Hatzer Date: Fri, 23 Dec 2016 15:24:25 +0100 Subject: [PATCH 25/37] Add port constant to install readme --- docs/install.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/install.rst b/docs/install.rst index f8e0efa2..627704fb 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -27,6 +27,7 @@ To change these values correctly, only update the second parameter of the functi define('PSM_DB_NAME', 'db_name'); define('PSM_DB_USER', 'db_user'); define('PSM_DB_PASS', 'db_user_password'); + define('PSM_DB_PORT', '3306'); For example: to change your username you should ONLY change the 'db\_user' part. Do NOT remove the quotes around your username as that will result in an error. From a760dce77a1c6a4a9e1251b8eb357680aab0c26b Mon Sep 17 00:00:00 2001 From: Tom Hatzer Date: Fri, 23 Dec 2016 15:28:25 +0100 Subject: [PATCH 26/37] Add protected variable $db_port --- src/psm/Service/Database.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/psm/Service/Database.php b/src/psm/Service/Database.php index afb022a7..c15348e0 100644 --- a/src/psm/Service/Database.php +++ b/src/psm/Service/Database.php @@ -35,6 +35,12 @@ class Database { */ protected $db_host; + /** + * DB port + * @var string $db_port + */ + protected $db_port; + /** * DB name * @var string $db_name From 29a6385ea6043af2e3539f546959d36b6c782444 Mon Sep 17 00:00:00 2001 From: Tom Hatzer Date: Fri, 23 Dec 2016 15:30:39 +0100 Subject: [PATCH 27/37] Initialize protected variable db_port with value 3306 --- src/psm/Service/Database.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/psm/Service/Database.php b/src/psm/Service/Database.php index c15348e0..16ff69fc 100644 --- a/src/psm/Service/Database.php +++ b/src/psm/Service/Database.php @@ -39,7 +39,7 @@ class Database { * DB port * @var string $db_port */ - protected $db_port; + protected $db_port = 3306; /** * DB name From 7e31b6ab3da90efb814bac2c2476f5c9f488d73a Mon Sep 17 00:00:00 2001 From: Tom Hatzer Date: Fri, 23 Dec 2016 15:38:50 +0100 Subject: [PATCH 28/37] Add port input fields to template --- src/templates/default/module/install/config_new.tpl.html | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/templates/default/module/install/config_new.tpl.html b/src/templates/default/module/install/config_new.tpl.html index 64fe07ab..4a07a4ce 100644 --- a/src/templates/default/module/install/config_new.tpl.html +++ b/src/templates/default/module/install/config_new.tpl.html @@ -17,6 +17,12 @@
+
+ +
+ +
+
@@ -60,4 +66,4 @@
{% endif %}
-{% endblock %} \ No newline at end of file +{% endblock %} From beeab18956f814ba502dd8491b44208b555177b8 Mon Sep 17 00:00:00 2001 From: Tom Hatzer Date: Fri, 23 Dec 2016 15:41:03 +0100 Subject: [PATCH 29/37] Add port to installer --- src/psm/Module/Install/Controller/InstallController.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/psm/Module/Install/Controller/InstallController.php b/src/psm/Module/Install/Controller/InstallController.php index dad31b14..fab71709 100644 --- a/src/psm/Module/Install/Controller/InstallController.php +++ b/src/psm/Module/Install/Controller/InstallController.php @@ -121,6 +121,7 @@ class InstallController extends AbstractController { $config = array( 'host' => 'localhost', + 'port' => '3306', 'name' => '', 'user' => '', 'pass' => '', @@ -143,7 +144,8 @@ class InstallController extends AbstractController { $config['host'], $config['user'], $config['pass'], - $config['name'] + $config['name'], + $config['port'], ); if($this->db->status()) { @@ -307,6 +309,7 @@ class InstallController extends AbstractController { 'pass' => '', 'name' => '', 'host' => '', + 'port' => '3306', ); $pattern = "/define\('SM_DB_{key}', '(.*?)'/u"; From c5b3bcc5827140d190163b047eff47c6530e6494 Mon Sep 17 00:00:00 2001 From: Tom Hatzer Date: Fri, 23 Dec 2016 15:42:15 +0100 Subject: [PATCH 30/37] Remove trailing comma --- src/psm/Module/Install/Controller/InstallController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/psm/Module/Install/Controller/InstallController.php b/src/psm/Module/Install/Controller/InstallController.php index fab71709..75a7e94a 100644 --- a/src/psm/Module/Install/Controller/InstallController.php +++ b/src/psm/Module/Install/Controller/InstallController.php @@ -145,7 +145,7 @@ class InstallController extends AbstractController { $config['user'], $config['pass'], $config['name'], - $config['port'], + $config['port'] ); if($this->db->status()) { @@ -309,7 +309,7 @@ class InstallController extends AbstractController { 'pass' => '', 'name' => '', 'host' => '', - 'port' => '3306', + 'port' => '3306' ); $pattern = "/define\('SM_DB_{key}', '(.*?)'/u"; From f89d656afa70115ad6fb6910bf03b714401656fd Mon Sep 17 00:00:00 2001 From: criwe Date: Sun, 25 Dec 2016 22:44:44 +0100 Subject: [PATCH 31/37] add A monitoring website should not be indexed by google. will prevent that. Removed autor-tag, because not relevant anymore (especially for a page like that) --- src/templates/default/main/body.tpl.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/templates/default/main/body.tpl.html b/src/templates/default/main/body.tpl.html index fa7d252a..4ce7dc56 100644 --- a/src/templates/default/main/body.tpl.html +++ b/src/templates/default/main/body.tpl.html @@ -6,7 +6,7 @@ {{ title }} - + From 461b55cbe3de3128825af1916514c30255859cd7 Mon Sep 17 00:00:00 2001 From: criwe Date: Sun, 25 Dec 2016 23:00:49 +0100 Subject: [PATCH 32/37] Added some basic pagespeed settings Added some basic pagespeed settings to the htaccess --- .htaccess | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.htaccess b/.htaccess index 5a928f6d..1014e510 100644 --- a/.htaccess +++ b/.htaccess @@ -1 +1,20 @@ Options -Indexes + + + + ExpiresActive on + ExpiresDefault "access plus 1 month" + + + + +AddOutputFilterByType DEFLATE text/plain +AddOutputFilterByType DEFLATE text/html +AddOutputFilterByType DEFLATE text/xml +AddOutputFilterByType DEFLATE text/css +AddOutputFilterByType DEFLATE application/xml +AddOutputFilterByType DEFLATE application/xhtml+xml +AddOutputFilterByType DEFLATE application/rss+xml +AddOutputFilterByType DEFLATE application/javascript +AddOutputFilterByType DEFLATE application/x-javascript + From 663141b2018210120bf23302f7a678aa7da23bd3 Mon Sep 17 00:00:00 2001 From: Samuel Denis-D'Ortun Date: Fri, 13 Jan 2017 03:01:15 -0500 Subject: [PATCH 33/37] Update composer.json --- composer.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/composer.json b/composer.json index b307dc44..a1e5c180 100755 --- a/composer.json +++ b/composer.json @@ -3,10 +3,7 @@ "description": "PHP Server Monitor", "homepage": "http://www.phpservermonitor.org", "repositories": [ - { - "type": "vcs", - "url": "https://github.com/phpservermon/php-pushover" - } + ], "require": { "php": ">=5.3.7", From b1b69867d55c4ea7fa75380e34333b55537529de Mon Sep 17 00:00:00 2001 From: sandybeachit Date: Wed, 18 Jan 2017 21:19:30 +0000 Subject: [PATCH 34/37] removed additional w from "dowwn" removed additional w from "dowwn" --- CHANGELOG.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 2ff1ddc6..0c0069f7 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -21,7 +21,7 @@ v3.2.0 not yet released * #181: Added blank index files to prevent directory listing. * #237: Adding CSRF protection. * #287: Default language - English -* #286: Add popular ports drop dowwn +* #286: Add popular ports drop down * #269: Added Slovenian language * #96: Authentication for website checks From c14498b21e8e5a66a256c31c800af03f16365389 Mon Sep 17 00:00:00 2001 From: Samuel Denis-D'Ortun Date: Thu, 19 Jan 2017 16:32:07 -0500 Subject: [PATCH 35/37] Fix #406 --- src/psm/Module/Install/Controller/InstallController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/psm/Module/Install/Controller/InstallController.php b/src/psm/Module/Install/Controller/InstallController.php index cae533f8..d948370e 100644 --- a/src/psm/Module/Install/Controller/InstallController.php +++ b/src/psm/Module/Install/Controller/InstallController.php @@ -121,7 +121,7 @@ class InstallController extends AbstractController { $config = array( 'db_host' => 'localhost', - 'db_port' => '3306' + 'db_port' => '3306', 'db_name' => '', 'db_user' => '', 'db_pass' => '', From b0178d1da0a6b65e46bcb2c3ecf45cd42c1d491c Mon Sep 17 00:00:00 2001 From: Guillaume Date: Fri, 20 Jan 2017 11:32:38 +0100 Subject: [PATCH 36/37] Update fr_FR.lang.php Typo in login / remember_me --- src/lang/fr_FR.lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lang/fr_FR.lang.php b/src/lang/fr_FR.lang.php index 6c7edbdf..b540de9e 100644 --- a/src/lang/fr_FR.lang.php +++ b/src/lang/fr_FR.lang.php @@ -282,7 +282,7 @@ $sm_lang = array( 'title_forgot' => 'Mot de passe oublié ?', 'title_reset' => 'Réinitialisation du mot de passe', 'submit' => 'Envoyer', - 'remember_me' => 'Se vouvenir de moi', + 'remember_me' => 'Se souvenir de moi', 'login' => 'Connexion', 'logout' => 'Déconnexion', 'username' => 'Nom', From 1faa7d99ee9685e4dcd6bb01269735679eb63f58 Mon Sep 17 00:00:00 2001 From: Jonas Hansen Date: Wed, 8 Feb 2017 15:59:23 +0100 Subject: [PATCH 37/37] Changed mysql pdo port empty check, to fix problem with mysql cant connect, when using custom port --- src/psm/Service/Database.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/psm/Service/Database.php b/src/psm/Service/Database.php index 16ff69fc..15cbf101 100644 --- a/src/psm/Service/Database.php +++ b/src/psm/Service/Database.php @@ -90,7 +90,7 @@ class Database { function __construct($host = null, $user = null, $pass = null, $db = null, $port = null) { if($host != null && $user != null && $pass !== null && $db != null) { $this->db_host = $host; - $this->db_port = $port || 3306; + $this->db_port = (!empty($port)) ? $port : 3306; $this->db_name = $db; $this->db_user = $user; $this->db_pass = $pass;