minor fixes for bulk user actions, adding ?>, using delete_user() function to delete...

diff --git a/admin/user/user_bulk.php b/admin/user/user_bulk.php
index 78695d5dcdd45b16fe7f0cc66b11d174f495c53e..c326536eed3ca8d6658c504487c1141623145326 100755 (executable)
--- a/admin/user/user_bulk.php
+++ b/admin/user/user_bulk.php
@@ -28,14 +28,20 @@
     $user_bulk_form =& new user_bulk_form(null, $actions);
     // check if an action should be performed and do so
     switch ($user_bulk_form->getAction()) {
-    case 1:
-        redirect($CFG->wwwroot . '/admin/user/user_bulk_confirm.php');
-    case 2:
-        redirect($CFG->wwwroot . '/admin/user/user_bulk_message.php');
-    case 3:
-        redirect($CFG->wwwroot . '/admin/user/user_bulk_delete.php');
-    case 4:
-        redirect($CFG->wwwroot . '/admin/user/user_bulk_display.php');
+        case 1:
+            redirect($CFG->wwwroot . '/admin/user/user_bulk_confirm.php');
+            break;
+        case 2:
+            redirect($CFG->wwwroot . '/admin/user/user_bulk_message.php');
+            break;
+        case 3:
+            redirect($CFG->wwwroot . '/admin/user/user_bulk_delete.php');
+            break;
+        case 4:
+            redirect($CFG->wwwroot . '/admin/user/user_bulk_display.php');
+            break;
+        default:
+            break;
     }
 
     // prepare user filter types
@@ -73,3 +79,4 @@
     // display the bulk user form
     $user_bulk_form->display();
     admin_externalpage_print_footer();
+?>
\ No newline at end of file

diff --git a/admin/user/user_bulk_confirm.php b/admin/user/user_bulk_confirm.php
index 2e062b23e23b88af9389087bf6684ebcbc910edf..eef6929dd541ad9f8e45b84f9ba7be641ca93ca4 100755 (executable)
--- a/admin/user/user_bulk_confirm.php
+++ b/admin/user/user_bulk_confirm.php
@@ -26,6 +26,7 @@ if (empty($userlist)) {
 
 admin_externalpage_setup('userbulk');
 admin_externalpage_print_header();
+
 if (empty($confirm)) {
     $usernames = array();
     foreach ($userlist as $user) {
@@ -47,3 +48,4 @@ if (empty($confirm)) {
     redirect($CFG->wwwroot . '/admin/user/user_bulk.php', get_string('changessaved'));
 }
 admin_externalpage_print_footer();
+?>
\ No newline at end of file

diff --git a/admin/user/user_bulk_delete.php b/admin/user/user_bulk_delete.php
index 42c18c79e6261f1172670541214a3741eac852fc..513d54054d642fea8e146745256f54f6f05064d6 100755 (executable)
--- a/admin/user/user_bulk_delete.php
+++ b/admin/user/user_bulk_delete.php
@@ -15,7 +15,7 @@ require_capability('moodle/user:delete', $sitecontext);
 $primaryadmin = get_admin();
 $userlist = array();
 foreach ($SESSION->bulk_susers as $k => $v) {
-    $user = get_record('user', 'id', $v, null, null, null, null, 'id,firstname,lastname,email');
+    $user = get_record('user', 'id', $v, null, null, null, null, 'id,firstname,lastname,email,auth');
     if (!empty($user) && $user->id != $primaryadmin->id) {
         $userlist[$k] = $user;
     }
@@ -39,16 +39,7 @@ if (empty($confirm)) {
     notice_yesno(get_string('deletecheckfull', '', $usernames), 'user_bulk_delete.php', 'user_bulk.php', $optionsyes, NULL, 'post', 'get');
 } else {
     foreach ($userlist as $k => $user) {
-        $user->username     = addslashes($user->email . time());  // Remember it just in case
-        $user->deleted      = 1;
-        $user->email        = '';               // Clear this field to free it up
-        $user->timemodified = time();
-        $user->idnumber     = '';               // Clear this field to free it up
-        if (update_record('user', $user)) {
-            // not sure if this is needed. unenrol_student($user->id);  // From all courses
-            delete_records('role_assignments', 'userid', $user->id); // unassign all roles
-            // remove all context assigned on this user?
-            // notify(get_string('deletedactivity', '', fullname($user, true)) );
+        if (delete_user($user)) {
             unset($SESSION->bulk_susers[$k]);
         } else {
             notify(get_string('deletednot', '', fullname($user, true)));
@@ -57,3 +48,4 @@ if (empty($confirm)) {
     redirect($CFG->wwwroot . '/admin/user/user_bulk.php', get_string('changessaved'));
 }
 admin_externalpage_print_footer();
+?>

diff --git a/admin/user/user_bulk_form.php b/admin/user/user_bulk_form.php
index 90c1f236ca73da66f87c0133e5a09c6206e23daf..302013ad8c169cc80e1013425a496b44c3c72096 100644 (file)
--- a/admin/user/user_bulk_form.php
+++ b/admin/user/user_bulk_form.php
@@ -188,4 +188,5 @@ class user_bulk_form extends moodleform {
         }
         return $data->action;
     }
-}
\ No newline at end of file
+}
+?>
\ No newline at end of file

diff --git a/admin/user/user_bulk_message.php b/admin/user/user_bulk_message.php
index 72ca3fd94ecf3e3893210c6af438b51d080c6b6e..396d08dce046ec46f87eee23789a2fe39abbb37e 100755 (executable)
--- a/admin/user/user_bulk_message.php
+++ b/admin/user/user_bulk_message.php
@@ -3,16 +3,16 @@ require_once('../../config.php');
 require_once($CFG->dirroot.'/message/lib.php');
 require_once($CFG->libdir.'/adminlib.php');
 
-$users       = $SESSION->bulk_susers;
-$sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
 require_login();
 require_capability('moodle/site:readallmessages', $sitecontext);
-
 // fix for MDL-10112
 if (empty($CFG->messaging)) {
     error("Messaging is disabled on this site");  
 }
 
+$users       = $SESSION->bulk_susers;
+$sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
+
 require_once('user_message_form.php');
 $extradata['userlist'] =& $users;
 $noteform =& new user_message_form('user_bulk_message.php', $extradata);
@@ -45,3 +45,4 @@ if ($noteform->is_submitted() && !empty($formdata->preview)) {
 
 $noteform->display();
 admin_externalpage_print_footer();
+?>
\ No newline at end of file

diff --git a/admin/user/user_message_form.php b/admin/user/user_message_form.php
index 806b1593e3ea73f767e4d4d034fc5bc3c31742e3..2d06ea126b62589edb881dca138c084a979ba9e5 100644 (file)
--- a/admin/user/user_message_form.php
+++ b/admin/user/user_message_form.php
@@ -30,3 +30,4 @@ class user_message_form extends moodleform {
         $mform->closeHeaderBefore('buttonar');
     }
 }
+?>
\ No newline at end of file