Empty commit

classes/class_mysql.php

@@ -319,10 +319,14 @@ function to_array($Key = false, $Type = MYSQLI_BOTH, $Escape = true) {
 	function to_pair($KeyField, $ValField, $Escape = true) {
 		$Return = array();
 		while ($Row = mysqli_fetch_array($this->QueryID)) {
-			if ($Escape !== false) {
+			if ($Escape) {
-				$Row = Misc::display_array($Row[$ValField], $Escape);
+				$Key = display_str($Row[$KeyField]);
+				$Val = display_str($Row[$ValField]);
+			} else {
+				$Key = $Row[$KeyField];
+				$Val = $Row[$ValField];
 			}
-			$Return[$Row[$KeyField]] = $Row[$ValField];
+			$Return[$Key] = $Val;
 		}
 		mysqli_data_seek($this->QueryID, 0);
 		return $Return;

classes/class_torrentsdl.php

@@ -21,6 +21,8 @@ class TorrentsDL {
 	 * @param string $Title name of the collection that will be created
 	 */
 	public function __construct(&$QueryResult, $Title) {
+		global $Cache;
+		$Cache->InternalCache = false; // The internal cache is almost completely useless for this
 		Zip::unlimit(); // Need more memory and longer timeout
 		$this->QueryResult = $QueryResult;
 		$this->Title = $Title;
@@ -168,6 +170,7 @@ public function errors() {
 	 * @return file name with at most 180 characters that is valid on most systems
 	 */
 	public static function construct_file_name($Artist, $Album, $Year, $Media, $Format, $Encoding, $TorrentID = false, $TxtExtension = false) {
+		$TorrentArtist = Misc::file_string($Artist);
 		$TorrentName = Misc::file_string($Album);
 		if ($Year > 0) {
 			$TorrentName .= " - $Year";
@@ -190,8 +193,8 @@ public static function construct_file_name($Artist, $Album, $Year, $Media, $Form
 
 		if (!$TorrentName) {
 			$TorrentName = "No Name";
-		} else if (strlen($TorrentName . $TorrentInfo) <= 197) {
+		} else if (strlen($Artist . $TorrentName . $TorrentInfo) <= 196) {
-			$TorrentName = Misc::file_string($Artist) . $TorrentName;
+			$TorrentName = $Artist . $TorrentName;
 		}
 
 		// Leave some room to the user in case the file system limits the path length

design/privateheader.php

@@ -264,8 +264,6 @@
 		$Cache->cache_value('staff_blog_latest_time', $LatestSBlogTime, 1209600);
 	}
 	if ($SBlogReadTime < $LatestSBlogTime) {
-		global $Debug;
-		$Debug->log_var(array('b' => $SBlogReadTime, 'l' => $LatestSBlogTime), 'Times');
 		$Alerts[] = '<a href="staffblog.php">'.'New Staff Blog Post!'.'</a>';
 	}
 }

sections/artist/download.php

@@ -135,8 +135,6 @@
 $Collector = new TorrentsDL($DownloadsQ, $ArtistName);
 
 while (list($Downloads, $GroupIDs) = $Collector->get_downloads('GroupID')) {
-	$Debug->log_var($Downloads, '$Downloads');
-	$Debug->log_var($GroupIDs, '$GroupIDs');
 	$Artists = Artists::get_artists($GroupIDs);
 	$TorrentFilesQ = $DB->query("SELECT TorrentID, File FROM torrents_files WHERE TorrentID IN (".implode(',', array_keys($GroupIDs)).")", false);
 	if (is_int($TorrentFilesQ)) {

sections/reports/reports.php

@@ -219,7 +219,7 @@
 						<a href="#" id="claim_<?=$ReportID?>" onclick="claim(<?=$ReportID?>); return false;" class="brackets">Claim</a>
 						<? } ?>
 						&nbsp;&nbsp;
-						<a href="#" onclick="toggleNotes(<?=$ReportID?>); return false;" class="brackets">Toggle Notes</a>
+						<a href="#" onclick="toggleNotes(<?=$ReportID?>); return false;" class="brackets">Toggle notes</a>
 
 						<div id="notes_div_<?=$ReportID?>" style="display: <?=empty($Notes) ? "none" : "block"?>;">
 							<textarea cols="50" rows="3" id="notes_<?=$ReportID?>"><?=$Notes?></textarea>

sections/rules/jump.php

@@ -4,14 +4,14 @@
 	<table width="100%">
 		<tr class="colhead">
 			<td style="width:150px;">Category</td>
-			<td style="width:400px;">Additional Info</td>
+			<td style="width:400px;">Additional information</td>
 		</tr>
 		<tr class="rowb">
 			<td class="nobr">
 				<a href="rules.php">Golden Rules</a>
 			</td>
 			<td class="nobr">
-				These are the most important rules, breaking these will result in the most serious consequences.
+				These are the most important rules. Breaking these rules will result in the most serious consequences.
 			</td>
 		</tr>
 		<tr class="rowa">
@@ -59,7 +59,7 @@
 				<a href="rules.php?p=chat">Chat</a>
 			</td>
 			<td class="nobr">
-				Read this before posting in our forums or talking on the IRC.
+				Read this before posting in our forums or talking on our IRC network.
 			</td>
 		</tr>
 		<tr class="rowa">
@@ -67,11 +67,11 @@
 				<a href="rules.php?p=tag">Tagging</a>
 			</td>
 			<td class="nobr">
-				These rules govern what tags can and can not be added. 
+				These rules govern what tags can and cannot be added.
 			</td>
 		</tr>
 		<tr class="colhead">
-			<td colspan="2">Other Languages (Please note, these are community maintained and subject to error.)</td>
+			<td colspan="2">Other languages (Please note, these are community-maintained and are subject to error.)</td>
 		</tr>
 		<tr class="rowb">
 			<td class="nobr">

sections/user/advancedsearch.php

@@ -235,7 +235,7 @@ function num_compare($Field, $Operand, $Num1, $Num2 = ''){
 		}
 		
 
-		if (!empty($_GET['email_cnt'])) {
+		if (!empty($_GET['email_cnt']) && is_number($_GET['email_cnt'])) {
 			$Query = "SELECT UserID FROM users_history_emails GROUP BY UserID HAVING COUNT(DISTINCT Email) ";
 			if ($_GET['emails_opt'] === 'equal') {
 				$operator = '=';
@@ -269,9 +269,9 @@ function num_compare($Field, $Operand, $Num1, $Num2 = ''){
 
 		if (!empty($_GET['cc'])) {
 			if ($_GET['cc_op'] == "equal") {
-				$Where[]="um1.ipcc = '".$_GET['cc']."'";
+				$Where[]="um1.ipcc = '".db_string($_GET['cc'])."'";
 			} else {
-				$Where[]="um1.ipcc != '".$_GET['cc']."'";
+				$Where[]="um1.ipcc != '".db_string($_GET['cc'])."'";
 			}
 		}