From bcef09b8463bade5b9ad238fb3b405e1295a64ed Mon Sep 17 00:00:00 2001
From: Wruczek <wruczekk@gmail.com>
Date: Tue, 14 Mar 2023 13:00:01 +0100
Subject: [PATCH] Auto-detect Cloudflare in installer

---
 src/installer/pages/3.php | 3 +--
 src/installer/pages/6.php | 5 +++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/installer/pages/3.php b/src/installer/pages/3.php
index 19ebd41..c05bda3 100644
--- a/src/installer/pages/3.php
+++ b/src/installer/pages/3.php
@@ -1,9 +1,8 @@
 <?php
+if(!defined("__TSWEBSITE_VERSION")) die("Direct access not allowed");
 
 use Medoo\Medoo;
 
-if(!defined("__TSWEBSITE_VERSION")) die("Direct access not allowed");
-
 if (!empty($_POST)) {
     $dbhostname = trim($_POST["dbhostname"]);
     $dbusername = trim($_POST["dbusername"]);
diff --git a/src/installer/pages/6.php b/src/installer/pages/6.php
index 74c64c5..53b97a1 100644
--- a/src/installer/pages/6.php
+++ b/src/installer/pages/6.php
@@ -98,9 +98,10 @@ $displayip = Config::get("query_displayip"); // set initial website name to the
 
                 <div class="form-group mb-4">
                     <div class="custom-control custom-checkbox">
-                        <input type="checkbox" class="custom-control-input" id="using-cloudflare" name="using-cloudflare">
+                        <input type="checkbox" class="custom-control-input" id="using-cloudflare" name="using-cloudflare"
+                            <?= isset($_SERVER["HTTP_CF_CONNECTING_IP"]) ? "checked" : "" ?>>
                         <label class="custom-control-label" for="using-cloudflare">
-                            I am using CloudFlare
+                            I am using Cloudflare
                         </label>
                     </div>
                     <p><small>This will change the way ts-website detects user IP address</small></p>