Empty commit

docs/CHANGES.txt

@@ -1,5 +1,11 @@
 CHANGE LOG
 
+2013-12-01 by alderaan
+Fix some CSS issues in the forum search category list for Anorex, Layer Cake, Kuro, and Whatnificent
+
+2013-11-30 by alderaan
+For staff notes, wrap custom titles in [code] BBcode tags
+
 2013-11-25 by alderaan
 Add a [Check private flag] button for torrents. Uncomment its HTML to use it. Note: Torrent files must be encoded in a certain way in the DB for this to work.
 

sections/forums/mod_thread.php

@@ -370,11 +370,11 @@
 				$TopicNotes[] = "Ranking changed from \"$OldRanking\" to \"$Ranking\"";
 			}
 			if ($ForumID != $OldForumID) {
-				$TopicNotes[] = "Moved from [url=https://" . SSL_SITE_URL . "/forums.php?action=viewforum&forumid=$OldForumID]${OldForumName}[/url] to [url=https://" . SSL_SITE_URL . "/forums.php?action=viewforum&forumid=$ForumID]${ForumName}[/url]";
+				$TopicNotes[] = "Moved from [url=" . site_url() . "forums.php?action=viewforum&forumid=$OldForumID]{$OldForumName}[/url] to [url=" . site_url() . "forums.php?action=viewforum&forumid=$ForumID]{$ForumName}[/url]";
 			}
 			break;
 		case 'trashing':
-			$TopicNotes[] = "Trashed (moved from [url=https://" . SSL_SITE_URL . "/forums.php?action=viewforum&forumid=$OldForumID]${OldForumName}[/url] to [url=https://" . SSL_SITE_URL . "/forums.php?action=viewforum&forumid=$ForumID]${ForumName}[/url])";
+			$TopicNotes[] = "Trashed (moved from [url=" . site_url() . "forums.php?action=viewforum&forumid=$OldForumID]{$OldForumName}[/url] to [url=" . site_url() . "forums.php?action=viewforum&forumid=$ForumID]{$ForumName}[/url])";
 			$Notification = "Your thread \"$NewLastTitle\" has been trashed";
 			break;
 		default:

sections/forums/search.php

@@ -8,11 +8,10 @@
 
 list($Page, $Limit) = Format::page_limit(POSTS_PER_PAGE);
 
