From 0c14789cc35acd0a487e24ef220f96b5207a6118 Mon Sep 17 00:00:00 2001
From: Pranav Kant <pranavk@collabora.co.uk>
Date: Fri, 19 May 2017 23:45:19 +0530
Subject: [PATCH] Revert "Remove unrequired route"; respect OOXML settings
 again

This reverts commit aa89c908a70dddabb39ea7d0a166e147e31d3f5d.
---
 appinfo/routes.php                    |  1 +
 js/viewer/viewer.js                   | 11 ++++++++---
 lib/Controller/SettingsController.php | 12 ++++++++++++
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/appinfo/routes.php b/appinfo/routes.php
index 07a5068c..67dfc3fa 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -25,5 +25,6 @@ return [
 
 		//settings
 		['name' => 'settings#setSettings', 'url' => 'ajax/admin.php', 'verb' => 'POST'],
+		['name' => 'settings#getSettings', 'url' => 'ajax/settings.php', 'verb' => 'GET'],
 	]
 ];
diff --git a/js/viewer/viewer.js b/js/viewer/viewer.js
index c5aad237..8afbe288 100644
--- a/js/viewer/viewer.js
+++ b/js/viewer/viewer.js
@@ -119,8 +119,8 @@ var odfViewer = {
 		$('#richdocumentsframe').remove();
 	},
 
-	registerFilesMenu: function() {
-		var ooxml = false;
+	registerFilesMenu: function(response) {
+		var ooxml = response.doc_format === 'ooxml';
 
 		var docExt, spreadsheetExt, presentationExt;
 		var docMime, spreadsheetMime, presentationMime;
@@ -208,7 +208,12 @@ $(document).ready(function() {
 		&& typeof OCA.Files.fileActions !== 'undefined'
 	) {
 		odfViewer.register();
-		odfViewer.registerFilesMenu();
+
+		$.get(
+			OC.filePath('richdocuments', 'ajax', 'settings.php'),
+			{},
+			odfViewer.registerFilesMenu
+		);
 	}
 });
 
diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php
index b8122658..211e93ca 100644
--- a/lib/Controller/SettingsController.php
+++ b/lib/Controller/SettingsController.php
@@ -45,6 +45,18 @@ class SettingsController extends Controller{
 		$this->discoveryManager = $discoveryManager;
 	}
 
+	/**
+	 * @NoAdminRequired
+	 *
+	 * @return JSONResponse
+	 */
+	public function getSettings() {
+		return new JSONResponse([
+			'doc_format' => $this->appConfig->getAppValue('doc_format'),
+			'wopi_url' => $this->appConfig->getAppValue('wopi_url'),
+		]);
+	}
+
 	/**
 	 * @param string $wopi_url
 	 * @param string $doc_format