Browse Source

Merge pull request #186 from nextcloud/fixes

Some fixes
master^2
Roeland Jago Douma 4 years ago
committed by GitHub
parent
commit
cde747108d
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      appinfo/info.xml
  2. 0
      lib/AppConfig.php
  3. 15
      lib/AppInfo/Application.php
  4. 4
      lib/Db/DbBase.php
  5. 5
      lib/Db/Wopi.php
  6. 0
      lib/Helper.php

2
appinfo/info.xml

@ -23,7 +23,7 @@
<screenshot>https://nextcloud.com/wp-content/themes/next/assets/img/features/collabora-presentation.png</screenshot>
<screenshot>https://nextcloud.com/wp-content/themes/next/assets/img/features/collabora-spreadsheet.png</screenshot>
<dependencies>
<nextcloud min-version="12" max-version="13" />
<nextcloud min-version="12" max-version="14" />
</dependencies>
<settings>
<admin>OCA\Richdocuments\Settings\Admin</admin>

0
lib/appconfig.php → lib/AppConfig.php

15
appinfo/Application.php → lib/AppInfo/Application.php

@ -29,18 +29,5 @@ use OCP\AppFramework\IAppContainer;
class Application extends App {
public function __construct (array $urlParams = array()) {
parent::__construct('richdocuments', $urlParams);
$container = $this->getContainer();
$container->registerService(
DiscoveryManager::class,
function(IAppContainer $container) {
return new DiscoveryManager(
$container->getServer()->getHTTPClientService(),
$container->getServer()->getAppDataDir('richdocuments'),
$container->getServer()->getConfig(),
$container->getServer()->getL10N('richdocuments'),
new TimeFactory()
);
}
);
}
}
}

4
lib/db.php → lib/Db/DbBase.php

@ -9,13 +9,13 @@
* later.
*/
namespace OCA\Richdocuments;
namespace OCA\Richdocuments\Db;
/**
* Generic DB class
*/
abstract class Db {
abstract class DbBase {
protected $data;

5
lib/db/wopi.php → lib/Db/Wopi.php

@ -11,10 +11,7 @@
namespace OCA\Richdocuments\Db;
use \OCA\Richdocuments\Download;
use \OCA\Richdocuments\DownloadResponse;
class Wopi extends \OCA\Richdocuments\Db{
class Wopi extends DbBase {
const DB_TABLE = '`*PREFIX*richdocuments_wopi`';

0
lib/helper.php → lib/Helper.php

Loading…
Cancel
Save