Commit Graph

195 Commits

Author SHA1 Message Date
Victor Macko 62acb604c6 Removed duplicate file 2016-07-07 00:21:26 +10:00
Victor Macko 3a1e8522a3 Added ClickSend SMS provider 2016-07-07 00:09:57 +10:00
Victor Macko dc132831d4 Merge branch 'develop' of github.com:phpservermon/phpservermon
Conflicts:
	src/includes/functions.inc.php
	src/lang/en_US.lang.php
	src/psm/Module/Config/Controller/ConfigController.class.php
	src/psm/Util/Server/Updater/StatusUpdater.php
	src/templates/config/config.tpl.html
2016-07-06 22:43:10 +10:00
Victor Macko 8e2698f4ce Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/lang/en_US.lang.php
#	src/psm/Txtmsg/Smsglobal.class.php
#	src/psm/Util/Updater/StatusNotifier.class.php
2016-07-06 22:37:50 +10:00
Valentin Deville d9557b4115
Add FreeMobile SMS 2016-07-04 14:31:42 +02:00
Samuel Denis-D'Ortun dcd552517b Merge branch 'davyrolink-201410_log-users' into develop 2016-05-21 20:34:16 -04:00
Samuel Denis-D'Ortun 953a7ddf57 Mute error when fsockopen fail to connect to host 2016-05-21 20:34:03 -04:00
Samuel Denis-D'Ortun c811876c89 Merge branch '201410_log-users' of https://github.com/davyrolink/phpservermon into davyrolink-201410_log-users
# Conflicts:
#	src/includes/psmconfig.inc.php
#	src/psm/Util/Install/Installer.php
2016-05-21 20:33:31 -04:00
Pavel Dvořák 24d7fee63e Use salt to encrypt the website check password #297 2016-05-21 19:55:35 -04:00
Samuel Denis-D'Ortun 9ded89b6a5 Improve password security by obfuscating it in the form #96 2016-05-21 16:55:12 -04:00
Pavel Dvořák 36b5229fcd Issue #96 Authentication fields for website/services
- Installer.php - Fixed install method
2016-05-21 18:11:57 +02:00
Pavel Dvořák 340660da4b Issue #96 Authentication fields for website/services
- File functions.inc.php - modified and added features psm_curl_get parameters for website_username and website_password
- File functions.inc.php - new features and psm_password_encrypt psm_password_decrypt to encrypt and decrypt passwords
- Adjusted basic language EN and supplemented by new language CZ phrase
- ConfigController.php - adjusted executeIndex method of password encryption key for each installation separately + executeSave method of saving the settings + added labels to methods getLabels
- AbstractServerController.php - adjusted method getServers a login password of the name
- ServerController.php - adjusted executeEdit method for storing information about name and password + executeSave method of storage in a database + method getLabels on labels
- Installer.php - adjusted method install a new configuration values ​​for the encryption key passwords + method installTables a new table structure servers + method upgrade320 the new structure
- StatusUpdater.php - adjusted method update the transmission website_username and website_password + method updateWebsite adjusted parameters passed to the function psm_curl_get
- Modified template: config/config.tpl.html, server/update.tpl.html, view.tpl.html
- Adapted javascript scripts.js
2016-05-21 17:08:01 +02:00
Samuel Denis-D'Ortun aac195e893 Merge branch 'master' into develop 2016-05-18 23:14:56 -04:00
Pavel Dvořák 5fc59454d0 Issue #286 Popular Ports
- scripts.js - selection and filling port based on a selection from the popular port
- update.tpl.html - Added section with a selection of popular ports
- ServerController.php - Methods to getLabels added new label
- en_US.lang.php + cs_CZ.lang.php - modified the language of the new texts
2016-05-18 23:04:50 -04:00
Samuel Denis-D'Ortun cbfd60871e Allow empty db password 2016-05-18 22:48:09 -04:00
Samuel Denis-D'Ortun bceb6ea3db Merge branch 'develop' of https://github.com/TechReanimate/phpservermon into TechReanimate-develop
# Conflicts:
#	README.rst
#	docs/credits.rst
#	docs/intro.rst
#	src/includes/functions.inc.php
#	src/lang/de_DE.lang.php
#	src/lang/en_US.lang.php
#	src/lang/es_ES.lang.php
#	src/lang/fr_FR.lang.php
#	src/lang/it_IT.lang.php
#	src/lang/nl_NL.lang.php
#	src/lang/pl_PL.lang.php
#	src/lang/pt_BR.lang.php
#	src/lang/ru_RU.lang.php
#	src/lang/sv_SE.lang.php
#	src/lang/tr_TR.lang.php
#	src/lang/zh_CN.lang.php
2016-05-15 05:15:32 -04:00
Victor Macko 7cf13e5b8a Case insensitive check 2016-03-30 12:25:40 +11:00
Victor Macko b77ffc95c3 Also use string comparison 2016-03-24 07:35:06 +11:00
Alexis U (portable) 87a576642c ajout mode premium 2016-03-15 15:11:52 +01:00
Alexis U (portable) 57a01d27c5 add support for Octopush sms provider 2016-03-15 13:00:07 +01:00
Pepijn Over 52803e2d70 adding language subtags to template and support for right-to-left locales 2016-01-31 17:48:59 +01:00
Pepijn Over 4be64dfa3a removing csrf key from login module to prevent 401 errors on login 2016-01-31 17:07:56 +01:00
Pep 653fe4f7b8 Merge pull request #195 from Esselans/develop
Improved translation & UTF email output
2016-01-31 00:28:04 +01:00
Pepijn Over 98faef1b06 fixes #237: adding CSRF token to all forms and requires now on POST 2016-01-31 00:24:37 +01:00
Pepijn Over b2ed873b1b on login, make sure to clear existing session vars and start from fresh (moving from migrate() to invalidate()) 2016-01-31 00:17:28 +01:00
Laurent a02ea03399 If pattern is set up, you cannot catch server problems
The need : to have 3 differents error codes :

