Merge branch 'MDL-86848-501' of https://github.com/andrewnicols/moodle into MOODLE_501_STABLE

index.php

@@ -15,13 +15,12 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * This file acts as a redirector to the public directory.
- *
- * Note: This file is not intended to be accessed directly.
+ * Throw an exception when users try to access index.php outside of the web root.
  *
  * @package    core
  * @copyright  Andrew Lyons <[email protected]>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-@header($_SERVER['SERVER_PROTOCOL'] . ' 308 Permanent Redirect');
-@header('Location: ./public/');
+require_once('config.php');
+
+throw new \core\exception\moodle_exception('rootdirpublic', 'error');

public/lang/en/error.php

@@ -531,6 +531,7 @@ $string['restore_path_element_noobject'] = 'Restore object {$a} is not an object
 $string['restrictedcontextexception'] = 'Sorry, execution of external function violates context restriction.';
 $string['restricteduser'] = 'Sorry, but your current account "{$a}" is restricted from doing that';
 $string['reverseproxyabused'] = 'Reverse proxy enabled so the server cannot be accessed directly.<br />Please contact the server administrator.';
+$string['rootdirpublic'] = 'The Moodle root directory must not be publicly accessible. Please reconfigure your web server to use the `/public` directory instead.';
 $string['rpcerror'] = 'Ooops! Your MNET communication has failed! Here\'s that error message to pass on to your administrator: {$a}';
 $string['secretalreadyused'] = 'Change password confirmation link was already used, password was not changed';
 $string['sectioncantbefound'] = '<p><strong>This content can\'t be found.</strong></p><p>It may have been deleted, or the URL may be incorrect.</p>';