Removed the last of the dist_conf calls.

page.tpl and the version information get displayed configuration based now.

2 files changed, 9 insertions, 9 deletions

diff --git a/www/admin/addressbook/addr.php b/www/admin/addressbook/addr.php
index 5dc580c..66adeab 100644
--- a/www/admin/addressbook/addr.php
+++ b/www/admin/addressbook/addr.php
@@ -175,7 +175,7 @@ if( !$errors ) {
 			  unset( $distlists['count'] );
 			  foreach( $distlists as $distlist ) {
 				$dlcn = $distlist['mail'][0];
-				$errors[] = sprintf(_("Addressbook entry DN could not be modified, distribution list <a href='@kolab_wui@/distributionlist/list.php?action=modify&dn=%s'>'%s'</a> depends on it. To modify this entry, first remove it from the distribution list."), urlencode($distlist['dn']), $dlcn );
+				$errors[] = sprintf(_("Addressbook entry DN could not be modified, distribution list <a href='" $params['kolab_wui'] . "/distributionlist/list.php?action=modify&dn=%s'>'%s'</a> depends on it. To modify this entry, first remove it from the distribution list."), urlencode($distlist['dn']), $dlcn );
 			  }
 			  
 			  if( !$errors ) {
diff --git a/www/admin/kolab/versions.php.in b/www/admin/kolab/versions.php
index cc35f09..94eb230 100644
--- a/www/admin/kolab/versions.php.in
+++ b/www/admin/kolab/versions.php
@@ -27,26 +27,25 @@ $menuitems[$sidx]['selected'] = 'selected';
 // The variable 'kolab_pkgs' is used to collect a packages that make up the
 // kolab groupware server.
 $kolabversions = shell_exec('
-  @RPM@ -q --qf "%{NAME}: %{VERSION}-%{RELEASE}\n" \
-    @kolab_pkgs@ \
+  ' . $RPM .' -q --qf "%{NAME}: %{VERSION}-%{RELEASE}\n" \
+    ' . $kolab_pkgs . ' \
     | sort
 ');
 
 $pearhordeversions = shell_exec('
-  @RPM@ -q --qf "%{NAME}: %{VERSION}-%{RELEASE}\n" \
-    @pear_horde_pkgs@ \
+  ' . $RPM . ' -q --qf "%{NAME}: %{VERSION}-%{RELEASE}\n" \
+    ' . $pear_horde_pkgs . ' \
     | sort
 ');
 
 
 # This is an openpkg test, difficult to see after make.
 # but visible in the vanilla sources.
-if ("@WITHOPENPKG@" == "yes") {
-  $openpkgversion = shell_exec("@RPM@ -q openpkg");
-  $kolabpatchedversions = shell_exec("@RPM@ -qa|grep 'kolab[0-9]*$'" );
+if ($WITHOPENPKG == "yes") {
+  $openpkgversion = shell_exec("$RPM -q openpkg");
+  $kolabpatchedversions = shell_exec("$RPM -qa|grep 'kolab[0-9]*$'" );
 }
 
-$kolabversion = '@kolab_version@';
 if( $kolabversion[0] == '@' ) {
   // Unofficial/non-openpkg package
   $kolabversion = 'unknown';
@@ -65,6 +64,7 @@ $smarty->assign( 'kolabversions', $kolabversions );
 $smarty->assign( 'pearhordeversions', $pearhordeversions );
 $smarty->assign( 'kolabpatchedversions', $kolabpatchedversions );
 $smarty->assign( 'openpkgversion', $openpkgversion );
+$smarty->assign( 'OPENPKG', $WITHOPENPKG );
 $smarty->assign( 'maincontent', 'versions.tpl' );
 $smarty->display('page.tpl');