- Timeout
- Http status code
- pattern not found.

The error of status code or timebout where overwritten by pattern, if set up
2015-06-01 00:22:10 +02:00
Mauro Vietri 0d3934108c Improved Spanish translation & add utf8 decoding before sending email notifications to correctly display special characters on subject and body 2015-04-21 08:07:30 -03:00
Luis Rodriguez 6a2a4c1898 Implement Nexmo SMS Issue #170 2015-02-28 21:05:18 -05:00
Pepijn Over ffd9cfc6c8 [refactoring] renaming initialize() and initializeAction() methods to run() to correspond with router naming 2015-02-27 17:11:37 +01:00
Pepijn Over 8505a34292 [event] adding experimental support for user events 2015-02-27 17:06:22 +01:00
Pepijn Over 1123603f64 [refactoring] PSR-4 support through composer, mass-renaming all *.class.php to *.php to adhere to PSR-4 2015-02-27 15:18:37 +01:00
Pepijn Over dc54bf14ea [refactoring] moving UpdateManger to service container as util.server.updatemanager 2015-02-27 15:05:46 +01:00
Pepijn Over f63a39d92c [refatoring] adding symfony service container and upgrading symfony packages to 2.6 2015-02-27 14:34:28 +01:00
Pepijn Over 51ff0f2044 updating copyright year in headers and email 2015-02-27 11:43:09 +01:00
Pepijn Over 390a8e6156 [txtmsg/freevoipdeal] issue #164: adding freevoipdeal to config dropdown 2015-02-27 11:43:04 +01:00
Pepijn Over d4843a2990 Merge branch 'develop' of git://github.com/mvdw/phpservermon into mvdw-develop 2015-02-27 11:18:47 +01:00
Pepijn Over 6548a16972 [module/server] issue #169: adding new server ip limit of 500 chars to upgrade script and changelog 2015-02-27 11:15:29 +01:00
Pepijn Over dc7036c39a Merge branch 'develop' of git://github.com/sudarshann/phpservermon into sudarshann-develop 2015-02-27 11:11:05 +01:00
Pepijn Over e3dc55220c fixing line endings 2015-02-27 11:07:11 +01:00
Sudarshan Anbazhagan 37aa55a472 updated maximum length of the server hostname
most of the urls I have are very long and it needs to have a larger value. 100 is simply not enough
2015-01-08 01:52:22 +05:30
Michiel van der Wulp 365131df40 correct text message 2014-12-11 22:13:35 +01:00
Michiel van der Wulp 419ba4a0cf added freevoipdeal support 2014-12-11 13:16:06 +01:00
Pepijn Over 391701721b issue #128: adding SSL/TLS support forr SMTP 2014-11-06 14:30:39 +01:00
Pepijn Over 54f5dbf8f3 issue #135: uptimes displayed above 100% because of unsorted uptime records 2014-11-06 14:00:09 +01:00
Davy Rolink 3cc48dff2d bugfix, missing $log_id 2014-10-02 22:00:08 +02:00
Davy Rolink 58b104c1fb log users displaying for the new log-users data structure 2014-10-02 21:33:51 +02:00
Davy Rolink aaa073d9fd 3.1.1 upgrade 2014-10-02 20:55:22 +02:00
Davy Rolink 6aabe1eca7 save log_users in a separate table, so that we can add additional data to each log_user in the near future 2014-10-02 09:32:21 +02:00
Davy Rolink 7585eb23e0 allow urls to be generated from cli, with the help of argument --uri= 2014-09-12 09:05:52 +02:00
Pepijn Over 16bba4b949 disable pushover by default on upgrade 2014-08-07 14:25:01 +02:00