[Koha-cvs] CVS: koha about.pl,1.4,1.4.2.1

[Ambrose C. LI]

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31315

Modified Files:
      Tag: rel_2_0
	about.pl 
Log Message:
This should be better if mysql is not in the path, or if we are not running
Apache.


Index: about.pl
===================================================================
RCS file: /cvsroot/koha/koha/about.pl,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** about.pl	28 Nov 2003 13:59:30 -0000	1.4
--- about.pl	1 Mar 2004 00:18:30 -0000	1.4.2.1
***************
*** 10,13 ****
--- 10,14 ----
  use CGI;
  
+ my $dbh = C4::Context->dbh;
  my $query = new CGI;
  my ($template, $loggedinuser, $cookie)
***************
*** 23,28 ****
  my $osVersion = `uname -a`;
  my $perlVersion = $];
! my $mysqlVersion = `mysql -V`;
! my $apacheVersion =  `httpd -v`;
  
  $template->param(
--- 24,35 ----
  my $osVersion = `uname -a`;
  my $perlVersion = $];
! 
! # mysql(1) may not be on the PATH, so we try to do a select statement instead
! my $sti = $dbh->prepare("select version()");
! $sti->execute;
! my $mysqlVersion = ($sti->fetchrow_array)[0]; # `mysql -V`
! 
! # The web server may not be httpd, and/or may not be in the PATH
! my $apacheVersion =  $ENV{SERVER_SOFTWARE} || `httpd -v`;
  
  $template->param(