summaryrefslogtreecommitdiff
path: root/actions/register.php
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-05-19 12:52:23 -0700
committerBrion Vibber <brion@pobox.com>2010-05-19 12:52:23 -0700
commitc4203be9a4e13f892fa8ea71f08477110a39dbe3 (patch)
tree34989ca973dc56d0ba5f57583ce74fde333e4341 /actions/register.php
parent91367dbc2145d0ad0eebd12cd6197d54c3d3b930 (diff)
parent7005ef66617b265ddccdd9082c2368bf014a7e83 (diff)
Merge branch '0.9.x' into 1.0.x
Diffstat (limited to 'actions/register.php')
-rw-r--r--actions/register.php7
1 files changed, 7 insertions, 0 deletions
diff --git a/actions/register.php b/actions/register.php
index 9b8161e08..7307bc689 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -74,6 +74,13 @@ class RegisterAction extends Action
parent::prepare($args);
$this->code = $this->trimmed('code');
+ // @todo this check should really be in index.php for all sensitive actions
+ $ssl = common_config('site', 'ssl');
+ if (empty($_SERVER['HTTPS']) && ($ssl == 'always' || $ssl == 'sometimes')) {
+ common_redirect(common_local_url('register'));
+ // exit
+ }
+
if (empty($this->code)) {
common_ensure_session();
if (array_key_exists('invitecode', $_SESSION)) {