Changeset 197

Show
Ignore:
Timestamp:
01/26/09 16:26:09 (10 months ago)
Author:
gallardj
Message:

Fixes #2935. Grabs the HTTP_REFERER and shoves that into the bounce param in the sso url.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • elgg/trunk/auth/sso/lib.php

    r170 r197  
    3333function sso_authenticate_user_login()  
    3434{ 
    35     global $CFG; 
    36     $redirect = "/social/index.php"; 
    37  
    38     sso_authenticate(true, true, array('bounce'=>$redirect)); 
     35    global $CFG, $redirect_url; 
     36     
     37    sso_authenticate(true, true, array('bounce'=>$redirect_url)); 
    3938    $data = sso_session_userinfo();  
    4039 

  • elgg/trunk/login/index.php

    r37 r197  
    44 
    55require_once(dirname(dirname(__FILE__)).'/includes.php'); 
    6 global $CFG; 
     6global $CFG, $redirect_url; 
    77 
    88$redirect_url = trim(optional_param('passthru_url')); 
    99if (empty($redirect_url) || substr_count($redirect_url,$CFG->wwwroot) == 0) { 
    10     $redirect_url = $CFG->wwwroot . "index.php"; 
    11 } 
    12  
    13 if (substr_count($redirect_url,$CFG->wwwroot) == 0) { 
    14     $redirect_url = substr($CFG->wwwroot,0,strlen($CFG->wwwroot) - 1) . $redirect_url; 
     10      $url = parse_url($_SERVER["HTTP_REFERER"]); 
     11      $redirect_url = $url['path']; 
    1512} 
    1613