From 9157dc5ec162e64c60ebe0063553342f42a43831 Mon Sep 17 00:00:00 2001
From: Git <git@what.cd>
Date: Sat, 14 Apr 2012 08:00:26 +0000
Subject: [PATCH] Empty commit

---
 classes/class_torrent_form.php     | 43 +-----------------------------
 sections/ajax/index.php            |  3 +++
 sections/index/private.php         | 40 ---------------------------
 sections/reportsv2/array.php       | 17 ------------
 sections/reportsv2/takeresolve.php |  4 ---
 5 files changed, 4 insertions(+), 103 deletions(-)

diff --git a/classes/class_torrent_form.php b/classes/class_torrent_form.php
index 85bea74e..43037f0d 100644
--- a/classes/class_torrent_form.php
+++ b/classes/class_torrent_form.php
@@ -190,13 +190,6 @@ function music_form($GenreTags) {
 		$BadFiles = $Torrent['BadFiles'];
 		$CassetteApproved = $Torrent['CassetteApproved'];
 		$LossymasterApproved = $Torrent['LossymasterApproved'];
-		if (!$this->NewTorrent) {
-			$DB->query("SELECT UserID, Points FROM library_contest WHERE TorrentID = ".$this->TorrentID);
-			list($LibraryUser, $LibraryPoints) = $DB->next_record();
-		}
-		if ($LibraryUser != "") {
-			$LibraryUpload = '1';
-		}
 		global $ReleaseTypes;
 ?>
 		<table cellpadding="3" cellspacing="1" border="0" class="border<? if($this->NewTorrent) { echo ' slice'; }?>" width="100%">
@@ -571,19 +564,7 @@ function show() {
 					<input type="checkbox" id="lossymaster_approved" name="lossymaster_approved"<? if ($LossymasterApproved) {echo " checked='checked'";}?>/> Check this box if the torrent is an approved lossy master.
 				</td>
 			</tr>
-			<tr>
-				<td class="label">Library Contest Upload</td>
-				<td>
-					<input type="checkbox" id="library_upload" name="library_upload"<? if ($LibraryUpload) { echo " checked='checked'";}?>/> Check this box if the torrent is library contest upload.
-				</td>
-			</tr>
-			<tr>
-				<td class="label">Library Contest Points</td>
-				<td>
-					<input type="text" name="library_points" value="<?=$LibraryPoints?>" size="10" />
-				</td>
-			</tr>
-<?		} ?>
+<?		 }?>
 <?		 if($this->NewTorrent) { ?> 
 			<tr>
 				<td class="label">Tags</td>
@@ -643,14 +624,6 @@ function show() {
 
 	function audiobook_form() { 
 		$Torrent = $this->Torrent;
-		if (!$this->NewTorrent) {
-			global $DB;
-			$DB->query("SELECT UserID, Points FROM library_contest WHERE TorrentID = ".$this->TorrentID);
-			list($LibraryUser, $LibraryPoints) = $DB->next_record();
-			if ($LibraryUser != "") {
-				$LibraryUpload = '1';
-			}
-		}
 ?>
 		<table cellpadding="3" cellspacing="1" border="0" class="border slice" width="100%">
 <?		if($this->NewTorrent){ ?>
@@ -717,20 +690,6 @@ function audiobook_form() {
 					</span>
 				</td>
 			</tr>
-<?			if(!$this->NewTorrent && check_perms('users_mod')) {?>
-			<tr>
-			     <td class="label">Library Contest Upload</td>
-			     <td>
-				    <input type="checkbox" id="library_upload" name="library_upload"<? if ($LibraryUpload) { echo " checked='checked'";}?>/> Check this box if the torrent is library contest upload.
-			     </td>
-			</tr>
-			<tr>
-			     <td class="label">Library Contest Points</td>
-			     <td>
-				    <input type="text" name="library_points" value="<?=$LibraryPoints?>" size="10" />
-			     </td>
-			</tr>
-<?			}?>
 <?		if($this->NewTorrent) { ?> 
 			<tr>
 				<td class="label">Tags</td>
diff --git a/sections/ajax/index.php b/sections/ajax/index.php
index 223931ac..aebd5445 100644
--- a/sections/ajax/index.php
+++ b/sections/ajax/index.php
@@ -71,6 +71,9 @@
 	case 'bookmarks':
 		require(SERVER_ROOT.'/sections/ajax/bookmarks.php');
 		break;
+	case 'announcements':
+		require(SERVER_ROOT.'/sections/ajax/announcements.php');
+                break;
 	case 'notifications':
 		require(SERVER_ROOT.'/sections/ajax/notifications.php');
 		break;
diff --git a/sections/index/private.php b/sections/index/private.php
index 9718bcb2..5dc11dfe 100644
--- a/sections/index/private.php
+++ b/sections/index/private.php
@@ -28,46 +28,6 @@
 ?>
 <div class="thin">
 	<div class="sidebar">
-<?
-	$DB->query("SELECT lc.UserID,
-			   SUM(lc.Points)
-			   FROM library_contest AS lc
-			   GROUP BY lc.UserID
-			   ORDER BY SUM(lc.Points) DESC
-			   LIMIT 10");
-	$Contest = $DB->to_array();
-	?>
-	<div class="box">
-		<div class="head colhead_dark"><strong><a href="index.php?action=library_scoreboard">Library Contest Scoreboard</a></strong></div>
-		<div class="center pad">
-		<table>
-			<tr class="colhead">
-				<td><strong>Place</strong></td>
-				<td><strong>Username</strong></td>
-				<td><strong>Points</strong></td>
-			</tr>
-			<?
-			$i = 1;
-			foreach ($Contest as $Contestant) {
-				list($UserID, $Uploads, $Username, $Donor, $Warned, $Enabled, $PermissionID) = $Contestant;
-				$Class = ($i%2 == 0) ? 'a':'b';
-				$Num = $i;
-			?>
-				<tr class="row<?=$Class?>">
-					<td><strong><?=$Num?></td>
-					<td><?=format_username($UserID, true, true, true, true)?></td>
-					<td><?=number_format($Uploads)?></td>
-				</tr>
-			<?
-				$i++;
-			}
-			?>
-		</table>
-		</div>
-		<div class="center">
-			<i><a href="forums.php?action=viewthread&threadid=151451">Announcement</a></i>
-		</div>
-	</div>
 <?
 	$FeaturedAlbum = $Cache->get_value('featured_album');
 	if($FeaturedAlbum === false) {
diff --git a/sections/reportsv2/array.php b/sections/reportsv2/array.php
index 29a0d748..d43d82ed 100644
--- a/sections/reportsv2/array.php
+++ b/sections/reportsv2/array.php
@@ -84,23 +84,6 @@
 					'delete' => '0',
 					'pm' => ''
 				)
-			),
-			'library' => array(
-				'priority' => '90',
-				'title' => 'Library Contest Request',
-				'report_messages' => array(
-					"Make sure to include a link to the image so we can verify it is a library upload.",
-					"Please indicate if this is a multi-disc upload in the Comments field. A simple 'yes' or 'no' will do."
-				),
-				'report_fields' => array(
-					'image' => '1'
-				),
-				'resolve_options' => array(
-					'upload' => '0',
-					'warn' => '0',
-					'delete' => '0',
-					'pm' => ""
-				)
 			)
 		),
 		'1' => array( //Music Resolves
diff --git a/sections/reportsv2/takeresolve.php b/sections/reportsv2/takeresolve.php
index 817c7afb..2af4de68 100644
--- a/sections/reportsv2/takeresolve.php
+++ b/sections/reportsv2/takeresolve.php
@@ -168,10 +168,6 @@
 		$Cache->delete_value('torrents_details_'.$GroupID);
 		$SendPM = true;
 	}
-	if ($_POST['resolve_type'] == "library") {
-		$DB->query("INSERT INTO library_contest (UserID, TorrentID, Points) VALUES (".$UploaderID.", ".$TorrentID.", 1)");
-		$SendPM = false;
-	}
 	
 	//Log and delete
 	if(isset($Escaped['delete']) && check_perms('users_mod')) {