diff options
| author | root <root@ip-10-250-162-129.ec2.internal> | 2010-01-10 08:20:29 +0000 |
|---|---|---|
| committer | root <root@ip-10-250-162-129.ec2.internal> | 2010-01-10 08:20:29 +0000 |
| commit | ef0e0116c200cc805522239794c1fbf279e204e6 (patch) | |
| tree | f2949f745c2651cee6329272a8e142f7ba4779bb | |
| parent | d636bee4c01bd393a2b210fb3dd2761d4b76888d (diff) | |
| parent | e2dee5fedbedef69fbc825fcac39973f91f09c1a (diff) | |
Merge branch 'redironlogin' of http://git.gitorious.org/~evan/statusnet/evans-mainline into redironlogin
| -rw-r--r-- | actions/login.php | 2 | ||||
| -rw-r--r-- | actions/register.php | 5 | ||||
| -rw-r--r-- | classes/Status_network.php | 6 |
3 files changed, 9 insertions, 4 deletions
diff --git a/actions/login.php b/actions/login.php index a2f853e3a..ea9b96a46 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; } diff --git a/actions/register.php b/actions/register.php index 108d05f5a..ec6534eee 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)); diff --git a/classes/Status_network.php b/classes/Status_network.php index 1f0e602cf..776f6abb0 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; |