2 files changed, 41 insertions, 4 deletions

diff --git a/apps/files/controller/apicontroller.php b/apps/files/controller/apicontroller.php
index ad286284386..43d426476fe 100644
--- a/apps/files/controller/apicontroller.php
+++ b/apps/files/controller/apicontroller.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Christoph Wurst <christoph@winzerhof-wurst.at>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Roeland Jago Douma <rullzer@owncloud.com>
@@ -29,13 +30,14 @@ namespace OCA\Files\Controller;
 
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Controller;
+use OCP\IConfig;
 use OCP\IRequest;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\Http\DataDisplayResponse;
+use OCP\AppFramework\Http\Response;
 use OCA\Files\Service\TagService;
 use OCP\IPreview;
 use OCP\Share\IManager;
-use OCP\Files\FileInfo;
 use OCP\Files\Node;
 use OCP\IUserSession;
 
@@ -53,6 +55,8 @@ class ApiController extends Controller {
 	private $previewManager;
 	/** IUserSession */
 	private $userSession;
+	/** IConfig */
+	private $config;
 
 	/**
 	 * @param string $appName
@@ -65,12 +69,14 @@ class ApiController extends Controller {
 								IUserSession $userSession,
 								TagService $tagService,
 								IPreview $previewManager,
-								IManager $shareManager) {
+								IManager $shareManager,
+								IConfig $config) {
 		parent::__construct($appName, $request);
 		$this->userSession = $userSession;
 		$this->tagService = $tagService;
 		$this->previewManager = $previewManager;
 		$this->shareManager = $shareManager;
+		$this->config = $config;
 	}
 
 	/**
@@ -196,4 +202,26 @@ class ApiController extends Controller {
 		return $shareTypes;
 	}
 
+	/**
+	 * Change the default sort mode
+	 *
+	 * @NoAdminRequired
+	 *
+	 * @param string $mode
+	 * @param string $direction
+	 * @return Response
+	 */
+	public function updateFileSorting($mode, $direction) {
+		$allowedMode = ['name', 'size', 'mtime'];
+		$allowedDirection = ['asc', 'desc'];
+		if (!in_array($mode, $allowedMode) || !in_array($direction, $allowedDirection)) {
+			$response = new Response();
+			$response->setStatus(Http::STATUS_UNPROCESSABLE_ENTITY);
+			return $response;
+		}
+		$this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'file_sorting', $mode);
+		$this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'file_sorting_direction', $direction);
+		return new Response();
+	}
+
 }
diff --git a/apps/files/controller/viewcontroller.php b/apps/files/controller/viewcontroller.php
index 800cf008fa7..6c5f4c6d2a0 100644
--- a/apps/files/controller/viewcontroller.php
+++ b/apps/files/controller/viewcontroller.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Christoph Wurst <christoph@winzerhof-wurst.at>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
@@ -27,11 +28,12 @@ use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\ContentSecurityPolicy;
 use OCP\AppFramework\Http\RedirectResponse;
 use OCP\AppFramework\Http\TemplateResponse;
+use OCP\IConfig;
 use OCP\IL10N;
 use OCP\INavigationManager;
 use OCP\IRequest;
 use OCP\IURLGenerator;
-use OCP\IConfig;
+use OCP\IUserSession;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 /**
@@ -54,6 +56,8 @@ class ViewController extends Controller {
 	protected $config;
 	/** @var EventDispatcherInterface */
 	protected $eventDispatcher;
+	/** @var IUserSession */
+	protected $userSession;
 
 	/**
 	 * @param string $appName
@@ -70,7 +74,8 @@ class ViewController extends Controller {
 								INavigationManager $navigationManager,
 								IL10N $l10n,
 								IConfig $config,
-								EventDispatcherInterface $eventDispatcherInterface) {
+								EventDispatcherInterface $eventDispatcherInterface,
+								IUserSession $userSession) {
 		parent::__construct($appName, $request);
 		$this->appName = $appName;
 		$this->request = $request;
@@ -79,6 +84,7 @@ class ViewController extends Controller {
 		$this->l10n = $l10n;
 		$this->config = $config;
 		$this->eventDispatcher = $eventDispatcherInterface;
+		$this->userSession = $userSession;
 	}
 
 	/**
@@ -213,6 +219,9 @@ class ViewController extends Controller {
 		$params['mailNotificationEnabled'] = $this->config->getAppValue('core', 'shareapi_allow_mail_notification', 'no');
 		$params['mailPublicNotificationEnabled'] = $this->config->getAppValue('core', 'shareapi_allow_public_notification', 'no');
 		$params['allowShareWithLink'] = $this->config->getAppValue('core', 'shareapi_allow_links', 'yes');
+		$user = $this->userSession->getUser()->getUID();
+		$params['defaultFileSorting'] = $this->config->getUserValue($user, 'files', 'file_sorting', 'name');
+		$params['defaultFileSortingDirection'] = $this->config->getUserValue($user, 'files', 'file_sorting_direction', 'asc');
 		$params['appNavigation'] = $nav;
 		$params['appContents'] = $contentItems;
 		$this->navigationManager->setActiveEntry('files_index');