diff options
| author | Frank Karlitschek <frank@owncloud.org> | 2012-05-01 23:19:39 +0200 |
|---|---|---|
| committer | Frank Karlitschek <frank@owncloud.org> | 2012-05-01 23:19:39 +0200 |
| commit | e48f511606a1ef64aa39099055dd6ae437f45d03 (patch) | |
| tree | 6ecbbc9c14cb621845fc12af9412e24d17168397 /apps/user_openid | |
| parent | 31e32e3c10ace169e0d841ff6e4b17d11fe64f1b (diff) | |
| download | nextcloud-server-e48f511606a1ef64aa39099055dd6ae437f45d03.tar.gz nextcloud-server-e48f511606a1ef64aa39099055dd6ae437f45d03.zip | |
port linkto and serverHost
Diffstat (limited to 'apps/user_openid')
| -rwxr-xr-x | apps/user_openid/appinfo/app.php | 4 | ||||
| -rwxr-xr-x | apps/user_openid/templates/settings.php | 2 | ||||
| -rwxr-xr-x | apps/user_openid/user.php | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/apps/user_openid/appinfo/app.php b/apps/user_openid/appinfo/app.php index 3e26d922689..b77067758b3 100755 --- a/apps/user_openid/appinfo/app.php +++ b/apps/user_openid/appinfo/app.php @@ -14,8 +14,8 @@ if(strpos($_SERVER["REQUEST_URI"],'?') and !strpos($_SERVER["REQUEST_URI"],'=')) } } -OCP\Util::addHeader('link',array('rel'=>'openid.server', 'href'=>OC_Helper::linkToAbsolute( "user_openid", "user.php" ).'/'.$userName)); -OCP\Util::addHeader('link',array('rel'=>'openid.delegate', 'href'=>OC_Helper::linkToAbsolute( "user_openid", "user.php" ).'/'.$userName)); +OCP\Util::addHeader('link',array('rel'=>'openid.server', 'href'=>OCP\Util::linkToAbsolute( "user_openid", "user.php" ).'/'.$userName)); +OCP\Util::addHeader('link',array('rel'=>'openid.delegate', 'href'=>OCP\Util::linkToAbsolute( "user_openid", "user.php" ).'/'.$userName)); OC_APP::registerPersonal('user_openid','settings'); diff --git a/apps/user_openid/templates/settings.php b/apps/user_openid/templates/settings.php index dd30d82aa93..731a2c57e98 100755 --- a/apps/user_openid/templates/settings.php +++ b/apps/user_openid/templates/settings.php @@ -1,7 +1,7 @@ <form id="openidform"> <fieldset class="personalblock"> <strong>OpenID</strong> - <?php echo ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 'https' : 'http').'://'.OC_Helper::serverHost().OC::$WEBROOT.'/?'; echo OCP\USER::getUser(); ?><br /><em><?php echo $l->t('you can authenticate to other sites with this address');?></em><br /> + <?php echo ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 'https' : 'http').'://'.OCP\Util::getServerHost().OC::$WEBROOT.'/?'; echo OCP\USER::getUser(); ?><br /><em><?php echo $l->t('you can authenticate to other sites with this address');?></em><br /> <label for="identity"><?php echo $l->t('Authorized OpenID provider');?></label> <input type="text" name="identity" id="identity" value="<?php echo $_['identity']; ?>" placeholder="<?php echo $l->t('Your address at Wordpress, Identi.ca, …');?>" /><span class="msg"></span> </fieldset> diff --git a/apps/user_openid/user.php b/apps/user_openid/user.php index cd17dae6d6f..22b3a8ba73d 100755 --- a/apps/user_openid/user.php +++ b/apps/user_openid/user.php @@ -43,7 +43,7 @@ if(!OCP\User::userExists($USERNAME)){ OCP\Util::writeLog('user_openid',$USERNAME.' doesn\'t exist',OCP\Util::WARN); $USERNAME=''; } -$IDENTITY=OC_Helper::linkToAbsolute( "user_openid", "user.php" ).'/'.$USERNAME; +$IDENTITY=OCP\Util::linkToAbsolute( "user_openid", "user.php" ).'/'.$USERNAME; require_once 'phpmyid.php'; |