Empty commit

This commit is contained in:
Git 2012-11-13 08:00:17 +00:00
parent 331f36b6cf
commit a26061ad5c
3 changed files with 10 additions and 8 deletions

View File

@ -2,7 +2,7 @@
require(SERVER_ROOT.'/sections/torrents/functions.php');
include(SERVER_ROOT.'/sections/bookmarks/functions.php');
include(SERVER_ROOT.'/classes/class_text.php'); // Text formatting class
$Text = new TEXT;
@ -51,6 +51,7 @@
'categoryName' => $CategoryName,
'time' => $TorrentDetails['Time'],
'vanityHouse' => $TorrentDetails['VanityHouse'] == 1,
'isBookmarked' => has_bookmarked('torrent', $GroupID),
'musicInfo' => $JsonMusicInfo
);
@ -77,7 +78,7 @@
'snatched' => (int) $Torrent['Snatched'],
'freeTorrent' => $Torrent['FreeTorrent'] == 1,
'time' => $Torrent['Time'],
'description' => $Torrent['Description'],
'description' => $Torrent['Description'],
'fileList' => $Torrent['FileList'],
'filePath' => $Torrent['FilePath'],
'userId' => (int) $Torrent['UserID'],

View File

@ -24,11 +24,12 @@
// What are we looking for? Let's make sure it isn't dangerous.
if(isset($_GET['search'])) {
$Search = trim($_GET['search']);
} else {
$Search = '';
}
// Searching for posts by a specific user
if(!empty($_GET['user'])) {
$User = $_GET['user'];

View File

@ -7,12 +7,12 @@
View::show_header();
//requires wget, unzip commands to be installed
shell_exec('wget http://geolite.maxmind.com/download/geoip/database/GeoLiteCity_CSV/GeoLiteCity_'.date('Ym').'02.zip');
shell_exec('wget http://geolite.maxmind.com/download/geoip/database/GeoLiteCity_CSV/GeoLiteCity_'.date('Ym').'06.zip');
//shell_exec('wget http://debug.what.cd/GeoLiteCity_'.date('Ym').'01.zip');
shell_exec('unzip GeoLiteCity_'.date('Ym').'02.zip');
shell_exec('rm GeoLiteCity_'.date('Ym').'02.zip');
shell_exec('unzip GeoLiteCity_'.date('Ym').'06.zip');
shell_exec('rm GeoLiteCity_'.date('Ym').'06.zip');
if(($Locations = file("GeoLiteCity_".date('Ym')."02/GeoLiteCity-Location.csv", FILE_IGNORE_NEW_LINES)) === false) {
if(($Locations = file("GeoLiteCity_".date('Ym')."06/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 "<br />";
if(($Blocks = file("GeoLiteCity_".date('Ym')."02/GeoLiteCity-Blocks.csv", FILE_IGNORE_NEW_LINES)) === false) {
if(($Blocks = file("GeoLiteCity_".date('Ym')."06/GeoLiteCity-Blocks.csv", FILE_IGNORE_NEW_LINES)) === false) {
echo "Error";
}
array_shift($Blocks);