Empty commit

classes/class_text.php

@@ -1,7 +1,7 @@
 <?
 class TEXT {
 	// tag=>max number of attributes
-	private $ValidTags = array('b'=>0, 'u'=>0, 'i'=>0, 's'=>0, '*'=>0, '#'=>0, 'artist'=>0, 'user'=>0, 'n'=>0, 'inlineurl'=>0, 'inlinesize'=>1, 'align'=>1, 'color'=>1, 'colour'=>1, 'size'=>1, 'url'=>1, 'img'=>1, 'quote'=>1, 'pre'=>1, 'code'=>1, 'tex'=>0, 'hide'=>1, 'plain'=>0, 'important'=>0, 'torrent'=>0
+	private $ValidTags = array('b'=>0, 'u'=>0, 'i'=>0, 's'=>0, '*'=>0, '#'=>0, 'artist'=>0, 'user'=>0, 'n'=>0, 'inlineurl'=>0, 'inlinesize'=>1, 'headline'=>1, 'align'=>1, 'color'=>1, 'colour'=>1, 'size'=>1, 'url'=>1, 'img'=>1, 'quote'=>1, 'pre'=>1, 'code'=>1, 'tex'=>0, 'hide'=>1, 'plain'=>0, 'important'=>0, 'torrent'=>0, 'rule'=>0,
 	);
 	private $Smileys = array(
 		':angry:'			=> 'angry.gif',
@@ -377,6 +377,9 @@ function parse($Str) {
 				case 'tex':
 					$Array[$ArrayPos] = array('Type'=>'tex', 'Val'=>$Block);
 					break;
+                case 'rule':
+                    $Array[$ArrayPos] = array('Type'=>'rule', 'Val'=>$Block);
+                    break;
 				case 'pre':
 				case 'code':
 				case 'plain':
@@ -454,6 +457,13 @@ function to_html($Array) {
 				case 'artist':
 					$Str.='<a href="artist.php?artistname='.urlencode(undisplay_str($Block['Val'])).'">'.$Block['Val'].'</a>';
 					break;
+                case 'rule':
+                    $Rule = trim(strtolower($Block['Val']));
+                    if($Rule[0] != 'r' && $Rule[0] != 'h') {
+                        $Rule = 'r'.$Rule;
+                    }
+                    $Str.='<a href="rules.php?p=upload#'.urlencode(undisplay_str($Rule)).'">'.preg_replace('/[aA-zZ]/', '', $Block['Val']).'</a>';
+                    break;
 				case 'torrent':
 					$Pattern = '/('.NONSSL_SITE_URL.'\/torrents\.php.*[\?&]id=)?(\d+)($|&|\#).*/i';
 					$Matches = array();

classes/script_start.php

@@ -2214,7 +2214,7 @@ function selected($Name, $Value, $Attribute='selected', $Array = array()) {
 		}
 	}
 }
-function error($Error, $Ajax=false) {
+function error($Error, $Ajax=false, $Log=false) {
 	global $Debug;
 	require(SERVER_ROOT.'/sections/error/index.php');
 	$Debug->profile();

sections/chat/index.php

@@ -1,6 +1,6 @@
 <?
 enforce_login();
-show_header('IRC');	
+show_header('IRC');
 
 $DB->query("SELECT IRCKey FROM users_main WHERE ID = $LoggedUser[ID]");
 list($IRCKey) = $DB->next_record();
@@ -24,7 +24,7 @@
 	<div class="box pad" style="padding:10px 10px 10px 20px;">
 		<ul>
 			<li>
-				Staff have the final decision, if they say stop and you continue, expect at least to be banned from the IRC server. 
+				Staff have the final decision, if they say stop and you continue, expect at least to be banned from the IRC server.
 			</li>
 			<li>
 				Be respectful to IRC Operators and Administrators. These people are site staff who volunteer their time for little compensation. They are there for the benefit of all and to aid in conflict resolution, do not waste their time.
@@ -60,7 +60,7 @@
 				Don't PM, DCC, or Query anyone you don't know or have never talked to without asking, this applies specifically to staff.
 			</li>
 			<li>
-				No language other than English is permitted in the official IRC channels. If we can't understand it, we can't moderate it. 
+				No language other than English is permitted in the official IRC channels. If we can't understand it, we can't moderate it.
 			</li>
 			<li>
 				The offering, selling, trading and giving away of invites to this or any other site on our IRC network is <strong>strictly forbidden</strong>.
@@ -69,14 +69,12 @@
 				<strong>Read the topic before asking questions.</strong>
 			</li>
 		</ul>
+		<form method="post" action="chat.php" class="center">
+			<input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
+			<input type="submit" name="accept" value="I agree to these rules" />
+		</form>
 	</div>
 </div>
-<form method="post" action="chat.php">
-	<center>
-		<input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
-		<input type="submit" name="accept" value="I agree to these rules" />
-	</center>
-</form>
 <?
 	} else {
 		$nick = $LoggedUser["Username"];
@@ -104,6 +102,7 @@
 				<param name="multiserver" value="true">
 				<param name="autorejoin" value="false">
 
+
 				<param name="gui" value="sbox">
 				<param name="pixx:highlight" value="true">
 				<param name="pixx:highlightnick" value="true">

sections/error/index.php

@@ -21,10 +21,7 @@ function notify ($Channel, $Message) {
 			break;
 		case '404':
 			$Title = "Error 404";
-			if(check_perms('users_mod')) {
-				$LogLink = "<a href='log.php'> View Log</a>";
-			}
-			$Description = "You just tried to go to a page that doesn't really exist.".$LogLink;
+			$Description = "You just tried to go to a page that doesn't really exist.";
 			break;
 		case '0':
 			$Title = "Invalid Input";
@@ -45,6 +42,10 @@ function notify ($Channel, $Message) {
 			}
 	}
 
+	if($Log) {
+		$Description .= ' <a href="log.php?search='.$Log.'">Search Log</a>';
+	}
+
 	if(empty($Ajax)) {
 		show_header($Title);
 ?>

sections/reports/takereport.php

@@ -78,7 +78,7 @@
 	$Channels[] = "#requestedits";
 	$Cache->increment('num_update_reports');
 }
-if(in_array($Short, array('collages_comment', 'Post', 'requests_comment', 'thread', 'torrents_comment'))) {
+if(in_array($Short, array('collages_comment', 'post', 'requests_comment', 'thread', 'torrents_comment'))) {
 	$Channels[] = "#forumreports";
 }
 

sections/torrents/details.php

@@ -44,6 +44,7 @@ function compare($X, $Y){
 if($GroupYear>0) {
 	$DisplayName.=' ['.$GroupYear.']';
 	$AltName.=' ['.$GroupYear.']';
+	$Title.= ' ['.$GroupYear.']';
 }
 if($GroupVanityHouse){
 	$DisplayName.=' [Vanity House]';

sections/torrents/functions.php

@@ -106,7 +106,7 @@ function get_group_info($GroupID, $Return = true, $RevisionID = 0) {
 
 		$TorrentList = $DB->to_array();
 		if(count($TorrentList) == 0) {
-			error(404);
+			error(404, false, 'torrent+'.$GroupID);
 		}
 		if(in_array(0, $DB->collect('Seeders'))) {
 			$CacheTime = 600;

sections/torrents/index.php

@@ -409,7 +409,11 @@ function js_pages($Action, $TorrentID, $NumResults, $CurrentPage) {
 		if($GroupID) {
 			header("Location: torrents.php?id=".$GroupID."&torrentid=".$_GET['torrentid']."#torrent".$_GET['torrentid']);
 		} else {
-			error(404);
+			if(check_perms('users_mod')) {
+				error(404, false, 'torrent+'.$_GET['torrentid']);
+			} else {
+				error(404);
+			}
 		}
 	} elseif(!empty($_GET['type'])) {
 		include(SERVER_ROOT.'/sections/torrents/user.php');