'.get_string('paymentrequired').'
';
echo '
'.get_string('cost').": $instance->currency $localisedcost".'
';
echo '
'.get_string('loginsite').'
';
diff --git a/lang/en/admin.php b/lang/en/admin.php
index 2449b314589..89832944e8d 100644
--- a/lang/en/admin.php
+++ b/lang/en/admin.php
@@ -258,7 +258,6 @@ $string['configlanglist'] = 'Leave this blank to allow users to choose from any
$string['configlangmenu'] = 'Choose whether or not you want to display the general-purpose language menu on the home page, login page etc. This does not affect the user\'s ability to set the preferred language in their own profile.';
$string['configlatinexcelexport'] = 'Choose the encoding for Excel exports.';
$string['configlocale'] = 'Choose a sitewide locale - this will override the format and language of dates for all language packs (though names of days in calendar are not affected). You need to have this locale data installed on your operating system (eg for linux en_US.UTF-8 or es_ES.UTF-8). In most cases this field should be left blank.';
-$string['configloginhttps'] = 'Turning this on will make Moodle use a secure https connection just for the login page (providing a secure login), and then afterwards revert back to the normal http URL for general speed. CAUTION: this setting REQUIRES https to be specifically enabled on the web server - if it is not then YOU COULD LOCK YOURSELF OUT OF YOUR SITE.';
$string['configloglifetime'] = 'This specifies the length of time you want to keep logs about user activity. Logs that are older than this age are automatically deleted. It is best to keep logs as long as possible, in case you need them, but if you have a very busy server and are experiencing performance problems, then you may want to lower the log lifetime. Values lower than 30 are not recommended because statistics may not work properly.';
$string['configlookahead'] = 'Days to look ahead';
$string['configmailnewline'] = 'Newline characters used in mail messages. CRLF is required according to RFC 822bis, some mail servers do automatic conversion from LF to CRLF, other mail servers do incorrect conversion from CRLF to CRCRLF, yet others reject mails with bare LF (qmail for example). Try changing this setting if you are having problems with undelivered emails or double newlines.';
@@ -680,7 +679,6 @@ $string['lockoutwindow_desc'] = 'Observation time for lockout threshold, if ther
$string['log'] = 'Logs';
$string['logguests'] = 'Log guest access';
$string['logguests_help'] = 'This setting enables logging of actions by guest account and not logged in users. High profile sites may want to disable this logging for performance reasons. It is recommended to keep this setting enabled on production sites.';
-$string['loginhttps'] = 'Use HTTPS for logins';
$string['loginpageautofocus'] = 'Autofocus login page form';
$string['loginpageautofocus_help'] = 'Enabling this option improves usability of the login page, but automatically focusing fields may be considered an accessibility issue.';
$string['loglifetime'] = 'Keep logs for';
@@ -815,6 +813,7 @@ $string['order2'] = 'Second';
$string['order3'] = 'Third';
$string['order4'] = 'Fourth';
$string['outgoingmailconfig'] = 'Outgoing mail configuration';
+$string['overridetossl'] = 'HTTPS for logins has now been deprecated. This instance is now forced to SSL. To remedy this warning change your wwwroot in config.php to https://';
$string['passwordchangelogout'] = 'Log out after password change';
$string['passwordchangelogout_desc'] = 'If enabled, when a password is changed, all browser sessions are terminated, apart from the one in which the new password is specified. (This setting does not affect password changes via bulk user upload.)';
$string['passwordchangetokendeletion'] = 'Remove web service access tokens after password change';
@@ -1285,3 +1284,5 @@ $string['unoconvwarning'] = 'The version of unoconv you have installed is not su
// Deprecated since Moodle 3.4
$string['moodleorghubname'] = 'Moodle.net';
$string['hubs'] = 'Hubs';
+$string['configloginhttps'] = 'Turning this on will make Moodle use a secure https connection just for the login page (providing a secure login), and then afterwards revert back to the normal http URL for general speed. CAUTION: this setting REQUIRES https to be specifically enabled on the web server - if it is not then YOU COULD LOCK YOURSELF OUT OF YOUR SITE.';
+$string['loginhttps'] = 'Use HTTPS for logins';
diff --git a/lang/en/deprecated.txt b/lang/en/deprecated.txt
index 4fde1a4431f..b912982899b 100644
--- a/lang/en/deprecated.txt
+++ b/lang/en/deprecated.txt
@@ -157,3 +157,5 @@ quickdownloadcalendar,core_calendar
ical,core_calendar
privacy,core_hub
privacy_help,core_hub
+configloginhttps,core_admin
+loginhttps,core_admin
diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index 02c60ea1615..50599a736eb 100644
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -2781,5 +2781,17 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2017101900.02);
}
+ if ($oldversion < 2017102100.01) {
+ // We will need to force them onto ssl if loginhttps is set.
+ if (!empty($CFG->loginhttps)) {
+ set_config('overridetossl', 1);
+ }
+ // Loginhttps should no longer be set.
+ unset_config('loginhttps');
+
+ // Main savepoint reached.
+ upgrade_main_savepoint(true, 2017102100.01);
+ }
+
return true;
}
diff --git a/lib/deprecatedlib.php b/lib/deprecatedlib.php
index 6d35d855ffb..33e039816e0 100644
--- a/lib/deprecatedlib.php
+++ b/lib/deprecatedlib.php
@@ -501,10 +501,10 @@ function filter_text($text, $courseid = NULL) {
}
/**
- * @deprecated use $PAGE->https_required() instead
+ * @deprecated Loginhttps is no longer supported
*/
function httpsrequired() {
- throw new coding_exception('httpsrequired() can not be used any more use $PAGE->https_required() instead.');
+ throw new coding_exception('httpsrequired() can not be used any more. Loginhttps is no longer supported.');
}
/**
@@ -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";
diff --git a/lib/editor/tinymce/lib.php b/lib/editor/tinymce/lib.php
index e82709296b7..a886e1ef705 100644
--- a/lib/editor/tinymce/lib.php
+++ b/lib/editor/tinymce/lib.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('/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('/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("/lib/editor/tinymce/tiny_mce/$this->version/");
}
}
diff --git a/lib/editor/tinymce/plugins/spellchecker/lib.php b/lib/editor/tinymce/plugins/spellchecker/lib.php
index 330bbe44eae..230a8744a37 100644
--- a/lib/editor/tinymce/plugins/spellchecker/lib.php
+++ b/lib/editor/tinymce/plugins/spellchecker/lib.php
@@ -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;
}
diff --git a/lib/editor/tinymce/tests/editor_test.php b/lib/editor/tinymce/tests/editor_test.php
index 331c2d559fc..d2358db1801 100644
--- a/lib/editor/tinymce/tests/editor_test.php
+++ b/lib/editor/tinymce/tests/editor_test.php
@@ -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',
diff --git a/lib/filelib.php b/lib/filelib.php
index 61b5bcec52a..0e17a8111a6 100644
--- a/lib/filelib.php
+++ b/lib/filelib.php
@@ -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
diff --git a/lib/filterlib.php b/lib/filterlib.php
index 516f3030eeb..0a9753ba4f6 100644
--- a/lib/filterlib.php
+++ b/lib/filterlib.php
@@ -1527,7 +1527,7 @@ function filter_add_javascript($text) {