preparing for 3.2.0 release

phpservermon · Apr 15, 2017 · 21dfc71 · 21dfc71
1 parent abd4d35
commit 21dfc71
Show file tree

Hide file tree

Showing 89 changed files with 166 additions and 150 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -3,12 +3,12 @@ Changelog
 
 
 not yet released
-----------------------------------
+----------------
 
 
 
-v3.2.0 not yet released
-----------------------------------
+v3.2.0 (released April 15, 2017)
+--------------------------------
 
 * #170: Implement Nexmo SMS.
 * #161: Added Swedish translation.
@@ -25,6 +25,7 @@ v3.2.0 not yet released
 * #269: Added Slovenian language 
 * #96:  Authentication for website checks
 
+
 v3.1.1 (released November 6, 2014)
 ----------------------------------
 

diff --git a/cron/status.cron.php b/cron/status.cron.php
@@ -18,8 +18,8 @@
  * along with PHP Server Monitor.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @package     phpservermon
- * @author      Pepijn Over <pep@peplab.net>
- * @copyright   Copyright (c) 2008-2015 Pepijn Over <pep@peplab.net>
+ * @author      Pepijn Over <pep@mailbox.org>
+ * @copyright   Copyright (c) 2008-2017 Pepijn Over <pep@mailbox.org>
  * @license     http://www.gnu.org/licenses/gpl.txt GNU GPL v3
  * @version     Release: @package_version@
  * @link        http://www.phpservermonitor.org/

diff --git a/docs/conf.py b/docs/conf.py
@@ -44,7 +44,7 @@
 
 # General information about the project.
 project = u'PHP Server Monitor'
-copyright = u'2008-2014, Pepijn Over'
+copyright = u'2008-2017, Pepijn Over'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

diff --git a/docs/copyright.rst b/docs/copyright.rst
@@ -5,7 +5,7 @@ Copyright
 
 .. code-block:: none
 
-    Copyright (C) 2008-2014 Pepijn Over <pep_at_neanderthal-technology.com>
+    Copyright (C) 2008-2017 Pepijn Over <pep_at_mailbox_org>
 
 
 PHP Server Monitor is free software: you can redistribute it and/or modify

diff --git a/docs/credits.rst b/docs/credits.rst
@@ -14,6 +14,10 @@ The following people have contributed to the development of PHP Server Monitor:
 
   * Creator and project maintainer
 
+* Samuel Denis-D'Ortun - https://github.com/sadortun
+
+ * Project developer
+
 * Jérôme Cabanis - https://github.com/Abawell
 
   * History graphs

diff --git a/index.php b/index.php
@@ -18,8 +18,8 @@
  * along with PHP Server Monitor.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @package     phpservermon
- * @author      Pepijn Over <pep@peplab.net>
- * @copyright   Copyright (c) 2008-2015 Pepijn Over <pep@peplab.net>
+ * @author      Pepijn Over <pep@mailbox.org>
+ * @copyright   Copyright (c) 2008-2017 Pepijn Over <pep@mailbox.org>
  * @license     http://www.gnu.org/licenses/gpl.txt GNU GPL v3
  * @version     Release: @package_version@
  * @link        http://www.phpservermonitor.org/

diff --git a/install.php b/install.php
@@ -18,8 +18,8 @@
  * along with PHP Server Monitor.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @package     phpservermon
- * @author      Pepijn Over <pep@peplab.net>
- * @copyright   Copyright (c) 2008-2015 Pepijn Over <pep@peplab.net>
+ * @author      Pepijn Over <pep@mailbox.org>
+ * @copyright   Copyright (c) 2008-2017 Pepijn Over <pep@mailbox.org>
  * @license     http://www.gnu.org/licenses/gpl.txt GNU GPL v3
  * @version     Release: @package_version@
  * @link        http://www.phpservermonitor.org/

diff --git a/src/bootstrap.php b/src/bootstrap.php
@@ -18,8 +18,8 @@
  * along with PHP Server Monitor.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @package     phpservermon
