Merge pull request #30062 from nextcloud/backport/30024/stable23

[stable23] list.php files are only invoked via ViewController and APIController
nextcloud · Dec 2, 2021 · 617d742 · 617d742
2 parents 395e90c + d6bad0c
commit 617d742
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 26 deletions.
diff --git a/apps/files/list.php b/apps/files/list.php
@@ -29,7 +29,7 @@
 // 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
@@ -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
@@ -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
@@ -28,8 +28,6 @@
 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
@@ -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
@@ -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();