Commit Graph

113 Commits

Author SHA1 Message Date
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 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 2d460abbf8 Issue #287 - Added to the default English language
- Modified file functions.inc.php - because if you add new language variable so it is necessary to immediately translate all languages or all files added to the English translation of which is very inconvenient and time consuming.

- Function psm_load_lang - loading the default language that I chose English and stored in the $ GLOBALS [ 'sm_lang_default'] for further use.

- Function psm_get_lang - edited selection of translation. If there is no translation in the language you chose the user returns to the default language.
2016-05-18 23:04:50 -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
Alexis U (portable) 57a01d27c5 add support for Octopush sms provider 2016-03-15 13:00:07 +01:00
Javad Evazzadeh Kakroudi 1c9823f165 add charset for sending email 2015-05-29 23:19:25 +04:30
Luis Rodriguez 6a2a4c1898 Implement Nexmo SMS Issue #170 2015-02-28 21:05:18 -05:00
Pepijn Over 51ff0f2044 updating copyright year in headers and email 2015-02-27 11:43:09 +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 a2753c6348 issue #131: adding timeout setting to cronjob as well 2014-11-06 10:53:43 +01: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 750513d681 adding db check to psm_load_conf in case we're on install page 2014-08-05 15:19:29 +02:00
Pepijn Over 4d92e9c0c1 psm_get_conf(): auto-load config if it hasnt been loaded yet 2014-07-31 16:06:20 +02:00
Pepijn Over c589424bce issue #101: finishing pushover implementation 2014-07-31 14:36:39 +02:00
Pepijn Over 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
Pepijn Over 254b281237 issue #109: finishing custom timeout per server (slight changes from pull request) 2014-07-28 11:10:23 +02:00
Pepijn Over 3cc2c26abd issue #108: fixing dirname() for Windows when used for URLs instead of actual dirs 2014-07-28 10:25:41 +02:00
Pepijn Over 4916b9e5d0 issue #110: adding missing translations and changelog 2014-07-28 09:38:11 +02:00
Victor Macko ea8e767377 Added SMSGlobal as sms gateway 2014-07-28 09:25:03 +02:00
Pepijn Over eee14aea53 issue #107: previous fix caused all requests with "register_argc_argv" on to be detected as CLI. 2014-07-28 09:23:14 +02:00
Pepijn Over 1fe4c9a293 issue #111: non-default ports should always be included in the HTTP "Host" header, so should not be added again when building urls. 2014-07-28 09:01:30 +02:00
Pepijn Over 1400d65202 issue #107: removing SERVER_SOFTWARE check from is_cli function to make it compatible with synology 2014-07-28 08:47:59 +02:00
Victor Macko ae4cf0e288 Added SMSGlobal as sms gateway 2014-07-05 17:28:02 +10:00
Samuel Denis-D'Ortun 909085cc1c Enable check for website with unverified SSL
Signed-off-by: Samuel Denis-D'Ortun <sam@sddproductions.com>
2014-06-17 22:44:04 -04:00
lange@rem-media.de d205dcb0e3 added Pushover 2014-06-13 18:48:35 +02:00
lange@rem-media.de e92b243a37 added pushover 2014-06-13 17:34:09 +02:00
Pepijn Over 34a22a7914 cleaning up unused imports 2014-05-06 15:41:38 +02:00
Pepijn Over c10d714a7d importing danish language, updating redirect for login and docs updates 2014-04-25 07:42:53 +02:00
jerome d79ba42e85 Issue #75 2014-04-25 00:25:29 +02:00
Pepijn Over b4a7ab3ba7 issue #55: adding xhr functionality to controllers 2014-04-24 23:50:47 +02:00
Pepijn Over 110c42ed5d fixing if-config exists check 2014-04-15 22:06:45 +02:00
Pepijn Over c9d1d7888f changing database version-check so if no changes have been made
you dont have to run install.php again
2014-04-09 21:47:42 +02:00
Pepijn Over 3ee8b9406b issue #49: set custom user agent so requests can be identified in access
logs
2014-04-06 16:16:10 +02:00
Pepijn Over bd623e1ebd adding sanity checks to bootstrap to detect upgrade/missing config/etc; 2014-04-05 15:18:36 +02:00
jerome 4c2183f2b3 list of locales in the lang file 2014-04-03 01:14:28 +02:00
Pepijn Over a120c877bb removing sidebar from config page;
moving update message to the footer and adding new version number

