Changeset 473

Show
Ignore:
Timestamp:
08/03/06 08:28:34 (2 years ago)
Author:
ben
Message:

The sidebar log on pane now returns the user to wherever they were within the Elgg site once they have logged on. The optional param 'passthru_url' in login/index.php is checked for; if this doesn't exist, $CFG->wwwroot . "home.php" is used instead.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • devel/login/index.php

    r408 r473  
    22 
    33require_once(dirname(dirname(__FILE__)).'/includes.php'); 
     4global $CFG; 
     5 
     6$redirect_url = trim(optional_param('passthru_url')); 
     7if (empty($redirect_url)) { 
     8    $redirect_url = $CFG->wwwroot . "home.php"; 
     9} 
     10 
    411 
    512// if we're already logged in, redirect away again. 
    613if (logged_on) { 
    714    $messages[] = gettext("You are already logged on."); 
    8     define('redirect_url',url . "home.php"); 
     15    define('redirect_url', $redirect_url); 
    916    $_SESSION['messages'] = $messages; 
    1017    header("Location: " . redirect_url); 
     
    1926    if ($ok) { 
    2027        $messages[] = gettext("You have been logged on."); 
    21         define('redirect_url',url . "home.php"); 
     28        define('redirect_url', $redirect_url); 
    2229        $_SESSION['messages'] = $messages; 
    2330        header("Location: " . redirect_url); 
  • devel/units/display/function_log_on_pane.php

    r420 r473  
    3030                        <label>' . gettext("Username") . '&nbsp;<input type="text" name="username" id="username" style="size: 200px" /></label><br /> 
    3131                        <label>' . gettext("Password") . '&nbsp;<input type="password" name="password" id="password" style="size: 200px" /> 
    32                         </label></p> 
     32                        </label> 
     33                        <input type="hidden" name="passthru_url" value="'. $_SERVER['REQUEST_URI'] .'" /> 
     34                        </p> 
    3335                    </td> 
    3436                </tr>