Merge branch '0.9.x' into inblob

1 files changed, 18 insertions, 7 deletions

diff --git a/classes/Status_network.php b/classes/Status_network.php
index b3117640d..776f6abb0 100644
--- a/classes/Status_network.php
+++ b/classes/Status_network.php
@@ -150,9 +150,19 @@ class Status_network extends DB_DataObject
         }
 
         if (!empty($sn)) {
-            if (!empty($sn->hostname) && 0 != strcasecmp($sn->hostname, $servername)) {
-                $sn->redirectToHostname();
+
+            // Redirect to the right URL
+
+            if (!empty($sn->hostname) &&
+                empty($_SERVER['HTTPS']) &&
+                0 != strcasecmp($sn->hostname, $servername)) {
+                $sn->redirectTo('http://'.$sn->hostname.$_SERVER['REQUEST_URI']);
+            } else if (!empty($_SERVER['HTTPS']) &&
+                       0 != strcasecmp($sn->hostname, $servername) &&
+                       0 != strcasecmp($sn->nickname.'.'.$wildcard, $servername)) {
+                $sn->redirectTo('https://'.$sn->nickname.'.'.$wildcard.$_SERVER['REQUEST_URI']);
             }
+
             $dbhost = (empty($sn->dbhost)) ? 'localhost' : $sn->dbhost;
             $dbuser = (empty($sn->dbuser)) ? $sn->nickname : $sn->dbuser;
             $dbpass = $sn->dbpass;
@@ -160,7 +170,11 @@ class Status_network extends DB_DataObject
 
             $config['db']['database'] = "mysqli://$dbuser:$dbpass@$dbhost/$dbname";
 
-            $config['site']['name'] = $sn->sitename;
+            $config['site']['name']   = $sn->sitename;
+
+            if (!empty($sn->hostname)) {
+                $config['site']['server'] = $sn->hostname;
+            }
 
             if (!empty($sn->theme)) {
                 $config['site']['theme'] = $sn->theme;
@@ -179,11 +193,8 @@ class Status_network extends DB_DataObject
     // (C) 2006 by Heiko Richler  http://www.richler.de/
     // LGPL
 
-    function redirectToHostname()
+    function redirectTo($destination)
     {
-        $destination = 'http://'.$this->hostname;
-        $destination .= $_SERVER['REQUEST_URI'];
-
         $old = 'http'.
           (($_SERVER['HTTPS'] == 'on') ? 'S' : '').
           '://'.