[Koha-cvs] CVS: koha/reports manager.pl,1.1,1.2

[Paul POULAIN]

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

Modified Files:
	manager.pl 
Log Message:
merging 2.2 branch with head. Sorry for not making it before, many many commits done here

Index: manager.pl
===================================================================
RCS file: /cvsroot/koha/koha/reports/manager.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** manager.pl	30 Mar 2004 16:09:04 -0000	1.1
--- manager.pl	1 Mar 2005 13:41:32 -0000	1.2
***************
*** 42,46 ****
  $template->param(do_it => $do_it,
  		report_name => $report_name);
! my $plugin = "./".$report_name.".plugin";
  require $plugin;
  if ($do_it) {
--- 42,50 ----
  $template->param(do_it => $do_it,
  		report_name => $report_name);
! my $cgidir = C4::Context->config('intranetdir')."/cgi-bin/reports/";
! unless (opendir(DIR, "$cgidir")) {
! 	$cgidir = C4::Context->intranetdir."/reports/";
! } 
! my $plugin = $cgidir.$report_name.".plugin";
  require $plugin;
  if ($do_it) {