From 7af18ff8958864d1ba8c9afb2a71550a130f3abe Mon Sep 17 00:00:00 2001
From: Ralf Becker <RalfBecker@outdoor-training.de>
Date: Thu, 9 Jun 2016 12:10:01 +0200
Subject: [PATCH] remove SyncML Authentication config

---
 setup/inc/hook_config.inc.php      |  4 ----
 setup/templates/default/config.tpl | 16 +++-------------
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/setup/inc/hook_config.inc.php b/setup/inc/hook_config.inc.php
index 50143ca9a0..33bccb70dc 100644
--- a/setup/inc/hook_config.inc.php
+++ b/setup/inc/hook_config.inc.php
@@ -174,10 +174,6 @@ function auth_types($config)
 {
 	return _options_from(setup_cmd_config::auth_types(),$config['auth_type']);
 }
-function auth_type_syncml($config)
-{
-	return _options_from(setup_cmd_config::auth_types(),$config['auth_type_syncml']);
-}
 function auth_type_groupdav($config)
 {
 	return _options_from(setup_cmd_config::auth_types(),$config['auth_type_groupdav']);
diff --git a/setup/templates/default/config.tpl b/setup/templates/default/config.tpl
index 12d7fbcb45..0209b0f528 100644
--- a/setup/templates/default/config.tpl
+++ b/setup/templates/default/config.tpl
@@ -123,7 +123,7 @@
     <td colspan="2"><b>{lang_Authentication_/_Accounts}</b></td>
    </tr>
 
-   <tr class="row_on">
+   <tr class="row_off">
     <td>{lang_Select_which_type_of_authentication_you_are_using}:</td>
     <td>
      <select name="newsettings[auth_type]">
@@ -132,18 +132,8 @@
     </td>
    </tr>
 
-   <tr class="row_off">
-    <td>{lang_Authentication_type_for_application}: <b>SyncML</b></td>
-    <td>
-     <select name="newsettings[auth_type_syncml]">
-      <option value="">{lang_Standard,_as_defined_above}</option>
-{hook_auth_type_syncml}
-     </select>
-    </td>
-   </tr>
-
     <tr class="row_on">
-    <td>{lang_Authentication_type_for_application}: <b>GroupDAV/CalDAV/CardDAV</b></td>
+    <td>{lang_Authentication_type_for_application}: <b>CalDAV/CardDAV Sync</b></td>
     <td>
      <select name="newsettings[auth_type_groupdav]">
       <option value="">{lang_Standard,_as_defined_above}</option>
@@ -153,7 +143,7 @@
    </tr>
 
     <tr class="row_off">
-    <td>{lang_Authentication_type_for_application}: <b>ActiveSync</b></td>
+    <td>{lang_Authentication_type_for_application}: <b>eSync (ActiveSync)</b></td>
     <td>
      <select name="newsettings[auth_type_activesync]">
       <option value="">{lang_Standard,_as_defined_above}</option>