diff options
| author | Florian Pritz <bluewind@xinu.at> | 2015-08-18 22:01:18 +0200 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2015-08-18 22:01:18 +0200 |
| commit | 1c247bc4073451ad156ecedfbd2f7ebe73b56c12 (patch) | |
| tree | 522b1527126d4b687229fb3e2c50a3c052f4f310 /application/views | |
| parent | f0dd547bd84b4461cdab8d7d556bdb275bf4864a (diff) | |
Fix redirect URI when using multiple tabs
If we store only the last called URI in the session we can't support
multiple browser tabs that all need to log in again. Fix this by
storing the URI in the URL.
Also change a trim() to ltrim() so that the URI string we store keeps
it's trailing slash.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'application/views')
| -rw-r--r-- | application/views/header.php | 2 | ||||
| -rw-r--r-- | application/views/user/login.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/application/views/header.php b/application/views/header.php index 081f91820..6332382b2 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", array("class" => "form-signin")); ?> + <?php echo form_open("user/login?redirect_uri=".get_instance()->uri->uri_string(), 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> diff --git a/application/views/user/login.php b/application/views/user/login.php index 3e30d53bd..5b2067bb0 100644 --- a/application/views/user/login.php +++ b/application/views/user/login.php @@ -3,7 +3,7 @@ if (isset($login_error)) { ?> <div class="alert alert-danger">The entered credentials are invalid.</div> <?php } ?> -<?php echo form_open('user/login', array("class" => "form-horizontal login-page")); ?> +<?php echo form_open("user/login?redirect_uri=$redirect_uri", array("class" => "form-horizontal login-page")); ?> <div class="form-group"> <label class="control-label" for="inputUsername">Username</label> <div class="controls"> |