porting of OC_User to public API complete.

What better thing to do during a long train ride than refactoring ;-)

diff --git a/apps/calendar/ajax/share/changepermission.php b/apps/calendar/ajax/share/changepermission.php
old mode 100644 (file)
new mode 100755 (executable)
index faf2a13..431ef79
--- a/apps/calendar/ajax/share/changepermission.php
+++ b/apps/calendar/ajax/share/changepermission.php
@@ -28,7 +28,7 @@ switch($sharetype){
                OC_JSON::error(array('message'=>'unexspected parameter'));
                exit;
 }
-if($sharetype == 'user' && !OC_User::userExists($sharewith)){
+if($sharetype == 'user' && !OCP\User::userExists($sharewith)){
        OC_JSON::error(array('message'=>'user not found'));
        exit;
 }

diff --git a/apps/calendar/ajax/share/share.php b/apps/calendar/ajax/share/share.php
index 9f4dc39e52447e1e0c70ccb42f2d98c2b058e997..39d97522338bfef7bb55d1da01d8b22dc2c42b5e 100755 (executable)
--- a/apps/calendar/ajax/share/share.php
+++ b/apps/calendar/ajax/share/share.php
@@ -35,7 +35,7 @@ switch($sharetype){
                OC_JSON::error(array('message'=>'unexspected parameter'));
                exit;
 }
-if($sharetype == 'user' && !OC_User::userExists($sharewith)){
+if($sharetype == 'user' && !OCP\User::userExists($sharewith)){
        OC_JSON::error(array('message'=>'user not found'));
        exit;
 }

diff --git a/apps/calendar/ajax/share/unshare.php b/apps/calendar/ajax/share/unshare.php
index 1a93748982cc370da7733e3835567b22bbc87b55..e5676c72f311943905a873e761ef4251178c21d3 100755 (executable)
--- a/apps/calendar/ajax/share/unshare.php
+++ b/apps/calendar/ajax/share/unshare.php
@@ -27,7 +27,7 @@ switch($sharetype){
                OC_JSON::error(array('message'=>'unexspected parameter'));
                exit;
 }
-if($sharetype == 'user' && !OC_User::userExists($sharewith)){
+if($sharetype == 'user' && !OCP\User::userExists($sharewith)){
        OC_JSON::error(array('message'=>'user not found'));
        exit;
 }elseif($sharetype == 'group' && !OC_Group::groupExists($sharewith)){

diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
old mode 100644 (file)
new mode 100755 (executable)
index fda2a55..98ba484
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -11,7 +11,7 @@ OC_Hook::connect('OC_User','post_login','OC_Crypt','loginListener');
 stream_wrapper_register('crypt','OC_CryptStream');
 
 if(!isset($_SESSION['enckey']) and OCP\User::isLoggedIn()){//force the user to re-loggin if the encryption key isn't unlocked (happens when a user is logged in before the encryption app is enabled)
-       OC_User::logout();
+       OCP\User::logout();
        header("Location: ".OC::$WEBROOT.'/');
        exit();
 }

diff --git a/apps/files_sharing/lib_share.php b/apps/files_sharing/lib_share.php
index 0ccfea180c66d276173085ac4e01fcc511134a85..96df29c4f42bb529a720196df0d06cb76a08c79d 100755 (executable)
--- a/apps/files_sharing/lib_share.php
+++ b/apps/files_sharing/lib_share.php
@@ -51,7 +51,7 @@ class OC_Share {
                                $uid_shared_with = OC_Group::usersInGroup($gid);
                                // Remove the owner from the list of users in the group
                                $uid_shared_with = array_diff($uid_shared_with, array($uid_owner));
-                       } else if (OC_User::userExists($uid_shared_with)) {
+                       } else if (OCP\User::userExists($uid_shared_with)) {
                                $userGroups = OC_Group::getUserGroups($uid_owner);
                                // Check if the user is in one of the owner's groups
                                foreach ($userGroups as $group) {

diff --git a/apps/media/tomahawk.php b/apps/media/tomahawk.php
old mode 100644 (file)
new mode 100755 (executable)
index 019e80b..f3f3fd1
--- a/apps/media/tomahawk.php
+++ b/apps/media/tomahawk.php
@@ -29,7 +29,7 @@ require_once(OC::$APPSROOT . '/apps/media/lib_collection.php');
 
 $user=isset($_POST['user'])?$_POST['user']:'';
 $pass=isset($_POST['pass'])?$_POST['pass']:'';
-if(OC_User::checkPassword($user,$pass)){
+if(OCP\User::checkPassword($user,$pass)){
        OC_Util::setupFS($user);
        OC_MEDIA_COLLECTION::$uid=$user;
 }else{

diff --git a/apps/user_openid/phpmyid.php b/apps/user_openid/phpmyid.php
old mode 100644 (file)
new mode 100755 (executable)
index ef01e7a..a86e807
--- 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 (OCP\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;

diff --git a/apps/user_openid/user.php b/apps/user_openid/user.php
index 59220aedc569fa7b29c5364b72c6fe6b85caefb6..cd17dae6d6f0220b0bf22deddd2c277c293d12fe 100755 (executable)
--- a/apps/user_openid/user.php
+++ b/apps/user_openid/user.php
@@ -39,7 +39,7 @@ $RUNTIME_NOAPPS=false;
 require_once '../../lib/base.php';
 OC_Util::checkAppEnabled('user_openid');
 
-if(!OC_User::userExists($USERNAME)){
+if(!OCP\User::userExists($USERNAME)){
        OCP\Util::writeLog('user_openid',$USERNAME.' doesn\'t exist',OCP\Util::WARN);
        $USERNAME='';
 }