summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@pardus.de>2010-08-23 14:28:50 (GMT)
committerGunnar Wrobel <wrobel@pardus.de>2010-08-23 14:28:50 (GMT)
commitf47beaf22f091cc7323fd9a9bf8f990b17373dd4 (patch)
treedabfd0ce9fc58ce30c66fd4ccea21efe2c38c7b5
parent1b85139b048582833dc6226201edebd9f8e6672e (diff)
downloadkolab-webadmin-f47beaf22f091cc7323fd9a9bf8f990b17373dd4.tar.gz
kolab/issue4512 (Allow to hide the admin mail settings in the web admin)
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.am9
-rw-r--r--kolab-webadmin.spec.in5
-rw-r--r--php/admin/include/config.php.in35
4 files changed, 10 insertions, 44 deletions
diff --git a/ChangeLog b/ChangeLog
index 51701f7..fac1fe0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2010-08-23 Gunnar Wrobel <p@rdus.de>
+ * kolab-webadmin.spec:
+
+ Support template based configuration of the web admin.
+ kolab/issue4512 (Allow to hide the admin mail settings in the web admin)
+
* php/admin/include/form.class.php:
kolab/issue4510 (Fix the kolab web admin display for Firefox)
diff --git a/Makefile.am b/Makefile.am
index 392ded7..fb273b7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -102,9 +102,6 @@ wsuser_DATA = $(WSUSER_FILES)
phpkolabdir = $(phplibdir2)/$(kolab_php_module_prefix)admin
-php_includes_configdir = $(phpkolabdir)/include
-php_includes_config_DATA = php/admin/include/config.php
-
PHP_INCLUDES = php/admin/include/menu.php \
php/admin/include/debug.php \
php/admin/include/form.class.php \
@@ -388,12 +385,6 @@ php/admin/include/auth.class.php: php/admin/include/auth.class.php.in
CLEANFILES += php/admin/include/auth.class.php
EXTRA_DIST += php/admin/include/auth.class.php.in
-php/admin/include/config.php: php/admin/include/config.php.in
- $(mkinstalldirs) php/admin/include
- $(do_subst) <$(srcdir)/php/admin/include/config.php.in >$@
-CLEANFILES += php/admin/include/config.php
-EXTRA_DIST += php/admin/include/config.php.in
-
php/admin/include/headers.php: php/admin/include/headers.php.in
@$(mkinstalldirs) php/admin/include
$(do_subst) <$(srcdir)/php/admin/include/headers.php.in >$@
diff --git a/kolab-webadmin.spec.in b/kolab-webadmin.spec.in
index d08b143..8e68c04 100644
--- a/kolab-webadmin.spec.in
+++ b/kolab-webadmin.spec.in
@@ -36,6 +36,7 @@ Release: @spec_build_date@
# list of sources
Source0: kolab-webadmin-%{version}.tar.bz2
+Source1: webadmin.conf.template
# build information
Prefix: %{l_prefix}
@@ -61,11 +62,15 @@ AutoReqProv: no
./configure -prefix=%{l_prefix} --with-dist=kolab
%install
+ %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates
# install package
%{l_make} %{l_mflags} install \
DESTDIR=$RPM_BUILD_ROOT
+ %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates
+
# generate file list
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
%dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/php/admin/templates_c
diff --git a/php/admin/include/config.php.in b/php/admin/include/config.php.in
deleted file mode 100644
index 7f2f5df..0000000
--- a/php/admin/include/config.php.in
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/*
- * Copyright (c) 2004 Klarälvdalens Datakonsult AB
- *
- * Written by Steffen Hansen <steffen@klaralvdalens-datakonsult.se>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You can view the GNU General Public License, online, at the GNU
- * Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
- */
-
-$topdir = '/@kolab_php_module_prefix@admin';
-$kolab_prefix = '@prefix@';
-$php_dir = '@phplibdir2@';
-$locale_dir = "$php_dir/@kolab_php_module_prefix@admin/locale/";
-
-/*
- Local variables:
- mode: php
- indent-tabs-mode: t
- tab-width: 4
- buffer-file-coding-system: utf-8
- End:
- vim:encoding=utf-8:
- */
-?>