MDL-10947 https was replaced with httpss when wwwroot already is https credit goes to Tobias Marx

This commit is contained in:
skodak
2007-08-22 19:36:24 +00:00
parent c331cf23c5
commit 3a233b85c5
5 changed files with 5 additions and 5 deletions
+1 -1
View File
@@ -122,7 +122,7 @@ if ($action == 'delchoice') {
if (has_capability('moodle/legacy:guest', $sitecontext, NULL, false)) { // Guest on whole site
$wwwroot = $CFG->wwwroot.'/login/index.php';
if (!empty($CFG->loginhttps)) {
$wwwroot = str_replace('http','https', $wwwroot);
$wwwroot = str_replace('http:','https:', $wwwroot);
}
notice_yesno(get_string('noguestchoose', 'choice').'<br /><br />'.get_string('liketologin'),
$wwwroot, $_SERVER['HTTP_REFERER']);
+1 -1
View File
@@ -29,7 +29,7 @@
if (isguest()) { // Guests can't change forum
$wwwroot = $CFG->wwwroot.'/login/index.php';
if (!empty($CFG->loginhttps)) {
$wwwroot = str_replace('http','https', $wwwroot);
$wwwroot = str_replace('http:','https:', $wwwroot);
}
$strforums = get_string('modulenameplural', 'forum');
+1 -1
View File
@@ -24,7 +24,7 @@
$wwwroot = $CFG->wwwroot.'/login/index.php';
if (!empty($CFG->loginhttps)) {
$wwwroot = str_replace('http', 'https', $wwwroot);
$wwwroot = str_replace('http:', 'https:', $wwwroot);
}
if (!empty($forum)) { // User is starting a new discussion in a forum
+1 -1
View File
@@ -27,7 +27,7 @@
if (isguest()) { // Guests can't change tracking
$wwwroot = $CFG->wwwroot.'/login/index.php';
if (!empty($CFG->loginhttps)) {
$wwwroot = str_replace('http','https', $wwwroot);
$wwwroot = str_replace('http:','https:', $wwwroot);
}
$strforums = get_string('modulenameplural', 'forum');
+1 -1
View File
@@ -48,7 +48,7 @@
if (isguest()) { // Guests can't subscribe
$wwwroot = $CFG->wwwroot.'/login/index.php';
if (!empty($CFG->loginhttps)) {
$wwwroot = str_replace('http','https', $wwwroot);
$wwwroot = str_replace('http:','https:', $wwwroot);
}
$strforums = get_string('modulenameplural', 'forum');