allow users to use myhost/owncloud/?myusername as openid identity

This commit is contained in:
Robin Appelman 2011-08-04 18:49:29 +02:00
parent 12cc7c77ba
commit 60a7a9d6f0
2 changed files with 17 additions and 7 deletions

View File

@ -6,8 +6,18 @@ if (!in_array ('curl', get_loaded_extensions())){
}
$urlBase=((isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') ? 'https' : 'http').'://'.$_SERVER['HTTP_HOST'];
OC_Util::addHeader('link',array('rel'=>'openid.server', 'href'=>$urlBase.OC_Helper::linkTo( "user_openid", "user.php" ).'/'));
OC_Util::addHeader('link',array('rel'=>'openid.delegate', 'href'=>$urlBase.OC_Helper::linkTo( "user_openid", "user.php" ).'/'));
$userName='';
if(strpos($_SERVER["REQUEST_URI"],'?') and !strpos($_SERVER["REQUEST_URI"],'=')){
if(strpos($_SERVER["REQUEST_URI"],'/?')){
$userName=substr($_SERVER["REQUEST_URI"],strpos($_SERVER["REQUEST_URI"],'/?')+2);
}elseif(strpos($_SERVER["REQUEST_URI"],'.php?')){
$userName=substr($_SERVER["REQUEST_URI"],strpos($_SERVER["REQUEST_URI"],'.php?')+5);
}
}
OC_Util::addHeader('link',array('rel'=>'openid.server', 'href'=>$urlBase.OC_Helper::linkTo( "user_openid", "user.php" ).'/'.$userName));
OC_Util::addHeader('link',array('rel'=>'openid.delegate', 'href'=>$urlBase.OC_Helper::linkTo( "user_openid", "user.php" ).'/'.$userName));
require_once 'apps/user_openid/user_openid.php';

View File

@ -1646,12 +1646,12 @@ $profile['req_url'] = sprintf("%s://%s%s",
// $port,//host already includes the path
$_SERVER["REQUEST_URI"]);
$fullId='user.php/'.$USERNAME.'/';
$incompleteId='user.php/';
// $fullId='user.php/'.$USERNAME.'/';
// $incompleteId='user.php/';
if(!strpos($profile['req_url'],$fullId)){
$profile['req_url']=str_replace($incompleteId,$fullId,$profile['req_url']);
}
// if(!strpos($profile['req_url'],$fullId)){
// $profile['req_url']=str_replace($incompleteId,$fullId,$profile['req_url']);
// }
// error_log('inc id: '.$fullId);
// error_log('req url: '.$profile['req_url']);