From 8797e8f5e06f7b80961ebdde83288177bec39bfa Mon Sep 17 00:00:00 2001
From: Matt Pass <matt@mattpass.com>
Date: Thu, 25 Aug 2016 16:59:28 +0100
Subject: [PATCH] Simpler code moved to settings.php

---
 index.php        |  6 ------
 lib/settings.php | 15 +++++----------
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/index.php b/index.php
index 235e602..9f90997 100644
--- a/index.php
+++ b/index.php
@@ -3,12 +3,6 @@ include("lib/headers.php");
 include("lib/settings.php");
 $t = $text['index'];
 
-// Check IP permissions
-if (!in_array($_SERVER["REMOTE_ADDR"], $_SESSION['allowedIPs']) && !in_array("*", $_SESSION['allowedIPs'])) {
-	header('Location: /');
-	die("Sorry, not in allowed IPs list");
-};
-
 $updateMsg = '';
 // Check for updates
 if ($ICEcoder["checkUpdates"]) {
diff --git a/lib/settings.php b/lib/settings.php
index e848e16..7a84934 100644
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -164,16 +164,11 @@ for ($i=0;$i<count($settingsArray);$i++) {
 	if (!isset($_SESSION[$settingsArray[$i]])) {$_SESSION[$settingsArray[$i]] = $ICEcoder[$settingsArray[$i]];}
 }
 
-// Determin our allowed IP addresses
-$allowedIP = false;
-for($i=0;$i<count($_SESSION['allowedIPs']);$i++) {
-	if ($_SESSION['allowedIPs'][$i]==$_SERVER["REMOTE_ADDR"]||$_SESSION['allowedIPs'][$i]=="*") {
-		$allowedIP = true;
-	}
-}
-// If user not allowed to view, display message
-if (!$allowedIP) {
-	die('Sorry, access not permitted');
+// Check IP permissions
+if (!in_array($_SERVER["REMOTE_ADDR"], $_SESSION['allowedIPs']) && !in_array("*", $_SESSION['allowedIPs'])) {
+	header('Location: /');
+	die("Sorry, not in allowed IPs list");
+	exit;
 };
 
 // Establish any FTP site to use