Merge branch 'MDL-65075-master' of git://github.com/jleyva/moodle

admin/tool/mobile/classes/api.php

@@ -297,11 +297,6 @@ class api {
             throw new moodle_exception('enablewsdescription', 'webservice');
         }
 
-        // Only requests from the Moodle mobile or desktop app. This enhances security to avoid any type of XSS attack.
-        if (!\core_useragent::is_moodle_app()) {
-            throw new moodle_exception('apprequired', 'tool_mobile');
-        }
-
         if (!is_https()) {
             throw new moodle_exception('httpsrequired', 'tool_mobile');
         }

admin/tool/mobile/classes/external.php

@@ -286,6 +286,12 @@ class external extends external_api {
             }
         }
 
+        // Only requests from the Moodle mobile or desktop app. This enhances security to avoid any type of XSS attack.
+        // This code goes intentionally here and not inside the check_autologin_prerequisites() function because it
+        // is used by other PHP scripts that can be opened in any browser.
+        if (!\core_useragent::is_moodle_app()) {
+            throw new moodle_exception('apprequired', 'tool_mobile');
+        }
         api::check_autologin_prerequisites($USER->id);
 
         if (isset($_GET['privatetoken']) or empty($privatetoken)) {