From 815194cddb294b6ccd6e42f3221b01bb0fe4287d Mon Sep 17 00:00:00 2001
From: Victor Dubiniuk <victor.dubiniuk@gmail.com>
Date: Tue, 28 Oct 2014 18:50:58 +0300
Subject: [PATCH] Move supported mimes to settings controller

---
 ajax/mimes.php                    | 19 -------------------
 appinfo/routes.php                |  4 +---
 controller/settingscontroller.php | 12 ++++++++++++
 js/viewer/viewer.js               |  2 +-
 4 files changed, 14 insertions(+), 23 deletions(-)
 delete mode 100644 ajax/mimes.php

diff --git a/ajax/mimes.php b/ajax/mimes.php
deleted file mode 100644
index 2031a040..00000000
--- a/ajax/mimes.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/**
- * ownCloud - Documents App
- *
- * @author Victor Dubiniuk
- * @copyright 2013 Victor Dubiniuk victor.dubiniuk@gmail.com
- *
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- */
-
-namespace OCA\Documents;
-
-\OCP\JSON::success(
-		array( 'mimes' => Filter::getAll())
-);
-
-exit();
\ No newline at end of file
diff --git a/appinfo/routes.php b/appinfo/routes.php
index f023407d..fd723f42 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -33,14 +33,12 @@ $application->registerRoutes($this, array(
 		array('name' => 'settings#savePersonal', 'url' => 'ajax/personal.php', 'verb' => 'POST'),
 		array('name' => 'settings#setUnstable', 'url' => 'ajax/config/unstable', 'verb' => 'POST'),
 		array('name' => 'settings#setConverter', 'url' => 'ajax/admin.php', 'verb' => 'POST'),
+		array('name' => 'settings#getSupportedMimes', 'url' => 'ajax/mimes.php', 'verb' => 'GET'),
 	)
 ));
 
 
 /** @var $this \OC\Route\Router */
-$this->create('documents_ajax_mimes', 'ajax/mimes.php')
-	->actionInclude('documents/ajax/mimes.php');
-
 $this->create('documents_ajax_otpoll', 'ajax/otpoll.php')
 	->actionInclude('documents/ajax/otpoll.php');
 
diff --git a/controller/settingscontroller.php b/controller/settingscontroller.php
index 9f459bf0..0dddd0d7 100644
--- a/controller/settingscontroller.php
+++ b/controller/settingscontroller.php
@@ -20,6 +20,7 @@ use \OCP\AppFramework\Http\JSONResponse;
 use OCA\Documents\Converter;
 use OCA\Documents\Config;
 use OCA\Documents\Helper;
+use OCA\Documents\Filter;
 
 class SettingsController extends Controller{
 	
@@ -34,6 +35,17 @@ class SettingsController extends Controller{
 		$this->l10n = $l10n;
 	}
 	
+	/**
+	 * @NoAdminRequired
+	 */
+	public function getSupportedMimes(){
+		return array(
+			'status' => 'success',
+			'mimes' => Filter::getAll()
+		);
+	}
+	
+	
 	/**
 	 * @NoAdminRequired
 	 */
diff --git a/js/viewer/viewer.js b/js/viewer/viewer.js
index ef00d014..799929d2 100644
--- a/js/viewer/viewer.js
+++ b/js/viewer/viewer.js
@@ -108,7 +108,7 @@ $(document).ready(function() {
 		&& typeof OCA.Files !== 'undefined'
 		&& typeof OCA.Files.fileActions !== 'undefined'
 	) {
-		$.post(
+		$.get(
 			OC.filePath('documents', 'ajax', 'mimes.php'),
 			{},
 			odfViewer.register