<No commit messages entered>

classes/class_mysql.php

@@ -115,12 +115,13 @@
 //Handles escaping
 function db_string($String,$DisableWildcards=false) {
 	global $DB;
+	//Escape
+	$String = $DB->escape_str($String);
 	//Remove user input wildcards
 	if ($DisableWildcards) {
-		$String = str_replace(array('%','_'), '', $String);
+		$String = str_replace(array('%','_'), array('\%','\_'), $String);
 	}
-	//Escape and return
-	return $DB->escape_str($String);
+	return $String;
 }
 
 function db_array($Array, $DontEscape = array(), $Quote = false) {

classes/script_start.php

@@ -489,7 +489,13 @@ function get_cc($IP) {
 	++$ID;
 	return '<span id="cc_'.$ID.'">Resolving CC...<script type="text/javascript">ajax.get(\'tools.php?action=get_cc&ip='.$IP.'\',function(cc){$(\'#cc_'.$ID.'\').raw().innerHTML=cc;});</script></span>';
 }
-			
+
+function display_ip($IP) {
+	$Line = display_str($IP).' ('.get_cc($IP).') ';
+	$Line .= '[<a href="user.php?action=search&amp;ip_history=on&amp;ip='.display_str($IP).'&matchtype=strict" title="Search">S</a>]';
+	
+	return $Line;
+}
 
 function logout() {
 	global $SessionID, $LoggedUser, $DB, $Cache;
@@ -783,6 +789,21 @@ function get_size($Size, $Levels = 2) {
 	return number_format($Size,$Levels).$Units[$Steps];
 }
 
+function get_bytes($Size) {
+	list($Value,$Unit) = sscanf($Size, "%f%s");
+	$Unit = ltrim($Unit);
+	if(empty($Unit)) {
+		return $Value ? round($Value) : 0;
+	}
+	switch(strtolower($Unit[0])) {
+		case 'k': return round($Value * 1024);
+		case 'm': return round($Value * 1048576);
+		case 'g': return round($Value * 1073741824);
+		case 't': return round($Value * 1099511627776);
+		default: return 0;
+	}
+}
+
 function human_format($Number) {
 	$Steps = 0;
 	while($Number>=1000) {

sections/artist/rename.php

@@ -38,7 +38,7 @@
 list($OldAliasID) = $DB->next_record(MYSQLI_NUM, false);
 if(!$OldAliasID) { error('Could not find old alias ID'); }
 
-$DB->query("SELECT AliasID, ArtistID FROM artists_alias WHERE name LIKE '".db_string($NewName)."'");
+$DB->query("SELECT AliasID, ArtistID FROM artists_alias WHERE name LIKE '".db_string($NewName, true)."'");
 list($TargetAliasID, $TargetArtistID) = $DB->next_record(MYSQLI_NUM, false);
 
 if(!$TargetAliasID || $TargetAliasID==$OldAliasID) {

sections/better/better.php

@@ -64,7 +64,7 @@
 			</tr>
 			<tr class="rowb">
 				<td class="nobr">
-					<a href="better.php?method=tags">Tags</a>
+					<a href="better.php?method=tags&amp;filter=all">Tags</a>
 				</td>
 				<td class="nobr">
 					Torrents that have been marked as having 'Very bad tags' or 'No tags at all'.

sections/collages/edit_handle.php

@@ -8,7 +8,15 @@
 list($UserID, $CategoryID) = $DB->next_record();
 if($CategoryID == 0 && $UserID!=$LoggedUser['ID'] && !check_perms('site_collages_delete')) { error(403); }
 
-
+$DB->query("SELECT ID,Deleted FROM collages WHERE Name='".db_string($_POST['name'])."' AND ID!='$CollageID' LIMIT 1");
+if($DB->record_count()) {
+	list($ID, $Deleted) = $DB->next_record();
+	if($Deleted) {
+		$Err = 'A collage with that name already exists but needs to be recovered, please <a href="staffpm.php">contact</a> the staff team!';
+	} else {
+		$Err = "A collage with that name already exists: <a href=\"/collages.php?id=$ID\">$ID</a>.";
+	}
+}
 
 $TagList = explode(',',$_POST['tags']);
 foreach($TagList as $ID=>$Tag) {

sections/requests/requests.php

@@ -38,7 +38,7 @@
 				$Title = "Requests I've voted on";
 				$SS->set_filter('voter', array($LoggedUser['ID']));
 			}
-			if(empty($_GET['show_filled'])) {
+			if(empty($_GET['show_filled']) && $Submitted) {
 				$SS->set_filter('torrentid', array(0));
 			}
 			break;

sections/requests/takeunfill.php

@@ -77,6 +77,7 @@
 write_log("Request $RequestID ($FullName), with a ".get_size($RequestVotes['TotalBounty'])." bounty, was un-filled by user ".$LoggedUser['ID']." (".$LoggedUser['Username'].") for the reason: ".$_POST['reason']);
 
 $Cache->delete_value('request_'.$RequestID);
+$Cache->delete_value('request_artists_'.$RequestID);
 
 update_sphinx_requests($RequestID);
 

sections/tools/tools.php

@@ -25,6 +25,7 @@
 			<tr><td><a href="tools.php?action=recommend">Vanity House additions</a></td></tr>
 <? } if (check_perms('users_mod')) { ?>
 			<tr><td><a href="tools.php?action=email_blacklist">Email Blacklist</a></td></tr>
+
 <? } ?>
 		</table>
 	</div>

sections/torrents/add_alias.php

@@ -16,7 +16,7 @@
 $Changed = false;
 
 for($i = 0; $i < count($AliasNames); $i++) {
-	$AliasName = trim(db_string($AliasNames[$i]));
+	$AliasName = trim($AliasNames[$i]);
 	$Importance = $Importances[$i];
 	
 	if($Importance!='1' && $Importance!='2' && $Importance!='3') {
@@ -24,8 +24,9 @@
 	}
 	
 	if(strlen($AliasName) > 0) {
-		$DB->query("SELECT AliasID, ArtistID, Redirect, Name FROM artists_alias WHERE Name LIKE '$AliasName'");
+		$DB->query("SELECT AliasID, ArtistID, Redirect, Name FROM artists_alias WHERE Name LIKE '".db_string($AliasName,true)."'");
 		if($DB->record_count() == 0) {
+			$AliasName = db_string($AliasName);
 			$DB->query("INSERT INTO artists_group (Name) VALUES ('$AliasName')");
 			$ArtistID = $DB->inserted_id();
 			$DB->query("INSERT INTO artists_alias (ArtistID, Name) VALUES ('$ArtistID', '$AliasName')");
@@ -79,6 +80,5 @@
 	update_hash($GroupID);
 }
 
-
 header('Location: '.$_SERVER['HTTP_REFERER']);
 ?>

sections/torrents/index.php

@@ -323,11 +323,11 @@ function js_pages($Action, $TorrentID, $NumResults, $CurrentPage) {
 			$ThisCatalogue = floor((POSTS_PER_PAGE*$Page-POSTS_PER_PAGE)/THREAD_CATALOGUE);
 			$LastCatalogue = floor((POSTS_PER_PAGE*$Pages-POSTS_PER_PAGE)/THREAD_CATALOGUE);
 			for($i=$ThisCatalogue;$i<=$LastCatalogue;$i++) {
-				$Cache->delete('thread_'.$TopicID.'_catalogue_'.$i);
+				$Cache->delete('torrent_comments_'.$GroupID.'_catalogue_'.$i);
 			}
 			
 			// Delete thread info cache (eg. number of pages)
-			$Cache->delete('torrentcomments_count_'.$GroupID);
+			$Cache->delete('torrent_comments_'.$GroupID);
 			break;
 		case 'regen_filelist' :
 			if(check_perms('users_mod') && !empty($_GET['torrentid']) && is_number($_GET['torrentid'])) {

sections/upload/upload.php

@@ -12,7 +12,7 @@
 ini_set('max_file_uploads','100');
 show_header('Upload','upload');
 
-if(!empty($_GET['groupid']) && is_number($_GET['groupid'])) {
+if(empty($Properties) && !empty($_GET['groupid']) && is_number($_GET['groupid'])) {
 	$DB->query("SELECT 
 		tg.ID as GroupID,
 		tg.CategoryID,
@@ -41,7 +41,7 @@
 	list($Properties['TagList']) = $DB->next_record();
 }
 
-if(!empty($_GET['requestid']) && is_number($_GET['requestid'])) {
+if(empty($Properties) && !empty($_GET['requestid']) && is_number($_GET['requestid'])) {
 	include(SERVER_ROOT.'/sections/requests/functions.php');	
 	$DB->query("SELECT
 		r.ID AS RequestID,

sections/user/edit.php

@@ -138,16 +138,42 @@ function checked($Checked) {
 			<tr>
 				<td class="label"><strong>Hide release types</strong></td>
 				<td>
-<?	foreach ($ReleaseTypes as $Key => $Val) {
-		if(!empty($SiteOptions['HideTypes']) && in_array($Key, $SiteOptions['HideTypes'])) { 
-			$Checked = 'checked="checked"'; 
-		} else { 
-			$Checked=''; 
+					<table style="border:none;">
+<?
+	$ReleaseTypes[1024] = "Guest Appearance";
+	$ReleaseTypes[1023] = "Remixed By";
+	for($i = 0; list($Key,$Val) = each($ReleaseTypes); $i++) {
+		if(!($i % 7)) {
+			if($i) {
+?>
+						</tr>
+<?
+			}
+?>
+						<tr style="border:none;">
+<?
+		}
+		if(!empty($SiteOptions['HideTypes']) && in_array($Key, $SiteOptions['HideTypes'])) {
+			$Checked = 'checked="checked" ';
+		} else {
+			$Checked='';
 		}
 ?>
-		<input type="checkbox" id="hide_type_<?=$Key?>" name="hidetypes[]=" value="<?=$Key?>" <?=$Checked?> />
-		<label for="hide_type_<?=$Key?>"><?=$Val?></label>
-<?	}?>
+							<td style="border:none;">
+								<label><input type="checkbox" id="hide_type_<?=$Key?>" name="hidetypes[]=" value="<?=$Key?>" <?=$Checked?>/>
+								<?=$Val?></label>
+							</td>
+<?
+	}
+	if($i % 7) {
+?>
+							<td style="border:none;" colspan="<?=7 - ($i % 7)?>"></td>
+<?
+	}
+	unset($ReleaseTypes[1023], $ReleaseTypes[1024]);
+?>
+						</tr>
+					</table>
 				</td>
 			</tr>
 			<tr>

sections/user/takemoderate.php

@@ -31,14 +31,16 @@
 $Warned = (isset($_POST['Warned']))? 1 : 0;
 $Logs095 = (int)$_POST['095logs']; 
 if(isset($_POST['Uploaded']) && isset($_POST['Downloaded'])) {
-	$Uploaded = ($_POST['Uploaded']  == "" ? 0 : $_POST['Uploaded']); 
-	if(!is_number($Uploaded)) { 
-		error(0);
+	$Uploaded = ($_POST['Uploaded']  == "" ? 0 : $_POST['Uploaded']);
+	if($Arithmetic = strpbrk($Uploaded, '+-')) {
+		$Uploaded += max(-$Uploaded, get_bytes($Arithmetic));
 	}
-
 	$Downloaded = ($_POST['Downloaded'] == "" ? 0 : $_POST['Downloaded']);
-	if(!is_number($Downloaded)) { 
-		error(0); 
+	if($Arithmetic = strpbrk($Downloaded, '+-')) {
+		$Downloaded += max(-$Downloaded, get_bytes($Arithmetic));
+	}
+	if(!is_number($Uploaded) || !is_number($Downloaded)) {
+		error(0);
 	}
 }
 

sections/user/user.php

@@ -315,7 +315,9 @@ function check_paranoia_here($Setting) {
 	if (check_perms('users_view_ips',$Class)) {
 ?>
 	<li>IPs: <?=number_format($IPChanges)?> [<a href="userhistory.php?action=ips&amp;userid=<?=$UserID?>">View</a>]&nbsp;[<a href="userhistory.php?action=ips&amp;userid=<?=$UserID?>&amp;usersonly=1">View Users</a>]</li>
+<?		if (check_perms('users_view_ips',$Class) && check_perms('users_mod',$Class)) { ?>
 	<li>Tracker IPs: <?=number_format($TrackerIPs)?> [<a href="userhistory.php?action=tracker_ips&amp;userid=<?=$UserID?>">View</a>]</li>
+<?		} ?>
 <?
 	}
 	if (check_perms('users_view_keys',$Class)) {
@@ -363,7 +365,7 @@ function check_paranoia_here($Setting) {
 
 if (check_perms('users_view_ips',$Class)) {
 ?>
-				<li>IP: <?=display_str($IP)?> (<?=get_cc($IP)?>) [<a href="user.php?action=search&amp;ip_history=on&amp;ip=<?=display_str($IP)?>&matchtype=strict" title="Search">S</a>]</li>
+				<li>IP: <?=display_ip($IP)?></li>
 				<li>Host: <?=get_host($IP)?></li>
 <?
 }

sections/userhistory/ip_tracker_history.php

@@ -12,7 +12,7 @@
 
 define('IPS_PER_PAGE', 25);
 
-if(!check_perms('users_view_ips')) { error(403); }
+if(!check_perms('users_view_ips') || !check_perms('users_mod')) { error(403); }
 
 $UserID = $_GET['userid'];
 if (!is_number($UserID)) { error(404); }