From 9e1056f810f855e4a88479cb23fecdbc6be7e0a9 Mon Sep 17 00:00:00 2001
From: Meitar Moscovitz <meitarm@gmail.com>
Date: Sat, 17 Jan 2015 15:22:25 -0600
Subject: [PATCH] Easier setup: auto-detect tracker address if no config file
 found.

This commit adds a simple configuration file in PHP `.ini` syntax that
makes it easier to configure the tracker address and the database path.
The result is that no edits to the source code are required to use this.
---
 .gitignore              |  1 +
 README.txt              | 11 ++++++-----
 index.php               | 12 ++++++++++--
 ipmagnet.ini.php-sample | 19 +++++++++++++++++++
 4 files changed, 36 insertions(+), 7 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 ipmagnet.ini.php-sample

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..04a9adc
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+ipmagnet.ini.php
diff --git a/README.txt b/README.txt
index 5d523ac..1b82e69 100644
--- a/README.txt
+++ b/README.txt
@@ -22,13 +22,14 @@ Requirements
 
 Setup
 	Clone the repo into a folder that is available by the httpd.
-	Edit index.php
-		Change the tracker URL (line 2) to point to the public
+	Optionally, copy the sample config file (ipmagnet.ini.php-sample)
+	to ipmagnet.ini.php and change its settings. Options include:
+		Change the tracker URL to point to the public
 		 location of the index.php file.
 	
-		Optionally edit the database path (line 3) if you do not
-		 want to have the database in the same folder for security
-		 reasons.
+		Change the database path to point to the location of the
+		 ipmagnet.db3 file if you want to have the database in a
+		 different folder than index.php for security reasons.
 
 	If you'd like to set a timeout after which clients should recheck their
 	IP against the tracking link, set $enableInterval to true on line 4.
diff --git a/index.php b/index.php
index 6a5b395..333d353 100755
--- a/index.php
+++ b/index.php
@@ -1,6 +1,14 @@
 <?php
-	$TRACKER=urlencode("http://localhost:80/ipmagnet/");
-	$db = new PDO("sqlite:ipmagnet.db3");
+	$cnfgFile=dirname(__FILE__) . '/ipmagnet.ini.php';
+	if(file_exists($cnfgFile)){
+		$cnfg=parse_ini_file($cnfgFile);
+	}
+	$TRACKER = (empty($cnfg['tracker']))
+		? urlencode("http://{$_SERVER['HTTP_HOST']}".dirname($_SERVER['PHP_SELF']).'/')
+		: urlencode($cnfg['tracker']);
+	$db = (empty($cnfg['db_path']))
+		? new PDO("sqlite:ipmagnet.db3")
+		: new PDO("sqlite:$db_path");
 	$enableInterval=false;
 	$trackerInterval=300;
 	
diff --git a/ipmagnet.ini.php-sample b/ipmagnet.ini.php-sample
new file mode 100644
index 0000000..37a01f4
--- /dev/null
+++ b/ipmagnet.ini.php-sample
@@ -0,0 +1,19 @@
+; This is a sample configuration for the IPMagnet torrent IP testing tool.
+; It sets the default tracker address that you may wish to use, or modify.
+; Copy this file to `ipmagnet.ini.php`, then make changes there.
+;
+; This file uses "init file" formatting. To learn more about the syntax of this
+; file, please refer to the PHP manual:
+;
+;     http://php.net/parse_ini_file
+;
+;<?php
+; exit('Direct access to this file is prohibited.');
+;// EDIT BELOW THESE LINES.
+;/*
+
+tracker="http://localhost:80/ipmagnet/"
+db_path="ipmagnet.db3"
+
+;*/
+;?>