From c14f25c0e8c07f435f37c36cdbf7058a53a93516 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 25 Apr 2016 20:14:47 +0000
Subject: [PATCH] hide spellchecker config and always use browser native
 spellchecker

---
 admin/templates/default/config.xet | 5 +++--
 api/src/Html/CkEditorConfig.php    | 8 ++++++++
 setup/templates/default/config.tpl | 6 +++---
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/admin/templates/default/config.xet b/admin/templates/default/config.xet
index 66ff747b30..bda363f8a3 100644
--- a/admin/templates/default/config.xet
+++ b/admin/templates/default/config.xet
@@ -70,6 +70,7 @@
 					<description value="How big should thumbnails for linked images be (maximum in pixels) ?" label="%s:"/>
 					<textbox id="newsettings[link_list_thumbnail]" size="5"/>
 				</row>
+				<!-- disable spellcheck config in favor to always use browser native spellchecker
 				<row>
 					<description value="Enable spellcheck in rich text editor" label="%s:"/>
 					<select id="newsettings[enabled_spellcheck]">
@@ -79,7 +80,7 @@
 						<option value="YesBrowserBased">{Yes, use browser based spell checking engine} - {more secure}</option>
 						<option value="YesUseWebSpellCheck">Yes, use WebSpellChecker</option>
 					</select>
-				</row>
+				</row> -->
 				<row>
 					<description value="EGroupware Tutorial" label="%s:"/>
 					<select id="newsettings[egw_tutorial_disable]">
@@ -91,7 +92,7 @@
 				</row>
 				<row>
 					<description value="Applications available on mobile devices" label="%s:"/>
-					<select-app id="newsettings[fw_mobile_app_list]" multiple="true" tags="true" options=",,enabled" width="100%"/>
+					<select-app id="newsettings[fw_mobile_app_list]" multiple="true" tags="true" other=",enabled" width="100%"/>
 				</row>
 				<row>
 					<description value="security" span="all" class="subHeader"/>
diff --git a/api/src/Html/CkEditorConfig.php b/api/src/Html/CkEditorConfig.php
index 607fe6e320..3bc8355f90 100644
--- a/api/src/Html/CkEditorConfig.php
+++ b/api/src/Html/CkEditorConfig.php
@@ -319,6 +319,13 @@ class CkEditorConfig
 	private static function add_spellchecker_options(&$config, &$spellchecker_button, &$scayt_button)
 	{
 		//error_log(__METHOD__.__LINE__.' Spellcheck:'.$GLOBALS['egw_info']['server']['enabled_spellcheck']);
+
+		// currently we only support browser native spellchecker, and always disable Scayt
+		$config['disableNativeSpellChecker'] = false;
+		$config['scayt_autoStartup'] = false;
+		$spellchecker_button = $scayt_button = null;
+
+		/*
 		if (isset($GLOBALS['egw_info']['server']['enabled_spellcheck']) && $GLOBALS['egw_info']['server']['enabled_spellcheck'])
 		{
 			// enable browsers native spellchecker as default, if e.g.: aspell fails
@@ -349,6 +356,7 @@ class CkEditorConfig
 		{
 			$config['scayt_autoStartup'] = false;
 		}
+		*/
 	}
 
 	/**
diff --git a/setup/templates/default/config.tpl b/setup/templates/default/config.tpl
index c8d73ffba8..12d7fbcb45 100644
--- a/setup/templates/default/config.tpl
+++ b/setup/templates/default/config.tpl
@@ -75,14 +75,14 @@
     </td>
    </tr>
 
-   <tr class="row_on">
+   <!-- tr class="row_on">
     <td>{lang_Complete_path_to_aspell_program}:</td>
     <td>
      <input name="newsettings[aspell_path]" value="{value_aspell_path}" size="40">
     </td>
-   </tr>
+   </tr -->
 
-   <tr class="row_off">
+   <tr class="row_on">
     <td colspan="2">&nbsp;</td>
    </tr>