Commit Graph

31 Commits

Author SHA1 Message Date
Yigit Kerem Oktay
96f79ee725 Revert "Merge pull request #135 from server-status-project/master"
This reverts commit 8d571547f5, reversing
changes made to e96df7015e.
2020-11-05 16:54:04 +03:00
Yigit Kerem Oktay
46c0b55779 Revert "Merge branch 'dev' into master"
This reverts commit 18b89e8c35, reversing
changes made to 81132e9ccf.
2020-11-05 16:51:43 +03:00
Thomas Nilsen
23dc109764 Removed Telegram and email notification setup from install routine.
In prepearing to move the config.php options to db options, the following config
options have been removed from config.php

- SUBSCRIBE_TELEGRAM
- SUBSCRIBE_EMAIL
- TG_BOT_API_TOKEN
- TG_BOT_USERNAME
- GOOGLE_RECAPTCHA
- GOOGLE_RECAPTCHA_SITEKEY
- GOOGLE_RECAPTCHA_SECRET
- PHP_MAILER
- PHP_MAILER_PATH
- PHP_MAILER_SMTP
- PHP_MAILER_HOST
- PHP_MAILER_PORT
- PHP_MAILER_SECURE
- PHP_MAILER_USER
- PHP_MAILER_PASS
- CRON_SERVER_IP
2020-08-19 23:24:32 +02:00
Yiğit Kerem Oktay
0271ca87cf
Fix a conflict that overwrites the settings in the db 2020-08-16 23:34:13 +03:00
Yiğit Kerem Oktay
d041c9b58f
Remove non required line 2020-08-16 22:15:06 +03:00
Yiğit Kerem Oktay
6854dcb638
Merge pull request #2 from thnilsen/subscription2_dev
Fix bug notifications not being sent.
2020-08-15 23:08:16 +03:00
thnilsen
ea582aeed6 Fix bug notifications not being sent.
The code to handle sending of notification was missing. This change
makes two different options available on how notifications will be
handled which will be controlled by CRON_SERVER_IP config option.

 - If CRON_SERVER_IP is set, the server with the given IP should
   call URL ../admin/?task=cron every x minutes. If the config
   is left empty, the notification will be called once the
   incident has  been saved. (The latter meothod might cause
   server timeout if there are large numbers of subscribers!)

Other minor changes:

 - Removed old commented code

 - Removed call to syslog used for debugging
2020-08-15 21:09:57 +02:00
Yiğit Kerem Oktay
2f544eace2
Include db class 2020-08-15 20:23:23 +03:00
Thomas Nilsen
8d31ec7f7c Merge branch 'master' into subscription2_dev
Fix Subscriber CSS issue
2020-08-15 18:48:41 +02:00
Yiğit Kerem Oktay
f785d56b78
Manual Merge of PR 114 STEP 1 2020-08-14 20:02:42 +03:00
Yiğit Kerem Oktay
28431cc240
Added required definitions 2020-08-14 19:52:18 +03:00
Yiğit Kerem Oktay
34e3782a61
Add additional info 2020-08-14 15:11:42 +03:00
Yiğit Kerem Oktay
b14f60e08b
Add some required info for creating server config 2020-08-14 14:58:05 +03:00
thnilsen
4a4a3f7bdd Merged Upstream master 2020-06-16 20:20:51 +02:00
thnilsen
02cd19a439 Fixes issue #64 2020-05-23 17:03:08 +02:00
Vojtěch Sajdl
7294b356dd Fix #78 - run data through htmlspecialchars so we don't crash when there are quotes in the name 2019-03-15 12:22:16 +01:00
Thomas Nilsen
cd6ce3c8d8 Added additional config definitions
In preparation for adding subscription notification a number of
new  configuration options has been added. These are as follows:

- SUBSCRIBE_EMAIL : True/False to allow email subscription

- SUBSCRIBE_TELEGRAM : True/False to allow Telegram
   subscription

- GOOGLE_RECAPTCHA : True/False to enable reCapthca for
   e-mail signup form

- GOOGLE_RECAPTCHA_SITEKEY : Google reCaptcha sitekey

- GOOGLE_RECAPTCHA_SECRET : Google reCaptcha secret

- PHP_MAILER : True/False to allow the use of PHPMailer()
  library for emails.

- PHP_MAILER_PATH: Path to where PHPMailer() class is
  located on the system

- PHP_MAILER_SMTP : True/False if SMTP is to be used with
  PHPmailer(). Default will be mail().

- PHP_MAILER_HOST : SMTP Host to use if PHP_MAILER_SMTP
  is enabled.

- PHP_MAILER_PORT : SMTP Port

- PHP_MAILER_SECURE : tls/ssl option for PHPMailer()

- PHP_MAILER_USER : Username for SMTP

- PHP_MAILER_PASS : Password for SMTP
2018-11-24 22:19:06 +01:00
jhuesser
bc92eea651 added tg values to config file 2018-11-23 22:07:37 +01:00
Thomas Nilsen
b4926077fa Add option to use existing URL for privacy policy. Pryx/server-status#41
- Also moved the gitbug icon to the left of the footer as it looked like it was part of the imprint/policy link.
- Fixed Imprint & Privacy policy text so that it will be translated.
2018-11-08 14:15:20 +01:00
Vojtěch Sajdl
fccc45d602
String changes
Making translations better by fixing typos and stuff
2018-08-10 22:57:27 +02:00
jhuesser
d923a9b88c Add Privacy policy (#40)
* add contact fields

* added really simple privacy policy and install proccedure

* add link to policy in footer
2018-08-02 11:48:10 +02:00
Vojtěch Sajdl
4b62701974
Fix #21 - ability to change title
Add define("TITLE", "<title>") to your config.php file if you're updating and want to use this feature.
2018-03-10 00:32:06 +01:00
Vojtěch Sajdl
7b1b68c0ef
Translations updated 2018-01-13 03:00:13 +01:00
Vojtěch Sajdl
f310aac8b5
Minor fixes 2018-01-12 22:38:19 +01:00
Vojtěch Sajdl
c25e8bcae8
Instalator fixes and lots and lots of other bugfixes 2018-01-12 21:35:31 +01:00
Vojtěch Sajdl
5dd9a2a1bd
Add template doc, fixup rendering locale select 2018-01-07 20:51:16 +01:00
Vojtěch Sajdl
61f563c9b0
Objectify locale negotiator and template files, add documentation 2018-01-07 20:39:10 +01:00
Vojtěch Sajdl
3202189967
Start working on translation system, czech translation added 2017-12-31 02:26:08 +01:00
Vojtěch Sajdl
bef338fd99
Prepare for gettext 2017-12-31 00:42:16 +01:00
Vojtěch Sajdl
5f8c7f8166
Checking validity of data - install script 2017-11-29 14:40:34 +01:00
Vojtěch Sajdl
9a49428bf9 Initial commit 2017-11-24 00:09:36 +01:00