RPJosh
/
nc-gpxedit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

app is now compliant to occ check-code

merge-requests/1/head
Julien Veyssier 2017-03-17 20:16:12 -03:00
parent 2945391963
commit 71b0715058
4 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
### Changed ### Changed
### Fixed ### Fixed
- app is now compliant to occ check-code
## 0.0.4 – 2017-01-17 ## 0.0.4 – 2017-01-17
### Added ### Added

20
appinfo/application.php
View File

@ -49,21 +49,8 @@ class Application extends App {
$c->query('UserId'), $c->query('UserId'),
$c->query('ServerContainer')->getUserFolder($c->query('UserId')), $c->query('ServerContainer')->getUserFolder($c->query('UserId')),
$c->query('ServerContainer')->getConfig(), $c->query('ServerContainer')->getConfig(),
$c->getServer()->getShareManager() $c->getServer()->getShareManager(),
); $c->getServer()->getAppManager()
}
);
$container->registerService(
'ComparisonController', function (IAppContainer $c) {
return new ComparisonController(
$c->query('AppName'),
$c->query('Request'),
$c->query('UserId'),
//$c->getServer()->getUserFolder($c->query('UserId')),
//$c->query('OCP\IConfig'),
$c->query('ServerContainer')->getUserFolder($c->query('UserId')),
$c->query('ServerContainer')->getConfig()
); );
} }
); );
@ -77,7 +64,8 @@ class Application extends App {
//$c->getServer()->getUserFolder($c->query('UserId')), //$c->getServer()->getUserFolder($c->query('UserId')),
//$c->query('OCP\IConfig'), //$c->query('OCP\IConfig'),
$c->query('ServerContainer')->getUserFolder($c->query('UserId')), $c->query('ServerContainer')->getUserFolder($c->query('UserId')),
$c->query('ServerContainer')->getConfig() $c->query('ServerContainer')->getConfig(),
$c->getServer()->getAppManager()
); );
} }
); );

6
controller/pagecontroller.php
View File

@ -11,7 +11,7 @@
namespace OCA\GpxEdit\Controller; namespace OCA\GpxEdit\Controller;
use \OC_App; use OCP\App\IAppManager;
use OCP\IURLGenerator; use OCP\IURLGenerator;
use OCP\IConfig; use OCP\IConfig;
@ -95,10 +95,10 @@ class PageController extends Controller {
private $appPath; private $appPath;
public function __construct($AppName, IRequest $request, $UserId, public function __construct($AppName, IRequest $request, $UserId,
$userfolder, $config, $shareManager){ $userfolder, $config, $shareManager, IAppManager $appManager){
parent::__construct($AppName, $request); parent::__construct($AppName, $request);
$this->appVersion = $config->getAppValue('gpxedit', 'installed_version'); $this->appVersion = $config->getAppValue('gpxedit', 'installed_version');
$this->appPath = \OC_App::getAppPath('gpxedit'); $this->appPath = $appManager->getAppPath('gpxedit');
$this->userId = $UserId; $this->userId = $UserId;
$this->dbtype = $config->getSystemValue('dbtype'); $this->dbtype = $config->getSystemValue('dbtype');
// IConfig object // IConfig object

7
controller/utilscontroller.php
View File

@ -11,7 +11,7 @@
namespace OCA\GpxEdit\Controller; namespace OCA\GpxEdit\Controller;
use \OC_App; use OCP\App\IAppManager;
use OCP\IURLGenerator; use OCP\IURLGenerator;
use OCP\IConfig; use OCP\IConfig;
@ -85,10 +85,11 @@ class UtilsController extends Controller {
private $appPath; private $appPath;
//private $request; //private $request;
public function __construct($AppName, IRequest $request, $UserId, $userfolder, $config){ public function __construct($AppName, IRequest $request, $UserId,
$userfolder, $config, IAppManager $appManager){
parent::__construct($AppName, $request); parent::__construct($AppName, $request);
//$this->request = $request; //$this->request = $request;
$this->appPath = \OC_App::getAppPath('gpxedit'); $this->appPath = $appManager->getAppPath('gpxedit');
$this->userId = $UserId; $this->userId = $UserId;
$this->dbtype = $config->getSystemValue('dbtype'); $this->dbtype = $config->getSystemValue('dbtype');
// IConfig object // IConfig object