summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Bos <richard@radoeka.nl>2006-01-15 21:05:54 (GMT)
committerRichard Bos <richard@radoeka.nl>2006-01-15 21:05:54 (GMT)
commit450f5005274a01c21a9e22c272b9e0333afeddd6 (patch)
treed272a41edc8f89e515c7d892c62dc614ba21e21f
parent6c5809a447cd93ca0c0bc4c089bc53f6c08ed050 (diff)
downloadkolab-webadmin-450f5005274a01c21a9e22c272b9e0333afeddd6.tar.gz
Use the @RPM@ in www/admin/kolab/versions.php, to show the version
nnumber of the used packages.
-rw-r--r--ChangeLog6
-rw-r--r--Makefile.am11
-rw-r--r--www/admin/kolab/versions.php59
3 files changed, 15 insertions, 61 deletions
diff --git a/ChangeLog b/ChangeLog
index 84f0e9e..8f9b452 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-15 Marcus Hüwe <suse-tux@gmx.de>
+ Patch committed by Richard Bos
+ * www/admin/kolab/versions.php: moved to /www/admin/kolab/versions.php.in,
+ replaced "$kolab_prefix/bin/openpkg" with @RPM@
+ * Makefile.am: make www/admin/kolab/versions.php.in
+
2006-01-14 Marcus Hüwe <suse-tux@gmx.de>
Patch commited by Richard Bos
* configure.ac: replaced --enable-dist with --with-dist
diff --git a/Makefile.am b/Makefile.am
index 7011d01..72125fe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,14 +41,15 @@ dist_wsdistributionlist_DATA = $(WSDISTRIBUTIONLIST_FILES)
WSABOUT_FILES = www/admin/kolab/erfrakon.php \
www/admin/kolab/index.php \
- www/admin/kolab/versions.php \
www/admin/kolab/intevation.php \
www/admin/kolab/codefusion.php \
www/admin/kolab/kdab.php \
www/admin/kolab/kde.php
wsaboutdir = $(wskolabdir)/kolab
-dist_wsabout_DATA = $(WSABOUT_FILES)
+wsabout_DATA = $(WSABOUT_FILES) \
+ www/admin/kolab/versions.php
+EXTRA_DIST += $(WSABOUT_FILES)
WSMAINTAINER_FILES = www/admin/maintainer/maintainer.php \
www/admin/maintainer/index.php
@@ -230,6 +231,12 @@ www/admin/user/user.php:
CLEANFILES += www/admin/user/user.php
EXTRA_DIST += www/admin/user/user.php.in
+www/admin/kolab/versions.php:
+ @$(mkinstalldirs) www/admin/kolab
+ $(do_subst) <$(srcdir)/www/admin/kolab/versions.php.in >$@
+CLEANFILES += www/admin/kolab/versions.php
+EXTRA_DIST += www/admin/kolab/versions.php.in
+
install-data-hook:
$(mkinstalldirs) $(DESTDIR)$(phpkolabdir)/templates_c
diff --git a/www/admin/kolab/versions.php b/www/admin/kolab/versions.php
deleted file mode 100644
index 5f4878e..0000000
--- a/www/admin/kolab/versions.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/*
- (c) 2004 Klarälvdalens Datakonsult AB
- (c) 2003 Tassilo Erlewein <tassilo.erlewein@erfrakon.de>
- (c) 2003 Martin Konold <martin.konold@erfrakon.de>
- This program is Free Software under the GNU General Public License (>=v2).
- Read the file COPYING that comes with this packages for details.
-*/
-
-require_once('admin/include/mysmarty.php');
-require_once('admin/include/headers.php');
-require_once('admin/include/locale.php');
-require_once('admin/include/authenticate.php');
-
-/**** Authentication etc. ***/
-$sidx = 'about';
-
-require_once('admin/include/menu.php');
-
-/**** Submenu for current page ***/
-$menuitems[$sidx]['selected'] = 'selected';
-
-/**** Page logic ****/
-
-// Remember to keep this list up to date when patching packages!
-$kolabversions = shell_exec("$kolab_prefix/bin/openpkg rpm -q perl-kolab kolabd kolab-resource-handlers kolab-webadmin" );
-$kolabpatchedversions = shell_exec("$kolab_prefix/bin/openpkg rpm -q amavisd apache imapd postfix" );
-$openpkgversion = shell_exec("$kolab_prefix/bin/openpkg rpm -q openpkg");
-
-$kolabversion = '@kolab_version@';
-if( $kolabversion[0] == '@' ) {
- // Unofficial/non-openpkg package
- $kolabversion = '2.0-unofficial';
-}
-
-/**** Insert into template and output ***/
-$smarty = new MySmarty();
-$smarty->assign( 'topdir', $topdir );
-$smarty->assign( 'uid', $auth->uid() );
-$smarty->assign( 'group', $auth->group() );
-$smarty->assign( 'page_title', $menuitems[$sidx]['title'] );
-$smarty->assign( 'menuitems', $menuitems );
-$smarty->assign( 'submenuitems', $menuitems[$sidx]['submenu'] );
-$smarty->assign( 'kolabversion', $kolabversion );
-$smarty->assign( 'kolabversions', $kolabversions );
-$smarty->assign( 'kolabpatchedversions', $kolabpatchedversions );
-$smarty->assign( 'openpkgversion', $openpkgversion );
-$smarty->assign( 'maincontent', 'versions.tpl' );
-$smarty->display('page.tpl');
-
-/*
- Local variables:
- mode: php
- indent-tabs-mode: t
- tab-width: 4
- buffer-file-coding-system: utf-8
- End:
-*/
- ?>