Merge branch 'master' into subscription2_dev

Fix Subscriber CSS issue

config.php.template

@@ -1,7 +1,26 @@
 <?php
-//This is config file, please be careful
+/**************************************************************************************/
+//                      SERVER STATUS CONFIG FILE TEMPLATE
+//                THIS FILE IS FOR CREATING YOUR CONFIG MANUALLY
+//                     !!!!!!!IMPORTANT NOTE!!!!!!!!!
+// You will need to create your htaccess or web.config file yourself if you use this template
+//           Please head to http(s)://yourdomain.com/create-server-config.php
+//		        Wait until script finishes.
+//               Then delete it from your document root.
+// If you don't want to allow php to access your root directory or if you have permission
+//                issues please follow the steps below.
+// --------------------------
+// FOR IIS:
+// Rename IISWebConfig to web.config
+// FOR Apache and Nginx
+// Rename ApacheHtaccess to .htaccess
+// --------------------------
+//   Contributors:
+//   Vojtěch Sajdl - Yigit Kerem Oktay - Thomas Nilsen - jhuesser
+/**************************************************************************************/
+
 session_start();
-//You can change these:
+//Start editing here
 define("NAME", "##name##"); //Website name
 define("TITLE", "##title##");
 define("WEB_URL", "##url##"); //Used for links 
@@ -30,7 +49,13 @@ define("PHP_MAILER_PORT", "##phpmailer_port##");  // SMTP Port
 define("PHP_MAILER_SECURE", ""); // Set to TLS or SSL or leave blank for plaintext 
 define("PHP_MAILER_USER", "##phpmailer_user##");  // SMTP Authentication user
 define("PHP_MAILER_PASS", "##phpmailer_pass##");  // SMTP authenticatin password
-
+define("CUSTOM_LOGO_URL",""); // This will use the default logo if left empty
+define("COPYRIGHT_TEXT",""); // Leave this empty if you don't want your copyright displayed
+// Without COPYRIGHT_TEXT Set
+// 2020 Server Status Project Contributors
+// With COPYRIGHT_TEXT Set
+// 2020 Server Status Project Contributors and COPYRIGHT_TEXT
+//Stop editing
 require("classes/locale-negotiator.php");
 
 $negotiator = new LocaleNegotiator(DEFAULT_LANGUAGE);
@@ -57,4 +82,4 @@ if ($mysqli->connect_errno) {
     exit();
 }
 
-$mysqli->set_charset("utf8");
+$mysqli->set_charset("utf8");