- * @author      Pepijn Over <pep@peplab.net>
- * @copyright   Copyright (c) 2008-2015 Pepijn Over <pep@peplab.net>
+ * @author      Pepijn Over <pep@mailbox.org>
+ * @copyright   Copyright (c) 2008-2017 Pepijn Over <pep@mailbox.org>
  * @license     http://www.gnu.org/licenses/gpl.txt GNU GPL v3
  * @version     Release: @package_version@
  * @link        http://www.phpservermonitor.org/

diff --git a/src/includes/functions.inc.php b/src/includes/functions.inc.php
@@ -18,8 +18,8 @@
  * along with PHP Server Monitor.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @package     phpservermon
- * @author      Pepijn Over <pep@peplab.net>
- * @copyright   Copyright (c) 2008-2015 Pepijn Over <pep@peplab.net>
+ * @author      Pepijn Over <pep@mailbox.org>
+ * @copyright   Copyright (c) 2008-2017 Pepijn Over <pep@mailbox.org>
  * @license     http://www.gnu.org/licenses/gpl.txt GNU GPL v3
  * @version     Release: @package_version@
  * @link        http://www.phpservermonitor.org/
@@ -570,9 +570,10 @@ function psm_build_url($params = array(), $urlencode = true, $htmlentities = tru
 		$url = ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off') || $_SERVER['SERVER_PORT'] == 443 ? 'https' : 'http') . '://' . $_SERVER['HTTP_HOST'];
 		// on Windows, dirname() adds both back- and forward slashes (http://php.net/dirname).
 		// for urls, we only want the forward slashes.
-		$url .= dirname($_SERVER['SCRIPT_NAME']) . '/';
+		$url .= dirname($_SERVER['SCRIPT_NAME']);
 		$url = str_replace('\\', '', $url);
 	}
