From fe812d5b7829bf8f2c6391fb331f243aebd13853 Mon Sep 17 00:00:00 2001 From: Thomas Nilsen Date: Sun, 25 Nov 2018 19:18:38 +0100 Subject: [PATCH] Reverts changes done by a rebase merge gone wrong --- policy.php | 34 +--------------------------------- 1 file changed, 1 insertion(+), 33 deletions(-) diff --git a/policy.php b/policy.php index 0759b83..9379583 100644 --- a/policy.php +++ b/policy.php @@ -3,7 +3,7 @@ require_once("config.php"); Template::render_header("Privacy Policy"); - echo "

" . _("Privacy Policy") . "

"; + echo "

" . _("Privacy Policy") . "

"; echo "

" . _("Who we are") . "

"; echo WHO_WE_ARE; echo "

" . _("Contact") . "

"; @@ -45,36 +45,4 @@ The most effective way to do this is to disable cookies in your browser. We suggest consulting the Help section of your browser or taking a look at the About Cookies website which offers guidance for all modern browsers"); - echo "

" . _("Contact & Privacy Policy") . "

"; - echo "

" . _("Privcacy Policy") . "

"; - echo "

" . _("Who we are") . "

"; - echo WHO_WE_ARE; - echo "

" . _("Contact") . "

"; - echo POLICY_NAME . "
"; - echo ADDRESS . "
"; - echo POLICY_MAIL . "
"; - if(defined('POLICY_PHONE') && POLICY_PHONE != ""){ - echo POLICY_PHONE . "
"; - } - - echo '

' . _("What personal data we collect and why") . '

'; - echo '

' . _("Global") . "

"; - echo _("If you access our websites, the following information will be saved: IP-address, Date, Time, Browser queries, - General information about your browser, operating system and all search queries on the sites. - This user data will be used for anonym user statistics to recognize trends and improve our content. - ") . "

"; - echo "

" . _("How we protect your data") . "

"; - echo _("In collaboration with our hosting provider we try our best to protect our - databases against access from third parties, losses, misuse or forgery. - ") . "

"; - echo "

" . _("Third party that receive your personal data") . "

"; - echo "Our hosting provider can access the date we store on their server. We have a data processing agreement with them."; - echo "

" . _("Cookies") . "

"; - echo _("This site uses cookies – small text files that are placed on your machine to help the site provide a better user experience. - In general, cookies are used to retain user preferences, store information for things like shopping carts, - and provide anonymised tracking data to third party applications like Google Analytics. - As a rule, cookies will make your browsing experience better. However, you may prefer to disable cookies on this site and on others. - The most effective way to do this is to disable cookies in your browser. We suggest consulting the Help section of your browser - or taking a look at the About Cookies website which offers guidance for all modern browsers"); - Template::render_footer();