Merge "Bug 1606101: usr.suspendedcusr must be non-zero"

htdocs/lang/en.utf8/mahara.php

@@ -840,7 +840,9 @@ $string['phpuploaderror_8'] = 'File upload stopped by extension.';
 $string['adminphpuploaderror'] = 'A file upload error was probably caused by your server configuration.';
 
 $string['youraccounthasbeensuspendedtext2'] = 'Your account at %s has been suspended by %s.'; // @todo: more info?
+$string['youraccounthasbeensuspendedtextcron'] = 'Your account at %s has been suspended.';
 $string['youraccounthasbeensuspendedreasontext'] = "Your account at %s has been suspended by %s. Reason:\n\n%s";
+$string['youraccounthasbeensuspendedreasontextcron'] = "Your account at %s has been suspended. Reason:\n\n%s";
 $string['youraccounthasbeenunsuspendedtext2'] = 'Your account at %s has been unsuspended. You may once again log in and use the site.'; // can't provide a login link because we don't know how they log in - it might be by xmlrpc
 
 // size of stuff

htdocs/lib/db/upgrade.php

@@ -4639,5 +4639,12 @@ function xmldb_core_upgrade($oldversion=0) {
 
     }
 
+    if ($oldversion < 2016072500) {
+        log_debug('Updating usr.suspendedcusr from 0 to a valid site admin ID for users suspended via a cron task.');
+        $admins = get_site_admins();
+        $suspendinguserid = $admins[0]->id;
+        set_field('usr', 'suspendedcusr', $suspendinguserid, 'suspendedcusr', 0);
+    }
+
     return $status;
 }

htdocs/lib/user.php

@@ -1427,6 +1427,15 @@ function suspend_user($suspendeduserid, $reason, $suspendinguserid=null) {
         $suspendinguserid = $USER->get('id');
     }
 
+    $iscron = false;
+    if ($suspendinguserid == 0) {
+        // root user has ID = 0 -> happens when run in cron.
+        // Use a valid site admin ID.
+        $iscron = true;
+        $admins = get_site_admins();
+        $suspendinguserid = $admins[0]->id;
+    }
+
     $suspendrec = new StdClass;
     $suspendrec->id              = $suspendeduserid;
     $suspendrec->suspendedcusr   = $suspendinguserid;
@@ -1443,12 +1452,26 @@ function suspend_user($suspendeduserid, $reason, $suspendinguserid=null) {
     $message->users = array($suspendeduserid);
     $message->subject = get_string_from_language($lang, 'youraccounthasbeensuspended');
     if ($reason == '') {
-        $message->message = get_string_from_language($lang, 'youraccounthasbeensuspendedtext2', 'mahara',
-            get_config('sitename'), display_name($suspendinguserid, $suspendeduserid));
+        if ($iscron) {
+            // Suspended by a cron task
+            $message->message = get_string_from_language($lang, 'youraccounthasbeensuspendedtextcron', 'mahara',
+                get_config('sitename'));
+        }
+        else {
+            $message->message = get_string_from_language($lang, 'youraccounthasbeensuspendedtext2', 'mahara',
+                get_config('sitename'), display_name($suspendinguserid, $suspendeduserid));
+        }
     }
     else {
-        $message->message = get_string_from_language($lang, 'youraccounthasbeensuspendedreasontext', 'mahara',
-            get_config('sitename'), display_name($suspendinguserid, $suspendeduserid), $reason);
+        if ($iscron) {
+            // Suspended by a cron task
+            $message->message = get_string_from_language($lang, 'youraccounthasbeensuspendedreasontextcron', 'mahara',
+                get_config('sitename'), $reason);
+        }
+        else {
+            $message->message = get_string_from_language($lang, 'youraccounthasbeensuspendedreasontext', 'mahara',
+                get_config('sitename'), display_name($suspendinguserid, $suspendeduserid), $reason);
+        }
     }
     require_once('activity.php');
     activity_occurred('maharamessage', $message);
@@ -3171,3 +3194,23 @@ function get_user_favorites($userid, $limit=5, $offset=0) {
 
     return $users;
 }
+
+/**
+ * Returns a list of a site admin user IDs order by the oldest ID first.
+ *
+ * @returns array of stdclass objects containing site admin ids.
+ */
+function get_site_admins() {
+    // get a list of all the admins ordered by oldest ID.
+    // There will always be at least one site admin in the system.
+    if ($admins = get_records_sql_array('
+            SELECT u.id
+            FROM {usr} u
+            WHERE u.admin = 1
+            AND   u.active = 1
+            ORDER BY u.id', array())) {
+            return $admins;
+    }
+    // just in case there is something horribly wrong.
+    return false;
+}

htdocs/lib/version.php

@@ -16,7 +16,7 @@ $config = new stdClass();
 // See https://wiki.mahara.org/wiki/Developer_Area/Version_Numbering_Policy
 // For upgrades on stable branches, increment the version by one.  On master, use the date.
 
-$config->version = 2016072200;
+$config->version = 2016072500;
 $config->series = '16.10';
 $config->release = '16.10dev';
 $config->minupgradefrom = 2012080604;