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

@@ -69,14 +69,12 @@
 				<strong>Read the topic before asking questions.</strong>
 			</li>
 		</ul>
-	</div>
+		<form method="post" action="chat.php" class="center">
-</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>
-</form>
+	</div>
+</div>
 <?
 	} 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')) {
+			$Description = "You just tried to go to a page that doesn't really exist.";
-				$LogLink = "<a href='log.php'> View Log</a>";
-			}
-			$Description = "You just tried to go to a page that doesn't really exist.".$LogLink;
 			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

@@ -408,9 +408,13 @@ function js_pages($Action, $TorrentID, $NumResults, $CurrentPage) {
 		list($GroupID) = $DB->next_record();
 		if($GroupID) {
 			header("Location: torrents.php?id=".$GroupID."&torrentid=".$_GET['torrentid']."#torrent".$_GET['torrentid']);
+		} else {
+			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');
 	} elseif(!empty($_GET['groupname']) && !empty($_GET['forward'])) {