From b1b31e2b0b549d1d19e3db74b97f5cf19e3edd14 Mon Sep 17 00:00:00 2001
From: Ralf Becker <RalfBecker@outdoor-training.de>
Date: Mon, 20 Aug 2018 17:27:11 +0200
Subject: [PATCH] fix not working admin >> site configuration

---
 admin/inc/class.admin_config.inc.php | 21 ++++++++++++++++-----
 admin/templates/default/config.xet   | 28 ++++++++++++++--------------
 2 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/admin/inc/class.admin_config.inc.php b/admin/inc/class.admin_config.inc.php
index 09307d57a9..a089c66412 100644
--- a/admin/inc/class.admin_config.inc.php
+++ b/admin/inc/class.admin_config.inc.php
@@ -127,7 +127,7 @@ class admin_config
 		}
 
 		$c = new Api\Config($config_appname);
-		$c->read_repository();
+		$old = $c->read_repository();
 		if ($_content['cancel'] || ($_content['save'] || $_content['apply']) && $GLOBALS['egw']->acl->check('site_config_acce',2,'admin'))
 		{
 			Api\Framework::redirect_link('/admin/index.php?ajax=true');
@@ -179,11 +179,20 @@ class admin_config
 				unset($GLOBALS['egw_info']['server']['found_validation_hook']);
 			}
 
-			$c->save_repository();
-
+			$modifications = array_diff_assoc($c->config_data, $old);
+			$removals = array_diff_assoc($old, $c->config_data);
+			if ($modifications || $removals)
+			{
+				$c->save_repository();
+				$msg = lang('Configuration saved.');
+			}
+			else
+			{
+				$msg = lang('Nothing to save.');
+			}
 			if(!$errors && !$_content['apply'])
 			{
-				Api\Framework::message(lang('Configuration saved.'), 'success');
+				Api\Framework::message($msg, 'success');
 				Api\Framework::redirect_link('/index.php', array(
 					'menuaction' => 'admin.admin_ui.index',
 					'ajax' => 'true'
@@ -199,7 +208,7 @@ class admin_config
 		}
 		elseif ($_content['apply'])
 		{
-			Api\Framework::message(lang('Configuration saved.'), 'success');
+			Api\Framework::message($msg, 'success');
 		}
 
 		$sel_options = $readonlys = array();
@@ -218,6 +227,8 @@ class admin_config
 		$tmpl = new Api\Etemplate($appname.'.config');
 		$path = (parse_url($tmpl->rel_path, PHP_URL_SCHEME) !== 'vfs' ? EGW_SERVER_ROOT : '').$tmpl->rel_path;
 		$content = array(
+			'tabs' => $_content['tabs'],
+			'tabs2' => $_content['tabs2'],
 			'template' => $appname.'.config',
 			'newsettings' => array(),
 		);
diff --git a/admin/templates/default/config.xet b/admin/templates/default/config.xet
index b510368292..771592228e 100644
--- a/admin/templates/default/config.xet
+++ b/admin/templates/default/config.xet
@@ -2,20 +2,6 @@
 <!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
 <!-- $Id$ -->
 <overlay>
-	<template id="admin.config" template="" lang="" group="0" version="18.1">
-		<tabbox id="tabs" width="100%">
-			<tabs>
-				<tab id="general" label="General"/>
-				<tab id="appearance" label="Appearance"/>
-				<tab id="secrurity" label="Security"/>
-			</tabs>
-			<tabpanels>
-				<template id="admin.config.general"/>
-				<template id="admin.config.appearance"/>
-				<template id="admin.config.security"/>
-			</tabpanels>
-		</tabbox>
-	</template>
 	<template id="admin.config.general" template="" lang="" group="0" version="18.1">
 		<grid width="100%" class="admin-config egwGridView_grid">
 			<columns>
@@ -325,4 +311,18 @@
 			</rows>
 		</grid>
 	</template>
+	<template id="admin.config" template="" lang="" group="0" version="18.1">
+		<tabbox id="tabs" width="100%">
+			<tabs>
+				<tab id="general" label="General"/>
+				<tab id="appearance" label="Appearance"/>
+				<tab id="security" label="Security"/>
+			</tabs>
+			<tabpanels>
+				<template id="admin.config.general"/>
+				<template id="admin.config.appearance"/>
+				<template id="admin.config.security"/>
+			</tabpanels>
+		</tabbox>
+	</template>
 </overlay>