Merge branch 'release/3.4.3' into production

CHANGELOG.rst

@@ -4,22 +4,31 @@ Changelog
 
 Not yet released
 ----------------
+\-
+
+v3.4.3 (released September 26, 2019)
+------------------------------------
+
+* b399327c: Fixed week/month/year graph.
+* 4ebe934b: Added timeout to services.
+* 8342a979: Changed auto-refresh_help to uniform name.
+* 5d668b78: Fixed auto-refresh.
+* #777: Fix pushover_status checkbox population from config.
 
 v3.4.2 (released September 24, 2019)
---------------------------------
+------------------------------------
 
 * 1b0d86b: Fixed wrong upgrade query and added forgotten version_compare.
 
-
 v3.4.1 (released September 17, 2019)
---------------------------------
+------------------------------------
 
 * #733: Added catalan ca_ES.lang.php.
 * 6c1763e: Updated table style.
 * #770: Changed last_output column to TEXT and restricted to 5000 characters.
 
 v3.4.0 (released September 17, 2019)
---------------------------------
+------------------------------------
 
 * #741: Truncate server output.
 * accd556: Fixed typo in es_ES.lang.php.
@@ -72,7 +81,7 @@ v3.4.0 (released September 17, 2019)
 * f6173d4: Added license to composer.json file.
 
 v3.3.1 (released August 10, 2018)
---------------------------------
+---------------------------------
 
 * #403: Removed default mysql port settings from files and left empty values.
 * 5e61d89: Defined $encrypted_password.
@@ -98,7 +107,7 @@ v3.3.1 (released August 10, 2018)
 * b98a4af: Typo fix.
 
 v3.3.0 (released May 30, 2018)
---------------------------------
+------------------------------
 
 * 57f4c36: Added support for the following SMS gateways: Plivo, SolutionsInfini, Callr and GatewayAPI.
 * c3751e7: Moved Clickatell api key to password field.

README.rst

@@ -5,7 +5,7 @@ PHP Server Monitor
    :alt: Join the chat at https://gitter.im/erickrf/nlpnet
    :target: https://gitter.im/phpservermon/phpservermon
 
-Version 3.4.2 (Updated design!)
+Version 3.4.3 (Updated design!)
 
 
 PHP Server Monitor is a script that checks whether your websites and servers are up and running.

docs/conf.py

@@ -51,7 +51,7 @@ copyright = u'2008-2017, Pepijn Over'
 # built documents.
 #
 # The short X.Y version.
-version = '3.4.2'
+version = '3.4.3'
 # The full version, including alpha/beta/rc tags.
 release = version
 

src/includes/psmconfig.inc.php

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

src/lang/bg_BG.lang.php

