isguest() to has_capability('moodle/legacy:guest', get_context_instance(CONTEXT_SYSTE...

diff --git a/enrol/authorize/enrol.php b/enrol/authorize/enrol.php
index 1d95f531d39b9cb1343db8de177a47e8648e7239..04edb2ec2c7c41b32748c934a6a7c7dbc1b6da65 100755 (executable)
--- a/enrol/authorize/enrol.php
+++ b/enrol/authorize/enrol.php
@@ -45,6 +45,8 @@ class enrolment_plugin_authorize
             return;
         }
 
+        httpsrequired();
+
         if (empty($_SERVER['HTTPS']) || $_SERVER['HTTPS'] == 'off') {
             if (empty($CFG->loginhttps)) {
                 error(get_string('httpsrequired', 'enrol_authorize'));
@@ -55,8 +57,6 @@ class enrolment_plugin_authorize
             }
         }
 
-        httpsrequired();
-
         $strcourses = get_string('courses');
         $strloginto = get_string('loginto', '', $course->shortname);
 
@@ -70,7 +70,7 @@ class enrolment_plugin_authorize
         }
 
         print_simple_box_start('center');
-        if (isguest()) {
+        if (has_capability('moodle/legacy:guest', get_context_instance(CONTEXT_SYSTEM, SITEID), $USER->id, false)) {
             $curcost = get_course_cost($course);
             echo '<div align="center">';
             echo '<p>'.get_string('paymentrequired').'</p>';

diff --git a/enrol/authorize/index.php b/enrol/authorize/index.php
index 894e3315be6e6a6b51f7156ad9f8e51f6eb6b1fd..e806e656f643398c6f3d7b6d486b84a014eeb6cc 100644 (file)
--- a/enrol/authorize/index.php
+++ b/enrol/authorize/index.php
@@ -12,7 +12,7 @@
 /// Only site users can access to this page
     require_login(); // Don't use $courseid! User may want to see old orders.
 
-    if (isguest()) {
+    if (has_capability('moodle/legacy:guest', get_context_instance(CONTEXT_SYSTEM, SITEID), $USER->id, false)) {
         error("Guests cannot use this page.");
     }