From 58f97c8d49e944875a1dabb81a51739a50d7b9ef Mon Sep 17 00:00:00 2001
From: BodgeMaster <>
Date: Fri, 21 Feb 2020 13:14:22 +0100
Subject: [PATCH] %FORCE_IP%

---
 deployment-script.sh       |  2 ++
 enforce_ip.template        | 12 ++++++++++++
 threadr/userhome/index.php | 12 +-----------
 3 files changed, 15 insertions(+), 11 deletions(-)
 create mode 100644 enforce_ip.template

diff --git a/deployment-script.sh b/deployment-script.sh
index 1f0d5f2..01465c8 100755
--- a/deployment-script.sh
+++ b/deployment-script.sh
@@ -10,6 +10,8 @@ echo "Deployment script for repository \"web-deployment\"
 =============================================================================="
 
 rewrite_code %CONTENT_DIR% "\/common\/threadr"
+rewrite_code %ENFORCE_IP% `cat enforce_ip.template`
+
 
 echo "==============================================================================
 Done."
diff --git a/enforce_ip.template b/enforce_ip.template
new file mode 100644
index 0000000..796490f
--- /dev/null
+++ b/enforce_ip.template
@@ -0,0 +1,12 @@
+if ($_SESSION['user_ip']!=$_SERVER['REMOTE_ADDR']){
+  // force logout
+  $_SESSION = array();
+  if (ini_get("session.use_cookies")) {
+    $params = session_get_cookie_params();
+    setcookie(session_name(), '', time() - 42000, $params["path"], $params["domain"], $params["secure"], $params["httponly"]);
+  }
+  session_destroy();
+  header("Location: https://lostcave.ddnss.de/common/threadr/login/?error=session");
+  die();
+}
+
diff --git a/threadr/userhome/index.php b/threadr/userhome/index.php
index 590058c..4a6a21d 100644
--- a/threadr/userhome/index.php
+++ b/threadr/userhome/index.php
@@ -1,17 +1,7 @@
 <?php
 session_start();
 //Todo: make this a setting for users that use VPNs/Proxies and seem to jump around the world rather quickly...
-if ($_SESSION['user_ip']!=$_SERVER['REMOTE_ADDR']){
-  // force logout
-  $_SESSION = array();
-  if (ini_get("session.use_cookies")) {
-    $params = session_get_cookie_params();
-    setcookie(session_name(), '', time() - 42000, $params["path"], $params["domain"], $params["secure"], $params["httponly"]);
-  }
-  session_destroy();
-  header("Location: https://lostcave.ddnss.de/common/threadr/login/?error=session");
-  die();
-}
+%ENFORCE_IP%
 
 $pdo = new PDO('mysql:host=localhost;dbname=web', 'webstuff', 'Schei// auf Pa$$w0rter!');
 $statement = $pdo->prepare('SELECT name FROM users WHERE id = :user_id;'); // to be replaced with optional user name off the user data table