Merge pull request #7903 from nextcloud/13-7891

[stable13] Fix systemtags/list to be compliant
This commit is contained in:
Morris Jobke 2018-01-17 11:40:56 +01:00 committed by GitHub
commit 9efdd684c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 1 deletions

View File

@ -19,8 +19,24 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
// WARNING: this should be moved to proper AppFramework handling
// Check if we are a user
OCP\User::checkLoggedIn();
if (!\OC::$server->getUserSession()->isLoggedIn()) {
header('Location: ' . \OC::$server->getURLGenerator()->linkToRoute(
'core.login.showLoginForm',
[
'redirect_url' => \OC::$server->getRequest()->getRequestUri(),
]
)
);
exit();
}
// Redirect to 2FA challenge selection if 2FA challenge was not solved yet
if (\OC::$server->getTwoFactorAuthManager()->needsSecondFactor(\OC::$server->getUserSession()->getUser())) {
header('Location: ' . \OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.selectChallenge'));
exit();
}
$tmpl = new OCP\Template('systemtags', 'list', '');
$tmpl->printPage();