yetangitu/nextcloud-apps
1
0
Fork 0
mirror of https://github.com/Yetangitu/owncloud-apps.git synced 2025-10-02 14:49:17 +02:00
Code Issues Releases Wiki Activity

NextCloud14 compatibility fix

Browse source
This commit is contained in:
root 2018-10-05 22:21:49 +02:00
parent 457c1603fa
commit 3fe30c1200
10 changed files with 39 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

7
files_opds/ajax/admin.php
View file

@ -12,8 +12,8 @@
namespace OCA\Files_Opds; namespace OCA\Files_Opds;
\OCP\JSON::callCheck(); \OC_JSON::callCheck();
\OCP\JSON::checkLoggedIn(); \OC_JSON::checkLoggedIn();
$defaults = new \OC_Defaults(); $defaults = new \OC_Defaults();
$l = \OC::$server->getL10N('files_opds'); $l = \OC::$server->getL10N('files_opds');
@ -53,11 +53,10 @@ if (isset($_POST['opdsCoverX'])) {
Config::setPreview('OC\Preview\MSOffice2007',$opdsPreviewMsOffice); Config::setPreview('OC\Preview\MSOffice2007',$opdsPreviewMsOffice);
} }
\OCP\JSON::success( \OC_JSON::success(
array( array(
'data' => array('message'=> $l->t('Settings updated successfully.')) 'data' => array('message'=> $l->t('Settings updated successfully.'))
) )
); );
exit(); exit();

6
files_opds/ajax/clear_bookshelf.php
View file

@ -14,8 +14,8 @@ namespace OCA\Files_Opds;
$l = \OC::$server->getL10N('files_opds'); $l = \OC::$server->getL10N('files_opds');
\OCP\JSON::checkLoggedIn(); \OC_JSON::checkLoggedIn();
\OCP\JSON::callCheck(); \OC_JSON::callCheck();
Bookshelf::clear(); Bookshelf::clear();
\OCP\JSON::success(array( "data" => array( "message" => $l->t("Bookshelf cleared")))); \OC_JSON::success(array( "data" => array( "message" => $l->t("Bookshelf cleared"))));

21
files_opds/ajax/personal.php
View file

