From 304f3b4f188d92720848ae1e3ac85ee04bd5ef71 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sun, 10 Jan 2010 00:18:17 -0800 Subject: [PATCH 1/3] correctly check for ssl enabled --- actions/login.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actions/login.php b/actions/login.php index a2f853e3a4..ea9b96a46b 100644 --- a/actions/login.php +++ b/actions/login.php @@ -133,7 +133,7 @@ class LoginAction extends Action $url = common_get_returnto(); if (common_config('ssl', 'sometimes') && // mixed environment - common_config('site', 'server') != common_config('site', 'sslserver')) { + 0 != strcasecmp(common_config('site', 'server'), common_config('site', 'sslserver'))) { $this->redirectFromSSL($user, $url, $this->boolean('rememberme')); return; } From 06ed0bc7913e6af0a4aaab93459148c690be70f1 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sun, 10 Jan 2010 00:19:46 -0800 Subject: [PATCH 2/3] correctly check for ssl enabled --- actions/register.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/actions/register.php b/actions/register.php index 108d05f5a7..ec6534eee0 100644 --- a/actions/register.php +++ b/actions/register.php @@ -260,8 +260,9 @@ class RegisterAction extends Action // Re-init language env in case it changed (not yet, but soon) common_init_language(); - if (common_config('ssl', 'sometimes') && // mixed environment - common_config('site', 'server') != common_config('site', 'sslserver')) { + if (common_config('site', 'ssl') == 'sometimes' && // mixed environment + 0 != strcasecmp(common_config('site', 'server'), common_config('site', 'sslserver'))) { + $url = common_local_url('all', array('nickname' => $user->nickname)); From e2dee5fedbedef69fbc825fcac39973f91f09c1a Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sun, 10 Jan 2010 00:20:08 -0800 Subject: [PATCH 3/3] always set site/server to hostname if it exists --- classes/Status_network.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/classes/Status_network.php b/classes/Status_network.php index 1f0e602cf7..776f6abb03 100644 --- a/classes/Status_network.php +++ b/classes/Status_network.php @@ -170,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;