Commit 672f4836 authored by John Okely's avatar John Okely Committed by Mark Nelson
Browse files

MDL-42834 admin: Removal of httpswwwroot

parent cd1eb7ce
......@@ -134,7 +134,7 @@ class api {
list($maintenancemessage, $notusedformat) = external_format_text($CFG->maintenance_message, FORMAT_MOODLE, $context->id);
$settings = array(
'wwwroot' => $CFG->wwwroot,
'httpswwwroot' => $CFG->httpswwwroot,
'httpswwwroot' => $CFG->wwwroot,
'sitename' => external_format_string($SITE->fullname, $context->id, true),
'guestlogin' => $CFG->guestloginbutton,
'rememberusername' => $CFG->rememberusername,
......
......@@ -235,7 +235,6 @@ class tool_mobile_external_testcase extends externallib_advanced_testcase {
// Need to simulate a non HTTPS site here.
$CFG->wwwroot = str_replace('https:', 'http:', $CFG->wwwroot);
$CFG->httpswwwroot = str_replace('https:', 'http:', $CFG->wwwroot);
$this->resetAfterTest(true);
$this->setAdminUser();
......
......@@ -90,8 +90,8 @@ class login implements renderable, templatable {
$this->autofocusform = !empty($CFG->loginpageautofocus);
$this->rememberusername = isset($CFG->rememberusername) and $CFG->rememberusername == 2;
$this->forgotpasswordurl = new moodle_url($CFG->httpswwwroot . '/login/forgot_password.php');
$this->loginurl = new moodle_url($CFG->httpswwwroot . '/login/index.php');
$this->forgotpasswordurl = new moodle_url($CFG->wwwroot . '/login/forgot_password.php');
$this->loginurl = new moodle_url($CFG->wwwroot . '/login/index.php');
$this->signupurl = new moodle_url('/login/signup.php');
// Authentication instructions.
......
......@@ -1671,8 +1671,8 @@ class auth_plugin_ldap extends auth_plugin_base {
if ($referer &&
$referer != $CFG->wwwroot &&
$referer != $CFG->wwwroot . '/' &&
$referer != $CFG->httpswwwroot . '/login/' &&
$referer != $CFG->httpswwwroot . '/login/index.php') {
$referer != $CFG->wwwroot . '/login/' &&
$referer != $CFG->wwwroot . '/login/index.php') {
$SESSION->wantsurl = $referer;
}
}
......@@ -1684,7 +1684,7 @@ class auth_plugin_ldap extends auth_plugin_base {
$sesskey = sesskey();
redirect($CFG->wwwroot.'/auth/ldap/ntlmsso_magic.php?sesskey='.$sesskey);
} else if ($this->config->ntlmsso_ie_fastpath == AUTH_NTLM_FASTPATH_YESFORM) {
redirect($CFG->httpswwwroot.'/login/index.php?authldap_skipntlmsso=1');
redirect($CFG-wwwroot.'/login/index.php?authldap_skipntlmsso=1');
}
}
redirect($CFG->wwwroot.'/auth/ldap/ntlmsso_attempt.php');
......@@ -1699,7 +1699,7 @@ class auth_plugin_ldap extends auth_plugin_base {
// we don't want to use at all. As we can't get rid of it, just point
// $SESSION->wantsurl to $CFG->wwwroot (after all, we came from there).
if (empty($SESSION->wantsurl)
&& (get_local_referer() == $CFG->httpswwwroot.'/auth/ldap/ntlmsso_finish.php')) {
&& (get_local_referer() == $CFG->wwwroot.'/auth/ldap/ntlmsso_finish.php')) {
$SESSION->wantsurl = $CFG->wwwroot;
}
......
......@@ -32,6 +32,6 @@ echo $OUTPUT->header();
$msg = '<p>'.get_string('ntlmsso_attempting', 'auth_ldap').'</p>'
. '<img width="1", height="1" '
. ' src="' . $CFG->httpswwwroot . '/auth/ldap/ntlmsso_magic.php?sesskey='
. ' src="' . $CFG->wwwroot . '/auth/ldap/ntlmsso_magic.php?sesskey='
. $sesskey . '" />';
redirect($CFG->httpswwwroot . '/auth/ldap/ntlmsso_finish.php', $msg, 3);
redirect($CFG->wwwroot . '/auth/ldap/ntlmsso_finish.php', $msg, 3);
......@@ -29,6 +29,6 @@ if (!$authplugin->ntlmsso_finish()) {
$PAGE->set_title("$site->fullname: $loginsite");
$PAGE->set_heading($site->fullname);
echo $OUTPUT->header();
redirect($CFG->httpswwwroot . '/login/index.php?authldap_skipntlmsso=1',
redirect($CFG->wwwroot . '/login/index.php?authldap_skipntlmsso=1',
get_string('ntlmsso_failed','auth_ldap'), 3);
}
......@@ -26,7 +26,7 @@ $file = $CFG->dirroot.'/pix/spacer.gif';
if ($authplugin->ntlmsso_magic($sesskey) && file_exists($file)) {
if (!empty($authplugin->config->ntlmsso_ie_fastpath)) {
if (core_useragent::is_ie()) {
redirect($CFG->httpswwwroot.'/auth/ldap/ntlmsso_finish.php');
redirect($CFG->wwwroot.'/auth/ldap/ntlmsso_finish.php');
}
}
......
......@@ -1073,7 +1073,7 @@ class auth_plugin_mnet extends auth_plugin_base {
global $DB, $CFG;
// strip off wwwroot, since the remote site will prefix it's return url with this
$wantsurl = preg_replace('/(' . preg_quote($CFG->wwwroot, '/') . '|' . preg_quote($CFG->httpswwwroot, '/') . ')/', '', $wantsurl);
$wantsurl = preg_replace('/(' . preg_quote($CFG->wwwroot, '/') . ')/', '', $wantsurl);
$sql = "SELECT DISTINCT h.id, h.wwwroot, h.name, a.sso_jump_url, a.name as application
FROM {mnet_host} h
......
......@@ -339,7 +339,7 @@ class auth extends \auth_plugin_base {
$PAGE->set_title($title);
$PAGE->set_heading($PAGE->course->fullname);
echo $OUTPUT->header();
notice($message, "$CFG->httpswwwroot/index.php");
notice($message, "$CFG->wwwroot/index.php");
}
/**
......@@ -363,7 +363,7 @@ class auth extends \auth_plugin_base {
$errormsg = get_string('loginerror_nouserinfo', 'auth_oauth2');
$SESSION->loginerrormsg = $errormsg;
$client->log_out();
redirect(new moodle_url($CFG->httpswwwroot . '/login/index.php'));
redirect(new moodle_url($CFG->wwwroot . '/login/index.php'));
}
if (empty($userinfo['username']) || empty($userinfo['email'])) {
// Trigger login failed event.
......@@ -375,7 +375,7 @@ class auth extends \auth_plugin_base {
$errormsg = get_string('loginerror_userincomplete', 'auth_oauth2');
$SESSION->loginerrormsg = $errormsg;
$client->log_out();
redirect(new moodle_url($CFG->httpswwwroot . '/login/index.php'));
redirect(new moodle_url($CFG->wwwroot . '/login/index.php'));
}
$userinfo['username'] = trim(core_text::strtolower($userinfo['username']));
......@@ -416,7 +416,7 @@ class auth extends \auth_plugin_base {
$errormsg = get_string('confirmationpending', 'auth_oauth2');
$SESSION->loginerrormsg = $errormsg;
$client->log_out();
redirect(new moodle_url($CFG->httpswwwroot . '/login/index.php'));
redirect(new moodle_url($CFG->wwwroot . '/login/index.php'));
}
} else if (!empty($linkedlogin)) {
// Trigger login failed event.
......@@ -428,7 +428,7 @@ class auth extends \auth_plugin_base {
$errormsg = get_string('confirmationpending', 'auth_oauth2');
$SESSION->loginerrormsg = $errormsg;
$client->log_out();
redirect(new moodle_url($CFG->httpswwwroot . '/login/index.php'));
redirect(new moodle_url($CFG->wwwroot . '/login/index.php'));
}
$issuer = $client->get_issuer();
......@@ -442,7 +442,7 @@ class auth extends \auth_plugin_base {
$errormsg = get_string('notloggedindebug', 'auth_oauth2', get_string('loginerror_invaliddomain', 'auth_oauth2'));
$SESSION->loginerrormsg = $errormsg;
$client->log_out();
redirect(new moodle_url($CFG->httpswwwroot . '/login/index.php'));
redirect(new moodle_url($CFG->wwwroot . '/login/index.php'));
}
if (!$userwasmapped) {
......@@ -481,7 +481,7 @@ class auth extends \auth_plugin_base {
$errormsg = get_string('accountexists', 'auth_oauth2');
$SESSION->loginerrormsg = $errormsg;
$client->log_out();
redirect(new moodle_url($CFG->httpswwwroot . '/login/index.php'));
redirect(new moodle_url($CFG->wwwroot . '/login/index.php'));
}
if (email_is_not_allowed($userinfo['email'])) {
......@@ -495,7 +495,7 @@ class auth extends \auth_plugin_base {
$errormsg = get_string('notloggedindebug', 'auth_oauth2', $reason);
$SESSION->loginerrormsg = $errormsg;
$client->log_out();
redirect(new moodle_url($CFG->httpswwwroot . '/login/index.php'));
redirect(new moodle_url($CFG->wwwroot . '/login/index.php'));
}
if (!empty($CFG->authpreventaccountcreation)) {
......@@ -509,7 +509,7 @@ class auth extends \auth_plugin_base {
$errormsg = get_string('notloggedindebug', 'auth_oauth2', $reason);
$SESSION->loginerrormsg = $errormsg;
$client->log_out();
redirect(new moodle_url($CFG->httpswwwroot . '/login/index.php'));
redirect(new moodle_url($CFG->wwwroot . '/login/index.php'));
}
if ($issuer->get('requireconfirmation')) {
......
......@@ -41,17 +41,17 @@
// Redirect to SessionInitiator with entityID as argument
if (isset($IdPs[$selectedIdP][1]) && !empty($IdPs[$selectedIdP][1])) {
// For Shibbolet 1.x Service Providers
header('Location: '.$IdPs[$selectedIdP][1].'?providerId='. urlencode($selectedIdP) .'&target='. urlencode($CFG->httpswwwroot.'/auth/shibboleth/index.php'));
header('Location: '.$IdPs[$selectedIdP][1].'?providerId='. urlencode($selectedIdP) .'&target='. urlencode($CFG->wwwroot.'/auth/shibboleth/index.php'));
// For Shibbolet 2.x Service Providers
// header('Location: '.$IdPs[$selectedIdP][1].'?entityID='. urlencode($selectedIdP) .'&target='. urlencode($CFG->httpswwwroot.'/auth/shibboleth/index.php'));
// header('Location: '.$IdPs[$selectedIdP][1].'?entityID='. urlencode($selectedIdP) .'&target='. urlencode($CFG->wwwroot.'/auth/shibboleth/index.php'));
} else {
// For Shibbolet 1.x Service Providers
header('Location: /Shibboleth.sso?providerId='. urlencode($selectedIdP) .'&target='. urlencode($CFG->httpswwwroot.'/auth/shibboleth/index.php'));
header('Location: /Shibboleth.sso?providerId='. urlencode($selectedIdP) .'&target='. urlencode($CFG->wwwroot.'/auth/shibboleth/index.php'));
// For Shibboleth 2.x Service Providers
// header('Location: /Shibboleth.sso/DS?entityID='. urlencode($selectedIdP) .'&target='. urlencode($CFG->httpswwwroot.'/auth/shibboleth/index.php'));
// header('Location: /Shibboleth.sso/DS?entityID='. urlencode($selectedIdP) .'&target='. urlencode($CFG->wwwroot.'/auth/shibboleth/index.php'));
}
} elseif (isset($_POST['idp']) && !isset($IdPs[$_POST['idp']])) {
$errormsg = get_string('auth_shibboleth_errormsg', 'auth_shibboleth');
......
......@@ -61,7 +61,7 @@ if ($action === 'delete') {
die;
} else {
if ($manager->delete_comment($commentid)) {
redirect($CFG->httpswwwroot.'/comment/');
redirect($CFG->wwwroot.'/comment/');
} else {
$err = 'cannotdeletecomment';
}
......@@ -81,7 +81,7 @@ echo $OUTPUT->header();
echo $OUTPUT->heading(get_string('comments'));
echo $OUTPUT->box_start('generalbox commentsreport');
if (!empty($err)) {
print_error($err, 'error', $CFG->httpswwwroot.'/comment/');
print_error($err, 'error', $CFG->wwwroot.'/comment/');
}
if (empty($action)) {
echo '<form method="post">';
......
......@@ -534,9 +534,6 @@ function get_file_url($path, $options=null, $type='coursefile') {
case 'rssfile':
$url = $CFG->wwwroot."/rss/file.php";
break;
case 'httpscoursefile':
$url = $CFG->httpswwwroot."/file.php";
break;
case 'coursefile':
default:
$url = $CFG->wwwroot."/file.php";
......
......@@ -80,9 +80,9 @@ class tinymce_texteditor extends texteditor {
global $PAGE, $CFG;
// Note: use full moodle_url instance to prevent standard JS loader, make sure we are using https on profile page if required.
if ($CFG->debugdeveloper) {
$PAGE->requires->js(new moodle_url($CFG->httpswwwroot.'/lib/editor/tinymce/tiny_mce/'.$this->version.'/tiny_mce_src.js'));
$PAGE->requires->js(new moodle_url($CFG->wwwroot.'/lib/editor/tinymce/tiny_mce/'.$this->version.'/tiny_mce_src.js'));
} else {
$PAGE->requires->js(new moodle_url($CFG->httpswwwroot.'/lib/editor/tinymce/tiny_mce/'.$this->version.'/tiny_mce.js'));
$PAGE->requires->js(new moodle_url($CFG->wwwroot.'/lib/editor/tinymce/tiny_mce/'.$this->version.'/tiny_mce.js'));
}
$PAGE->requires->js_init_call('M.editor_tinymce.init_editor', array($elementid, $this->get_init_params($elementid, $options)), true);
if ($fpoptions) {
......@@ -127,8 +127,8 @@ class tinymce_texteditor extends texteditor {
'mode' => "exact",
'elements' => $elementid,
'relative_urls' => false,
'document_base_url' => $CFG->httpswwwroot,
'moodle_plugin_base' => "$CFG->httpswwwroot/lib/editor/tinymce/plugins/",
'document_base_url' => $CFG->wwwroot,
'moodle_plugin_base' => "$CFG->wwwroot/lib/editor/tinymce/plugins/",
'content_css' => $contentcss,
'language' => $lang,
'directionality' => $directionality,
......@@ -257,7 +257,7 @@ class tinymce_texteditor extends texteditor {
*/
public function get_tinymce_base_url() {
global $CFG;
return new moodle_url("$CFG->httpswwwroot/lib/editor/tinymce/tiny_mce/$this->version/");
return new moodle_url("$CFG->wwwroot/lib/editor/tinymce/tiny_mce/$this->version/");
}
}
......@@ -55,7 +55,7 @@ class tinymce_spellchecker extends editor_tinymce_plugin {
// Add JS file, which uses default name.
$this->add_js_plugin($params);
$params['spellchecker_rpc_url'] = $CFG->httpswwwroot .
$params['spellchecker_rpc_url'] = $CFG->wwwroot .
'/lib/editor/tinymce/plugins/spellchecker/rpc.php';
$params['spellchecker_languages'] = $spelllanguagelist;
}
......
......@@ -74,7 +74,7 @@ class editor_tinymce_testcase extends advanced_testcase {
'xhtmlxtras,template,pagebreak',
'gecko_spellcheck' => true,
'theme_advanced_font_sizes' => "1,2,3,4,5,6,7",
'moodle_plugin_base' => "$CFG->httpswwwroot/lib/editor/tinymce/plugins/",
'moodle_plugin_base' => "$CFG->wwwroot/lib/editor/tinymce/plugins/",
'theme_advanced_font_sizes' => "1,2,3,4,5,6,7",
'theme_advanced_layout_manager' => "SimpleLayout",
'theme_advanced_buttons1' => 'one,two,|,three,four',
......
......@@ -436,7 +436,7 @@ function file_prepare_draft_area(&$draftitemid, $contextid, $component, $fileare
// at this point there should not be any draftfile links yet,
// because this is a new text from database that should still contain the @@pluginfile@@ links
// this happens when developers forget to post process the text
$text = str_replace("\"$CFG->httpswwwroot/draftfile.php", "\"$CFG->httpswwwroot/brokenfile.php#", $text);
$text = str_replace("\"$CFG->wwwroot/draftfile.php", "\"$CFG->wwwroot/brokenfile.php#", $text);
}
} else {
// nothing to do
......
......@@ -1527,7 +1527,7 @@ function filter_add_javascript($text) {
<script type=\"text/javascript\">
<!--
function openpopup(url,name,options,fullscreen) {
fullurl = \"".$CFG->httpswwwroot."\" + url;
fullurl = \"".$CFG->wwwroot."\" + url;
windowobj = window.open(fullurl,name,options);
if (fullscreen) {
windowobj.moveTo(0,0);
......
......@@ -4445,7 +4445,7 @@ function complete_user_login($user) {
} else {
require_once($CFG->dirroot . '/login/lib.php');
$SESSION->wantsurl = core_login_get_return_url();
redirect($CFG->httpswwwroot.'/login/change_password.php');
redirect($CFG->wwwroot.'/login/change_password.php');
}
} else {
print_error('nopasswordchangeforced', 'auth');
......@@ -6160,7 +6160,7 @@ function reset_password_and_mail($user) {
$a->sitename = format_string($site->fullname);
$a->username = $user->username;
$a->newpassword = $newpassword;
$a->link = $CFG->httpswwwroot .'/login/change_password.php';
$a->link = $CFG->wwwroot .'/login/change_password.php';
$a->signoff = generate_email_signoff();
$message = get_string('newpasswordtext', '', $a);
......@@ -6241,7 +6241,7 @@ function send_password_change_confirmation_email($user, $resetrecord) {
$data->lastname = $user->lastname;
$data->username = $user->username;
$data->sitename = format_string($site->fullname);
$data->link = $CFG->httpswwwroot .'/login/forgot_password.php?token='. $resetrecord->token;
$data->link = $CFG->wwwroot .'/login/forgot_password.php?token='. $resetrecord->token;
$data->admin = generate_email_signoff();
$data->resetminutes = $pwresetmins;
......
......@@ -432,7 +432,6 @@ class user_picture implements renderable {
// If the currently requested page is https then we'll return an
// https gravatar page.
if (is_https()) {
$gravatardefault = str_replace($CFG->wwwroot, $CFG->httpswwwroot, $gravatardefault); // Replace by secure url.
return new moodle_url("https://secure.gravatar.com/avatar/{$md5}", array('s' => $size, 'd' => $gravatardefault));
} else {
return new moodle_url("http://www.gravatar.com/avatar/{$md5}", array('s' => $size, 'd' => $gravatardefault));
......@@ -520,7 +519,7 @@ class help_icon implements renderable, templatable {
$data->icon = (new pix_icon('help', $alt, 'core', ['class' => 'iconhelp']))->export_for_template($output);
$data->linktext = $this->linktext;
$data->title = get_string('helpprefix2', '', trim($title, ". \t"));
$data->url = (new moodle_url($CFG->httpswwwroot . '/help.php', [
$data->url = (new moodle_url($CFG->wwwroot . '/help.php', [
'component' => $this->component,
'identifier' => $this->identifier,
'lang' => current_language()
......
......@@ -894,7 +894,7 @@ class theme_config {
global $CFG;
$rev = theme_get_revision();
if ($rev > -1) {
$url = new moodle_url("$CFG->httpswwwroot/theme/styles.php");
$url = new moodle_url("$CFG->wwwroot/theme/styles.php");
if (!empty($CFG->slasharguments)) {
$url->set_slashargument('/'.$this->name.'/'.$rev.'/editor', 'noparam', true);
} else {
......@@ -902,7 +902,7 @@ class theme_config {
}
} else {
$params = array('theme'=>$this->name, 'type'=>'editor');
$url = new moodle_url($CFG->httpswwwroot.'/theme/styles_debug.php', $params);
$url = new moodle_url($CFG->wwwroot.'/theme/styles_debug.php', $params);
}
return $url;
}
......@@ -966,7 +966,7 @@ class theme_config {
if ($rev > -1) {
$filename = right_to_left() ? 'all-rtl' : 'all';
$url = new moodle_url("$CFG->httpswwwroot/theme/styles.php");
$url = new moodle_url("$CFG->wwwroot/theme/styles.php");
$themesubrevision = theme_get_sub_revision_for_theme($this->name);
// Provide the sub revision to allow us to invalidate cached theme CSS
......@@ -1002,7 +1002,7 @@ class theme_config {
$urls[] = $url;
} else {
$baseurl = new moodle_url($CFG->httpswwwroot.'/theme/styles_debug.php');
$baseurl = new moodle_url($CFG->wwwroot.'/theme/styles_debug.php');
$css = $this->get_css_files(true);
if (!$svg) {
......@@ -1686,11 +1686,11 @@ class theme_config {
}
if (!empty($CFG->slasharguments) and $rev > 0) {
$url = new moodle_url("$CFG->httpswwwroot/theme/javascript.php");
$url = new moodle_url("$CFG->wwwroot/theme/javascript.php");
$url->set_slashargument('/'.$this->name.'/'.$rev.'/'.$params['type'], 'noparam', true);
return $url;
} else {
return new moodle_url($CFG->httpswwwroot.'/theme/javascript.php', $params);
return new moodle_url($CFG->wwwroot.'/theme/javascript.php', $params);
}
}
......@@ -1922,7 +1922,7 @@ class theme_config {
$params['image'] = $imagename;
$url = new moodle_url("$CFG->httpswwwroot/theme/image.php");
$url = new moodle_url("$CFG->wwwroot/theme/image.php");
if (!empty($CFG->slasharguments) and $rev > 0) {
$path = '/'.$params['theme'].'/'.$params['component'].'/'.$params['rev'].'/'.$params['image'];
if (!$svg) {
......@@ -1968,7 +1968,7 @@ class theme_config {
$params['font'] = $font;
$url = new moodle_url("$CFG->httpswwwroot/theme/font.php");
$url = new moodle_url("$CFG->wwwroot/theme/font.php");
if (!empty($CFG->slasharguments) and $rev > 0) {
$path = '/'.$params['theme'].'/'.$params['component'].'/'.$params['rev'].'/'.$params['font'];
$url->set_slashargument($path, 'noparam', true);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment