DontSellMe/richdocuments
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove deprecated API usage. Step 3

Browse Source
This commit is contained in:
Victor Dubiniuk 2015-08-27 01:57:31 +03:00
parent 58725da687
commit 52f251a8af
5 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
controller/sessioncontroller.php
View File

@ -123,8 +123,8 @@ class SessionController extends Controller{
$member = new Db\Member(); $member = new Db\Member();
$member->load($memberId); $member->load($memberId);
if (!$member->getIsGuest() && !\OCP\User::checkLoggedIn()){ if (!$member->getIsGuest()){
exit(); \OCP\JSON::checkLoggedIn();
} }
try { try {

4
lib/config.php
View File

@ -20,8 +20,8 @@ class Config {
$targetFilter = 'odt:writer8'; $targetFilter = 'odt:writer8';
$targetExtension = 'odt'; $targetExtension = 'odt';
$input = file_get_contents(dirname(__DIR__) . self::TEST_DOC_PATH); $input = file_get_contents(dirname(__DIR__) . self::TEST_DOC_PATH);
$infile = \OCP\Files::tmpFile(); $infile = \OC::$server->getTempManager()->getTemporaryFile();
$outdir = \OCP\Files::tmpFolder(); $outdir = \OC::$server->getTempManager()->getTemporaryFolder();
$outfile = $outdir . '/' . basename($infile) . '.' . $targetExtension; $outfile = $outdir . '/' . basename($infile) . '.' . $targetExtension;
$cmd = Helper::findOpenOffice(); $cmd = Helper::findOpenOffice();

2
lib/db.php
View File

@ -43,7 +43,7 @@ abstract class Db {
* @return mixed * @return mixed
*/ */
public function getLastInsertId(){ public function getLastInsertId(){
return \OCP\DB::insertid($this->tableName); return \OC::$server->getDatabaseConnection()->lastInsertId($this->tableName);
} }
/** /**

16
lib/db/session.php
View File

@ -90,6 +90,7 @@ class Session extends \OCA\Documents\Db {
if (!$member->insert()){ if (!$member->insert()){
throw new \Exception('Failed to add member into database'); throw new \Exception('Failed to add member into database');
} }
$sessionData['member_id'] = (string) $member->getLastInsertId();
// Do we have OC_Avatar in out disposal? // Do we have OC_Avatar in out disposal?
if (\OC_Config::getValue('enable_avatars', true) !== true){ if (\OC_Config::getValue('enable_avatars', true) !== true){
@ -98,10 +99,11 @@ class Session extends \OCA\Documents\Db {
$imageUrl = $uid; $imageUrl = $uid;
} }
$displayName = $file->isPublicShare() ? $uid . ' ' . \OCA\Documents\Db\Member::getGuestPostfix() : \OCP\User::getDisplayName($uid); $displayName = $file->isPublicShare()
$userId = $file->isPublicShare() ? $displayName : \OCP\User::getUser(); ? $uid . ' ' . \OCA\Documents\Db\Member::getGuestPostfix()
: \OC::$server->getUserSession()->getUser()->getDisplayName($uid)
$sessionData['member_id'] = (string) $member->getLastInsertId(); ;
$userId = $file->isPublicShare() ? $displayName : \OC::$server->getUserSession()->getUser()->getUID();
$op = new \OCA\Documents\Db\Op(); $op = new \OCA\Documents\Db\Op();
$op->addMember( $op->addMember(
$sessionData['es_id'], $sessionData['es_id'],
@ -190,10 +192,10 @@ class Session extends \OCA\Documents\Db {
WHERE `s`.`es_id` = ? WHERE `s`.`es_id` = ?
GROUP BY `m`.`es_id` GROUP BY `m`.`es_id`
', ',
array( [
\OCP\User::getUser(), \OC::$server->getUserSession()->getUser()->getUID(),
$esId $esId
) ]
); );
$info = $result->fetchRow(); $info = $result->fetchRow();

7
lib/file.php
View File

@ -147,7 +147,10 @@ class File {
if ($this->isPublicShare()){ if ($this->isPublicShare()){
if (isset($this->sharing['uid_owner'])){ if (isset($this->sharing['uid_owner'])){
$owner = $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::tearDownFS();
\OC_Util::setupFS($this->sharing['uid_owner']); \OC_Util::setupFS($this->sharing['uid_owner']);
} else { } else {
@ -155,7 +158,7 @@ class File {
} }
$view = new View('/' . $owner . '/files'); $view = new View('/' . $owner . '/files');
} else { } else {
$owner = \OCP\User::getUser(); $owner = \OC::$server->getUserSession()->getUser()->getUID();
$root = '/' . $owner; $root = '/' . $owner;
if ($useDefaultRoot){ if ($useDefaultRoot){
$root .= '/' . 'files'; $root .= '/' . 'files';