fixed problem when set both loginhttps and https in wwwroot, closes bug #5507 and...

diff --git a/auth/cas/login.php b/auth/cas/login.php
index ba86d7598b2fb0dd3d0db15f4482545ee8f9d58e..36cfd6977592e5b42e11c64ce2d805579ddb422c 100644 (file)
--- a/auth/cas/login.php
+++ b/auth/cas/login.php
@@ -18,7 +18,7 @@ defined('MOODLE_INTERNAL') or die('Direct access to this script is forbidden.');
         if (empty($CFG->loginhttps)) {
             $wwwroot = $CFG->wwwroot;
         } else {
-            $wwwroot = str_replace('http','https',$CFG->wwwroot);
+            $wwwroot = str_replace('http:','https:',$CFG->wwwroot);
         }
         $langmenu = popup_form ("$wwwroot/login/index.php?lang=", $langs, "chooselang", $currlang, "", "", "", true);
     }

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 576da03c5ea23a351fdaa51bc1e0737af07e8c75..88deb9bdf6a747b656f623a6fac53fb006b1704d 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -1525,7 +1525,7 @@ function require_login($courseid=0, $autologinguest=true, $cm=null) {
         if (empty($CFG->loginhttps)) {
             redirect($CFG->wwwroot .'/login/index.php'. $loginguest);
         } else {
-            $wwwroot = str_replace('http','https', $CFG->wwwroot);
+            $wwwroot = str_replace('http:','https:', $CFG->wwwroot);
             redirect($wwwroot .'/login/index.php'. $loginguest);
         }
         exit;

diff --git a/lib/weblib.php b/lib/weblib.php
index 16231e780f2aebc90462288848f94acdff245c97..3f9dfb3b648a1b07be4d5a70847e30af3623603a 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -1906,11 +1906,11 @@ function print_header ($title='', $heading='', $navigation='', $focus='', $meta=
 
 /// We have to change some URLs in styles if we are in a $HTTPSPAGEREQUIRED page
     if (!empty($HTTPSPAGEREQUIRED)) {
-        $CFG->themewww = str_replace('http', 'https', $CFG->themewww);
-        $CFG->pixpath = str_replace('http', 'https', $CFG->pixpath);
-        $CFG->modpixpath = str_replace('http', 'https', $CFG->modpixpath);
+        $CFG->themewww = str_replace('http:', 'https:', $CFG->themewww);
+        $CFG->pixpath = str_replace('http:', 'https:', $CFG->pixpath);
+        $CFG->modpixpath = str_replace('http:', 'https:', $CFG->modpixpath);
         foreach ($CFG->stylesheets as $key => $stylesheet) {
-            $CFG->stylesheets[$key] = str_replace('http', 'https', $stylesheet);
+            $CFG->stylesheets[$key] = str_replace('http:', 'https:', $stylesheet);
         }
     }
 
@@ -1945,7 +1945,7 @@ function print_header ($title='', $heading='', $navigation='', $focus='', $meta=
         if (empty($CFG->loginhttps)) {
             $wwwroot = $CFG->wwwroot;
         } else {
-            $wwwroot = str_replace('http','https',$CFG->wwwroot);
+            $wwwroot = str_replace('http:','https:',$CFG->wwwroot);
         }
         if (isset($course->id)) {
             $menu = user_login_string($course);
@@ -2430,7 +2430,7 @@ function user_login_string($course=NULL, $user=NULL) {
     if (empty($CFG->loginhttps)) {
         $wwwroot = $CFG->wwwroot;
     } else {
-        $wwwroot = str_replace('http','https',$CFG->wwwroot);
+        $wwwroot = str_replace('http:','https:',$CFG->wwwroot);
     }
 
     if (isset($user->id) and $user->id) {

diff --git a/mod/chat/view.php b/mod/chat/view.php
index e6f73a1279d8672aac42a2fbfcc950ae82ecd1a2..d908c3714fbe2f24e700b2d849e517ec3f256257 100644 (file)
--- a/mod/chat/view.php
+++ b/mod/chat/view.php
@@ -108,7 +108,7 @@
 
         $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('noguests', 'chat').'<br /><br />'.get_string('liketologin'),

diff --git a/mod/forum/markposts.php b/mod/forum/markposts.php
index 45cb80f3353e4393c121850c9ab7afeea5cbef8b..933ff38c41d545262eca9da0436785197873c396 100644 (file)
--- a/mod/forum/markposts.php
+++ b/mod/forum/markposts.php
@@ -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');

diff --git a/mod/forum/post.php b/mod/forum/post.php
index df7800890345f53469b1fec06082517e43e46e09..d420360fa44b20635628b5a2d8eb65a8d06ff55d 100644 (file)
--- a/mod/forum/post.php
+++ b/mod/forum/post.php
@@ -16,7 +16,7 @@
     if (isguest()) {
         $wwwroot = $CFG->wwwroot.'/login/index.php';
         if (!empty($CFG->loginhttps)) {
-            $wwwroot = str_replace('http','https', $wwwroot);
+            $wwwroot = str_replace('http:','https:', $wwwroot);
         }
 
         if (isset($forum)) {      // User is starting a new discussion in a forum

diff --git a/mod/forum/settracking.php b/mod/forum/settracking.php
index 111452b0da2f3b2dee3130f99c0c99c16132adff..8acd9a8df50d73470c15df90ce63b1aa8d58027a 100644 (file)
--- a/mod/forum/settracking.php
+++ b/mod/forum/settracking.php
@@ -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');

diff --git a/mod/forum/subscribe.php b/mod/forum/subscribe.php
index 323f299c8dceb8119e68f3f40eeeadde0de30c66..ad8d1d7c1873763b6718d4d7d4ecb60092a8da8b 100644 (file)
--- a/mod/forum/subscribe.php
+++ b/mod/forum/subscribe.php
@@ -43,7 +43,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');

diff --git a/mod/quiz/view.php b/mod/quiz/view.php
index d408728d3c346f35f36ba8c2203ad759fb3c8cb2..e79c92bf00da8c153fcbd7d6719aadb8ec5e9761 100644 (file)
--- a/mod/quiz/view.php
+++ b/mod/quiz/view.php
@@ -127,7 +127,7 @@
 
         $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('guestsno', 'quiz').'<br /><br />'.get_string('liketologin'),

diff --git a/my/index.php b/my/index.php
index 00e4fab6c479d4412e91c5d148074c9900e28dd5..de6ca4653d885051f1017f1ab8781bda48629bef 100644 (file)
--- a/my/index.php
+++ b/my/index.php
@@ -14,7 +14,7 @@
     if (isguest()) {
         $wwwroot = $CFG->wwwroot.'/login/index.php';
         if (!empty($CFG->loginhttps)) {
-            $wwwroot = str_replace('http','https', $wwwroot);
+            $wwwroot = str_replace('http:','https:', $wwwroot);
         }
 
         print_header($mymoodlestr);

diff --git a/user/tabs.php b/user/tabs.php
index ae5c04423f4dae20413c8497608ff4d53af7678a..85dd670723ad456f4509ff4399f9a465beb6ed70 100644 (file)
--- a/user/tabs.php
+++ b/user/tabs.php
@@ -93,7 +93,7 @@
             if(empty($CFG->loginhttps)) {
                 $wwwroot = $CFG->wwwroot;
             } else {
-                $wwwroot = str_replace('http','https',$CFG->wwwroot);
+                $wwwroot = str_replace('http:','https:',$CFG->wwwroot);
             }
 
             $toprow[] = new tabobject('editprofile', $wwwroot.'/user/edit.php?id='.$user->id.'&course='.$course->id, get_string('editmyprofile'));

diff --git a/user/view.php b/user/view.php
index 90adf252c99b846333ea2a31c3b6c74752ae0a45..44ef0f38e95126a2c3fc2b9d22e743f2653d5289 100644 (file)
--- a/user/view.php
+++ b/user/view.php
@@ -289,7 +289,7 @@
         if (empty($CFG->loginhttps)) {
             $internalpassword = "$CFG->wwwroot/login/change_password.php";
         } else {
-            $internalpassword = str_replace('http','https',$CFG->wwwroot.'/login/change_password.php');
+            $internalpassword = str_replace('http:','https:',$CFG->wwwroot.'/login/change_password.php');
         }
     }