From 7d38ecea41212bac42e30fefc9ef14086e45d29b Mon Sep 17 00:00:00 2001
From: Git <git@what.cd>
Date: Thu, 1 Mar 2012 08:00:25 +0000
Subject: [PATCH] Empty commit

---
 sections/ajax/index.php           |  3 +++
 sections/ajax/loadavg.php         | 15 +++++++++++++++
 sections/user/linkedfunctions.php |  2 +-
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 sections/ajax/loadavg.php

diff --git a/sections/ajax/index.php b/sections/ajax/index.php
index 46504d36..26af8171 100644
--- a/sections/ajax/index.php
+++ b/sections/ajax/index.php
@@ -77,6 +77,9 @@
 	case 'request':
 		require(SERVER_ROOT.'/sections/ajax/request.php');
 		break;
+	case 'loadavg':
+		require(SERVER_ROOT.'/sections/ajax/loadavg.php');
+		break;
 	default:
 		// If they're screwing around with the query string
 		print json_encode(array('status' => 'failure'));
diff --git a/sections/ajax/loadavg.php b/sections/ajax/loadavg.php
new file mode 100644
index 00000000..ed872cb1
--- /dev/null
+++ b/sections/ajax/loadavg.php
@@ -0,0 +1,15 @@
+<?
+
+authorize(true);
+
+print
+	json_encode(
+		array(
+			'status' => 'success',
+			'response' => array(
+				'loadAverage' => sys_getloadavg()
+			)
+		)
+	);
+
+?>
diff --git a/sections/user/linkedfunctions.php b/sections/user/linkedfunctions.php
index 2acf57ae..c443bee5 100644
--- a/sections/user/linkedfunctions.php
+++ b/sections/user/linkedfunctions.php
@@ -177,7 +177,7 @@ function user_dupes_table($UserID) {
 		list($DupeID) = $Dupe;
 		$DupeInfo = user_info($DupeID);
 ?>
-					<td align="left"><?=format_username($DupeID, $DupeInfo['Username'], $DupeInfo['Donor'], $DupeInfo['Warned'], $DupeInfo['Enabled'])?>
+					<td align="left"><?=format_username($DupeID, $DupeInfo['Username'], $DupeInfo['Donor'], $DupeInfo['Warned'], ($DupeInfo['Enabled']==2)?false:true)?>
 						(<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) {