summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Arendsen Hein <thomas@intevation.de>2008-02-26 18:39:55 (GMT)
committerThomas Arendsen Hein <thomas@intevation.de>2008-02-26 18:39:55 (GMT)
commitddff91bbdde9505550f9a037b84836f664479516 (patch)
tree65326123aca25c09c5e89603888ee24207409dec
parent731b3854c924ce37a8c6109450424fb1f4485a0f (diff)
downloadkolab-webadmin-ddff91bbdde9505550f9a037b84836f664479516.tar.gz
About Kolab -> Versions: Separate PEAR/Horde section, s/-/_ in autoconf vars.
kolab/issue2203 (About Kolab does not list new server components)
-rwxr-xr-xphp/admin/templates/versions.tpl.in2
-rw-r--r--www/admin/kolab/versions.php.in18
2 files changed, 14 insertions, 6 deletions
diff --git a/php/admin/templates/versions.tpl.in b/php/admin/templates/versions.tpl.in
index 5b258f9..51081b2 100755
--- a/php/admin/templates/versions.tpl.in
+++ b/php/admin/templates/versions.tpl.in
@@ -9,6 +9,8 @@
<pre>{$kolabversion}</pre>
<h1>{tr msg="Kolab2 Groupware Server Component Versions"}</h1>
<pre>{$kolabversions}</pre>
+<h1>{tr msg="PEAR/Horde Versions"}</h1>
+<pre>{$pearhordeversions}</pre>
@OPENPKG@<h1>{tr msg="Kolab2 Patched OpenPKG Package Versions"}</h1>
@OPENPKG@<pre>{$kolabpatchedversions}</pre>
@OPENPKG@<h1>{tr msg="OpenPKG Version"}</h1>
diff --git a/www/admin/kolab/versions.php.in b/www/admin/kolab/versions.php.in
index 5456413..25e5391 100644
--- a/www/admin/kolab/versions.php.in
+++ b/www/admin/kolab/versions.php.in
@@ -35,13 +35,18 @@ $kolabversions = shell_exec('
@webserver_pkg@ \
@kolab_pkg@ \
@kolab_webadmin_pkg@ \
- @kolab-filter_pkg@ \
- @kolab-freebusy_pkg@ \
- @perl-kolab-conf_pkg@ \
+ @kolab_filter_pkg@ \
+ @kolab_freebusy_pkg@ \
+ @perl_kolabconf_pkg@ \
@perl_kolab_pkg@ \
- @php-pear-kolab_filter_pkg@ \
- @php-pear-kolab_freebusy_pkg@ |
- sort
+ @php_kolab_pkg@ \
+ | sort
+');
+
+$pearhordeversions = shell_exec('
+ @RPM@ -q --qf "%{NAME}: %{VERSION}-%{RELEASE}\n" \
+ @pear_horde_pkg@ \
+ | sort
');
@@ -68,6 +73,7 @@ $smarty->assign( 'menuitems', $menuitems );
$smarty->assign( 'submenuitems', $menuitems[$sidx]['submenu'] );
$smarty->assign( 'kolabversion', $kolabversion );
$smarty->assign( 'kolabversions', $kolabversions );
+$smarty->assign( 'pearhordeversions', $pearhordeversions );
$smarty->assign( 'kolabpatchedversions', $kolabpatchedversions );
$smarty->assign( 'openpkgversion', $openpkgversion );
$smarty->assign( 'maincontent', 'versions.tpl' );