diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 0c0069f7..d10b3893 100644 --- 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 index 9e533a1a..4c008d4c 100644 --- a/cron/status.cron.php +++ b/cron/status.cron.php @@ -18,8 +18,8 @@ * along with PHP Server Monitor. If not, see . * * @package phpservermon - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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 index 7d554a16..1d3c554f 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -44,7 +44,7 @@ master_doc = 'index' # 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 index 16b5cd6c..1c5726e5 100644 --- a/docs/copyright.rst +++ b/docs/copyright.rst @@ -5,7 +5,7 @@ Copyright .. code-block:: none - Copyright (C) 2008-2014 Pepijn Over + Copyright (C) 2008-2017 Pepijn Over PHP Server Monitor is free software: you can redistribute it and/or modify diff --git a/docs/credits.rst b/docs/credits.rst index 42fe274e..1e12e784 100644 --- 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 index 1e68c8b0..ed223c87 100644 --- a/index.php +++ b/index.php @@ -18,8 +18,8 @@ * along with PHP Server Monitor. If not, see . * * @package phpservermon - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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 index b5a8bc4c..97a21476 100644 --- a/install.php +++ b/install.php @@ -18,8 +18,8 @@ * along with PHP Server Monitor. If not, see . * * @package phpservermon - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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 index e93b8a6d..ec134fe6 100644 --- a/src/bootstrap.php +++ b/src/bootstrap.php @@ -18,8 +18,8 @@ * along with PHP Server Monitor. If not, see . * * @package phpservermon - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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 old mode 100755 new mode 100644 index 02a84d22..b509929d --- a/src/includes/functions.inc.php +++ b/src/includes/functions.inc.php @@ -18,8 +18,8 @@ * along with PHP Server Monitor. If not, see . * * @package phpservermon - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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 index 047dc6e2..d68f15f9 100644 --- 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 - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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 index 6b8b0b03..3423aa30 100644 --- a/src/includes/psmconfig.inc.php +++ b/src/includes/psmconfig.inc.php @@ -18,8 +18,8 @@ * along with PHP Server Monitor. If not, see . * * @package phpservermon - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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 index eb73e964..89afc4c5 100644 --- 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 - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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 index f816f172..bb310bbc 100644 --- a/src/lang/cs_CZ.lang.php +++ b/src/lang/cs_CZ.lang.php @@ -20,7 +20,7 @@ * @package phpservermon * @author Simon Berka * @author Pavel Laupe Dvorak - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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 index b091d562..fd1059fb 100644 --- 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 + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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 index 885d6199..65da7201 100644 --- a/src/lang/de_DE.lang.php +++ b/src/lang/de_DE.lang.php @@ -19,7 +19,7 @@ * * @package phpservermon * @author Jean Pierre Kolb - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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 old mode 100755 new mode 100644 index 8c3eb986..b6089665 --- 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 . * * @package phpservermon - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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 index 8b77b20c..049d1f76 100644 --- a/src/lang/es_ES.lang.php +++ b/src/lang/es_ES.lang.php @@ -21,7 +21,7 @@ * @author Klemens Häckel * @author Luis Rodriguez * @author Mauro Vietri - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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 index ce5e6798..d8dfac49 100644 --- 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 + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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 index a25cca4a..b69f5ee6 100644 --- 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 + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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 index aa3e73c9..9d037ac8 100644 --- a/src/lang/fi_FI.lang.php +++ b/src/lang/fi_FI.lang.php @@ -19,7 +19,7 @@ * * @package phpservermon * @author Sami Nieminen - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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 index b540de9e..f6bc8220 100644 --- 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 - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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 index cf8353ef..4bb9f766 100644 --- a/src/lang/it_IT.lang.php +++ b/src/lang/it_IT.lang.php @@ -19,7 +19,7 @@ * * @package phpservermon * @author Marco Gargani - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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 index 53f7928a..99cfd94f 100644 --- 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 + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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 index f73bbdd4..4c87982e 100644 --- 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 . * * @package phpservermon - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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 index 3c22297f..c77cb7a5 100644 --- a/src/lang/pl_PL.lang.php +++ b/src/lang/pl_PL.lang.php @@ -19,7 +19,7 @@ * * @package phpservermon * @author Arkadiusz Klenczar - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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 index 74c58b99..1f2b325a 100644 --- 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 - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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 index 6ebf7b4e..b3347012 100644 --- a/src/lang/ru_RU.lang.php +++ b/src/lang/ru_RU.lang.php @@ -19,7 +19,7 @@ * * @package phpservermon * @author Roman Beylin - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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 index 4d720371..a5a0389d 100644 --- a/src/lang/sk_SK.lang.php +++ b/src/lang/sk_SK.lang.php @@ -19,7 +19,7 @@ * * @package phpservermon * @author Peter Misura - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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 index 074f6eff..a917be97 100644 --- a/src/lang/sl_SI.lang.php +++ b/src/lang/sl_SI.lang.php @@ -19,7 +19,7 @@ * * @package phpservermon * @author Matej Kovacic - * @copyright Copyright (c) 2008-2014 Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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 index 2c294514..0f0aa603 100644 --- 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 + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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 index 02b09b2d..f3f621a8 100644 --- a/src/lang/tr_TR.lang.php +++ b/src/lang/tr_TR.lang.php @@ -19,7 +19,7 @@ * * @package phpservermon * @author Haydar Kulekci - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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 index 29d745fd..f051de7e 100644 --- a/src/lang/vi_VN.lang.php +++ b/src/lang/vi_VN.lang.php @@ -19,9 +19,9 @@ * * @package phpservermon * @author Loi Le - * @copyright Copyright (c) 2008-2014 Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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 index fbb01528..17f73ec4 100644 --- a/src/lang/zh_CN.lang.php +++ b/src/lang/zh_CN.lang.php @@ -19,7 +19,7 @@ * * @package phpservermon * @author manhere - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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 index c4a44a25..ffe00447 100644 --- a/src/psm/Module/AbstractController.php +++ b/src/psm/Module/AbstractController.php @@ -18,8 +18,8 @@ * along with PHP Server Monitor. If not, see . * * @package phpservermon - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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 index 02f29e62..678b32d8 100644 --- 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 . * * @package phpservermon - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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 index 2fcaad1f..b030234f 100644 --- 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 . * * @package phpservermon - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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 index ba821adf..6ebefb71 100644 --- a/src/psm/Module/ControllerInterface.php +++ b/src/psm/Module/ControllerInterface.php @@ -18,8 +18,8 @@ * along with PHP Server Monitor. If not, see . * * @package phpservermon - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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/Error/Controller/ErrorController.php b/src/psm/Module/Error/Controller/ErrorController.php index bf12bc5f..684daa96 100644 --- a/src/psm/Module/Error/Controller/ErrorController.php +++ b/src/psm/Module/Error/Controller/ErrorController.php @@ -18,8 +18,8 @@ * along with PHP Server Monitor. If not, see . * * @package phpservermon - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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/Error/ErrorModule.php b/src/psm/Module/Error/ErrorModule.php index 8a315909..434831d5 100644 --- a/src/psm/Module/Error/ErrorModule.php +++ b/src/psm/Module/Error/ErrorModule.php @@ -18,8 +18,8 @@ * along with PHP Server Monitor. If not, see . * * @package phpservermon - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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/Install/Controller/InstallController.php b/src/psm/Module/Install/Controller/InstallController.php index 4849344d..81ec1f96 100644 --- a/src/psm/Module/Install/Controller/InstallController.php +++ b/src/psm/Module/Install/Controller/InstallController.php @@ -18,8 +18,8 @@ * along with PHP Server Monitor. If not, see . * * @package phpservermon - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @license http://www.gnu.org/licenses/gpl.txt GNU GPL v3 * @version Release: @package_version@ * @link http://www.phpservermonitor.org/ @@ -126,7 +126,7 @@ class InstallController extends AbstractController { 'db_user' => '', 'db_pass' => '', 'db_prefix' => 'psm_', - 'base_url' => '', + 'base_url' => $this->getBaseUrl(), ); $changed = false; @@ -275,7 +275,7 @@ class InstallController extends AbstractController { /** * Write config file with db variables - * @param array $db_vars prefix,user,pass,name,host + * @param array $array_config prefix,user,pass,name,host * @return boolean|string TRUE on success, string with config otherwise */ protected function writeConfigFile($array_config) { @@ -353,4 +353,14 @@ class InstallController extends AbstractController { return $version_from; } } + + /** + * Get base url of the current application + * @return string + */ + protected function getBaseUrl() { + $sym_request = \Symfony\Component\HttpFoundation\Request::createFromGlobals(); + + return $sym_request->getSchemeAndHttpHost() . $sym_request->getBasePath(); + } } diff --git a/src/psm/Module/Install/InstallModule.php b/src/psm/Module/Install/InstallModule.php index 347cd262..795f5498 100644 --- a/src/psm/Module/Install/InstallModule.php +++ b/src/psm/Module/Install/InstallModule.php @@ -18,8 +18,8 @@ * along with PHP Server Monitor. If not, see . * * @package phpservermon - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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/ModuleInterface.php b/src/psm/Module/ModuleInterface.php index 51cf86cc..a680973b 100644 --- a/src/psm/Module/ModuleInterface.php +++ b/src/psm/Module/ModuleInterface.php @@ -18,8 +18,8 @@ * along with PHP Server Monitor. If not, see . * * @package phpservermon - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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/Server/Controller/AbstractServerController.php b/src/psm/Module/Server/Controller/AbstractServerController.php index 79069e9c..de2160dc 100644 --- a/src/psm/Module/Server/Controller/AbstractServerController.php +++ b/src/psm/Module/Server/Controller/AbstractServerController.php @@ -18,8 +18,8 @@ * along with PHP Server Monitor. If not, see . * * @package phpservermon - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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/Server/Controller/LogController.php b/src/psm/Module/Server/Controller/LogController.php index ec1d3a36..e3d7db6c 100644 --- a/src/psm/Module/Server/Controller/LogController.php +++ b/src/psm/Module/Server/Controller/LogController.php @@ -18,8 +18,8 @@ * along with PHP Server Monitor. If not, see . * * @package phpservermon - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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/Server/Controller/ServerController.php b/src/psm/Module/Server/Controller/ServerController.php index 748f5434..aa24a2b4 100644 --- a/src/psm/Module/Server/Controller/ServerController.php +++ b/src/psm/Module/Server/Controller/ServerController.php @@ -18,8 +18,8 @@ * along with PHP Server Monitor. If not, see . * * @package phpservermon - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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/Server/Controller/StatusController.php b/src/psm/Module/Server/Controller/StatusController.php index 600e9be1..2d72a154 100644 --- a/src/psm/Module/Server/Controller/StatusController.php +++ b/src/psm/Module/Server/Controller/StatusController.php @@ -19,8 +19,8 @@ * * @package phpservermon * @author Michael Greenhill - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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/Server/Controller/UpdateController.php b/src/psm/Module/Server/Controller/UpdateController.php index e0b5b230..63f2c21b 100644 --- a/src/psm/Module/Server/Controller/UpdateController.php +++ b/src/psm/Module/Server/Controller/UpdateController.php @@ -19,8 +19,8 @@ * * @package phpservermon * @author Michael Greenhill - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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/Server/ServerModule.php b/src/psm/Module/Server/ServerModule.php index 9b645923..ef1ded99 100644 --- a/src/psm/Module/Server/ServerModule.php +++ b/src/psm/Module/Server/ServerModule.php @@ -18,8 +18,8 @@ * along with PHP Server Monitor. If not, see . * * @package phpservermon - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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/User/Controller/LoginController.php b/src/psm/Module/User/Controller/LoginController.php index d8cfc13e..e2235777 100644 --- a/src/psm/Module/User/Controller/LoginController.php +++ b/src/psm/Module/User/Controller/LoginController.php @@ -18,8 +18,8 @@ * along with PHP Server Monitor. If not, see . * * @package phpservermon - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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/User/Controller/ProfileController.php b/src/psm/Module/User/Controller/ProfileController.php index f7165104..0d4630e5 100644 --- a/src/psm/Module/User/Controller/ProfileController.php +++ b/src/psm/Module/User/Controller/ProfileController.php @@ -18,8 +18,8 @@ * along with PHP Server Monitor. If not, see . * * @package phpservermon - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @license http://www.gnu.org/licenses/gpl.txt GNU GPL v3 * @version Release: @package_version@ * @since phpservermon 3.0.0 diff --git a/src/psm/Module/User/Controller/UserController.php b/src/psm/Module/User/Controller/UserController.php index e7d093f2..ef71353c 100644 --- a/src/psm/Module/User/Controller/UserController.php +++ b/src/psm/Module/User/Controller/UserController.php @@ -18,8 +18,8 @@ * along with PHP Server Monitor. If not, see . * * @package phpservermon - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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/User/Event/UserEvent.php b/src/psm/Module/User/Event/UserEvent.php index 7f05cef1..6783dd7e 100644 --- a/src/psm/Module/User/Event/UserEvent.php +++ b/src/psm/Module/User/Event/UserEvent.php @@ -18,8 +18,8 @@ * along with PHP Server Monitor. If not, see . * * @package phpservermon - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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/User/EventListener/UserSubscriber.php b/src/psm/Module/User/EventListener/UserSubscriber.php index 55fd6d27..34ec5183 100644 --- a/src/psm/Module/User/EventListener/UserSubscriber.php +++ b/src/psm/Module/User/EventListener/UserSubscriber.php @@ -18,8 +18,8 @@ * along with PHP Server Monitor. If not, see . * * @package phpservermon - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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/User/UserEvents.php b/src/psm/Module/User/UserEvents.php index bfe4b124..f0816551 100644 --- a/src/psm/Module/User/UserEvents.php +++ b/src/psm/Module/User/UserEvents.php @@ -18,8 +18,8 @@ * along with PHP Server Monitor. If not, see . * * @package phpservermon - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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/User/UserModule.php b/src/psm/Module/User/UserModule.php index 11be0373..5e3f8f90 100644 --- a/src/psm/Module/User/UserModule.php +++ b/src/psm/Module/User/UserModule.php @@ -18,8 +18,8 @@ * along with PHP Server Monitor. If not, see . * * @package phpservermon - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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/Router.php b/src/psm/Router.php index 13e76c05..6743609a 100644 --- a/src/psm/Router.php +++ b/src/psm/Router.php @@ -18,8 +18,8 @@ * along with PHP Server Monitor. If not, see . * * @package phpservermon - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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/Service/Database.php b/src/psm/Service/Database.php index 15cbf101..57467f4a 100644 --- a/src/psm/Service/Database.php +++ b/src/psm/Service/Database.php @@ -18,8 +18,8 @@ * along with PHP Server Monitor. If not, see . * * @package phpservermon - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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/Service/User.php b/src/psm/Service/User.php index 55e3f074..be53ecf5 100644 --- a/src/psm/Service/User.php +++ b/src/psm/Service/User.php @@ -19,8 +19,8 @@ * * @package phpservermon * @author Panique - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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/Txtmsg/ClickSend.php b/src/psm/Txtmsg/ClickSend.php index 185bce81..59415c1d 100644 --- a/src/psm/Txtmsg/ClickSend.php +++ b/src/psm/Txtmsg/ClickSend.php @@ -19,7 +19,7 @@ * * @package phpservermon * @author Victor Macko - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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/Txtmsg/Clickatell.php b/src/psm/Txtmsg/Clickatell.php index 076eb4fb..e9b28073 100644 --- a/src/psm/Txtmsg/Clickatell.php +++ b/src/psm/Txtmsg/Clickatell.php @@ -18,8 +18,8 @@ * along with PHP Server Monitor. If not, see . * * @package phpservermon - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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/Txtmsg/Core.php b/src/psm/Txtmsg/Core.php index 8540f903..8f779504 100644 --- a/src/psm/Txtmsg/Core.php +++ b/src/psm/Txtmsg/Core.php @@ -18,8 +18,8 @@ * along with PHP Server Monitor. If not, see . * * @package phpservermon - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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/Txtmsg/FreeMobileSMS.php b/src/psm/Txtmsg/FreeMobileSMS.php old mode 100755 new mode 100644 index 9269d2c3..9f4cd0a4 --- a/src/psm/Txtmsg/FreeMobileSMS.php +++ b/src/psm/Txtmsg/FreeMobileSMS.php @@ -19,7 +19,7 @@ * * @package phpservermon * @author Michiel van der Wulp - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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/Txtmsg/FreeVoipDeal.php b/src/psm/Txtmsg/FreeVoipDeal.php index 1957a62d..f05b77d4 100755 --- a/src/psm/Txtmsg/FreeVoipDeal.php +++ b/src/psm/Txtmsg/FreeVoipDeal.php @@ -19,7 +19,7 @@ * * @package phpservermon * @author Michiel van der Wulp - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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/Txtmsg/Inetworx.php b/src/psm/Txtmsg/Inetworx.php index dca62efb..f9b9808e 100644 --- a/src/psm/Txtmsg/Inetworx.php +++ b/src/psm/Txtmsg/Inetworx.php @@ -18,8 +18,8 @@ * along with PHP Server Monitor. If not, see . * * @package phpservermon - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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/Txtmsg/Mollie.php b/src/psm/Txtmsg/Mollie.php index 1824c802..08981238 100644 --- a/src/psm/Txtmsg/Mollie.php +++ b/src/psm/Txtmsg/Mollie.php @@ -18,8 +18,8 @@ * along with PHP Server Monitor. If not, see . * * @package phpservermon - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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/Txtmsg/Mosms.php b/src/psm/Txtmsg/Mosms.php index 140c3747..becaaf12 100644 --- a/src/psm/Txtmsg/Mosms.php +++ b/src/psm/Txtmsg/Mosms.php @@ -19,7 +19,7 @@ * * @package phpservermon * @author Andreas Ek - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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/Txtmsg/Nexmo.class.php b/src/psm/Txtmsg/Nexmo.class.php index f2c7aa9f..9898b56f 100644 --- a/src/psm/Txtmsg/Nexmo.class.php +++ b/src/psm/Txtmsg/Nexmo.class.php @@ -19,7 +19,7 @@ * * @package phpservermon * @author Andreas Ek - * @copyright Copyright (c) 2008-2014 Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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/Txtmsg/Smsglobal.php b/src/psm/Txtmsg/Smsglobal.php index 56ebc35c..6ae92df5 100644 --- a/src/psm/Txtmsg/Smsglobal.php +++ b/src/psm/Txtmsg/Smsglobal.php @@ -19,7 +19,7 @@ * * @package phpservermon * @author Victor Macko - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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/Txtmsg/Smsgw.php b/src/psm/Txtmsg/Smsgw.php index 5fafb937..3eaa8f80 100644 --- a/src/psm/Txtmsg/Smsgw.php +++ b/src/psm/Txtmsg/Smsgw.php @@ -19,7 +19,7 @@ * * @package phpservermon * @author Daif Alotaibi - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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/Txtmsg/Smsit.php b/src/psm/Txtmsg/Smsit.php index 23a79927..99dd0d54 100644 --- a/src/psm/Txtmsg/Smsit.php +++ b/src/psm/Txtmsg/Smsit.php @@ -19,7 +19,7 @@ * * @package phpservermon * @author nerdalertdk - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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/Txtmsg/Spryng.php b/src/psm/Txtmsg/Spryng.php index 482aafba..35087277 100644 --- a/src/psm/Txtmsg/Spryng.php +++ b/src/psm/Txtmsg/Spryng.php @@ -18,8 +18,8 @@ * along with PHP Server Monitor. If not, see . * * @package phpservermon - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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/Txtmsg/Textmarketer.php b/src/psm/Txtmsg/Textmarketer.php index 55892449..5292491a 100644 --- a/src/psm/Txtmsg/Textmarketer.php +++ b/src/psm/Txtmsg/Textmarketer.php @@ -19,7 +19,7 @@ * * @package phpservermon * @author Perri Vardy-Mason - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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/Txtmsg/TxtmsgInterface.php b/src/psm/Txtmsg/TxtmsgInterface.php index 48962bd3..eed3441a 100644 --- a/src/psm/Txtmsg/TxtmsgInterface.php +++ b/src/psm/Txtmsg/TxtmsgInterface.php @@ -18,8 +18,8 @@ * along with PHP Server Monitor. If not, see . * * @package phpservermon - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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/Util/Install/Installer.php b/src/psm/Util/Install/Installer.php index eacbb410..66c649fe 100644 --- a/src/psm/Util/Install/Installer.php +++ b/src/psm/Util/Install/Installer.php @@ -18,8 +18,8 @@ * along with PHP Server Monitor. If not, see . * * @package phpservermon - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @license http://www.gnu.org/licenses/gpl.txt GNU GPL v3 * @version Release: @package_version@ * @link http://www.phpservermonitor.org/ @@ -78,7 +78,7 @@ class Installer { // different DB version, check if the version requires any changes // @todo this is currently a manual check for each version, similar to upgrade().. not a clean way - if(version_compare($version_db, '3.1.0', '<')) { + if(version_compare($version_db, '3.2.0', '<')) { return true; } else { // change database version to current version so this check won't be required next time diff --git a/src/psm/Util/Module/Modal.php b/src/psm/Util/Module/Modal.php index 2f5c1bf9..7cce8d48 100644 --- a/src/psm/Util/Module/Modal.php +++ b/src/psm/Util/Module/Modal.php @@ -18,9 +18,9 @@ * along with PHP Server Monitor. If not, see . * * @package phpservermon - * @author Pepijn Over + * @author Pepijn Over * @author Jérôme Cabanis - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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/Util/Module/ModalInterface.php b/src/psm/Util/Module/ModalInterface.php index be7b2576..d4cd0576 100644 --- a/src/psm/Util/Module/ModalInterface.php +++ b/src/psm/Util/Module/ModalInterface.php @@ -18,9 +18,9 @@ * along with PHP Server Monitor. If not, see . * * @package phpservermon - * @author Pepijn Over + * @author Pepijn Over * @author Jérôme Cabanis - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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/Util/Module/Sidebar.php b/src/psm/Util/Module/Sidebar.php index ffa19262..4985044d 100644 --- a/src/psm/Util/Module/Sidebar.php +++ b/src/psm/Util/Module/Sidebar.php @@ -18,8 +18,8 @@ * along with PHP Server Monitor. If not, see . * * @package phpservermon - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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/Util/Module/SidebarInterface.php b/src/psm/Util/Module/SidebarInterface.php index d6206463..9102bfaf 100644 --- a/src/psm/Util/Module/SidebarInterface.php +++ b/src/psm/Util/Module/SidebarInterface.php @@ -18,8 +18,8 @@ * along with PHP Server Monitor. If not, see . * * @package phpservermon - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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/Util/Server/ArchiveManager.php b/src/psm/Util/Server/ArchiveManager.php index 240a6ae7..94dbc54a 100644 --- a/src/psm/Util/Server/ArchiveManager.php +++ b/src/psm/Util/Server/ArchiveManager.php @@ -18,8 +18,8 @@ * along with PHP Server Monitor. If not, see . * * @package phpservermon - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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/Util/Server/Archiver/ArchiverInterface.php b/src/psm/Util/Server/Archiver/ArchiverInterface.php index e1a06da3..6007e1ad 100644 --- a/src/psm/Util/Server/Archiver/ArchiverInterface.php +++ b/src/psm/Util/Server/Archiver/ArchiverInterface.php @@ -18,8 +18,8 @@ * along with PHP Server Monitor. If not, see . * * @package phpservermon - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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/Util/Server/Archiver/LogsArchiver.php b/src/psm/Util/Server/Archiver/LogsArchiver.php index f705b9d6..619d7fa2 100644 --- a/src/psm/Util/Server/Archiver/LogsArchiver.php +++ b/src/psm/Util/Server/Archiver/LogsArchiver.php @@ -18,8 +18,8 @@ * along with PHP Server Monitor. If not, see . * * @package phpservermon - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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/Util/Server/Archiver/UptimeArchiver.php b/src/psm/Util/Server/Archiver/UptimeArchiver.php index e346c4d3..8b40bec9 100644 --- a/src/psm/Util/Server/Archiver/UptimeArchiver.php +++ b/src/psm/Util/Server/Archiver/UptimeArchiver.php @@ -18,9 +18,9 @@ * along with PHP Server Monitor. If not, see . * * @package phpservermon - * @author Pepijn Over + * @author Pepijn Over * Jérôme Cabanis - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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/Util/Server/HistoryGraph.php b/src/psm/Util/Server/HistoryGraph.php index 93cedc30..04ac531f 100644 --- a/src/psm/Util/Server/HistoryGraph.php +++ b/src/psm/Util/Server/HistoryGraph.php @@ -19,8 +19,8 @@ * * @package phpservermon * @author Jérôme Cabanis - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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/Util/Server/ServerValidator.php b/src/psm/Util/Server/ServerValidator.php index 4c97333f..819e3e63 100644 --- a/src/psm/Util/Server/ServerValidator.php +++ b/src/psm/Util/Server/ServerValidator.php @@ -18,8 +18,8 @@ * along with PHP Server Monitor. If not, see . * * @package phpservermon - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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/Util/Server/UpdateManager.php b/src/psm/Util/Server/UpdateManager.php index 13ea2d04..bb8ee4db 100644 --- a/src/psm/Util/Server/UpdateManager.php +++ b/src/psm/Util/Server/UpdateManager.php @@ -18,8 +18,8 @@ * along with PHP Server Monitor. If not, see . * * @package phpservermon - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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/Util/Server/Updater/StatusNotifier.php b/src/psm/Util/Server/Updater/StatusNotifier.php old mode 100755 new mode 100644 index 0edfde98..755b76ab --- a/src/psm/Util/Server/Updater/StatusNotifier.php +++ b/src/psm/Util/Server/Updater/StatusNotifier.php @@ -18,8 +18,8 @@ * along with PHP Server Monitor. If not, see . * * @package phpservermon - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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/Util/Server/Updater/StatusUpdater.php b/src/psm/Util/Server/Updater/StatusUpdater.php index ad787b2f..2088fd6e 100644 --- a/src/psm/Util/Server/Updater/StatusUpdater.php +++ b/src/psm/Util/Server/Updater/StatusUpdater.php @@ -18,8 +18,8 @@ * along with PHP Server Monitor. If not, see . * * @package phpservermon - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @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/Util/User/UserValidator.php b/src/psm/Util/User/UserValidator.php index 6b81dd56..138e1801 100644 --- a/src/psm/Util/User/UserValidator.php +++ b/src/psm/Util/User/UserValidator.php @@ -18,8 +18,8 @@ * along with PHP Server Monitor. If not, see . * * @package phpservermon - * @author Pepijn Over - * @copyright Copyright (c) 2008-2015 Pepijn Over + * @author Pepijn Over + * @copyright Copyright (c) 2008-2017 Pepijn Over * @license http://www.gnu.org/licenses/gpl.txt GNU GPL v3 * @version Release: @package_version@ * @link http://www.phpservermonitor.org/ diff --git a/src/templates/default/module/install/config_new.tpl.html b/src/templates/default/module/install/config_new.tpl.html index 200d45c3..c54bbe4c 100644 --- a/src/templates/default/module/install/config_new.tpl.html +++ b/src/templates/default/module/install/config_new.tpl.html @@ -27,7 +27,7 @@
- +