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
ff37adcc60
Merge pull request #321 from Laupe/upstream
...
Fix Issue #318
2016-06-16 18:58:40 -04:00
Pavel Dvořák
dc5b7a0cfc
Fix Issue #318 - delete class types, typeWebsite in warning_threshold
2016-06-17 00:52:10 +02:00
shaundma
f4037d2aaa
Initial Commit
2016-05-27 19:09:42 +02:00
Tim
5a85eeff36
Changed some wrong translations
2016-05-26 19:01:33 +02:00
lploi91
aee4eb0306
Create vi_VN.lang.php
2016-05-22 15:33:01 +07: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
fb131b843a
Bump version 3.2.0
2016-05-18 23:31:40 -04: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
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
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
Pavel Dvořák
f01c39695d
update language Czech (cs_CZ)
2016-05-14 08:43:10 +02:00
Pavel Dvořák
22112777d1
Issue #269 update language Slovenian (sl_SI)
2016-05-14 08:42:33 +02:00
Pavel Dvořák
d7140c9b2a
Issue #269 new language Slovenian (sl_SI)
2016-05-13 23:34:08 +02:00
Pavel Dvořák
e5db728634
Editing and updating of the Czech language
2016-05-13 23:22:30 +02:00
Samuel Denis-D'Ortun
73f77218fd
Merge pull request #258 from prathers/develop
...
Update da_DK.lang.php
2016-04-30 18:18:38 -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
Xendorf
9bda115e47
Update it_IT.lang.php
2016-03-01 11:25:40 +01:00
Preben Rather Sørensen
1c763e82ef
Update da_DK.lang.php
...
Done a few typos and translated new labels
2016-02-15 20:24:30 +01:00
Pepijn Over
a30dcf5610
adding estonian translation to changelog/credits
2016-01-31 18:08:45 +01:00
Pep
62ee04707f
Merge pull request #185 from ItsRichardRaz/patch-1
...
et_ET.lang.php
2016-01-31 18:02:04 +01:00
Pepijn Over
f46fae667b
fixes issue #202 and #203 : adding right-to-left stylesheet and html class
2016-01-31 17:58:12 +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
daf843df07
Merge branch 'patch-1' of git://github.com/evazzadeh/phpservermon into evazzadeh-patch-1
2016-01-31 17:09:53 +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
Pep
6300e8103f
Merge pull request #210 from celeroncool/develop
...
Added finnish translation and chrome mobile statusbar color
2016-01-30 21:27:05 +01:00
Pep
b1647d2c3f
Merge pull request #207 from loran750/patch-1
...
If pattern is set up, you cannot catch server problems
2016-01-30 21:13:47 +01:00
Pep
c0b4264959
Merge pull request #218 from rigonijunior/develop
...
changed the character of capitalized to tiny is the correct the ediom…
2016-01-30 21:11:51 +01:00
Southparkfan
1cecc80845
Translation fixes for NL language
2015-10-19 14:28:29 +02:00
José Rigoni Jr
7035410c1e
changed the character of capitalized to tiny is the correct the edioma pt_BR
...
changed the character of capitalized to tiny is the correct the edioma pt_BR
line 152
2015-07-23 10:35:53 -03:00
Edi Septriyanto
a482ae5e27
Fix for issue #187 (Unable to connect to MySQL)
2015-06-17 23:15:10 +07:00
Sami Nieminen
dbb24dd38e
Fixed the statusbar color code place
2015-06-16 07:15:40 +00:00
Sami Nieminen
2fcb65036b
Fixed the statusbar color code place
2015-06-16 07:14:06 +00:00
Sami Nieminen
c0bed02151
Added Chrome mobile statusbar color per material design guidelines
2015-06-16 07:05:06 +00:00
Sami Nieminen
03617ff58d
Added finnish translation, email messages are in english, as some email clients show finnish letters wrong.
2015-06-09 06:14:08 +00:00
Sami Nieminen
4bce8e24dd
Finnish translation done and tested. Feedback appreciated!
2015-06-08 12:28:00 +00:00
Sami Nieminen
53ee67773e
Translation done, testing begins...
2015-06-08 12:13:44 +00:00
Sami Nieminen
bcfeaba773
Updated more strings, work in progress
2015-06-08 11:29:04 +00:00
Sami Nieminen
315e963cdb
Added Finnish translation, work in progress
2015-06-04 10:52:11 +00: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
Javad Evazzadeh Kakroudi
1c9823f165
add charset for sending email
2015-05-29 23:19:25 +04:30
Javad Evazzadeh Kakroudi
c176cbc49f
add persian language support
...
add persian language translation file
2015-05-29 22:38:11 +04:30
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
ItsRichardRaz
7cd962abf8
et_ET.lang.php
...
Estonian translation (:
2015-02-28 20:50:07 +02: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
9370397555
issue #173 : typo in display_errors
2015-02-27 12:17:12 +01:00
Pepijn Over
6172b35a81
issue #181 : adding blank index files to prevent directory listing
2015-02-27 11:54:16 +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
Gildas NOEL
f0b8abe390
Fix some typos in french translation
2015-01-13 11:23:14 +01:00
Sudarshan Anbazhagan
62c9822ee9
increased maximum limit to for server ip to 500
2015-01-08 01:53:47 +05:30
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
Pep
69a2e4e668
Merge pull request #161 from andlil/patch-2
...
Create sv_SE.lang.php
2014-12-05 10:20:59 +01:00
andlil
8839c4d27b
Update sv_SE.lang.php
2014-11-30 00:25:05 +01:00
andlil
fd357c814e
Create sv_SE.lang.php
2014-11-29 23:43:10 +01:00
andlil
4728ca9b5f
Add icon for Apple iPhone/iPad/iPod shortcut
2014-11-29 22:25:19 +01:00
Pepijn Over
4b2c83588a
bumping version to 3.1.1
2014-11-06 14:40:39 +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
jerome
f903eb037d
French translation: Correction of spelling mistakes
2014-11-06 11:44:42 +01:00
Pepijn Over
a2753c6348
issue #131 : adding timeout setting to cronjob as well
2014-11-06 10:53:43 +01:00
Pepijn Over
a646928a70
updating changelog/credits for language changes
2014-11-06 10:53:43 +01:00
Klemm89
18f987a5d5
Updated the results template to allow links, with autoescape.
2014-11-05 15:38:50 -05:00
Pep
7b6500982c
Merge pull request #138 from aklenczar/develop
...
Added Polish translation
2014-11-05 11:55:10 +01:00
Pep
706886f8b8
Merge pull request #144 from madeinnordeste/develop
...
update brzilian lang file
2014-11-05 11:54:35 +01:00
Pep
26baa6d96f
Merge pull request #147 from TechReanimate/develop
...
Spanish translation update
2014-11-05 11:54:15 +01:00
Pep
880b322d98
Merge pull request #146 from roman-beylin/develop
...
Updated russian translation
2014-11-05 11:53:27 +01:00
Haydar Kulekci
51ec51b9d5
turkish translation file
2014-10-24 11:24:54 +03:00
Luis Rodriguez
490387820c
Updated spanish translation
2014-10-18 18:30:48 -04:00
Roman Beylin
be7279dd05
Updated russian translation
2014-10-14 23:44:55 +02:00
Luiz Alberto
40b9d3386d
update brzilian lang file
2014-10-04 12:04:00 -03: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
Arkadiusz Klenczar
7a0f148c33
Added Polish translation
...
Polish translation added.
2014-09-27 01:41:34 +02:00
Pep
9a88b830b6
Merge pull request #131 from davyrolink/201409_cli-url
...
allow urls to be generated from cli, with the help of argument --uri=
2014-09-26 21:58:05 +02:00
Pep
cb5f2b5952
Merge pull request #132 from JPKCom/develop
...
Full German translation
2014-09-26 21:28:28 +02:00
jerome
5eb0e69c32
French translation
2014-09-19 16:05:19 +02:00
Jean Pierre Kolb
ca9f52939c
Full German translation
2014-09-18 16:19:53 +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
Pep
1204c9a4b0
Merge pull request #124 from PVasileff/patch-9
...
bg_BG.lang.php - develop update
2014-09-08 09:52:45 +02:00
berkas1
8834dd6cfe
add Czech translation
2014-09-05 19:29:30 +02:00
Plamen Vasilev
ef49e67366
bg_BG.lang.php - develop update
...
bg_BG.lang.php - develop update
2014-08-23 23:42:15 +03:00
Pepijn Over
27be6360a3
bumping version to 3.1.0
2014-08-07 14:25:16 +02:00
Pepijn Over
16bba4b949
disable pushover by default on upgrade
2014-08-07 14:25:01 +02:00
Pepijn Over
55714e4208
removing closing tag from generated config
2014-08-07 13:05:34 +02:00
Pepijn Over
b25ceae4a8
minor layout changes to install page
2014-08-07 12:55:57 +02:00
Pepijn Over
eeda80e17f
adding catch block around LOCK TABLES to prevent warnings when user has no rights
2014-08-06 16:40:55 +02:00
Pepijn Over
1fd2fd7cb6
moving pushover device help to tooltip
2014-08-06 14:14:16 +02:00
Pepijn Over
7913fdaa8a
Moving updater utils to Server subnamespace, and renaming Autorun to UpdateManager
2014-08-06 13:20:12 +02:00
Pepijn Over
71d432c973
issue #119 : adding log retention period
2014-08-06 13:08:31 +02:00
jerome
5c99a4bbd3
Rewriting Archiver. Database access optimization + thread safe.
2014-08-06 13:08:31 +02:00
jerome
131ec1c7b4
Fixing dates in charts regression.
2014-08-06 13:08:31 +02:00
Pepijn Over
17b5d175ff
adding pushover clone button for new app
2014-08-05 15:58:44 +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
945a09cfc3
issue #117 : Replacing Template service with Twig and implementing Twig in all modules/utils
2014-08-05 15:19:17 +02:00
Yuriy Lyutov
458960addf
Russian translation revision.
2014-08-02 19:28:23 +02:00
Pepijn Over
fb0b321380
adding bootstrap multiselect for users/servers
2014-08-01 15:41:50 +02:00
Pepijn Over
e60e647eb3
issue #115 : add warning to server page when notifications are disabled
2014-08-01 15:04:36 +02:00
Pepijn Over
75be122e82
updating dutch translation
2014-07-31 16:53:54 +02:00
Pepijn Over
1f1ca0c3eb
disabling sms by default on new installs
2014-07-31 16:37:12 +02:00
Pepijn Over
e590eb798f
issue #101 : fixing instasll for pushover
2014-07-31 16:35:01 +02:00
Pepijn Over
5c605ddcb2
issue #101 : adding test feature for Pushover
2014-07-31 16:21:19 +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
ca7fdf1ec5
minor form styling, adding check all/uncheck all buttons, fixing url entities in forms
2014-07-31 14:37:27 +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
8e60e9cb3a
issue #53 : adding user selection to server edit page
2014-07-30 14:30:41 +02:00
Pepijn Over
cdfe3c85d2
issue #28 : adding permission denied error page
2014-07-30 13:47:06 +02:00
Pepijn Over
11900a55b3
ServerValidator did not allow domains for services
2014-07-28 11:38:12 +02:00
Pepijn Over
b79fbafe47
fixing wrong is_resource call (introduced by 4a09d9ec22
)
2014-07-28 11:18:43 +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
7a061832ec
Merge branch 'develop' of https://github.com/Halvra/phpservermon into Halvra-develop
2014-07-28 10:28:33 +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
b45c93f254
issue #113 : only send test sms if user has a mobile no
2014-07-28 09:46:48 +02:00
Pepijn Over
4916b9e5d0
issue #110 : adding missing translations and changelog
2014-07-28 09:38:11 +02:00
Victor Macko
2cbb2dc932
Added SMSGlobal as sms gateway
2014-07-28 09:25:03 +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