From 52f251a8af54f0ed25b7558be8d7a237bcb0f90f Mon Sep 17 00:00:00 2001
From: Victor Dubiniuk <victor.dubiniuk@gmail.com>
Date: Thu, 27 Aug 2015 01:57:31 +0300
Subject: [PATCH] Remove deprecated API usage. Step 3

---
 controller/sessioncontroller.php |  4 ++--
 lib/config.php                   |  4 ++--
 lib/db.php                       |  2 +-
 lib/db/session.php               | 16 +++++++++-------
 lib/file.php                     |  7 +++++--
 5 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/controller/sessioncontroller.php b/controller/sessioncontroller.php
index 3675489c..2c806e17 100644
--- a/controller/sessioncontroller.php
+++ b/controller/sessioncontroller.php
@@ -123,8 +123,8 @@ class SessionController extends Controller{
 			$member = new Db\Member();
 			$member->load($memberId);
 	
-			if (!$member->getIsGuest() && !\OCP\User::checkLoggedIn()){
-				exit();
+			if (!$member->getIsGuest()){
+				\OCP\JSON::checkLoggedIn();
 			}
 
 			try {
diff --git a/lib/config.php b/lib/config.php
index d718511b..b4e59067 100644
--- a/lib/config.php
+++ b/lib/config.php
@@ -20,8 +20,8 @@ class Config {
 		$targetFilter = 'odt:writer8';
 		$targetExtension = 'odt';
 		$input = file_get_contents(dirname(__DIR__) . self::TEST_DOC_PATH);
-		$infile = \OCP\Files::tmpFile();
-		$outdir = \OCP\Files::tmpFolder();
+		$infile = \OC::$server->getTempManager()->getTemporaryFile();
+		$outdir = \OC::$server->getTempManager()->getTemporaryFolder();
 		$outfile = $outdir . '/' . basename($infile) . '.' . $targetExtension;
 		$cmd = Helper::findOpenOffice();
  
diff --git a/lib/db.php b/lib/db.php
index b4bdac40..918ec7b8 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -43,7 +43,7 @@ abstract class Db {
 	 * @return mixed
 	 */
 	public function getLastInsertId(){
-		return \OCP\DB::insertid($this->tableName);
+		return \OC::$server->getDatabaseConnection()->lastInsertId($this->tableName);
 	}
 	
 	/**
diff --git a/lib/db/session.php b/lib/db/session.php
index 69d96118..b8de3c1c 100644
--- a/lib/db/session.php
+++ b/lib/db/session.php
@@ -90,6 +90,7 @@ class Session extends \OCA\Documents\Db {
 		if (!$member->insert()){
 			throw new \Exception('Failed to add member into database');
 		}
+		$sessionData['member_id'] = (string) $member->getLastInsertId();
 		
 		// Do we have OC_Avatar in out disposal?
 		if (\OC_Config::getValue('enable_avatars', true) !== true){
@@ -98,10 +99,11 @@ class Session extends \OCA\Documents\Db {
 			$imageUrl = $uid;
 		}
 
-		$displayName = $file->isPublicShare() ? $uid . ' ' . \OCA\Documents\Db\Member::getGuestPostfix() : \OCP\User::getDisplayName($uid);
-		$userId = $file->isPublicShare() ? $displayName : \OCP\User::getUser();
-			
-		$sessionData['member_id'] = (string) $member->getLastInsertId();
+		$displayName = $file->isPublicShare() 
+			? $uid . ' ' . \OCA\Documents\Db\Member::getGuestPostfix() 
+			: \OC::$server->getUserSession()->getUser()->getDisplayName($uid)
+		;
+		$userId = $file->isPublicShare() ? $displayName : \OC::$server->getUserSession()->getUser()->getUID();
 		$op = new \OCA\Documents\Db\Op();
 		$op->addMember(
 					$sessionData['es_id'],
@@ -190,10 +192,10 @@ class Session extends \OCA\Documents\Db {
 			WHERE `s`.`es_id` = ?
 			GROUP BY `m`.`es_id`
 			',
-			array(
-					\OCP\User::getUser(),
+			[
+					\OC::$server->getUserSession()->getUser()->getUID(),
 					$esId
-			)
+			]
 		);
 
 		$info = $result->fetchRow();
diff --git a/lib/file.php b/lib/file.php
index 74c8964e..ed4acf99 100644
--- a/lib/file.php
+++ b/lib/file.php
@@ -147,7 +147,10 @@ class File {
 		if ($this->isPublicShare()){
 			if (isset($this->sharing['uid_owner'])){
 				$owner = $this->sharing['uid_owner'];
-				\OCP\JSON::checkUserExists($this->sharing['uid_owner']);
+				if (!\OC::$server->getUserManager()->userExists($this->sharing['uid_owner'])) {
+					throw new \Exception('Share owner' . $this->sharing['uid_owner'] . ' does not exist ');
+				}
+
 				\OC_Util::tearDownFS();
 				\OC_Util::setupFS($this->sharing['uid_owner']);
 			} else {
@@ -155,7 +158,7 @@ class File {
 			}
 			$view = new View('/' . $owner . '/files');
 		} else {
-			$owner = \OCP\User::getUser();
+			$owner = \OC::$server->getUserSession()->getUser()->getUID();
 			$root = '/' . $owner;
 			if ($useDefaultRoot){
 				$root .= '/' . 'files';