Move index.php from files to AppFramework

1. Allows it to use the more secure CSP rules of the AppFramework.
2. Adds some unit tests.

2 files changed, 8 insertions, 3 deletions

diff --git a/apps/files/appinfo/app.php b/apps/files/appinfo/app.php
index 40b194ab882..c752b5e7d72 100644
--- a/apps/files/appinfo/app.php
+++ b/apps/files/appinfo/app.php
@@ -25,12 +25,14 @@
  */
 \OCP\App::registerAdmin('files', 'admin');
 
+
 \OC::$server->getNavigationManager()->add(function () {
+	$urlGenerator = \OC::$server->getURLGenerator();
 	$l = \OC::$server->getL10N('files');
 	return [
 		'id' => 'files_index',
 		'order' => 0,
-		'href' => \OCP\Util::linkTo('files', 'index.php'),
+		'href' => $urlGenerator->linkToRoute('files.view.index'),
 		'icon' => \OCP\Util::imagePath('core', 'places/files.svg'),
 		'name' => $l->t('Files'),
 	];
diff --git a/apps/files/appinfo/routes.php b/apps/files/appinfo/routes.php
index d52dfaab21c..2bb913c30a6 100644
--- a/apps/files/appinfo/routes.php
+++ b/apps/files/appinfo/routes.php
@@ -48,14 +48,17 @@ $application->registerRoutes(
 				'verb' => 'GET',
 				'requirements' => array('tagName' => '.+'),
 			),
+			[
+				'name' => 'view#index',
+				'url' => '/',
+				'verb' => 'GET',
+			],
 		)
 	)
 );
 
 /** @var $this \OC\Route\Router */
 
-$this->create('files_index', '/')
-	->actionInclude('files/index.php');
 $this->create('files_ajax_delete', 'ajax/delete.php')
 	->actionInclude('files/ajax/delete.php');
 $this->create('files_ajax_download', 'ajax/download.php')