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

Remove private and deprecated API calls

Browse Source
This commit is contained in:
Victor Dubiniuk 2015-08-28 19:32:54 +03:00
parent 1e6160adce
commit dfc91185f0
7 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
appinfo/application.php
View File

@ -66,14 +66,16 @@ class Application extends App {
$container->registerService('Logger', function($c) {
return $c->query('ServerContainer')->getLogger();
});
$container->registerService('CoreConfig', function($c) {
return $c->query('ServerContainer')->getConfig();
});
$container->registerService('L10N', function($c) {
return $c->query('ServerContainer')->getL10N($c->query('AppName'));
});
$container->registerService('UserId', function($c) {
return $c->query('ServerContainer')->getUserSession()->getUser()->getUID();
});
$container->registerService('CoreConfig', function($c) {
return $c->query('ServerContainer')->getConfig();
});
$container->registerService('L10N', function($c) {
return $c->query('ServerContainer')->getL10N($c->query('AppName'));
});
$container->registerService('UserId', function($c) {
$user = $c->query('ServerContainer')->getUserSession()->getUser();
$uid = is_null($user) ? '' : $user->getUID();
return $uid;
});
}
}

2
controller/documentcontroller.php
View File

@ -168,7 +168,7 @@ class DocumentController extends Controller{
} else {
$documents[$key] = $document;
}
$documents[$key]['icon'] = preg_replace('/\.png$/', '.svg', \OC_Helper::mimetypeIcon($document['mimetype']));
$documents[$key]['icon'] = preg_replace('/\.png$/', '.svg', \OCP\Template::mimetype_icon($document['mimetype']));
$fileIds[] = $document['fileid'];
}

6
lib/db.php
View File

@ -57,7 +57,7 @@ abstract class Db {
}
$result = $this->execute($this->loadStatement, $value);
$data = $result->fetchRow();
$data = $result->fetch();
if (!is_array($data)){
$data = array();
}
@ -194,7 +194,7 @@ abstract class Db {
* @return mixed (array/false)
*/
protected function execute($statement, $args = null){
$query = \OCP\DB::prepare($statement);
$query = \OC::$server->getDatabaseConnection()->prepare($statement);
if (!is_null($args)){
$result = $query->execute($args);
@ -204,7 +204,7 @@ abstract class Db {
$result = $query->execute();
}
return $result;
return $result ? $query : false;
}
public function __call($name, $arguments){

14
lib/db/op.php
View File

@ -41,18 +41,14 @@ class Op extends \OCA\Documents\Db {
* @returns "" when there are no Ops, or the seq of the last Op
*/
public function getHeadSeq($esId){
$query = \OCP\DB::prepare('
$query = \OC::$server->getDatabaseConnection()->prepare('
SELECT `seq`
FROM ' . $this->tableName . '
WHERE `es_id`=?
ORDER BY `seq` DESC
', 1);
$result = $query->execute(array(
$esId
))
->fetchOne()
;
return !$result ? "" : $result;
$result = $query->execute([$esId]);
return !$result ? "" : $query->fetchColumn();
}
public function getOpsAfterJson($esId, $seq){
@ -75,7 +71,7 @@ class Op extends \OCA\Documents\Db {
if ($seq == ""){
$seq = -1;
}
$query = \OCP\DB::prepare('
$query = \OC::$server->getDatabaseConnection()->prepare('
SELECT `opspec`
FROM ' . self::DB_TABLE . '
WHERE `es_id`=?
@ -83,7 +79,7 @@ class Op extends \OCA\Documents\Db {
ORDER BY `seq` ASC
');
$result = $query->execute(array($esId, $seq));
return $result->fetchAll();
return $query->fetchAll();
}
public function addMember($esId, $memberId, $fullName, $userId, $color, $imageUrl){

4
lib/db/session.php
View File

@ -93,7 +93,7 @@ class Session extends \OCA\Documents\Db {
$sessionData['member_id'] = (string) $member->getLastInsertId();
// Do we have OC_Avatar in out disposal?
if (\OC_Config::getValue('enable_avatars', true) !== true){
if (\OC::$server->getConfig()->getSystemValue('enable_avatars', true) !== true){
$imageUrl = 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAAAAACH5BAAAAAAALAAAAAABAAEAAAICTAEAOw==';
} else {
$imageUrl = $uid;
@ -198,7 +198,7 @@ class Session extends \OCA\Documents\Db {
]
);
$info = $result->fetchRow();
$info = $result->fetch();
if (!is_array($info)){
$info = array();
}

2
public.php
View File

@ -15,7 +15,7 @@ namespace OCA\Documents;
\OCP\JSON::checkAppEnabled('documents');
if (\OC_Appconfig::getValue('core', 'shareapi_allow_links', 'yes') !== 'yes') {
if (\OC::$server->getConfig()->getAppValue('core', 'shareapi_allow_links', 'yes') !== 'yes') {
header('HTTP/1.0 404 Not Found');
$tmpl = new OCP\Template('', '404', 'guest');
$tmpl->printPage();

2
templates/documents.php
View File

@ -16,7 +16,7 @@ script('files', 'jquery.fileupload');
<form data-upload-id="1"
id="data-upload-form"
class="file_upload_form"
action="<?php print_unescaped(OCP\Util::linkTo('files', 'ajax/upload.php')); ?>"
action="<?php print_unescaped(link_to('files', 'ajax/upload.php')); ?>"
method="post"
enctype="multipart/form-data"
target="file_upload_target_1">