Small fixes

This commit is contained in:
Julius Haertl
2016-08-19 18:02:07 +02:00
parent 2d0d6dd36f
commit aeb9f29119
2 changed files with 12 additions and 10 deletions

View File

@@ -39,7 +39,7 @@ class Application extends App {
$server->getUserManager(), $server->getUserManager(),
$server->getGroupManager(), $server->getGroupManager(),
$server->getDatabaseConnection(), $server->getDatabaseConnection(),
$server->getUserSession()->getUser()->getUID() $server->getUserSession()->getUser()->getUID() // FIXME: ERROR when logged out!!!
); );
}); });
$container->registerMiddleware('SharingMiddleware'); $container->registerMiddleware('SharingMiddleware');

View File

@@ -5,20 +5,20 @@
* @author Julius Härtl <jus@bitgrid.net> * @author Julius Härtl <jus@bitgrid.net>
* *
* @license GNU AGPL version 3 or any later version * @license GNU AGPL version 3 or any later version
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as * it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the * published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version. * License, or (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details. * GNU Affero General Public License for more details.
* *
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
namespace OCA\Deck\Controller; namespace OCA\Deck\Controller;
@@ -33,12 +33,12 @@ class PageController extends Controller {
private $userId; private $userId;
private $l10n; private $l10n;
public function __construct($AppName, IRequest $request,IL10N $l10n, $UserId){ public function __construct($AppName, IRequest $request, IL10N $l10n, $userId) {
parent::__construct($AppName, $request); parent::__construct($AppName, $request);
$this->userId = $UserId; $this->userId = $userId;
$this->l10n = $l10n; $this->l10n = $l10n;
} }
/** /**
@@ -49,7 +49,9 @@ class PageController extends Controller {
* @NoCSRFRequired * @NoCSRFRequired
*/ */
public function index() { public function index() {
$params = ['user' => $this->userId]; $params = [
'user' => $this->userId,
];
return new TemplateResponse('deck', 'main', $params); return new TemplateResponse('deck', 'main', $params);
} }