From 0a6f90f4513657fe5240949be24e1ec68a026b54 Mon Sep 17 00:00:00 2001
From: Git <git@what.cd>
Date: Sat, 4 Feb 2012 08:00:25 +0000
Subject: [PATCH] Empty commit

---
 classes/class_text.php            |   4 +--
 classes/class_torrent_form.php    |   9 ++++--
 classes/script_start.php          |   4 +--
 ocelot-0.3.1.tar.bz2              | Bin 13823 -> 0 bytes
 ocelot-0.3.2.tar.bz2              | Bin 0 -> 13815 bytes
 sections/ajax/index.php           |   4 +--
 sections/ajax/info.php            |  44 ++++++++----------------------
 sections/requests/request.php     |   4 +--
 sections/requests/requests.php    |   2 +-
 sections/staffpm/assign.php       |   8 +++++-
 sections/torrents/index.php       |   7 +++--
 sections/upload/upload.php        |   7 +++--
 sections/user/linkedfunctions.php |   1 +
 sections/user/manage_linked.php   |   1 +
 sections/user/user.php            |   7 +++++
 15 files changed, 51 insertions(+), 51 deletions(-)
 delete mode 100644 ocelot-0.3.1.tar.bz2
 create mode 100644 ocelot-0.3.2.tar.bz2
 create mode 100644 sections/user/linkedfunctions.php
 create mode 100644 sections/user/manage_linked.php

