move documents.php functionality to controller, add route

2 files changed, 25 insertions, 29 deletions

diff --git a/ajax/controller.php b/ajax/controller.php
index fe62ab51..09a9f7ff 100644
--- a/ajax/controller.php
+++ b/ajax/controller.php
@@ -96,7 +96,7 @@ class Controller {
 			exit();
 		} catch (\Exception $e){
 			Helper::warnLog('Joining a session failed. Reason:' . $e->getMessage());
-			\OCP\JSON::error();
+			\OCP\JSON::error(array('message'=>$e->getMessage()));
 			exit();
 		}
 	}
@@ -124,6 +124,30 @@ class Controller {
 		}
 	}
 
+	/**
+	 * lists the documents the user has access to (including shared files, once the code in core has been fixed)
+	 * also adds session and member info for these files
+	 */
+	public static function listDocuments(){
+		self::preDispatch();
+		
+		$documents = Storage::getDocuments();
+
+		$fileIds = array();
+		foreach ($documents as $document) {
+			$fileIds[] = $document['fileid'];
+		}
+
+		$sessions = Session::getSessionsByFileIds($fileIds);
+
+		$members = array();
+		foreach ($sessions as $session) {
+			$members[$session['es_id']] = Member::getMembersByEsId($session['es_id']);
+		}
+
+		\OCP\JSON::success(array('documents' => $documents,'sessions' => $sessions,'members' => $members));
+	}
+	
 	public static function listSessions(){
 		self::preDispatch();
 		$sessions = Session::getAll();
diff --git a/ajax/documents.php b/ajax/documents.php
deleted file mode 100644
index 216f360c..00000000
--- a/ajax/documents.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * returns the list of documents the user has access to
- */
-
-// Init owncloud
-
-namespace OCA\Documents;
-
-\OCP\User::checkLoggedIn();
-\OCP\JSON::checkAppEnabled('documents');
-
-$documents = Storage::getDocuments();
-
-$fileIds = array();
-foreach ($documents as $document) {
-	$fileIds[] = $document['fileid'];
-}
-
-$sessions = Session::getSessionsByFileIds($fileIds);
-
-$members = array();
-foreach ($sessions as $session) {
-	$members[$session['es_id']] = Member::getMembersByEsId($session['es_id']);
-}
-
-\OCP\JSON::success(array('documents' => $documents,'sessions' => $sessions,'members' => $members));