Bug 1486813: Stop redirect to 'register site' page after each upgrade

By adding a cancel option to the register site form that clears the
new_registration_policy config setting.

behatnotneeded

Change-Id: I65cf7239b9fe021d17be387eeb8bfda9547c5032
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

htdocs/admin/upgrade.php

@@ -26,7 +26,7 @@ if (param_integer('finished', 0)) {
         $message .= '  ' . get_string('ensurepluginsexist', 'admin', get_config('docroot'));
         $SESSION->add_error_msg($message);
     }
-    if (get_config('new_registration_policy')) {
+    if (get_config('new_registration_policy') == 1) {
         redirect('/admin/registersite.php');
     }
     redirect();

htdocs/lang/en.utf8/admin.php

@@ -229,6 +229,7 @@ $string['datathathavebeensent'] = 'Data that has been sent';
 $string['sendweeklyupdates'] = 'Send weekly updates?';
 $string['sendweeklyupdatesdescription1'] = 'If set to "On", your site will send weekly updates to mahara.org with some statistics about your site.';
 $string['Register'] = 'Register';
+$string['registrationcancelled'] = 'You can choose to register at any time by going to the <a href="%sadmin/registersite.php">site registration page</a>.';
 $string['registrationfailedtrylater'] = 'Registration failed with error code %s. Please try again later.';
 $string['registrationsuccessfulthanksforregistering'] = 'Registration successful - thanks for registering.';
 $string['registeryourmaharasite'] = 'Register your Mahara site';

htdocs/lib/db/upgrade.php

@@ -4181,7 +4181,9 @@ function xmldb_core_upgrade($oldversion=0) {
         // In 15.10, we changed the registration site policy.
         // We need to remind the site admins to register the site again with the new policy.
         log_debug('Remind the site admins to register the site again with the new policy');
-        set_config('new_registration_policy', true);
+        if (get_config('new_registration_policy') != -1) {
+            set_config('new_registration_policy', true);
+        }
         if (get_config('registration_sendweeklyupdates')) {
             set_config('registration_sendweeklyupdates', false);
         }

htdocs/lib/registration.php

@@ -63,9 +63,9 @@ EOF;
                 'defaultvalue' => true,
             ),
             'register' => array(
-                'type' => 'submit',
+                'type' => 'submitcancel',
                 'class' => 'btn-success',
-                'value' => get_string('Register', 'admin'),
+                'value' => array(get_string('Register', 'admin'), get_string('cancel', 'mahara')),
             ),
         )
      );
@@ -111,9 +111,22 @@ function register_submit(Pieform $form, $values) {
 
         $SESSION->add_ok_msg($info, false);
     }
-    redirect('/admin/');
+    redirect('/admin/index.php');
 }
 
+/**
+ * Runs when registration form is cancelled
+ */
+function register_cancel_register() {
+    global $SESSION;
+
+    if (get_config('new_registration_policy')) {
+        set_config('new_registration_policy', -1);
+        $SESSION->add_ok_msg(get_string('registrationcancelled', 'admin', get_config('wwwroot')), false);
+    }
+
+    redirect('/admin/index.php');
+}
 
 /**
  * Worker - performs sending of registration data to mahara.org