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
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
dcd552517b
Merge branch 'davyrolink-201410_log-users' into develop
2016-05-21 20:34:16 -04:00
953a7ddf57
Mute error when fsockopen fail to connect to host
2016-05-21 20:34:03 -04:00
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
24d7fee63e
Use salt to encrypt the website check password #297
2016-05-21 19:55:35 -04:00
36b5229fcd
Issue #96 Authentication fields for website/services
...
- Installer.php - Fixed install method
2016-05-21 18:11:57 +02:00
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
7cf13e5b8a
Case insensitive check
2016-03-30 12:25:40 +11:00
b77ffc95c3
Also use string comparison
2016-03-24 07:35:06 +11:00
653fe4f7b8
Merge pull request #195 from Esselans/develop
...
Improved translation & UTF email output
2016-01-31 00:28:04 +01:00
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
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
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
dc54bf14ea
[refactoring] moving UpdateManger to service container as util.server.updatemanager
2015-02-27 15:05:46 +01:00
51ff0f2044
updating copyright year in headers and email
2015-02-27 11:43:09 +01:00
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
dc7036c39a
Merge branch 'develop' of git://github.com/sudarshann/phpservermon into sudarshann-develop
2015-02-27 11:11:05 +01:00
e3dc55220c
fixing line endings
2015-02-27 11:07:11 +01:00
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
391701721b
issue #128 : adding SSL/TLS support forr SMTP
2014-11-06 14:30:39 +01:00
54f5dbf8f3
issue #135 : uptimes displayed above 100% because of unsorted uptime records
2014-11-06 14:00:09 +01:00
3cc48dff2d
bugfix, missing $log_id
2014-10-02 22:00:08 +02:00
aaa073d9fd
3.1.1 upgrade
2014-10-02 20:55:22 +02:00
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
7585eb23e0
allow urls to be generated from cli, with the help of argument --uri=
2014-09-12 09:05:52 +02:00
16bba4b949
disable pushover by default on upgrade
2014-08-07 14:25:01 +02:00
eeda80e17f
adding catch block around LOCK TABLES to prevent warnings when user has no rights
2014-08-06 16:40:55 +02:00
7913fdaa8a
Moving updater utils to Server subnamespace, and renaming Autorun to UpdateManager
2014-08-06 13:20:12 +02:00
71d432c973
issue #119 : adding log retention period
2014-08-06 13:08:31 +02:00
5c99a4bbd3
Rewriting Archiver. Database access optimization + thread safe.
2014-08-06 13:08:31 +02:00
131ec1c7b4
Fixing dates in charts regression.
2014-08-06 13:08:31 +02:00
945a09cfc3
issue #117 : Replacing Template service with Twig and implementing Twig in all modules/utils
2014-08-05 15:19:17 +02:00
1f1ca0c3eb
disabling sms by default on new installs
2014-07-31 16:37:12 +02:00
e590eb798f
issue #101 : fixing instasll for pushover
2014-07-31 16:35:01 +02:00
5c605ddcb2
issue #101 : adding test feature for Pushover
2014-07-31 16:21:19 +02:00
c589424bce
issue #101 : finishing pushover implementation
2014-07-31 14:36:39 +02:00
6b4668937d
Merge branch 'develop' of https://github.com/remmedia/phpservermon into remmedia-develop
...
Conflicts:
src/lang/de_DE.lang.php
src/lang/en_US.lang.php
src/psm/Module/Server/Controller/ServerController.class.php
src/templates/server/view.tpl.html
2014-07-30 15:03:57 +02:00
11900a55b3
ServerValidator did not allow domains for services
2014-07-28 11:38:12 +02:00
b79fbafe47
fixing wrong is_resource call (introduced by 4a09d9ec22)
2014-07-28 11:18:43 +02:00
254b281237
issue #109 : finishing custom timeout per server (slight changes from pull request)
2014-07-28 11:10:23 +02:00
5ddbfdd167
Added SMSGlobal support
2014-07-08 00:45:50 +10:00
e60f69e581
Adding timeout config for a server.
2014-06-27 14:26:26 +02:00
4a09d9ec22
adding if is_resource check around fclose to prevent warnings
2014-06-23 11:54:22 +02:00
d205dcb0e3
added Pushover
2014-06-13 18:48:35 +02:00
e92b243a37
added pushover
2014-06-13 17:34:09 +02:00
0f17b8b612
issue #50 : adding validation to servers page
2014-05-06 16:56:46 +02:00
c58a91fc3b
finishing #86 by jerome (adding sql to install, changing primary key,
...
..)
2014-05-04 13:42:31 +02:00
19ae7db77a
Saving status layout mode
2014-05-04 13:42:31 +02:00
625500495f
Merge branch 'develop' of https://github.com/nerdalertdk/phpservermon into nerdalertdk-develop
...
Conflicts:
src/psm/Module/Config/Controller/ConfigController.class.php
src/psm/Util/Updater/StatusNotifier.class.php
2014-04-25 07:12:49 +02:00
Victor Macko
Samuel Denis-D'Ortun
Pavel Dvořák
Pep
Laurent
Mauro Vietri
Pepijn Over
Sudarshan Anbazhagan
Davy Rolink
jerome
jl
lange@rem-media.de
Pepijn Over