@@ -240,7 +240,7 @@ $sm_lang = array(
 		'settings_notification' => 'Настройки на известията',
 		'settings_log' => 'Настройки на логовете',
 		'auto_refresh' => 'Автоматично опресняване',
-		'auto_refresh_servers' =>
+		'auto_refresh_description' =>
 			'Автоматично опресняване на страницата.<br>'.
 			'<span class="small">'.
 			'Времето е в секунди, ако е 0 страницата няма да се обновява.'.

src/lang/ca_ES.lang.php

@@ -303,7 +303,7 @@ $sm_lang = array(
 		'settings_log' => 'Preferències de LOG',
 		'settings_proxy' => 'Preferències de Proxy',
 		'auto_refresh' => 'Auto-recàrrega',
-		'auto_refresh_servers' => 'Recarregar automàticament la plana Servidors.<br/><span class="small">Temps en segons, si poseu ZERO la plana no s\'auto-recarregarà.</span>',
+		'auto_refresh_description' => 'Recarregar automàticament la plana Servidors.<br/><span class="small">Temps en segons, si poseu ZERO la plana no s\'auto-recarregarà.</span>',
 		'seconds' => 'segons',
 		'test' => 'Provar',
 		'test_email' => 'S\'enviarà un correu a l\'adreça que teniu al vostre perfil d\'usuari.',

src/lang/cs_CZ.lang.php

@@ -252,7 +252,7 @@ $sm_lang = array(
 		'settings_notification' => 'Nastavení upozornění',
 		'settings_log' => 'Nastavení logu',
 		'auto_refresh' => 'Automaticky obnovit',
-		'auto_refresh_servers' =>
+		'auto_refresh_description' =>
 			'Automaticky obnovit stránku Servery.<br>'.
 			'<span class="small">'.
 			'Čas v sekundách, 0 pro vypnutí automatického obnovení.'.

src/lang/da_DK.lang.php

@@ -238,7 +238,7 @@ $sm_lang = array(
 		'settings_notification' => 'Meddelelse indstillinger',
 		'settings_log' => 'Log indstillinger',
 		'auto_refresh' => 'Genopfrisk automatisk',
-		'auto_refresh_servers' =>
+		'auto_refresh_description' =>
 			'Genopfrisk automatisk serversider.<br>'.
 			'<span class="small">'.
 			'Tid i sekunder. Hvis 0 vil siden ikke genopfriske automatisk'.

src/lang/de_DE.lang.php

@@ -241,7 +241,7 @@ $sm_lang = array(
 		'settings_notification' => 'Benachrichtigungseinstellungen',
 		'settings_log' => 'Protokollierungseinstellungen',
 		'auto_refresh' => 'Automatische Aktualisierung',
-		'auto_refresh_servers' =>
+		'auto_refresh_description' =>
 			'Automatische Aktualisierung der Server-Übersichtsseite<br>'.
 			'<span class="small">'.
 			'Zeit in Sekunden - die Ziffer \'0\' deaktiviert die automatische Aktualisierung.'.

src/lang/en_US.lang.php

@@ -314,7 +314,7 @@ $sm_lang = array(
 		'settings_log' => 'Log settings',
 		'settings_proxy' => 'Proxy settings',
 		'auto_refresh' => 'Auto-refresh',
-		'auto_refresh_servers' =>
+		'auto_refresh_description' =>
 			'Auto-refresh servers page.<br>'.
 			'<span class="small">'.
 			'Time in seconds, if 0 the page won\'t refresh.'.

src/lang/es_ES.lang.php

@@ -312,7 +312,7 @@ $sm_lang = array(
 		'settings_log' => 'Configuración de registros',
 		'settings_proxy' => 'Configuración del proxy',
 		'auto_refresh' => 'Auto-actualizar',
-		'auto_refresh_servers' => 'Auto-actualizar la página de servidores.<br><span class="small">Tiempo en segundos, si se utiliza 0 la página no se actualizará.</span>',
+		'auto_refresh_description' => 'Auto-actualizar la página de servidores.<br><span class="small">Tiempo en segundos, si se utiliza 0 la página no se actualizará.</span>',
 		'seconds' => 'segundos',
 		'test' => 'Prueba',
 		'test_email' => 'Un correo electrónico será enviado a la dirección especificada en su perfil de usuario.',

src/lang/et_ET.lang.php

@@ -227,7 +227,7 @@ $sm_lang = array(
 		'settings_notification' => 'Teavituste seaded',
 		'settings_log' => 'Logi seaded',
 		'auto_refresh' => 'Automaatne värskendamine',
-		'auto_refresh_servers' =>
+		'auto_refresh_description' =>
 			'Värskenda lehte automaatselt.<br>'.
 			'<span class="small">'.
 			'Aeg sekundites, kui 0 siis lehte ei värskendata.'.

src/lang/fa_IR.lang.php

@@ -227,7 +227,7 @@ $sm_lang = array(
 		'settings_notification' => 'تنظیمات اطلاعیه ها',
 		'settings_log' => 'تنظیمات لاگ',
 		'auto_refresh' => 'رفرش خودکار',
-		'auto_refresh_servers' =>
+		'auto_refresh_description' =>
 			'رفرش خودکار صفحه سرورها.<br>'.
 			'<span class="small">'.
 			'زمان به ثنیه, اگر 0 باشد صفحه رفرش نخواهد شد.'.

src/lang/fi_FI.lang.php

@@ -227,7 +227,7 @@ $sm_lang = array(
 		'settings_notification' => 'Ilmoitusasetukset',
 		'settings_log' => 'Tapahtumamerkintöjen asetukset',
 		'auto_refresh' => 'Automaattipäivitys',
-		'auto_refresh_servers' =>
+		'auto_refresh_description' =>
 			'Päivittää automaattisesti palvelimet-sivun.<br>'.
 			'<span class="small">'.
 			'Aika sekunteina, jos 0, sivu ei päivity automaattisesti.'.

src/lang/fr_FR.lang.php

@@ -241,7 +241,7 @@ $sm_lang = array(
 		'settings_notification' => 'Configuration des notifications',
 		'settings_log' => 'Configuration des événements',
 		'auto_refresh' => 'Auto-rachaîchissement',
-		'auto_refresh_servers' =>
+		'auto_refresh_description' =>
 			'Auto-rachaîchissement de la page serveurs.<br>'.
 			'<span class="small">'.
 			'Temps en secondes. Si 0, la page n\'est pas rafraîchie.'.

src/lang/it_IT.lang.php

@@ -240,7 +240,7 @@ $sm_lang = array(
 		'settings_notification' => 'Impostazioni Notifiche',
 		'settings_log' => 'Impostazioni Log',
 		'auto_refresh' => 'Auto-Aggiornamento',
-		'auto_refresh_servers' =>
+		'auto_refresh_description' =>
 			'Auto-Aggiornamento pagina servers.<br>'.
 			'<span class="small">'.
 			'Tempo in secondi, se impostato a 0 la pagina non si aggiornerà.'.

src/lang/ja_JP.lang.php

@@ -309,7 +309,7 @@ $sm_lang = array(
 		'settings_log' => 'ログ設定',
 		'settings_proxy' => 'プロキシ設定',
 		'auto_refresh' => '自動更新',
-		'auto_refresh_servers' =>
+		'auto_refresh_description' =>
 			'サーバーページを自動更新します。<br>'.
 			'<span class="small">'.
 			'時間を秒で指定し、0に設定すると更新しません。'.

src/lang/ko_KR.lang.php

@@ -240,7 +240,7 @@ $sm_lang = array(
 		'settings_notification' => '알림 설정',
 		'settings_log' => '로그 설정',
 		'auto_refresh' => 'Auto-refresh',
-		'auto_refresh_servers' =>
+		'auto_refresh_description' =>
 			'서버페이지를 자동으로 새로고침.<br>'.
 			'<span class="small">'.
 			'시간은 초(sec)로 설정을 하고, 0은 새로고침을 하지 않습니다.'.

src/lang/nl_NL.lang.php

@@ -281,7 +281,7 @@ $sm_lang = array(
 		'settings_log' => 'Log instellingen',
 		'settings_proxy' => 'Proxy instellingen',
 		'auto_refresh' => 'Herlaad automatisch',
-		'auto_refresh_servers' => 'Auto-herladen servers pagina.<br><span class="small">Tijd in seconden, als de tijd 0 is wordt de pagina niet ververst.</span>',
+		'auto_refresh_description' => 'Auto-herladen servers pagina.<br><span class="small">Tijd in seconden, als de tijd 0 is wordt de pagina niet ververst.</span>',
 		'seconds' => 'seconden',
 		'test' => 'Test',
 		'test_email' => 'Er zal een email verstuurd worden naar het email adres in je profiel.',

src/lang/no_NB.lang.php

@@ -292,7 +292,7 @@ $sm_lang = array(
 		'settings_log' => 'Logg innstillinger',
 		'settings_proxy' => 'Proxy innstillinger',
 		'auto_refresh' => 'Auto-refresh',
-		'auto_refresh_servers' =>
+		'auto_refresh_description' =>
 			'Auto-refresh server side.<br>'.
 			'<span class="small">'.
 			'Tid i sekunder, hvis 0 siden ikke blir oppdatert.'.

src/lang/pl_PL.lang.php

@@ -240,7 +240,7 @@ $sm_lang = array(
 		'settings_notification' => 'Ustawienia powiadomień',
 		'settings_log' => 'Ustawienia Logowania',
 		'auto_refresh' => 'Auto-odświeżanie',
-		'auto_refresh_servers' =>
+		'auto_refresh_description' =>
 			'Auto-odświeżanie strony serwera.<br>'.
 			'<span class="small">'.
 			'Czas w sekundach, dla czasu 0 strona nie będzie odświeżana.'.

src/lang/pt_BR.lang.php

@@ -240,7 +240,7 @@ $sm_lang = array(
 		'settings_notification' => 'Configuração de notificações',
 		'settings_log' => 'Configuração de Logs',
 		'auto_refresh' => 'Atualizar automaticamente',
-		'auto_refresh_servers' =>
+		'auto_refresh_description' =>
 			'Atualizar automaticamente a página de servidores.<br>'.
 			'<span class="small">'.
 			'Tempo em segundos, Se 0 a página não será atualizada.'.

src/lang/ru_RU.lang.php

@@ -293,7 +293,7 @@ $sm_lang = array(
 		'settings_log' => 'Настройка логирования',
 		'settings_proxy' => 'Настройка прокси',
 		'auto_refresh' => 'Авто-обновление',
-		'auto_refresh_servers' =>
+		'auto_refresh_description' =>
 			'Авто-обновление страницы статуса серверов.<br>'.
 			'<span class="small">'.
 			'Время в секундах. Если указано 0, то страница не будет обновляться.'.

src/lang/sk_SK.lang.php

@@ -240,7 +240,7 @@ $sm_lang = array(
 		'settings_notification' => 'Nastavenie upozornení',
 		'settings_log' => 'Nastavenie logu',
 		'auto_refresh' => 'Automaticky obnoviť',
-		'auto_refresh_servers' =>
+		'auto_refresh_description' =>
 			'Automaticky obnoviť stránku Servery.<br>'.
 			'<span class="small">'.
 			'Čas v sekundách, 0 pre vypnutie automatického obnovenia.'.

src/lang/sl_SI.lang.php

@@ -225,7 +225,7 @@ $sm_lang = array(
 		'settings_notification' => 'Nastavitve obvestil',
 		'settings_log' => 'Hramba dnevniških zapisov',
 		'auto_refresh' => 'Samodejno posodabljanje',
-		'auto_refresh_servers' =>
+		'auto_refresh_description' =>
 			'Samodejno posodabljanje pregleda statusa strežnikov.<br>'.
 			'<span class="small">'.
 			'Čas v sekundah. Če je vrednost 0 se stran ne bo samodejno posodabljala.'.

src/lang/sv_SE.lang.php

@@ -240,7 +240,7 @@ $sm_lang = array(
 		'settings_notification' => 'Meddelande-inställningar',
 		'settings_log' => 'Logg-inställningar',
 		'auto_refresh' => 'Auto-uppdatera',
-		'auto_refresh_servers' =>
+		'auto_refresh_description' =>
 			'Auto-uppdatera status-sidan.<br>'.
 			'<span class="small">'.
 			'Tid i sekunder, om "0" så uppdateras sidan inte automatiskt.'.

src/lang/tr_TR.lang.php

@@ -240,7 +240,7 @@ $sm_lang = array(
 		'settings_notification' => 'Bildirim ayarları',
 		'settings_log' => 'Log ayarları',
 		'auto_refresh' => 'Otomatik Yenileme',
-		'auto_refresh_servers' =>
+		'auto_refresh_description' =>
 			'Otomatik yenileme sunucu sayfası<br>'.
 			'<span class="small">'.
 			'Eğer sayfa yenilenmez ise.'.

src/lang/vi_VN.lang.php

@@ -225,7 +225,7 @@ $sm_lang = array(
 		'settings_notification' => 'Thiết lặp thông báo',
 		'settings_log' => 'Thiết lặp Log',
 		'auto_refresh' => 'Tự động làm mới',
-		'auto_refresh_servers' =>
+		'auto_refresh_description' =>
 			'Tự động làm mới servers page.<br>'.
 			'<span class="small">'.
 			'Trong vài giây, nếu 0 trang sẽ không làm mới.'.

src/lang/zh_CN.lang.php

@@ -260,7 +260,7 @@ $sm_lang = array(
 		'settings_log' => '日志设置',
 		'settings_proxy' => '代理设置',
 		'auto_refresh' => '自动刷新',
-		'auto_refresh_servers' =>
+		'auto_refresh_description' =>
 			'自动刷新服务器页.<br>'.
 			'<span class="small">'.
 			'单位为秒, 设置为 0 则不自动刷新.'.

src/psm/Module/Config/Controller/ConfigController.php

@@ -422,7 +422,7 @@ class ConfigController extends AbstractController {
 			'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_auto_refresh_description' => psm_get_lang('config', 'auto_refresh_description'),
 			'label_seconds' => psm_get_lang('config', 'seconds'),
 			'label_save' => psm_get_lang('system', 'save'),
 			'label_test' => psm_get_lang('config', 'test'),

src/psm/Util/Server/HistoryGraph.php

@@ -144,7 +144,7 @@ class HistoryGraph {
 		$month = new \DateTime('-1 month -1 week 0:0:0');
 		$year = new \DateTime('-1 year -1 week 0:0:0');
 
-		$records = $this->getRecords('history', $server_id, $month, $end_time);
+		$records = $this->getRecords('history', $server_id, $year, $end_time);
 
 		// dont add uptime for now because we have no way to calculate accurate uptimes for archived records
 		$data = $this->generateGraphLines($records, $lines, 'latency_avg', $start_time, $end_time, false);

src/psm/Util/Server/Updater/StatusUpdater.php

@@ -215,7 +215,7 @@ class StatusUpdater {
 		// save response time
 		$starttime = microtime(true);
 
-		$fp = @fsockopen($this->server['ip'], $this->server['port'], $errno, $this->error, 10);
+		$fp = @fsockopen($this->server['ip'], $this->server['port'], $errno, $this->error, $this->server['timeout']);
 
 		$status = ($fp === false) ? false : true;
 		$this->rtime = (microtime(true) - $starttime);

src/templates/default/main/body.tpl.html

@@ -57,7 +57,7 @@
 		{% endfor %}
 		<div class="container">
 			<div class="row">{{ html_sidebar|raw }}</div>
-			<div class="row">{{ html_content|raw }}</div>
+			<div class="row" id="content">{{ html_content|raw }}</div>
 		</div>
 	</main>
 	{% if add_footer %}

src/templates/default/module/config/config.tpl.html

@@ -39,7 +39,7 @@
                 <!-- Language -->
                 {{ macro.input_select("language", "language", label_language, languages, language_current) }}
                 <!-- Auto refresh -->
-                {{ macro.input_field("text", "auto_refresh", null, "auto_refresh", label_auto_refresh, auto_refresh, "0", "10", "auto_refresh_help", null, label_seconds) }}
+                {{ macro.input_field("number", "auto_refresh_servers", null, "auto_refresh_servers", label_auto_refresh, auto_refresh_servers, "0", "10", "auto_refresh_description", null, label_seconds) }}
                 <!-- Password encryption key -->
                 <!-- TODO how does the encryption function works currently? -->
                 {{ macro.input_field("text", "password_encrypt_key", null, "password_encrypt_key", label_password_encrypt_key, password_encrypt_key, "cab03a766...", "40", "password_encrypt_key_help", label_password_encrypt_key_note) }}
@@ -130,7 +130,7 @@
             <fieldset>
                 <legend>{{ label_settings_pushover }}</legend>
                 <!-- enable pushover -->
-                {{ macro.input_checkbox("pushover_status", "pushover_status", label_pushover_status, log_pushover_status) }}
+                {{ macro.input_checkbox("pushover_status", "pushover_status", label_pushover_status, pushover_status_checked) }}
                 <!-- enable pushover log -->
                 {{ macro.input_checkbox("log_pushover", "log_pushover", label_log_pushover, log_pushover_checked) }}
                 <!-- pushover key -->
@@ -156,4 +156,4 @@
         </div>
     </div>
     {{ macro.input_csrf() }}
-</form>
+</form>

src/templates/default/module/server/status/index.tpl.html

@@ -101,7 +101,7 @@ setInterval(function() {
 	$.ajax({
 		url:"?",
 		success: function(html, status) {
-			$("#page-container").html(html);
+			$("#content").html(html);
 		}
 	});
 }, {{ auto_refresh_seconds }} * 1000);