-if ((isset($_GET['type']) && $_GET['type'] == 'body')) {
+if (isset($_GET['type']) && $_GET['type'] === 'body') {
 	$Type = 'body';
 } else {
-	$Type='title';
+	$Type = 'title';
-
 }
 
 // What are we looking for? Let's make sure it isn't dangerous.
@@ -24,8 +23,8 @@
 
 $ThreadAfterDate = db_string($_GET['thread_created_after']);
 $ThreadBeforeDate = db_string($_GET['thread_created_before']);
-$ThreadAfterDateDisplay = "";
+$ThreadAfterDateDisplay = '';
-$ThreadBeforeDateDisplay = "";
+$ThreadBeforeDateDisplay = '';
 
 if (!empty($ThreadAfterDate) && !is_date($ThreadAfterDate)) {
 	error('Incorrect topic after date format');
@@ -40,8 +39,8 @@
 
 $PostAfterDate = db_string($_GET['post_created_after']);
 $PostBeforeDate = db_string($_GET['post_created_before']);
-$PostAfterDateDisplay = "";
+$PostAfterDateDisplay = '';
-$PostBeforeDateDisplay = "";
+$PostBeforeDateDisplay = '';
 
 if (!empty($PostAfterDate) && !is_date($PostAfterDate)) {
 	error('Incorrect post after date format');
@@ -139,7 +138,8 @@
 				</td>
 			</tr>
 <?
-if (empty($ThreadID)) { ?>
+if (empty($ThreadID)) {
+?>
 			<tr>
 				<td><strong>Search in:</strong></td>
 				<td>
@@ -161,10 +161,11 @@
 			<tr>
 				<td><strong>Forums:</strong></td>
 				<td>
-		<table class="cat_list layout">
+		<table id="forum_search_cat_list" class="cat_list layout">
 
 
-<?	// List of forums
+<?
+	// List of forums
 	$Open = false;
 	$LastCategoryID = -1;
 	$Columns = 0;

sections/forums/take_new_thread.php

@@ -126,7 +126,7 @@
 	$Cache->cache_value("polls_$TopicID", array($Question, $Answers, $Votes, '0000-00-00 00:00:00', '0'), 0);
 
 	if ($ForumID == STAFF_FORUM) {
-		send_irc('PRIVMSG '.ADMIN_CHAN.' :!mod Poll created by '.$LoggedUser['Username'].": \"$Question\" https://".SSL_SITE_URL."/forums.php?action=viewthread&threadid=$TopicID");
+		send_irc('PRIVMSG '.ADMIN_CHAN.' :!mod Poll created by '.$LoggedUser['Username'].": \"$Question\" ".site_url()."forums.php?action=viewthread&threadid=$TopicID");
 	}
 }
 

sections/forums/takeedit.php

@@ -75,10 +75,10 @@
 
 // Send a PM to the user to notify them of the edit
 if ($UserID != $AuthorID && $DoPM) {
-	$PMSubject = 'Your post #'.$PostID.' has been edited';
+	$PMSubject = "Your post #$PostID has been edited";
-	$PMurl = 'https://'.SSL_SITE_URL.'/forums.php?action=viewthread&postid='.$PostID.'#post'.$PostID;
+	$PMurl = site_url()."forums.php?action=viewthread&postid=$PostID#post$PostID";
-	$ProfLink = '[url=https://'.SSL_SITE_URL.'/user.php?id='.$UserID.']'.$LoggedUser['Username'].'[/url]';
+	$ProfLink = '[url='.site_url()."user.php?id=$UserID]".$LoggedUser['Username'].'[/url]';
-	$PMBody = 'One of your posts has been edited by '.$ProfLink.': [url]'.$PMurl.'[/url]';
+	$PMBody = "One of your posts has been edited by $ProfLink: [url]{$PMurl}[/url]";
 	Misc::send_pm($AuthorID, 0, $PMSubject, $PMBody);
 }
 

sections/tools/managers/ocelot.php

@@ -1,44 +1,50 @@
 <?
-	$Key = $_REQUEST['key'];
+$Key = $_REQUEST['key'];
-	$Type = $_REQUEST['type'];
+$Type = $_REQUEST['type'];
 
-	if (($Key != TRACKER_SECRET) || ($_SERVER['REMOTE_ADDR'] != TRACKER_HOST && $_SERVER['REMOTE_HOST'] != TRACKER_HOST)) {
+if (($Key != TRACKER_SECRET) || ($_SERVER['REMOTE_ADDR'] != TRACKER_HOST && $_SERVER['REMOTE_HOST'] != TRACKER_HOST)) {
-		error(403);
+	error(403);
-	}
+}
 
-	switch ($Type) {
+switch ($Type) {
-		case 'expiretoken':
+	case 'expiretoken':
-			if (isset($_GET['tokens'])) {
+		if (isset($_GET['tokens'])) {
-				$Tokens = explode(',', $_GET['tokens']);
+			$Tokens = explode(',', $_GET['tokens']);
-				if (empty($Tokens)) {
+			if (empty($Tokens)) {
-					error(0);
+				error(0);
-				}
-				$Cond = $UserIDs = array();
-				foreach ($Tokens as $Key => $Token) {
-					list($UserID, $TorrentID) = explode(':', $Token);
-					if (!is_number($UserID) || !is_number($TorrentID)) {
-						continue;
-					}
-					$Cond[] = "(UserID=$UserID AND TorrentID=$TorrentID)";
-					$UserIDs[] = $UserID;
-				}
-				if (!empty($Cond)) {
-					$Query = "UPDATE users_freeleeches SET Expired=TRUE WHERE ".implode(" OR ", $Cond);
-					$DB->query($Query);
-					foreach ($UserIDs as $UserID) {
-						$Cache->delete_value('users_tokens_'.$UserID);
-					}
-				}
-			} else {
-				$TorrentID = $_REQUEST['torrentid'];
-				$UserID = $_REQUEST['userid'];
-				if (!is_number($TorrentID) || !is_number($UserID)) {
-					error(403);
-				}
-				$DB->query("UPDATE users_freeleeches SET Expired=TRUE WHERE UserID=$UserID AND TorrentID=$TorrentID");
-				$Cache->delete_value('users_tokens_'.$UserID);
 			}
-			break;
+			$Cond = $UserIDs = array();
-	}
+			foreach ($Tokens as $Key => $Token) {
+				list($UserID, $TorrentID) = explode(':', $Token);
+				if (!is_number($UserID) || !is_number($TorrentID)) {
+					continue;
+				}
+				$Cond[] = "(UserID = $UserID AND TorrentID = $TorrentID)";
+				$UserIDs[] = $UserID;
+			}
+			if (!empty($Cond)) {
+				$Query = "
+					UPDATE users_freeleeches
+					SET Expired = TRUE
+					WHERE ".implode(" OR ", $Cond);
+				$DB->query($Query);
+				foreach ($UserIDs as $UserID) {
+					$Cache->delete_value("users_tokens_$UserID");
+				}
+			}
+		} else {
+			$TorrentID = $_REQUEST['torrentid'];
+			$UserID = $_REQUEST['userid'];
+			if (!is_number($TorrentID) || !is_number($UserID)) {
+				error(403);
+			}
+			$DB->query("
+				UPDATE users_freeleeches
+				SET Expired = TRUE
+				WHERE UserID = $UserID
+					AND TorrentID = $TorrentID");
+			$Cache->delete_value("users_tokens_$UserID");
+		}
+		break;
+}
 ?>
-

sections/user/takemoderate.php

@@ -364,7 +364,7 @@
 		die();
 	} else {
 		$UpdateSet[] = "Title = '$Title'";
-		$EditSummary[] = "title changed to $Title";
+		$EditSummary[] = "title changed to [code]{$Title}[/code]";
 		$LightUpdates['Title'] = $_POST['Title'];
 	}
 }

static/styles/anorex/style.css

@@ -886,3 +886,7 @@ div.sidebar #event_div {
 ol {
 	margin-left: 1em;
 }
+
+#forum_search_cat_list {
+	border: none;
+}

static/styles/kuro/style.css

@@ -938,3 +938,7 @@ div.sidebar #event_div {
 ol {
 	margin-left: 1em;
 }
+
+#forum_search_cat_list, #forum_search_cat_list tr {
+	border: none;
+}

static/styles/layer_cake/style.css

@@ -849,3 +849,7 @@ div.sidebar #event_div {
 ol {
 	margin-left: 1em;
 }
+
+#forum_search_cat_list {
+	border: none;
+}