From b4926077fa88dba2476e2eeaab06f8e3e650d437 Mon Sep 17 00:00:00 2001 From: Thomas Nilsen Date: Thu, 8 Nov 2018 14:15:20 +0100 Subject: [PATCH] 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. --- config.php.template | 1 + install.php | 9 +++++++++ template.php | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/config.php.template b/config.php.template index cb94726..0e571ab 100644 --- a/config.php.template +++ b/config.php.template @@ -12,6 +12,7 @@ define("ADDRESS", "##address##"); define("POLICY_MAIL", "##policy_mail##"); //contact email in policy define("POLICY_PHONE", "##policy_phone##"); define("WHO_WE_ARE","##who_we_are##"); +define("POLICY_URL","##policy_url##"); define("INSTALL_OVERRIDE", false); define("DEFAULT_LANGUAGE", "en_GB"); diff --git a/install.php b/install.php index ccd06d8..1caa85b 100644 --- a/install.php +++ b/install.php @@ -3,6 +3,7 @@ require_once("template.php"); define("WEB_URL", "."); //Website name define("NAME", _('Status page')); //Website name define("MINIMUM_PHP_VERSION", "5.4.0"); +define("POLICY_URL", "policy.php"); //Default policy URL require_once("classes/locale-negotiator.php"); $negotiator = new LocaleNegotiator("en_GB"); @@ -127,6 +128,8 @@ if(isset($_POST['server']) && empty($message)) $config = str_replace("##policy_mail##", $_POST['policy_mail'], $config); $config = str_replace("##policy_phone##", $_POST['policy_phone'],$config); $config = str_replace("##who_we_are##", $_POST['who_we_are'], $config); + $policy_url_conf = ( ! empty($_POST['policy_url']) ) ? $_POST['policy_url'] : POLICY_URL; + $config = str_replace("##policy_url##", $policy_url_conf, $config); file_put_contents("config.php", $config); @@ -239,6 +242,12 @@ if (!empty($message))
+
+
+ + " class="form-control"> +
+

diff --git a/template.php b/template.php index b5177d9..782f19e 100644 --- a/template.php +++ b/template.php @@ -138,7 +138,7 @@ class Template{
-
Copyright © Vojtěch Sajdl
+
 Copyright © Vojtěch Sajdl
@@ -157,7 +157,7 @@ class Template{
- +