diff --git a/classes/class_text.php b/classes/class_text.php
index 58629e4b..78c85111 100644
--- a/classes/class_text.php
+++ b/classes/class_text.php
@@ -454,7 +454,7 @@ function to_html($Array) {
 					$Str.='<a href="artist.php?artistname='.urlencode(undisplay_str($Block['Val'])).'">'.$Block['Val'].'</a>';
 					break;
 				case 'torrent':
-					$Pattern = '/('.NONSSL_SITE_URL.'\/torrents\.php?.*id=)?(\d+)($|&|#)/i';
+					$Pattern = '/('.NONSSL_SITE_URL.'\/torrents\.php.*[\?&]id=)?(\d+)($|&|\#).*/i';
 					$Matches = array();
 					if (preg_match($Pattern, $Block['Val'], $Matches)) {
 						if (isset($Matches[2])) {
@@ -467,7 +467,7 @@ function to_html($Array) {
 							}
 						}
 					} else {
-						$Str .= '[torrent]'.$Block['Val'].'[/torrent]';
+						$Str .= '[torrent]'.str_replace('[inlineurl]','',$Block['Val']).'[/torrent]';
 					}
 					break;
 				case 'wiki':
diff --git a/classes/class_torrent_form.php b/classes/class_torrent_form.php
index ee58098f..960f9354 100644
--- a/classes/class_torrent_form.php
+++ b/classes/class_torrent_form.php
@@ -65,12 +65,15 @@ function head() {
 			<input type="hidden" name="action" value="takeedit" />
 			<input type="hidden" name="torrentid" value="<?=display_str($this->TorrentID)?>" />
 			<input type="hidden" name="type" value="<?=display_str($this->Torrent['CategoryID'])?>" />
-<?		} else if($this->Torrent && $this->Torrent['GroupID']) { ?>
+<?		} else {
+			if($this->Torrent && $this->Torrent['GroupID']) { ?>
 			<input type="hidden" name="groupid" value="<?=display_str($this->Torrent['GroupID'])?>" />
 			<input type="hidden" name="type" value="Music" />
-<?		} else if($this->Torrent && $this->Torrent['RequestID']) { ?>
+<?			} 
+			if($this->Torrent && $this->Torrent['RequestID']) { ?>
 			<input type="hidden" name="requestid" value="<?=display_str($this->Torrent['RequestID'])?>" />
-<?		} ?>
+<?			}
+		} ?>
 		</div>
 <?		if($this->NewTorrent) { ?>
 		<table cellpadding="3" cellspacing='1' border='0' class='border' width="100%">
diff --git a/classes/script_start.php b/classes/script_start.php
index c821dc6c..48cd6bf7 100644
--- a/classes/script_start.php
+++ b/classes/script_start.php
@@ -1898,13 +1898,13 @@ function update_sphinx_requests($RequestID) {
 
 	$DB->query("REPLACE INTO sphinx_requests_delta (
 				ID, UserID, TimeAdded, LastVote, CategoryID, Title,
-				Year, ReleaseType, RecordLabel, CatalogueNumber, BitrateList,
+				Year, ReleaseType, CatalogueNumber, BitrateList,
 				FormatList, MediaList, LogCue, FillerID, TorrentID,
 				TimeFilled, Visible, Votes, Bounty)
 			SELECT
 				ID, r.UserID, UNIX_TIMESTAMP(TimeAdded) AS TimeAdded,
 				UNIX_TIMESTAMP(LastVote) AS LastVote, CategoryID,
-				Title, Year, ReleaseType, RecordLabel, CatalogueNumber, BitrateList,
+				Title, Year, ReleaseType, CatalogueNumber, BitrateList,
 				FormatList, MediaList, LogCue, FillerID, TorrentID,
 				UNIX_TIMESTAMP(TimeFilled) AS TimeFilled, Visible,
 				COUNT(rv.UserID) AS Votes, SUM(rv.Bounty) >> 10 AS Bounty
diff --git a/ocelot-0.3.1.tar.bz2 b/ocelot-0.3.1.tar.bz2
deleted file mode 100644
index 2c3df81220549d031ddc093d6475f6bc84f27296..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13823
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
B;_(0g

diff --git a/ocelot-0.3.2.tar.bz2 b/ocelot-0.3.2.tar.bz2
new file mode 100644
index 0000000000000000000000000000000000000000..40578a07473b02fde1a3db7c9410f6334ca1cbb9
GIT binary patch
literal 13815
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

literal 0
HcmV?d00001

diff --git a/sections/ajax/index.php b/sections/ajax/index.php
index a112c1cc..532f499b 100644
--- a/sections/ajax/index.php
+++ b/sections/ajax/index.php
@@ -49,6 +49,7 @@
 		break;
 	case 'browse':
 		require(SERVER_ROOT.'/sections/ajax/browse.php');
+		break;
 	case 'usersearch':
 		require(SERVER_ROOT.'/sections/ajax/usersearch.php');
 		break;
@@ -57,8 +58,7 @@
 		break;
 	case 'requests':
 		require(SERVER_ROOT.'/sections/ajax/requests.php');
-	case 'bookmarks':
-		require(SERVER_ROOT.'/sections/ajax/bookmarks/index.php');
+		break;
 	case 'artist':
 		require(SERVER_ROOT.'/sections/ajax/artist.php');
 		break;
diff --git a/sections/ajax/info.php b/sections/ajax/info.php
index 9acbc183..ab14c73d 100644
--- a/sections/ajax/info.php
+++ b/sections/ajax/info.php
@@ -3,51 +3,31 @@
 
 //authorize(true);
 
-global $DB, $Cache;
-$HeavyInfo = $Cache->get_value('user_info_heavy_'.$UserID);
-
-$DB->query("SELECT
-	m.Username,
-	m.torrent_pass,
-	i.AuthKey,
-	Uploaded AS BytesUploaded,
-	Downloaded AS BytesDownloaded,
-	RequiredRatio,
-	p.Level AS Class
-	FROM users_main AS m
-	INNER JOIN users_info AS i ON i.UserID=m.ID
-	LEFT JOIN permissions AS p ON p.ID=m.PermissionID
-	WHERE m.ID='$UserID'");
-
-list($Username,$torrent_pass,$AuthKey,$Uploaded,$Downloaded,$RequiredRatio,$Class) = $DB->next_record(MYSQLI_NUM, array(9,11));
-
 //calculate ratio --Gwindow
 //returns 0 for DNE and -1 for infiinity, because we dont want strings being returned for a numeric value in our java
-if($Uploaded == 0 && $Downloaded == 0) {
+if($LoggedUser['BytesUploaded'] == 0 && $LoggedUser['BytesDownloaded'] == 0) {
 	$Ratio = '0';
-} elseif($Downloaded == 0) {
+} elseif($LoggedUser['BytesDownloaded'] == 0) {
 	$Ratio = '-1';
 } else {
-	$Ratio = number_format(max($Uploaded/$Downloaded-0.005,0), 2); //Subtract .005 to floor to 2 decimals
+	$Ratio = number_format(max($LoggedUser['BytesUploaded']/$LoggedUser['BytesDownloaded']-0.005,0), 2); //Subtract .005 to floor to 2 decimals
 }
 
-
-
 print json_encode(
 	array(
 		'status' => 'success',
 		'response' => array(
-			'username' => $Username,
-			'id' => $UserID,
-			'authkey'=>$AuthKey,
-			'passkey'=>$torrent_pass,
+			'username' => $LoggedUser['Username'],
+			'id' => $LoggedUser['ID'],
+			'authkey'=> $LoggedUser['AuthKey'],
+			'passkey'=> $LoggedUser['torrent_pass'],
 			'userstats' => array(
-				'uploaded' => (int) $Uploaded,
-				'downloaded' => (int) $Downloaded,
-				'ratio' => (float) $Ratio,
-				'requiredratio' => (float) $RequiredRatio,
+				'uploaded' => (int) $LoggedUser['BytesUploaded'],
+				'downloaded' => (int) $LoggedUser['BytesDownloaded'],
+				'ratio' => (float) $LoggedUser['Ratio'],
+				'requiredratio' => (float) $LoggedUser['RequiredRatio'],
 				//'class' => $Class
-				'class' => $ClassLevels[$Class]['Name']
+				'class' => $ClassLevels[$LoggedUser['Class']]['Name']
 			),
 		)
 	)
diff --git a/sections/requests/request.php b/sections/requests/request.php
index 4fcadb54..96f835ab 100644
--- a/sections/requests/request.php
+++ b/sections/requests/request.php
@@ -23,7 +23,7 @@
 }
 
 list($RequestID, $RequestorID, $RequestorName, $TimeAdded, $LastVote, $CategoryID, $Title, $Year, $Image, $Description, $CatalogueNumber, $RecordLabel, $ReleaseType,
-	$BitrateList, $FormatList, $MediaList, $LogCue, $FillerID, $FillerName, $TorrentID, $TimeFilled) = $Request;
+	$BitrateList, $FormatList, $MediaList, $LogCue, $FillerID, $FillerName, $TorrentID, $TimeFilled, $GroupID) = $Request;
 
 //Convenience variables
 $IsFilled = !empty($TorrentID);
@@ -97,7 +97,7 @@
 		<a href="#" id="bookmarklink_request_<?=$RequestID?>" onclick="Bookmark('request', <?=$RequestID?>,'[Remove bookmark]');return false;">[Bookmark]</a>
 <?	} ?>
 		<a href="reports.php?action=report&amp;type=request&amp;id=<?=$RequestID?>">[Report Request]</a>
-		<a href="upload.php?requestid=<?=$RequestID?>">[Upload Request]</a>
+		<a href="upload.php?requestid=<?=$RequestID?><?=($GroupID?"&groupid=$GroupID":'')?>">[Upload Request]</a>
 <? if(!$IsFilled && (($CategoryID == 0) || ($CategoryName == "Music" && $Year == 0))) { ?>
 		<a href="reports.php?action=report&amp;type=request_update&amp;id=<?=$RequestID?>">[Request Update]</a>
 <? } ?>
diff --git a/sections/requests/requests.php b/sections/requests/requests.php
index b6a66aa5..09d77b42 100644
--- a/sections/requests/requests.php
+++ b/sections/requests/requests.php
@@ -481,7 +481,7 @@
 			//	$Tags, $TimeAdded, $TimeFilled, $Title, $TorrentID, $RequestorID, $RequestorName, $Year, $RequestID, $Categoryid, $FillerID, $LastVote, 
 			//	$ReleaseType, $TagIDs, $TimeAdded, $TimeFilled, $TorrentID, $RequestorID, $Voters) = array_values($Request);
 			
-			list($RequestID, $RequestorID, $RequestorName, $TimeAdded, $LastVote, $CategoryID, $Title, $Year, $Image, $Description, $CatalogueNumber, 
+			list($RequestID, $RequestorID, $RequestorName, $TimeAdded, $LastVote, $CategoryID, $Title, $Year, $Image, $Description, $CatalogueNumber, $RecordLabel,
 				$ReleaseType, $BitrateList, $FormatList, $MediaList, $LogCue, $FillerID, $FillerName, $TorrentID, $TimeFilled) = $Request;
 				
 			$RequestVotes = get_votes_array($RequestID);
diff --git a/sections/staffpm/assign.php b/sections/staffpm/assign.php
index 60353a7a..c3322e42 100644
--- a/sections/staffpm/assign.php
+++ b/sections/staffpm/assign.php
@@ -48,8 +48,14 @@
 			// Assign to class
 			$DB->query("UPDATE staff_pm_conversations SET Status='Unanswered', Level=$NewLevel, AssignedToUser=NULL WHERE ID=$ConvID");
 		} else {
+			$UserInfo = user_info($NewLevel);
+			$Level    = $Classes[$UserInfo['PermissionID']]['Level'];
+			if (!$Level) {
+				error("Assign to user not found.");
+			}
+			
 			// Assign to user
-			$DB->query("UPDATE staff_pm_conversations SET Status='Unanswered', AssignedToUser=$NewLevel WHERE ID=$ConvID");
+			$DB->query("UPDATE staff_pm_conversations SET Status='Unanswered', AssignedToUser=$NewLevel, Level=$Level WHERE ID=$ConvID");
 			
 		}
 		echo '1';
diff --git a/sections/torrents/index.php b/sections/torrents/index.php
index 2e305b05..6015c3eb 100644
--- a/sections/torrents/index.php
+++ b/sections/torrents/index.php
@@ -260,7 +260,7 @@ function js_pages($Action, $TorrentID, $NumResults, $CurrentPage) {
 				WHERE tc.ID='".db_string($_POST['post'])."'");
 			list($OldBody, $AuthorID,$GroupID,$AddedTime)=$DB->next_record();
 			
-			$DB->query("SELECT ceil(COUNT(ID) / ".POSTS_PER_PAGE.") AS Page FROM torrents_comments WHERE GroupID = $GroupID AND ID <= $_POST[post]");
+			$DB->query("SELECT ceil(COUNT(ID) / ".TORRENT_COMMENTS_PER_PAGE.") AS Page FROM torrents_comments WHERE GroupID = $GroupID AND ID <= $_POST[post]");
 			list($Page) = $DB->next_record();
 			
 			if ($LoggedUser['ID']!=$AuthorID && !check_perms('site_moderate_forums')) { error(404); }
@@ -321,14 +321,15 @@ function js_pages($Action, $TorrentID, $NumResults, $CurrentPage) {
 			$DB->query("DELETE FROM torrents_comments WHERE ID='".db_string($_GET['postid'])."'");
 		
 			//We need to clear all subsequential catalogues as they've all been bumped with the absence of this post
-			$ThisCatalogue = floor((POSTS_PER_PAGE*$Page-POSTS_PER_PAGE)/THREAD_CATALOGUE);
-			$LastCatalogue = floor((POSTS_PER_PAGE*$Pages-POSTS_PER_PAGE)/THREAD_CATALOGUE);
+			$ThisCatalogue = floor((TORRENT_COMMENTS_PER_PAGE*$Page-TORRENT_COMMENTS_PER_PAGE)/THREAD_CATALOGUE);
+			$LastCatalogue = floor((TORRENT_COMMENTS_PER_PAGE*$Pages-TORRENT_COMMENTS_PER_PAGE)/THREAD_CATALOGUE);
 			for($i=$ThisCatalogue;$i<=$LastCatalogue;$i++) {
 				$Cache->delete('torrent_comments_'.$GroupID.'_catalogue_'.$i);
 			}
 			
 			// Delete thread info cache (eg. number of pages)
 			$Cache->delete('torrent_comments_'.$GroupID);
+			
 			break;
 		case 'regen_filelist' :
 			if(check_perms('users_mod') && !empty($_GET['torrentid']) && is_number($_GET['torrentid'])) {
diff --git a/sections/upload/upload.php b/sections/upload/upload.php
index 91618481..baac9ced 100644
--- a/sections/upload/upload.php
+++ b/sections/upload/upload.php
@@ -40,9 +40,10 @@
 		WHERE tt.GroupID='$_GET[groupid]'");
 	
 	list($Properties['TagList']) = $DB->next_record();
-}
-
-if(empty($Properties) && !empty($_GET['requestid']) && is_number($_GET['requestid'])) {
+	if (!empty($_GET['requestid']) && is_number($_GET['requestid'])) {
+		$Properties['RequestID'] = $_GET['requestid'];
+	}
+} elseif (empty($Properties) && !empty($_GET['requestid']) && is_number($_GET['requestid'])) {
 	include(SERVER_ROOT.'/sections/requests/functions.php');	
 	$DB->query("SELECT
 		r.ID AS RequestID,
diff --git a/sections/user/linkedfunctions.php b/sections/user/linkedfunctions.php
new file mode 100644
index 00000000..78e84b86
--- /dev/null
+++ b/sections/user/linkedfunctions.php
@@ -0,0 +1 @@
+<?

include_once(SERVER_ROOT.'/classes/class_text.php'); // Text formatting class


function link_users($UserID, $TargetID) {
	global $DB;

	authorize();
	if (!check_perms('users_mod')) {
		error(403);
	}

	if (!is_number($UserID) || !is_number($TargetID)) {
		error(403);
	}
	if ($UserID == $TargetID) {
		return;
	}

	$DB->query("SELECT 1 FROM users_main WHERE ID IN ($UserID, $TargetID)");
	if ($DB->record_count() != 2) {
		error(403);
	}

	$DB->query("SELECT GroupID FROM users_dupes WHERE UserID = $TargetID");
	list($TargetGroupID) = $DB->next_record();
	$DB->query("SELECT u.GroupID, d.Comments FROM users_dupes AS u JOIN dupe_groups AS d ON d.ID = u.GroupID WHERE UserID = $UserID");
	list($UserGroupID, $Comments) = $DB->next_record();

	if ($TargetGroupID) {
		if ($TargetGroupID == $UserGroupID) {
			return;
		}
		if ($UserGroupID) {
			$DB->query("UPDATE users_dupes SET GroupID = $TargetGroupID WHERE GroupID = $UserGroupID");
			$DB->query("UPDATE dupe_groups SET Comments = CONCAT('".db_string($Comments)."\n\n',Comments) WHERE ID = $TargetGroupID");
			$DB->query("DELETE FROM dupe_groups WHERE ID = $UserGroupID");
		} else {
			$DB->query("INSERT INTO users_dupes (UserID, GroupID) VALUES ($UserID, $TargetGroupID)");
		}
	} elseif ($UserGroupID) {
		$DB->query("INSERT INTO users_dupes (UserID, GroupID) VALUES ($TargetID, $UserGroupID)");
	} else {
		$DB->query("INSERT INTO dupe_groups () VALUES ()");
		$GroupID = $DB->inserted_id();
		$DB->query("INSERT INTO users_dupes (UserID, GroupID) VALUES ($TargetID, $GroupID)");
		$DB->query("INSERT INTO users_dupes (UserID, GroupID) VALUES ($UserID, $GroupID)");
	}
}

function unlink_user($UserID) {
	global $DB;

	authorize();
	if (!check_perms('users_mod')) {
		error(403);
	}

	if (!is_number($UserID)) {
		error(403);
	}

	$DB->query("DELETE FROM users_dupes WHERE UserID='$UserID'");
	$DB->query("DELETE g.* FROM dupe_groups AS g LEFT JOIN users_dupes AS u ON u.GroupID = g.ID WHERE u.GroupID IS NULL");
}

function delete_dupegroup($GroupID) {
	global $DB;

	authorize();
	if (!check_perms('users_mod')) {
		error(403);
	}

	if (!is_number($GroupID)) {
		error(403);
	}

	$DB->query("DELETE FROM dupe_groups WHERE ID = '$GroupID'");
}

function dupe_comments($GroupID, $Comments) {
	global $DB, $Text;

	authorize();
	if (!check_perms('users_mod')) {
		error(403);
	}

	if (!is_number($GroupID)) {
		error(403);
	}

	$DB->query("UPDATE dupe_groups SET Comments = '".db_string($Comments)."' WHERE ID = '$GroupID'");
}

function user_dupes_table($UserID) {
	global $DB, $LoggedUser;
	$Text = new TEXT;

	if (!check_perms('users_mod')) {
		error(403);
	}
	if (!is_number($UserID)) {
		error(403);
	}
	$DB->query("SELECT d.ID, d.Comments
				FROM dupe_groups AS d
				JOIN users_dupes AS u ON u.GroupID = d.ID
				WHERE u.UserID = $UserID");
	if (list($GroupID, $Comments) = $DB->next_record()) {
		$DB->query("SELECT m.ID
					FROM users_main AS m
					JOIN users_dupes AS d ON m.ID = d.UserID
					WHERE d.GroupID = $GroupID
					ORDER BY m.ID = $UserID DESC");
		$DupeCount = $DB->record_count();
		$Dupes = $DB->to_array();
	} else {
		$DupeCount = 0;
		$Dupes = array();
	}
?>

		<div class="box">
			<div class="head"><?=max($DupeCount - 1, 0)?> Linked Account<?=(($DupeCount == 2)?'':'s')?> <a href="#" onclick="$('.linkedaccounts').toggle(); return false;">(View)</a></div>
<?
	if ($DupeCount > 0) {
?>
			<table width="100%" class="hidden linkedaccounts">
				<tr>
<?
		$i = 0;
		foreach ($Dupes as $Dupe) {
			$i++;
			list($DupeID) = $Dupe;
			$DupeInfo = user_info($DupeID);
?>
				<td align="left"><?=format_username($DupeID, $DupeInfo['Username'], $DupeInfo['Donor'], $DupeInfo['Warned'], $DupeInfo['Enabled'])?>
					(<a href="user.php?action=dupes&dupeaction=remove&auth=<?=$LoggedUser['AuthKey']?>&userid=<?=$UserID?>&removeid=<?=$DupeID?>" onClick="return confirm('Are you sure you wish to remove <?=$DupeInfo['Username']?> from this group?');">x</a>)</td>
<?
			if ($i == 5) {
				$i = 0;
				echo "</tr><tr>";
			}
		}
		for ($j = $i; $j < 5; $j++) {
			echo '<td>&nbsp;</td>';
		}
?>
				</tr>
				<tr>
					<td colspan="5" align="left" style="border-top: thin solid"><strong>Comments:</strong></td>
				</tr>
				<tr>
					<td colspan="5" align="left">
						<div id="dupecomments"><?=$Text->full_format($Comments);?></div>
						<div id="editdupecomments" class="hidden">
							<form>
								<input type="hidden" name="action" value="dupes">
								<input type="hidden" name="dupeaction" value="comments">
								<input type="hidden" name="groupid" value="<?=$GroupID?>">
								<input type="hidden" name="userid" value="<?=$UserID?>">
								<input type="hidden" id="auth" name="auth" value="<?=$LoggedUser['AuthKey']?>">
								<textarea name="dupecomments" onkeyup="resize('dupecommentsbox');" id="dupecommentsbox" cols="65" rows="5" style="width:98%;"><?=display_str($Comments)?></textarea>
								<input type="submit" value="Set Comments">
							</form>
						</div>
						<span style="float:right; font-style: italic;"><a href="#" onClick="$('#dupecomments').toggle(); $('#editdupecomments').toggle(); resize('dupecommentsbox'); return false;">(Edit linked account comments)</a>
					</td>
				</tr>
			</table>
<?
	}
?>
			<div class="pad hidden linkedaccounts">
				<form method="GET">
					<input type="hidden" name="action" value="dupes">
					<input type="hidden" name="authkey" value="dupes">
					<input type="hidden" name="dupeaction" value="add">
					<input type="hidden" name="userid" value="<?=$UserID?>">
					<input type="hidden" id="auth" name="auth" value="<?=$LoggedUser['AuthKey']?>">
					<label for="target">Link this user with: </label><input type="text" name="target" id="target"><input type="submit" value="Link">
				</form>
			</div>
		</div>
<?
}
?>
\ No newline at end of file
diff --git a/sections/user/manage_linked.php b/sections/user/manage_linked.php
new file mode 100644
index 00000000..e1e26820
--- /dev/null
+++ b/sections/user/manage_linked.php
@@ -0,0 +1 @@
+<?
	authorize();
	include(SERVER_ROOT.'/sections/user/linkedfunctions.php');
	
	if (!check_perms('users_mod')) {
		error(403);
	}
	
	$UserID = $_REQUEST['userid'];
	
	switch ($_REQUEST['dupeaction']) {
		case 'remove':
			unlink_user($_REQUEST['removeid']);
			break;
			
		case 'add':
			$Target = $_REQUEST['target'];
			$DB->query("SELECT ID FROM users_main WHERE Username LIKE '".db_string($Target)."'");
			if (list($TargetID) = $DB->next_record()) {
				link_users($UserID, $TargetID);
			} else {
				error("User '$Target' not found.");
			}
			break;
			
		case 'comments':
			dupe_comments($_REQUEST['groupid'], $_REQUEST['dupecomments']);
			break;
			
		default:
			error(403);
	}
	echo '\o/';
	header("Location: user.php?id=$UserID");
?>
\ No newline at end of file
diff --git a/sections/user/user.php b/sections/user/user.php
index 576b6e73..692fd089 100644
--- a/sections/user/user.php
+++ b/sections/user/user.php
@@ -715,6 +715,13 @@ function check_paranoia_here($Setting) {
 }
 
 
+
+// Linked accounts
+if(check_perms('users_mod')) {
+	include(SERVER_ROOT.'/sections/user/linkedfunctions.php');
+	user_dupes_table($UserID);
+}
+
 if ((check_perms('users_view_invites')) && $Invited > 0) {
 	include(SERVER_ROOT.'/classes/class_invite_tree.php');
 	$Tree = new INVITE_TREE($UserID, array('visible'=>false));