From 8ad6fd30bbdb8020b7bd8174787cbcac2ebb16a4 Mon Sep 17 00:00:00 2001
From: MartyniP <admin@martynip.co.uk>
Date: Thu, 18 Oct 2012 12:07:24 +0100
Subject: [PATCH] Admin only update of geoip db, and link in admin panel

---
 admin/site.php              |  6 +++++-
 includes/geoip/download.php | 15 ++++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/admin/site.php b/admin/site.php
index 1ec2528..5251f4e 100644
--- a/admin/site.php
+++ b/admin/site.php
@@ -59,6 +59,9 @@
 elseif ($version < $current && $version !== $current) {
 echo "<center><p style=\"color:blue;\">It seems you are running a prerelease version of Phurl. Expect Bugs!</p></center><hr/>";
 }*/
+if (!is_readable("../includes/geoip/geo-ipv6.dat") || !file_exists("../includes/geoip/geo-ipv6.dat")) {
+	echo "<center><p style=\"color:red;\">You have not downloaded the Maxmind GeoIP Database yet. You can do so <a href=\"includes/geoip/download.php\">here.</a></p></center><hr/>";
+}
 print_errors();
 ?>
 <form method="post" action="admin/site.php">
@@ -145,7 +148,8 @@
 <input type="hidden" name="form" value="user_sett">
 </form>
 <br />
-
+<h4>Advanced</h4>
+<a href="includes/geoip/download.php">Update Maxmind GeoIP Database.</a>
 
 </div>
 <?php
diff --git a/includes/geoip/download.php b/includes/geoip/download.php
index 7cee8f6..2624509 100755
--- a/includes/geoip/download.php
+++ b/includes/geoip/download.php
@@ -1,10 +1,15 @@
 <?php
 
+include "../config.php";
+include "../functions.php";
+db_connect();
+require_admin();
+
 if (!is_writeable(".")) {
 	die("Error! The folder includes/geoip must be chmod 0777 (Writable by all)");
 }
 
-//ini_set('display_errors', '1');
+//ini_set('display_errors', '0');
 //error_reporting(E_ALL);
 
 function gzfile_get_contents ($filename, $use_include_path=0){
@@ -22,12 +27,12 @@ function gzfile_get_contents ($filename, $use_include_path=0){
 $countryDbIPv6 = "http://geolite.maxmind.com/download/geoip/database/GeoIPv6.dat.gz";
 
 echo "Downloading Maxmind GeoIP Lite Country database\n<br /><br />\n\n";
-$dbipv6 = file_get_contents($countryDbIPv6) or die("Error downloading IPv6 Database. Exiting\n");
-file_put_contents("geo-ipv6.dat.gz", $dbipv6) or die("Error writing gzfile.");
+$dbipv6 = file_get_contents($countryDbIPv6) or die("<br />\n\nError downloading IPv6 Database. Exiting\n");
+file_put_contents("geo-ipv6.dat.gz", $dbipv6) or die("<br />\n\nError writing gzfile.");
 echo "Downloaded IPv6 Database.\n<br />\n";
 
-$datipv6 = gzfile_get_contents("geo-ipv6.dat.gz", 0) or die("Error extracting IPv6 Database. Exiting\n");
-file_put_contents("geo-ipv6.dat", $datipv6) or die("Error writing dat file.");
+$datipv6 = gzfile_get_contents("geo-ipv6.dat.gz", 0) or die("<br />\n\nError extracting IPv6 Database. Exiting\n");
+file_put_contents("geo-ipv6.dat", $datipv6) or die("<br />\n\nError writing dat file.");
 echo "Extracted IPv6 Database.\n<br />\n";