diff options
author | Joas Schilling <coding@schilljs.com> | 2021-12-01 23:09:11 +0300 |
---|---|---|
committer | backportbot[bot] <backportbot[bot]@users.noreply.github.com> | 2021-12-03 00:32:25 +0300 |
commit | d6bad0c0ba7d62ea769732bf8170cfe03aab8ab8 (patch) | |
tree | 464f07132548dce7a3f0561e6aebe4bfee5e5ef3 | |
parent | 395e90c645bca528f7639c80e4094bd7f58561ef (diff) |
list.php files are only invoked via ViewController and APIController
Both of them actually check that the user is logged in before
and also the list.php files themselves would break with
getUserSession()->getUser()->getUID() which they contain.
Signed-off-by: Joas Schilling <coding@schilljs.com>
-rw-r--r-- | apps/files/list.php | 2 | ||||
-rw-r--r-- | apps/files/recentlist.php | 3 | ||||
-rw-r--r-- | apps/files_external/list.php | 3 | ||||
-rw-r--r-- | apps/files_sharing/list.php | 2 | ||||
-rw-r--r-- | apps/files_trashbin/list.php | 2 | ||||
-rw-r--r-- | apps/systemtags/list.php | 17 |
6 files changed, 3 insertions, 26 deletions
diff --git a/apps/files/list.php b/apps/files/list.php index 259713ae68e..54bdd814ada 100644 --- a/apps/files/list.php +++ b/apps/files/list.php @@ -29,7 +29,7 @@ $userSession = \OC::$server->getUserSession(); // TODO: move this to the generated config.js /** @var IManager $shareManager */ $shareManager = \OC::$server->get(IManager::class); -$publicUploadEnabled = $shareManager->shareApiLinkAllowPublicUpload() ? 'yes' : 'no';; +$publicUploadEnabled = $shareManager->shareApiLinkAllowPublicUpload() ? 'yes' : 'no'; $showgridview = $config->getUserValue($userSession->getUser()->getUID(), 'files', 'show_grid', false); $isIE = OC_Util::isIe(); diff --git a/apps/files/recentlist.php b/apps/files/recentlist.php index 899591013e2..daa69a374ef 100644 --- a/apps/files/recentlist.php +++ b/apps/files/recentlist.php @@ -23,8 +23,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -// Check if we are a user -OC_Util::checkLoggedIn(); + $config = \OC::$server->getConfig(); $userSession = \OC::$server->getUserSession(); diff --git a/apps/files_external/list.php b/apps/files_external/list.php index 0107bf92e6f..00f69bf881f 100644 --- a/apps/files_external/list.php +++ b/apps/files_external/list.php @@ -23,8 +23,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ -// Check if we are a user -OC_Util::checkLoggedIn(); + $config = \OC::$server->getConfig(); $userSession = \OC::$server->getUserSession(); diff --git a/apps/files_sharing/list.php b/apps/files_sharing/list.php index 759f87179a1..875d4251c98 100644 --- a/apps/files_sharing/list.php +++ b/apps/files_sharing/list.php @@ -28,8 +28,6 @@ use OCA\Files\Event\LoadSidebar; use OCA\Viewer\Event\LoadViewer; use OCP\EventDispatcher\GenericEvent; -// Check if we are a user -OC_Util::checkLoggedIn(); $config = \OC::$server->getConfig(); $userSession = \OC::$server->getUserSession(); $legacyEventDispatcher = \OC::$server->getEventDispatcher(); diff --git a/apps/files_trashbin/list.php b/apps/files_trashbin/list.php index 9ee833319fc..ec348a227f5 100644 --- a/apps/files_trashbin/list.php +++ b/apps/files_trashbin/list.php @@ -24,8 +24,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ -// Check if we are a user -OC_Util::checkLoggedIn(); $config = \OC::$server->getConfig(); $userSession = \OC::$server->getUserSession(); diff --git a/apps/systemtags/list.php b/apps/systemtags/list.php index d7ba2c9eed9..b5bbf223f29 100644 --- a/apps/systemtags/list.php +++ b/apps/systemtags/list.php @@ -20,23 +20,6 @@ * 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 -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(); |