Changeset 1014363

Timestamp:

10/26/2014 09:58:42 PM (11 years ago)

Author:

chsxf

Message:

Merge pull request #10 from no1lives4ever/patch-1

Fixed redirection problem with HTTPS

File:

• mqtranslate/trunk/mqtranslate_core.php (modified) (4 diffs)

mqtranslate/trunk/mqtranslate_core.php

@@ -120 +120 @@
                 if(qtrans_isEnabled($language)) {
                     if($q_config['hide_default_language'] && $language == $q_config['default_language']) break;
-                    $target = qtrans_convertURL(get_option('home'),$language);
+                    $target = qtrans_convertURL(qtrans_getHome(),$language);
                     break;
                 }
@@ -160 +160 @@
 }
 
+// returns the home in HTTP or HTTPS depending on the request
+function qtrans_getHome() {
+       $home = get_option('home');
+       if(is_ssl()) {
+               $home = str_replace('http://', 'https://', $home);
+       } else {
+               $home = str_replace('https://', 'http://', $home);
+       }
+       return $home;
+}
+
 function qtrans_postInit() {
     // init Javascript functions
@@ -171 +182 @@
 function qtrans_extractURL($url, $host = '', $referer = '') {
     global $q_config;
-    $home = qtrans_parseURL(get_option('home'));
+    $home = qtrans_parseURL(qtrans_getHome());
     $home['path'] = trailingslashit($home['path']);
     $referer = qtrans_parseURL($referer);
@@ -635 +646 @@
     // check if it's an external link
     $urlinfo = qtrans_parseURL($url);
-    $home = rtrim(get_option('home'),"/");
+    $home = rtrim(qtrans_getHome(),"/");
     if($urlinfo['host']!='') {
         // check for already existing pre-domain language information