diff options
| author | Florian Pritz <bluewind@xinu.at> | 2016-06-05 19:13:54 +0200 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2016-06-05 19:13:54 +0200 |
| commit | ad16e8ff484b1942ff905b6b87fe174740917afb (patch) | |
| tree | e9b007a59065bd216252a54d4a7d7b8114a9ca53 | |
| parent | 5eee0e8faec92393750cc8d89523bf786c536384 (diff) | |
Fix redirect on login after registering new account
Previously the login box in the navigation would redirect to the
current page, but this page will throw an error in the case of the
registration page since that's the page with the invition key and that
key is no longer valid.
Fix this by redirecting to the $redirect_uri and ensure that this value
is set for all requests.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
| -rw-r--r-- | application/controllers/user.php | 2 | ||||
| -rw-r--r-- | application/core/MY_Controller.php | 1 | ||||
| -rw-r--r-- | application/views/header.php | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/application/controllers/user.php b/application/controllers/user.php index 009e4c90c..e68a544f1 100644 --- a/application/controllers/user.php +++ b/application/controllers/user.php @@ -192,6 +192,8 @@ class User extends MY_Controller { $referrer = $query["user"]; + $this->data['redirect_uri'] = "/"; + if ($process !== false) { $username = $this->input->post("username"); $email = $this->input->post("email"); diff --git a/application/core/MY_Controller.php b/application/core/MY_Controller.php index 5181c2904..79d258c37 100644 --- a/application/core/MY_Controller.php +++ b/application/core/MY_Controller.php @@ -103,5 +103,6 @@ class MY_Controller extends CI_Controller { $this->load->model("muser"); $this->data["user_logged_in"] = $this->muser->logged_in(); + $this->data['redirect_uri'] = $this->uri->uri_string(); } } diff --git a/application/views/header.php b/application/views/header.php index 6332382b2..0e1f174de 100644 --- a/application/views/header.php +++ b/application/views/header.php @@ -77,7 +77,7 @@ if (is_cli_client() && !isset($force_full_html)) { <?php if(auth_driver_function_implemented("can_reset_password")) { ?> <p><?php echo anchor("user/reset_password", "Forgot your password?"); ?></p> <?php } ?> - <?php echo form_open("user/login?redirect_uri=".get_instance()->uri->uri_string(), array("class" => "form-signin")); ?> + <?php echo form_open("user/login?redirect_uri=".$redirect_uri, array("class" => "form-signin")); ?> <input type="text" name="username" placeholder="Username" class="form-control"> <input type="password" name="password" placeholder="Password" class="form-control"> <button type="submit" name="process" class="btn btn-default btn-block">Login</button> |