From b606162ef6f933a77eb03e0a24e3f838749762e3 Mon Sep 17 00:00:00 2001 From: Git Date: Tue, 10 Jul 2012 08:00:12 +0000 Subject: [PATCH] Empty commit --- sections/tools/data/bitcoin_balance.php | 3 ++- sections/tools/misc/update_geoip.php | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/sections/tools/data/bitcoin_balance.php b/sections/tools/data/bitcoin_balance.php index a8fb06db..65701c0d 100644 --- a/sections/tools/data/bitcoin_balance.php +++ b/sections/tools/data/bitcoin_balance.php @@ -7,7 +7,8 @@ $Balance = btc_balance() . " BTC"; $Receiveds = btc_received(); -$DB->query("SELECT i.UserID, i.BitcoinAddress FROM users_info AS i WHERE BitcoinAddress IS NOT NULL"); +$DB->query("SELECT i.UserID, i.BitcoinAddress FROM users_info AS i JOIN users_main AS m ON m.ID = i.UserID + WHERE BitcoinAddress IS NOT NULL ORDER BY m.Username ASC"); ?>

diff --git a/sections/tools/misc/update_geoip.php b/sections/tools/misc/update_geoip.php index e11cc212..66195bea 100644 --- a/sections/tools/misc/update_geoip.php +++ b/sections/tools/misc/update_geoip.php @@ -7,12 +7,12 @@ show_header(); //requires wget, unzip commands to be installed -shell_exec('wget http://geolite.maxmind.com/download/geoip/database/GeoLiteCity_CSV/GeoLiteCity_'.date('Ym').'05.zip'); +shell_exec('wget http://geolite.maxmind.com/download/geoip/database/GeoLiteCity_CSV/GeoLiteCity_'.date('Ym').'03.zip'); //shell_exec('wget http://debug.what.cd/GeoLiteCity_'.date('Ym').'01.zip'); -shell_exec('unzip GeoLiteCity_'.date('Ym').'05.zip'); -shell_exec('rm GeoLiteCity_'.date('Ym').'05.zip'); +shell_exec('unzip GeoLiteCity_'.date('Ym').'03.zip'); +shell_exec('rm GeoLiteCity_'.date('Ym').'03.zip'); -if(($Locations = file("GeoLiteCity_".date('Ym')."05/GeoLiteCity-Location.csv", FILE_IGNORE_NEW_LINES)) === false) { +if(($Locations = file("GeoLiteCity_".date('Ym')."03/GeoLiteCity-Location.csv", FILE_IGNORE_NEW_LINES)) === false) { error("Download or extraction of maxmind database failed"); } array_shift($Locations); @@ -31,7 +31,7 @@ echo "There are ".count($CountryIDs)." CountryIDs"; echo "
"; -if(($Blocks = file("GeoLiteCity_".date('Ym')."05/GeoLiteCity-Blocks.csv", FILE_IGNORE_NEW_LINES)) === false) { +if(($Blocks = file("GeoLiteCity_".date('Ym')."03/GeoLiteCity-Blocks.csv", FILE_IGNORE_NEW_LINES)) === false) { echo "Error"; } array_shift($Blocks);