Merge with git+ssh://git.catalyst.net.nz/var/git/mahara.git#master

htdocs/admin/users/suspended.php

@@ -67,9 +67,10 @@ $form = new Pieform(array(
             'value' => get_string('exportuserprofiles', 'admin')
         ),
         'delete' => array(
-            'type' => 'submit',
-            'name' => 'delete',
-            'value' => get_string('deleteusers', 'admin')
+            'type'    => 'submit',
+            'confirm' => get_string('confirmdeleteusers', 'admin'),
+            'name'    => 'delete',
+            'value'   => get_string('deleteusers', 'admin')
         )
     )
 ));

htdocs/lang/en.utf8/admin.php

@@ -178,6 +178,7 @@ $string['staffusersupdated'] = 'Staff users updated';
 
 // Suspended Users
 $string['deleteusers'] = 'Delete Users';
+$string['confirmdeleteusers'] = 'Are you sure you want to delete the selected users?';
 $string['exportingnotsupportedyet'] = 'Exporting user profiles is not supported yet';
 $string['exportuserprofiles'] = 'Export User Profiles';
 $string['nousersselected'] = 'No users selected';

htdocs/lib/pieforms/pieform/elements/submit.php

@@ -32,6 +32,10 @@
  * @return string           The HTML for the element
  */
 function pieform_element_submit(Pieform $form, $element) {
+    if (isset($element['confirm'])) {
+        $element['onclick'] = 'return confirm(' . json_encode($element['confirm']) . ');';
+    }
+
     return '<input type="submit"'
         . $form->element_attributes($element)
         . ' value="' . Pieform::hsc($form->get_value($element)) . '">';