summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorThomas Arendsen Hein <thomas@intevation.de>2008-12-12 10:28:56 (GMT)
committerThomas Arendsen Hein <thomas@intevation.de>2008-12-12 10:28:56 (GMT)
commit9836c5a7e37126bb8a34668654dd4e9f2693d71b (patch)
tree484d5e06cef0a4d625fb3d7f612446bc729c809b /www
parent51daf1a66ce7eadaece93d399786907617bc4761 (diff)
downloadkolab-webadmin-9836c5a7e37126bb8a34668654dd4e9f2693d71b.tar.gz
kolab-webadmin, kolabd: Folded @amavisd_pkg@,
@emailserver_pkg@, @imap_pkg@, @webserver_pkg@, @kolab_pkg@, @kolab_webadmin_pkg@, @kolab_filter_pkg@, @kolab_freebusy_pkg@, @perl_kolabconf_pkg@, @perl_kolab_pkg@ and @php_kolab_pkg@ into @kolab_pkgs@, and rename @pear_horde_pkg@ to @pear_horde_pkgs@ for consistency. List is not yet updated for new package names. Set $kolabversion default to 'unknown' instead of the obsolete value '2.1-official'.
Diffstat (limited to 'www')
-rw-r--r--www/admin/kolab/versions.php.in15
1 files changed, 2 insertions, 13 deletions
diff --git a/www/admin/kolab/versions.php.in b/www/admin/kolab/versions.php.in
index 25e5391..94671b1 100644
--- a/www/admin/kolab/versions.php.in
+++ b/www/admin/kolab/versions.php.in
@@ -29,23 +29,12 @@ $menuitems[$sidx]['selected'] = 'selected';
$kolabversions = shell_exec('
@RPM@ -q --qf "%{NAME}: %{VERSION}-%{RELEASE}\n" \
@kolab_pkgs@ \
- @amavisd_pkg@ \
- @emailserver_pkg@ \
- @imap_pkg@ \
- @webserver_pkg@ \
- @kolab_pkg@ \
- @kolab_webadmin_pkg@ \
- @kolab_filter_pkg@ \
- @kolab_freebusy_pkg@ \
- @perl_kolabconf_pkg@ \
- @perl_kolab_pkg@ \
- @php_kolab_pkg@ \
| sort
');
$pearhordeversions = shell_exec('
@RPM@ -q --qf "%{NAME}: %{VERSION}-%{RELEASE}\n" \
- @pear_horde_pkg@ \
+ @pear_horde_pkgs@ \
| sort
');
@@ -60,7 +49,7 @@ if ("@WITHOPENPKG@" == "yes") {
$kolabversion = '@kolab_version@';
if( $kolabversion[0] == '@' ) {
// Unofficial/non-openpkg package
- $kolabversion = '2.1-official';
+ $kolabversion = 'unknown';
}
/**** Insert into template and output ***/