@ -12,8 +12,8 @@
namespace OCA\Files_Opds; namespace OCA\Files_Opds;
\OCP\JSON::callCheck(); \OC_JSON::callCheck();
\OCP\JSON::checkLoggedIn(); \OC_JSON::checkLoggedIn();
$l = \OC::$server->getL10N('files_opds'); $l = \OC::$server->getL10N('files_opds');
@ -21,25 +21,25 @@ $opdsEnable = isset($_POST['opdsEnable']) ? $_POST['opdsEnable'] : 'false';
$rootPath = isset($_POST['rootPath']) ? $_POST['rootPath'] : '/Library'; $rootPath = isset($_POST['rootPath']) ? $_POST['rootPath'] : '/Library';
$fileTypes = isset($_POST['fileTypes']) ? $_POST['fileTypes'] : ''; $fileTypes = isset($_POST['fileTypes']) ? $_POST['fileTypes'] : '';
$skipList = isset($_POST['skipList']) ? $_POST['skipList'] : 'metadata.opf,cover.jpg'; $skipList = isset($_POST['skipList']) ? $_POST['skipList'] : 'metadata.opf,cover.jpg';
$feedTitle = isset($_POST['feedTitle']) ? $_POST['feedTitle'] : $l->t("%s's Library", \OCP\User::getDisplayName()); $feedTitle = isset($_POST['feedTitle']) ? $_POST['feedTitle'] : $l->t("%s's Library", \OC_User::getDisplayName());
if (!strlen($rootPath) || if (!strlen($rootPath) ||
\OC\Files\Filesystem::isValidPath($rootPath) === false || \OC\Files\Filesystem::isValidPath($rootPath) === false ||
\OC\Files\Filesystem::file_exists($rootPath) === false ) { \OC\Files\Filesystem::file_exists($rootPath) === false ) {
\OCP\JSON::error( \OC_JSON::error(
array( array(
'data' => array('message'=> $l->t('Directory does not exist!')) 'data' => array('message'=> $l->t('Directory does not exist!'))
) )
); );
} else { } else {
Config::set('root_path', $rootPath); Config::set('root_path', $rootPath);
Config::set('enable', $opdsEnable); Config::set('enable', $opdsEnable);
Config::set('file_types', $fileTypes); Config::set('file_types', $fileTypes);
Config::set('skip_list', $skipList); Config::set('skip_list', $skipList);
Config::set('feed_title', $feedTitle); Config::set('feed_title', $feedTitle);
Config::set('id', Util::genUuid()); Config::set('id', Util::genUuid());
\OCP\JSON::success( \OC_JSON::success(
array( array(
'data' => array('message'=> $l->t('Settings updated successfully.')) 'data' => array('message'=> $l->t('Settings updated successfully.'))
) )
@ -47,4 +47,3 @@ if (!strlen($rootPath) ||
} }
exit(); exit();

6
files_opds/ajax/schedule_rescan.php
View file

@ -14,8 +14,8 @@ namespace OCA\Files_Opds;
$l = \OC::$server->getL10N('files_opds'); $l = \OC::$server->getL10N('files_opds');
\OCP\JSON::checkLoggedIn(); \OC_JSON::checkLoggedIn();
\OCP\JSON::callCheck(); \OC_JSON::callCheck();
Meta::rescan(); Meta::rescan();
\OCP\JSON::success(array( "data" => array( "message" => $l->t("Rescan scheduled")))); \OC_JSON::success(array( "data" => array( "message" => $l->t("Rescan scheduled"))));

2
files_opds/appinfo/info.xml
View file

@ -37,7 +37,7 @@ See [README] for more information on (mis)features of this app.
<database>sqlite</database> <database>sqlite</database>
<database>mysql</database> <database>mysql</database>
<owncloud min-version="8.2" max-version="10.0" /> <owncloud min-version="8.2" max-version="10.0" />
<nextcloud min-version="8.1" max-version="13.0" /> <nextcloud min-version="8.1" max-version="14.0" />
</dependencies> </dependencies>
<settings> <settings>
<admin>OCA\Files_Opds\Settings\Admin</admin> <admin>OCA\Files_Opds\Settings\Admin</admin>

18
files_opds/lib/config.php
View file

@ -25,7 +25,7 @@ class Config
* @return string retrieved value or default * @return string retrieved value or default
*/ */
public static function get($key, $default) { public static function get($key, $default) {
return \OCP\Config::getUserValue(\OCP\User::getUser(), 'files_opds', $key, $default); return \OC::$server->getConfig()->getUserValue(\OC::$server->getUserSession()->getUser()->getUID(), 'files_opds', $key, $default);
} }
/** /**
@ -36,7 +36,7 @@ class Config
* @return bool success * @return bool success
*/ */
public static function set($key, $value) { public static function set($key, $value) {
return \OCP\Config::setUserValue(\OCP\User::getUser(), 'files_opds', $key, $value); return \OC::$server->getConfig()->setUserValue(\OC::$server->getUserSession()->getUser()->getUID(), 'files_opds', $key, $value);
} }
/** /**
@ -47,7 +47,7 @@ class Config
* @return string retrieved value or default * @return string retrieved value or default
*/ */
public static function getApp($key, $default) { public static function getApp($key, $default) {
return \OCP\Config::getAppValue('files_opds', $key, $default); return \OC::$server->getConfig()->getAppValue('files_opds', $key, $default);
} }
/** /**
@ -58,17 +58,17 @@ class Config
* @return bool success * @return bool success
*/ */
public static function setApp($key, $value) { public static function setApp($key, $value) {
return \OCP\Config::setAppValue('files_opds', $key, $value); return \OC::$server->getConfig()->setAppValue('files_opds', $key, $value);
} }
/** /**
* @brief get preview status * @brief get preview status
* *
* @param string format * @param string format
* @return bool (true = enabled, false = disabled) * @return bool (true = enabled, false = disabled)
*/ */
public static function getPreview($format) { public static function getPreview($format) {
$enablePreviewProviders = \OCP\Config::getSystemValue('enabledPreviewProviders', null); $enablePreviewProviders = \OC::$server->getConfig()->getSystemValue('enabledPreviewProviders', null);
if (!($enablePreviewProviders === null)) { if (!($enablePreviewProviders === null)) {
return in_array($format, $enablePreviewProviders); return in_array($format, $enablePreviewProviders);
} }
@ -83,7 +83,7 @@ class Config
* @return bool * @return bool
*/ */
public static function setPreview($format, $enable = 'false') { public static function setPreview($format, $enable = 'false') {
$enablePreviewProviders = \OCP\Config::getSystemValue('enabledPreviewProviders', null); $enablePreviewProviders = \OC::$server->getConfig()->getSystemValue('enabledPreviewProviders', null);
if ($enable == 'true') { if ($enable == 'true') {
if ($enablePreviewProviders === null) { if ($enablePreviewProviders === null) {
// set up default providers // set up default providers
@ -103,7 +103,7 @@ class Config
} }
} }
if (!(\OCP\Config::setSystemValue('enabledPreviewProviders', $enablePreviewProviders))) { if (!(\OC::$server->getConfig()->setSystemValue('enabledPreviewProviders', $enablePreviewProviders))) {
logWarn("Failed to enable " . $format . " preview provider (config.php readonly?)"); logWarn("Failed to enable " . $format . " preview provider (config.php readonly?)");
return true; return true;
} }

6
files_opds/lib/feed.php
View file

@ -24,7 +24,7 @@ class Feed
* @return string feed id * @return string feed id
*/ */
public static function getFeedId() { public static function getFeedId() {
return Config::get('id', ''); return Config::get('id', '');
} }
/** /**
@ -66,8 +66,8 @@ class Feed
$tmpl->assign('id', $id); $tmpl->assign('id', $id);
$tmpl->assign('type', $type); $tmpl->assign('type', $type);
$tmpl->assign('dir', $dir); $tmpl->assign('dir', $dir);
$tmpl->assign('user', \OCP\User::getDisplayName()); $tmpl->assign('user', \OC_User::getDisplayName());
$tmpl->assign('feed_title', Config::get('feed_title',\OCP\User::getDisplayName() . "'s Library")); $tmpl->assign('feed_title', Config::get('feed_title',\OC_User::getDisplayName() . "'s Library"));
$tmpl->assign('feed_subtitle', Config::getApp('feed_subtitle', $defaults->getName() . " OPDS catalog")); $tmpl->assign('feed_subtitle', Config::getApp('feed_subtitle', $defaults->getName() . " OPDS catalog"));
$tmpl->assign('feed_updated', time()); $tmpl->assign('feed_updated', time());
$tmpl->printPage(); $tmpl->printPage();

10
files_opds/lib/meta.php
View file

@ -64,7 +64,7 @@ class Meta
protected static function load($id) { protected static function load($id) {
$sql = 'SELECT * FROM `*PREFIX*opds_metadata` WHERE id = ?'; $sql = 'SELECT * FROM `*PREFIX*opds_metadata` WHERE id = ?';
$args = array($id); $args = array($id);
$query = \OCP\DB::prepare($sql); $query = \OC_DB::prepare($sql);
$result = $query->execute($args); $result = $query->execute($args);
return ($row = $result->fetchRow()) ? $row : false; return ($row = $result->fetchRow()) ? $row : false;
@ -79,7 +79,7 @@ class Meta
protected static function save($meta) { protected static function save($meta) {
$sql = "SELECT `id` FROM *PREFIX*opds_metadata WHERE `id`=?"; $sql = "SELECT `id` FROM *PREFIX*opds_metadata WHERE `id`=?";
$args = array($meta['id']); $args = array($meta['id']);
$query = \OCP\DB::prepare($sql); $query = \OC_DB::prepare($sql);
$result = $query->execute($args); $result = $query->execute($args);
$data = $result->fetchRow(); $data = $result->fetchRow();
if (isset($data['id'])) { if (isset($data['id'])) {
@ -118,7 +118,7 @@ class Meta
$meta['rescan'] $meta['rescan']
); );
} }
$query = \OCP\DB::prepare($sql); $query = \OC_DB::prepare($sql);
return $query->execute($args); return $query->execute($args);
} }
@ -150,7 +150,7 @@ class Meta
public static function remove($id) { public static function remove($id) {
$sql = "DELETE FROM *PREFIX*opds_metadata WHERE `id`=?"; $sql = "DELETE FROM *PREFIX*opds_metadata WHERE `id`=?";
$args = array($id); $args = array($id);
$query = \OCP\DB::prepare($sql); $query = \OC_DB::prepare($sql);
return $query->execute($args); return $query->execute($args);
} }
@ -162,7 +162,7 @@ class Meta
public static function rescan() { public static function rescan() {
$sql = "UPDATE *PREFIX*opds_metadata SET `rescan`=?"; $sql = "UPDATE *PREFIX*opds_metadata SET `rescan`=?";
$args = array(date("Y-m-d H:i:s")); $args = array(date("Y-m-d H:i:s"));
$query = \OCP\DB::prepare($sql); $query = \OC_DB::prepare($sql);
$result = $query->execute($args); $result = $query->execute($args);
} }

2
files_opds/lib/util.php
View file

@ -113,7 +113,7 @@ class Util
*/ */
public static function genUuid() { public static function genUuid() {
$defaults = new \OC_Defaults(); $defaults = new \OC_Defaults();
$hash = md5(\OCP\User::getDisplayName() . $defaults->getBaseUrl()); $hash = md5(\OC_User::getDisplayName() . $defaults->getBaseUrl());
$hash = substr($hash, 0, 8 ) .'-'. $hash = substr($hash, 0, 8 ) .'-'.
substr($hash, 8, 4) .'-3'. substr($hash, 8, 4) .'-3'.
substr($hash, 13, 3) .'-9'. substr($hash, 13, 3) .'-9'.

2
files_opds/personal.php
View file

@ -23,7 +23,7 @@ $tmpl->assign('opdsEnable-value', ($opdsEnable === 'true') ? '1' : '0');
$tmpl->assign('rootPath', Config::get('root_path', '/Library')); $tmpl->assign('rootPath', Config::get('root_path', '/Library'));
$tmpl->assign('fileTypes', Config::get('file_types', '')); $tmpl->assign('fileTypes', Config::get('file_types', ''));
$tmpl->assign('skipList', Config::get('skip_list', 'metadata.opf,cover.jpg')); $tmpl->assign('skipList', Config::get('skip_list', 'metadata.opf,cover.jpg'));
$tmpl->assign('feedTitle', Config::get('feed_title', $l->t("%s's Library", \OCP\User::getDisplayName()))); $tmpl->assign('feedTitle', Config::get('feed_title', $l->t("%s's Library", \OC_User::getDisplayName())));
$tmpl->assign('bookshelf-count', Bookshelf::count()); $tmpl->assign('bookshelf-count', Bookshelf::count());
$tmpl->assign('feedUrl', Util::linkToAbsolute('','index.php') . '/apps/files_opds/'); $tmpl->assign('feedUrl', Util::linkToAbsolute('','index.php') . '/apps/files_opds/');