changing CHANGELOG to markdown format

changing template directory structure to match module structure
2014-04-01 00:00:57 +02:00
Pepijn Over c7a3ba66c1 fixing fatal error after deleting server;
login screen: changing h2 to h3 and large buttons to medium;
tooltip: show on hover instead of focus;
changing styling of flashmessage (removing status text, adding icon, changing width);
changing shortcodes from info to success for some actions;
changing all php file permissions to 0644;
2014-03-28 16:52:04 +01:00
Pepijn Over 9866ab0c22 fixing CLI check for servers using cgi-fcgi (PHP_SAPI is in those cases same for web and cli mode) 2014-03-28 14:41:04 +01:00
Pepijn Over f6926334ce issue #39: changing language files to represent their respective
locales, change date format to use strftime(%x %X), making %e usage
windows compatible, and fixing yesterday_format and other_format,
updating language filename in README
2014-03-27 22:33:45 +01:00
jerome d761ecbc33 Finish the localization of the application 2014-03-25 23:53:21 +01:00
jerome 9201c9fff6 Date localisation (global and charts).
Add zoom capabilities on charts. Dbl-click to reset.
2014-03-24 21:27:53 +01:00
Pepijn Over 97edea3487 Merge branch 'develop' of github.com:phpservermon/phpservermon into develop 2014-03-24 16:37:59 +01:00
Pepijn Over 6415d0ed2e issue #15: adding warning threshold to server update, and separating notification/status functionality
adding warning threshold to insert form and adding tooltips

adding warning_threshold fields to install
2014-03-24 16:35:58 +01:00
jerome ae2b4700a7 Bad Status last online value. 2014-03-22 03:48:26 +01:00
Pepijn Over b45e3699d4 issue #11: adding profile page 2014-03-15 21:47:55 +01:00
Pepijn Over ce64ec6bc3 psm_build_url(): only add https for port 443, http for the rest 2014-03-15 01:46:14 +01:00
Pepijn Over d32eafe9ec changing uptime table to servers_uptime, adding primary key and fixing
install sql for it
2014-03-14 19:26:25 +01:00
Pepijn Over 26f8fedffe issue #11: adding login module, adding user authentication to user
module

issue #11: adding user authentication to installer
2014-03-14 18:53:03 +01:00
Pepijn Over f8f3b38708 adding new psm_build_url() function to create clean urls with params 2014-03-14 15:12:00 +01:00
Pepijn Over 21a0bce8a7 fixing string search for website with compression on 2014-03-13 20:28:32 +01:00
Perri 9100ae2412 Correct comments 2014-02-27 00:59:43 +00:00
Perri 7a91b8a3f3 Add database functions and upgrade queries for uptime logging feature 2014-02-26 21:06:33 +00:00
Pepijn Over a538f18cce issue #13: follow HTTP Location header when checking websites 2014-02-11 18:32:03 +01:00
Pepijn Over 9484339842 issue #14: adding SMTP support and upgrading phpmailer 2014-02-11 18:16:00 +01:00
Pepijn Over 0f7f6f011d Changing project url to http://www.phpservermonitor.org/ 2014-02-10 23:48:43 +01:00
Pepijn Over 10f9d666d2 adding psm_update_conf() function 2014-02-08 21:03:10 +01:00
Pepijn Over 6e19063972 Adding new install mode with upgrade support. Config file has been moved
one more (and last..) time so its back in the root directory.
2014-02-08 18:40:22 +01:00
Pepijn Over e5567bb465 testing new folder structure, implementing namespaces, changing function prefix to match namespace. 2014-01-10 18:31:57 +01:00