diff options
Diffstat (limited to 'apps/user_openid')
| -rw-r--r-- | apps/user_openid/appinfo/app.php | 8 | ||||
| -rw-r--r-- | apps/user_openid/phpmyid.php | 4 | ||||
| -rw-r--r-- | apps/user_openid/settings.php | 14 | ||||
| -rw-r--r-- | apps/user_openid/user.php | 2 | ||||
| -rw-r--r-- | apps/user_openid/user_openid.php | 2 |
5 files changed, 15 insertions, 15 deletions
diff --git a/apps/user_openid/appinfo/app.php b/apps/user_openid/appinfo/app.php index d6eacfc0a3a..74c13402caf 100644 --- a/apps/user_openid/appinfo/app.php +++ b/apps/user_openid/appinfo/app.php @@ -6,15 +6,15 @@ 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" ).'/')); +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" ).'/')); require_once 'apps/user_openid/user_openid.php'; -OC_APP::addSettingsPage( array( "id" => "user_openid_settings", 'order'=>1, "href" => OC_HELPER::linkTo( "user_openid", "settings.php" ), "name" => "OpenID")); +OC_App::addSettingsPage( array( "id" => "user_openid_settings", 'order'=>1, "href" => OC_Helper::linkTo( "user_openid", "settings.php" ), "name" => "OpenID")); //active the openid backend -OC_USER::useBackend('openid'); +OC_User::useBackend('openid'); //check for results from openid requests if(isset($_GET['openid_mode']) and $_GET['openid_mode'] == 'id_res'){ diff --git a/apps/user_openid/phpmyid.php b/apps/user_openid/phpmyid.php index 5726ca99948..bcab9e55cbb 100644 --- a/apps/user_openid/phpmyid.php +++ b/apps/user_openid/phpmyid.php @@ -205,7 +205,7 @@ function authorize_mode () { $profile['idp_url']=$IDENTITY; if (isset($_SERVER['PHP_AUTH_USER']) && $profile['authorized'] === false && $_SERVER['PHP_AUTH_USER']==$USERNAME) { - if (OC_USER::checkPassword($USERNAME, $_SERVER['PHP_AUTH_PW'])) {// successful login! + if (OC_User::checkPassword($USERNAME, $_SERVER['PHP_AUTH_PW'])) {// successful login! // return to the refresh url if they get in $_SESSION['openid_auth']=true; $_SESSION['openid_user']=$USERNAME; @@ -559,7 +559,7 @@ function logout_mode () { */ function no_mode () { global $USERNAME, $profile; - $tmpl = new OC_TEMPLATE( 'user_openid', 'nomode', 'guest' ); + $tmpl = new OC_Template( 'user_openid', 'nomode', 'guest' ); if(substr($profile['req_url'],-1,1)!=='/'){//the identity should always end with a / $profile['req_url'].='/'; } diff --git a/apps/user_openid/settings.php b/apps/user_openid/settings.php index 29c18eaa497..4293a6c8aaf 100644 --- a/apps/user_openid/settings.php +++ b/apps/user_openid/settings.php @@ -1,22 +1,22 @@ <?php require_once('../../lib/base.php'); -if( !OC_USER::isLoggedIn()){ - header( "Location: ".OC_HELPER::linkTo( "index.php" )); +if( !OC_User::isLoggedIn()){ + header( "Location: ".OC_Helper::linkTo( "index.php" )); exit(); } if(isset($_POST['input_identity'])){ - OC_PREFERENCES::setValue(OC_USER::getUser(),'user_openid','identity',$_POST['input_identity']); + OC_Preferences::setValue(OC_User::getUser(),'user_openid','identity',$_POST['input_identity']); } -OC_APP::setActiveNavigationEntry( "user_openid_settings" ); +OC_App::setActiveNavigationEntry( "user_openid_settings" ); -$identity=OC_PREFERENCES::getValue(OC_USER::getUser(),'user_openid','identity',''); +$identity=OC_Preferences::getValue(OC_User::getUser(),'user_openid','identity',''); -$tmpl = new OC_TEMPLATE( "user_openid", "settings", "admin"); +$tmpl = new OC_Template( "user_openid", "settings", "admin"); $tmpl->assign('identity',$identity); -$tmpl->assign('user',OC_USER::getUser()); +$tmpl->assign('user',OC_User::getUser()); $tmpl->printPage(); diff --git a/apps/user_openid/user.php b/apps/user_openid/user.php index 4b5d13e3398..3743d232b6d 100644 --- a/apps/user_openid/user.php +++ b/apps/user_openid/user.php @@ -38,7 +38,7 @@ $RUNTIME_NOAPPS=true; $RUNTIME_NOAPPS=false; require_once '../../lib/base.php'; -if(!OC_USER::userExists($USERNAME)){ +if(!OC_User::userExists($USERNAME)){ error_log($USERNAME.' doesn\'t exist'); $USERNAME=''; } diff --git a/apps/user_openid/user_openid.php b/apps/user_openid/user_openid.php index c18edccf2db..d9af94dcafa 100644 --- a/apps/user_openid/user_openid.php +++ b/apps/user_openid/user_openid.php @@ -26,7 +26,7 @@ require_once('class.openid.v3.php'); /** * Class for user management in a SQL Database (e.g. MySQL, SQLite) */ -class OC_USER_OPENID extends OC_USER_BACKEND { +class OC_USER_OPENID extends OC_User_Backend { /** * @brief Check if the password is correct * @param $uid The username |