From a57f6e2f86e1860f3cf83e72b485c478443616ba Mon Sep 17 00:00:00 2001
From: jhuesser <github@jhuesser.ch>
Date: Fri, 13 Jul 2018 17:10:03 +0200
Subject: [PATCH] after work commit [not working]

not working, but i need to push it to have it on my other locations
---
 install.php | 8 ++++++++
 policy.php  | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/install.php b/install.php
index c5e515a..87ed869 100644
--- a/install.php
+++ b/install.php
@@ -242,6 +242,7 @@ if (!empty($message))
 			<div class="col-sm-6"><label for="address"><?php echo _("Address");?>: </label><input type="text" name="address" value="<?php echo ((isset($_POST['address']))?htmlspecialchars($_POST['address'], ENT_QUOTES):'');?>" id="address" placeholder="<?php echo _("Full address");?>" class="form-control" required></div>
 		</div>
 		<div class="form-group clearfix">
+<<<<<<< HEAD
 			<div class="col-sm-6"><label for="policy_mail"><?php echo _("E-Mail");?>: </label><input type="text" name="policy_mail" value="<?php echo ((isset($_POST['policy_mail']))?htmlspecialchars($_POST['policy_mail'], ENT_QUOTES):'');?>" id="policy_mail" placeholder="<?php echo _("E-Mail");?>" class="form-control" required></div>
 			<div class="col-sm-6"><label for="policy_phone"><?php echo _("Phone");?>: </label><input type="text" name="policy_phone" value="<?php echo ((isset($_POST['policy_phone']))?htmlspecialchars($_POST['policy_phone'], ENT_QUOTES):'');?>" id="policy_phone" placeholder="<?php echo _("Phone number");?>" class="form-control"></div>
 		</div>
@@ -255,6 +256,13 @@ if (!empty($message))
 		<div class="form-group clearfix">
 			<div class="col-sm-6"><label for="tgtoken"><?php echo _("Telegram bot API Token");?>: </label><input type="text" name="tgtoken" value="<?php echo ((isset($_POST['tgtoken']))?htmlspecialchars($_POST['tgtoken'], ENT_QUOTES):'');?>" id="tgtoken" placeholder="<?php echo _("Telegram Bot API Token");?>" class="form-control" required></div>
 			<div class="col-sm-6"><label for="tgbot"><?php echo _("Telegram Bot Username");?>: </label><input type="text" name="tgbot" value="<?php echo ((isset($_POST['tgbot']))?htmlspecialchars($_POST['tgbot'], ENT_QUOTES):'');?>" id="tgbot" placeholder="<?php echo _("Telegram Bot Username");?>" class="form-control" required></div>
+=======
+			<div class="col-sm-6"><label for="policy_mail"><?php echo _("E-Mail");?>: </label><input type="text" name="policy-mail" value="<?php echo ((isset($_POST['policy-mail']))?htmlspecialchars($_POST['policy-mail'], ENT_QUOTES):'');?>" id="policy-mail" placeholder="<?php echo _("E-Mail");?>" class="form-control" required></div>
+			<div class="col-sm-6"><label for="policy_phone"><?php echo _("Phone");?>: </label><input type="text" name="policy_phone" value="<?php echo ((isset($_POST['policy_phone']))?htmlspecialchars($_POST['policy_phone'], ENT_QUOTES):'');?>" id="policy_phone" placeholder="<?php echo _("Phone number");?>" class="form-control"></div>
+		</div>
+		<div class="form-group clearfix">
+			<div class=""><label for="who_we_are"><?php echo _("Who we are");?>: </label><textarea class="form-control" id="who_we-are" rows="3" name="who-we-are" placeholder="<?php echo _("A small text about yourself");?>" value="<?php echo ((isset($_POST['who-we-are']))?htmlspecialchars($_POST['who-we-are'], ENT_QUOTES):'');?>"></textarea></div>
+>>>>>>> after work commit [not working]
 		</div>
 	</section>		
 	<section class="install-section clearfix">
diff --git a/policy.php b/policy.php
index 08b11c0..3c40361 100644
--- a/policy.php
+++ b/policy.php
@@ -54,7 +54,7 @@
 	echo _("In collaboration with our hosting provider we try our best to protect our 
 	databases against access from third parties, losses, misuse or forgery.
 	") . "<br><br>";
-	echo "<h2>" . _("Third party that receive your personal data") . "</24>";
+	echo "<h2>" . _("Third party that receive your personal data") . "</h2>";
 	echo "Our hosting provider can access the date we store on their server. We have a data processing agreement with them.";
 	echo "<h3>" . _("Cookies") . "</h3>";
 	echo _("This site uses cookies – small text files that are placed on your machine to help the site provide a better user experience.