+	$url = rtrim($url, '/') . '/';
 
 	if($params != null) {
 		$url .= '?';

diff --git a/src/includes/password_compatibility_library.inc.php b/src/includes/password_compatibility_library.inc.php
@@ -19,7 +19,7 @@
  *
  * @package     phpservermon
  * @author      Anthony Ferrara <ircmaxell@php.net>
- * @copyright   Copyright (c) 2008-2015 Pepijn Over <pep@peplab.net>
+ * @copyright   Copyright (c) 2008-2017 Pepijn Over <pep@mailbox.org>
  * @license     http://www.gnu.org/licenses/gpl.txt GNU GPL v3
  * @version     Release: @package_version@
  * @link        http://www.phpservermonitor.org/

diff --git a/src/includes/psmconfig.inc.php b/src/includes/psmconfig.inc.php
@@ -18,8 +18,8 @@
  * along with PHP Server Monitor.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @package     phpservermon
- * @author      Pepijn Over <pep@peplab.net>
- * @copyright   Copyright (c) 2008-2015 Pepijn Over <pep@peplab.net>
+ * @author      Pepijn Over <pep@mailbox.org>
+ * @copyright   Copyright (c) 2008-2017 Pepijn Over <pep@mailbox.org>
  * @license     http://www.gnu.org/licenses/gpl.txt GNU GPL v3
  * @version     Release: @package_version@
  * @link        http://www.phpservermonitor.org/

diff --git a/src/lang/bg_BG.lang.php b/src/lang/bg_BG.lang.php
@@ -19,7 +19,7 @@
  *
  * @package     phpservermon
  * @author      Plamen Vasilev a.k.a Paco <p.vasileff@gmail.com>
- * @copyright   Copyright (c) 2008-2015 Pepijn Over <pep@peplab.net>
+ * @copyright   Copyright (c) 2008-2017 Pepijn Over <pep@mailbox.org>
  * @license     http://www.gnu.org/licenses/gpl.txt GNU GPL v3
  * @version     Release: @package_version@
  * @link        http://www.phpservermonitor.org/

diff --git a/src/lang/cs_CZ.lang.php b/src/lang/cs_CZ.lang.php
@@ -20,7 +20,7 @@
  * @package     phpservermon
  * @author      Simon Berka <berka@berkasimon.com>
  * @author      Pavel Laupe Dvorak <pavel@pavel-dvorak.cz>
- * @copyright   Copyright (c) 2008-2015 Pepijn Over <pep@peplab.net>
+ * @copyright   Copyright (c) 2008-2017 Pepijn Over <pep@mailbox.org>
  * @license     http://www.gnu.org/licenses/gpl.txt GNU GPL v3
  * @version     Release: @package_version@
  * @link        http://www.phpservermonitor.org/

diff --git a/src/lang/da_DK.lang.php b/src/lang/da_DK.lang.php
@@ -19,9 +19,9 @@
  *
  * @package     phpservermon
  * @author      nerdalertdk
- * @copyright   Copyright (c) 2008-2014 Pepijn Over <pep@neanderthal-technology.com>
+ * @copyright   Copyright (c) 2008-2017 Pepijn Over <pep@mailbox.org>
  * @license     http://www.gnu.org/licenses/gpl.txt GNU GPL v3
- * @version     Release: v3.1.1
+ * @version     Release: @package_version@
  * @link        http://www.phpservermonitor.org/
  **/
 

diff --git a/src/lang/de_DE.lang.php b/src/lang/de_DE.lang.php
@@ -19,7 +19,7 @@
  *
  * @package     phpservermon
  * @author      Jean Pierre Kolb <http://www.jpkc.com/>
- * @copyright   Copyright (c) 2008-2015 Pepijn Over <pep@peplab.net>
+ * @copyright   Copyright (c) 2008-2017 Pepijn Over <pep@mailbox.org>
  * @license     http://www.gnu.org/licenses/gpl.txt GNU GPL v3
  * @version     Release: @package_version@
  * @link        http://www.phpservermonitor.org/

diff --git a/src/lang/en_US.lang.php b/src/lang/en_US.lang.php
@@ -18,8 +18,8 @@
  * along with PHP Server Monitor.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @package     phpservermon
- * @author      Pepijn Over <pep@peplab.net>
- * @copyright   Copyright (c) 2008-2015 Pepijn Over <pep@peplab.net>
+ * @author      Pepijn Over <pep@mailbox.org>
+ * @copyright   Copyright (c) 2008-2017 Pepijn Over <pep@mailbox.org>
  * @license     http://www.gnu.org/licenses/gpl.txt GNU GPL v3
  * @version     Release: @package_version@
  * @link        http://www.phpservermonitor.org/

diff --git a/src/lang/es_ES.lang.php b/src/lang/es_ES.lang.php
@@ -21,7 +21,7 @@
  * @author      Klemens Häckel <http://clickdimension.wordpress.com/>
  * @author      Luis Rodriguez <luis@techreanimate.com>
  * @author 		Mauro Vietri <mauro.vietri@outlook.com>
- * @copyright   Copyright (c) 2008-2015 Pepijn Over <pep@peplab.net>
+ * @copyright   Copyright (c) 2008-2017 Pepijn Over <pep@mailbox.org>
  * @license     http://www.gnu.org/licenses/gpl.txt GNU GPL v3
  * @version     Release: @package_version@
  * @link        http://www.phpservermonitor.org/

diff --git a/src/lang/et_ET.lang.php b/src/lang/et_ET.lang.php
@@ -19,7 +19,7 @@
  *
  * @package     phpservermon
  * @author      Richard A.
- * @copyright   Copyright (c) 2008-2014 Pepijn Over <pep@neanderthal-technology.com>
+ * @copyright   Copyright (c) 2008-2017 Pepijn Over <pep@mailbox.org>
  * @license     http://www.gnu.org/licenses/gpl.txt GNU GPL v3
  * @version     Release: @package_version@
  * @link        http://www.phpservermonitor.org/

diff --git a/src/lang/fa_IR.lang.php b/src/lang/fa_IR.lang.php
@@ -19,7 +19,7 @@
  *
  * @package     phpservermon
  * @author      Javad Evazzadeh Kakroudi
- * @copyright   Copyright (c) 2008-2015 Pepijn Over <pep@peplab.net>
+ * @copyright   Copyright (c) 2008-2017 Pepijn Over <pep@mailbox.org>
  * @license     http://www.gnu.org/licenses/gpl.txt GNU GPL v3
  * @version     Release: @package_version@
  * @link        http://www.phpservermonitor.org/

diff --git a/src/lang/fi_FI.lang.php b/src/lang/fi_FI.lang.php
@@ -19,7 +19,7 @@
  *
  * @package     phpservermon
  * @author      Sami Nieminen <nieminen.sami2@gmail.com>
- * @copyright   Copyright (c) 2008-2015 Pepijn Over <pep@peplab.net>
+ * @copyright   Copyright (c) 2008-2017 Pepijn Over <pep@mailbox.org>
  * @license     http://www.gnu.org/licenses/gpl.txt GNU GPL v3
  * @version     Release: @package_version@
  * @link        http://www.phpservermonitor.org/

diff --git a/src/lang/fr_FR.lang.php b/src/lang/fr_FR.lang.php
@@ -20,7 +20,7 @@
  * @package     phpservermon
  * @author      David Ribeiro
  * @author      Jérôme Cabanis <jerome@lauraly.com>
- * @copyright   Copyright (c) 2008-2015 Pepijn Over <pep@peplab.net>
+ * @copyright   Copyright (c) 2008-2017 Pepijn Over <pep@mailbox.org>
  * @license     http://www.gnu.org/licenses/gpl.txt GNU GPL v3
  * @version     Release: @package_version@
  * @link        http://www.phpservermonitor.org/

diff --git a/src/lang/it_IT.lang.php b/src/lang/it_IT.lang.php
@@ -19,7 +19,7 @@
  *
  * @package     phpservermon
  * @author      Marco Gargani <http://www.marcogargani.it>
- * @copyright   Copyright (c) 2008-2015 Pepijn Over <pep@peplab.net>
+ * @copyright   Copyright (c) 2008-2017 Pepijn Over <pep@mailbox.org>
  * @license     http://www.gnu.org/licenses/gpl.txt GNU GPL v3
  * @version     Release: @package_version@
  * @link        http://www.phpservermonitor.org/

diff --git a/src/lang/ko_KR.lang.php b/src/lang/ko_KR.lang.php
@@ -19,7 +19,7 @@
  *
  * @package     phpservermon
  * @author      Ik-Jun
- * @copyright   Copyright (c) 2008-2015 Pepijn Over <pep@peplab.net>
+ * @copyright   Copyright (c) 2008-2017 Pepijn Over <pep@mailbox.org>
  * @license     http://www.gnu.org/licenses/gpl.txt GNU GPL v3
  * @version     Release: @package_version@
  * @link        http://www.phpservermonitor.org/

diff --git a/src/lang/nl_NL.lang.php b/src/lang/nl_NL.lang.php
@@ -18,8 +18,8 @@
  * along with PHP Server Monitor.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @package     phpservermon
- * @author      Pepijn Over <pep@peplab.net>
- * @copyright   Copyright (c) 2008-2015 Pepijn Over <pep@peplab.net>
+ * @author      Pepijn Over <pep@mailbox.org>
+ * @copyright   Copyright (c) 2008-2017 Pepijn Over <pep@mailbox.org>
  * @license     http://www.gnu.org/licenses/gpl.txt GNU GPL v3
  * @version     Release: @package_version@
  * @link        http://www.phpservermonitor.org/

diff --git a/src/lang/pl_PL.lang.php b/src/lang/pl_PL.lang.php
@@ -19,7 +19,7 @@
  *
  * @package     phpservermon
  * @author      Arkadiusz Klenczar <a.klenczar@gmail.com>
- * @copyright   Copyright (c) 2008-2015 Pepijn Over <pep@peplab.net>
+ * @copyright   Copyright (c) 2008-2017 Pepijn Over <pep@mailbox.org>
  * @license     http://www.gnu.org/licenses/gpl.txt GNU GPL v3
  * @version     Release: @package_version@
  * @link        http://www.phpservermonitor.org/

diff --git a/src/lang/pt_BR.lang.php b/src/lang/pt_BR.lang.php
@@ -19,7 +19,7 @@
  *
  * @package     phpservermon
  * @author      Luiz Alberto S. Ribeiro <madeinnordeste@gmail.com>
- * @copyright   Copyright (c) 2008-2015 Pepijn Over <pep@peplab.net>
+ * @copyright   Copyright (c) 2008-2017 Pepijn Over <pep@mailbox.org>
  * @license     http://www.gnu.org/licenses/gpl.txt GNU GPL v3
  * @version     Release: @package_version@
  * @link        http://www.phpservermonitor.org/

diff --git a/src/lang/ru_RU.lang.php b/src/lang/ru_RU.lang.php
@@ -19,7 +19,7 @@
  *
  * @package     phpservermon
  * @author      Roman Beylin <roman.beylin@yandex.ru>
- * @copyright   Copyright (c) 2008-2015 Pepijn Over <pep@peplab.net>
+ * @copyright   Copyright (c) 2008-2017 Pepijn Over <pep@mailbox.org>
  * @license     http://www.gnu.org/licenses/gpl.txt GNU GPL v3
  * @version     Release: @package_version@
  * @link        http://www.phpservermonitor.org/

diff --git a/src/lang/sk_SK.lang.php b/src/lang/sk_SK.lang.php
@@ -19,7 +19,7 @@
  *
  * @package     phpservermon
  * @author      Peter Misura <bzurko@gmail.com>
- * @copyright   Copyright (c) 2008-2015 Pepijn Over <pep@peplab.net>
+ * @copyright   Copyright (c) 2008-2017 Pepijn Over <pep@mailbox.org>
  * @license     http://www.gnu.org/licenses/gpl.txt GNU GPL v3
  * @version     Release: @package_version@
  * @link        http://www.phpservermonitor.org/

diff --git a/src/lang/sl_SI.lang.php b/src/lang/sl_SI.lang.php
@@ -19,7 +19,7 @@
  *
  * @package     phpservermon
  * @author      Matej Kovacic <https://github.com/MatejKovacic>
- * @copyright   Copyright (c) 2008-2014 Pepijn Over <pep@neanderthal-technology.com>
+ * @copyright   Copyright (c) 2008-2017 Pepijn Over <pep@mailbox.org>
  * @license     http://www.gnu.org/licenses/gpl.txt GNU GPL v3
  * @version     Release: @package_version@
  * @link        http://www.phpservermonitor.org/

diff --git a/src/lang/sv_SE.lang.php b/src/lang/sv_SE.lang.php
@@ -19,7 +19,7 @@
  *
  * @package     phpservermon
  * @author      andlil
- * @copyright   Copyright (c) 2008-2015 Pepijn Over <pep@peplab.net>
+ * @copyright   Copyright (c) 2008-2017 Pepijn Over <pep@mailbox.org>
  * @license     http://www.gnu.org/licenses/gpl.txt GNU GPL v3
  * @version     Release: @package_version@
  * @link        http://www.phpservermonitor.org/

diff --git a/src/lang/tr_TR.lang.php b/src/lang/tr_TR.lang.php
@@ -19,7 +19,7 @@
  *
  * @package     phpservermon
  * @author      Haydar Kulekci <haydarkulekci@gmail.com>
- * @copyright   Copyright (c) 2008-2015 Pepijn Over <pep@peplab.net>
+ * @copyright   Copyright (c) 2008-2017 Pepijn Over <pep@mailbox.org>
  * @license     http://www.gnu.org/licenses/gpl.txt GNU GPL v3
  * @version     Release: @package_version@
  * @link        http://www.phpservermonitor.org/

diff --git a/src/lang/vi_VN.lang.php b/src/lang/vi_VN.lang.php
@@ -19,9 +19,9 @@
  *
  * @package     phpservermon
  * @author      Loi Le <lploi91@gmail.com>
- * @copyright   Copyright (c) 2008-2014 Pepijn Over <pep@neanderthal-technology.com>
+ * @copyright   Copyright (c) 2008-2017 Pepijn Over <pep@mailbox.org>
  * @license     http://www.gnu.org/licenses/gpl.txt GNU GPL v3
- * @version     Release: v3.1.1
+ * @version     Release: @package_version@
  * @link        http://www.phpservermonitor.org/
  **/
 

diff --git a/src/lang/zh_CN.lang.php b/src/lang/zh_CN.lang.php
@@ -19,7 +19,7 @@
  *
  * @package     phpservermon
  * @author      manhere <https://github.com/manhere>
- * @copyright   Copyright (c) 2008-2015 Pepijn Over <pep@peplab.net>
+ * @copyright   Copyright (c) 2008-2017 Pepijn Over <pep@mailbox.org>
  * @license     http://www.gnu.org/licenses/gpl.txt GNU GPL v3
  * @version     Release: @package_version@
  * @link        http://www.phpservermonitor.org/

diff --git a/src/psm/Module/AbstractController.php b/src/psm/Module/AbstractController.php
@@ -18,8 +18,8 @@
  * along with PHP Server Monitor.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @package     phpservermon
- * @author      Pepijn Over <pep@peplab.net>
- * @copyright   Copyright (c) 2008-2015 Pepijn Over <pep@peplab.net>
+ * @author      Pepijn Over <pep@mailbox.org>
+ * @copyright   Copyright (c) 2008-2017 Pepijn Over <pep@mailbox.org>
  * @license     http://www.gnu.org/licenses/gpl.txt GNU GPL v3
  * @version     Release: @package_version@
  * @link        http://www.phpservermonitor.org/

diff --git a/src/psm/Module/Config/ConfigModule.php b/src/psm/Module/Config/ConfigModule.php
@@ -18,8 +18,8 @@
  * along with PHP Server Monitor.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @package     phpservermon
- * @author      Pepijn Over <pep@peplab.net>
- * @copyright   Copyright (c) 2008-2015 Pepijn Over <pep@peplab.net>
+ * @author      Pepijn Over <pep@mailbox.org>
+ * @copyright   Copyright (c) 2008-2017 Pepijn Over <pep@mailbox.org>
  * @license     http://www.gnu.org/licenses/gpl.txt GNU GPL v3
  * @version     Release: @package_version@
  * @link        http://www.phpservermonitor.org/

diff --git a/src/psm/Module/Config/Controller/ConfigController.php b/src/psm/Module/Config/Controller/ConfigController.php
@@ -18,8 +18,8 @@
  * along with PHP Server Monitor.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @package     phpservermon
- * @author      Pepijn Over <pep@peplab.net>
- * @copyright   Copyright (c) 2008-2015 Pepijn Over <pep@peplab.net>
+ * @author      Pepijn Over <pep@mailbox.org>
+ * @copyright   Copyright (c) 2008-2017 Pepijn Over <pep@mailbox.org>
  * @license     http://www.gnu.org/licenses/gpl.txt GNU GPL v3
  * @version     Release: @package_version@
  * @link        http://www.phpservermonitor.org/

diff --git a/src/psm/Module/ControllerInterface.php b/src/psm/Module/ControllerInterface.php
@@ -18,8 +18,8 @@
  * along with PHP Server Monitor.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @package     phpservermon
- * @author      Pepijn Over <pep@peplab.net>
- * @copyright   Copyright (c) 2008-2015 Pepijn Over <pep@peplab.net>
+ * @author      Pepijn Over <pep@mailbox.org>
+ * @copyright   Copyright (c) 2008-2017 Pepijn Over <pep@mailbox.org>
  * @license     http://www.gnu.org/licenses/gpl.txt GNU GPL v3
  * @version     Release: @package_version@
  * @link        http://www.phpservermonitor.org/