From 2694f512b6a28a691ed839c6b69a6e62183edf35 Mon Sep 17 00:00:00 2001
From: Richard Mansfield <richard.mansfield@catalyst.net.nz>
Date: Wed, 27 Apr 2011 16:38:47 +1200
Subject: [PATCH] Check permission in admin user search, remove suspension code (bug #771614)

Change-Id: Ic9465c35d79cc663fc172da2ab66225eaeda76ee
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
---
 htdocs/admin/users/search.json.php |   15 +--------------
 htdocs/js/adminusersearch.js       |    7 -------
 2 files changed, 1 insertions(+), 21 deletions(-)

diff --git a/htdocs/admin/users/search.json.php b/htdocs/admin/users/search.json.php
index ad95ca2..2a2f3eb 100644
--- a/htdocs/admin/users/search.json.php
+++ b/htdocs/admin/users/search.json.php
@@ -27,25 +27,12 @@
 
 define('INTERNAL', 1);
 define('JSON', 1);
+define('INSTITUTIONALADMIN', 1);
 
 require(dirname(dirname(dirname(__FILE__))) . '/init.php');
 
 $action = param_variable('action');
 
-if ($action == 'suspend') {
-    $id = param_integer('id');
-    $reason = param_variable('reason');
-
-    try {
-        suspend_user($id, $reason);
-    }
-    catch (MaharaException $e) {
-        json_reply('local', get_string('suspendfailed', 'admin') . ': ' . $e->getMessage());
-    }
-
-    json_reply(false, get_string('usersuspended', 'admin'));
-}
-
 if ($action == 'search') {
     require_once('searchlib.php');
 
diff --git a/htdocs/js/adminusersearch.js b/htdocs/js/adminusersearch.js
index e8edb68..1a64f5c 100644
--- a/htdocs/js/adminusersearch.js
+++ b/htdocs/js/adminusersearch.js
@@ -142,17 +142,10 @@ function UserSearch() {
             if ($('searchresults')) {
                 self.rewritePaging();
                 self.rewriteSorting();
-                self.rewriteSuspendLinks();
             }
         });
     }
 
-    this.rewriteSuspendLinks = function() {
-        forEach(getElementsByTagAndClassName('a', 'suspend-user-link', 'searchresults'), function(i) {
-            connect(i, 'onclick', suspendDisplay);
-        });
-    }
-
     addLoadEvent(self.init);
 }
 
-- 
1.7.1