koha-cvs
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Koha-cvs] CVS: koha admin-home.pl,1.1.2.1,1.1.2.2 catalogue-home.pl,1.1

From: Steve Tonnesen
Subject: [Koha-cvs] CVS: koha admin-home.pl,1.1.2.1,1.1.2.2 catalogue-home.pl,1.1.2.1,1.1.2.2 groups.pl,1.1,1.1.2.1 members-home.pl,1.1.2.2,1.1.2.3 reports-home.pl,1.1.2.1,1.1.2.2
Date: Mon, 26 Aug 2002 10:08:58 -0700 
Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv32358

Modified Files:
      Tag: rel-1-2
        admin-home.pl catalogue-home.pl groups.pl members-home.pl 
        reports-home.pl 
Log Message:
Removed hard coded directories (as reported by Ville Huhtala).


Index: admin-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/Attic/admin-home.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** admin-home.pl       11 Jul 2002 18:05:28 -0000      1.1.2.1
--- admin-home.pl       26 Aug 2002 17:08:56 -0000      1.1.2.2
***************
*** 5,8 ****
--- 5,12 ----
  use C4::Auth;
  use C4::Output;
+ use C4::Database;
+ 
+ my $configfile=configfile();
+ my $intranetdir=$configfile->{'intranetdir'};
  
  my $query = new CGI;
***************
*** 17,21 ****
  print "<p align=left>Logged in as: $loggedinuser [<a 
href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>\n";
  
! open H, "/usr/local/koha/intranet/htdocs/admin/index.html";
  while (<H>) {
      print $_;
--- 21,25 ----
  print "<p align=left>Logged in as: $loggedinuser [<a 
href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>\n";
  
! open H, "$intranetdir/htdocs/admin/index.html";
  while (<H>) {
      print $_;

Index: catalogue-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/Attic/catalogue-home.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** catalogue-home.pl   11 Jul 2002 18:05:28 -0000      1.1.2.1
--- catalogue-home.pl   26 Aug 2002 17:08:56 -0000      1.1.2.2
***************
*** 5,8 ****
--- 5,12 ----
  use C4::Auth;
  use C4::Output;
+ use C4::Database;
+ 
+ my $configfile=configfile();
+ my $intranetdir=$configfile->{'intranetdir'};
  
  my $query = new CGI;
***************
*** 17,25 ****
  
  my $classlist='';
! open C, "/usr/local/koha/intranet/htdocs/includes/cat-class-list.inc";
  while (<C>) {
      $classlist.=$_;
  }
! open H, "/usr/local/koha/intranet/htdocs/catalogue/index.html";
  while (<H>) {
      s/<!-- CLASSLIST -->/$classlist/;
--- 21,29 ----
  
  my $classlist='';
! open C, "$intranetdir/htdocs/includes/cat-class-list.inc";
  while (<C>) {
      $classlist.=$_;
  }
! open H, "$intranetdir/htdocs/catalogue/index.html";
  while (<H>) {
      s/<!-- CLASSLIST -->/$classlist/;

Index: groups.pl
===================================================================
RCS file: /cvsroot/koha/koha/groups.pl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** groups.pl   2 May 2001 23:06:44 -0000       1.1
--- groups.pl   26 Aug 2002 17:08:56 -0000      1.1.2.1
***************
*** 10,13 ****
--- 10,18 ----
  use C4::Print;
  use DBI;
+ use C4::Database;
+ 
+ my $configfile=configfile();
+ my $intranetdir=$configfile->{'intranetdir'};
+ 
  
  my $input=new CGI;
***************
*** 214,218 ****
      $output= "<head><title>Overdue list for 
$groups->{$group}</title></head><body><center>\n";
      my $members=groupmembers($env, $group);
!     ($type eq 'overdues') && ($output.="<img 
src=/usr/local/koha/librarian/htdocs/images/overdues.jpg><br>\n");
      $output.= "<table border=1 cellspacing=5 cellpadding=10>\n";
      my $typetext='';
--- 219,223 ----
      $output= "<head><title>Overdue list for 
$groups->{$group}</title></head><body><center>\n";
      my $members=groupmembers($env, $group);
!     ($type eq 'overdues') && ($output.="<img 
src=/images/overdues.jpg><br>\n");
      $output.= "<table border=1 cellspacing=5 cellpadding=10>\n";
      my $typetext='';

Index: members-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/Attic/members-home.pl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** members-home.pl     27 Jul 2002 04:33:57 -0000      1.1.2.2
--- members-home.pl     26 Aug 2002 17:08:56 -0000      1.1.2.3
***************
*** 5,9 ****
--- 5,12 ----
  use C4::Auth;
  use C4::Output;
+ use C4::Database;
  
+ my $configfile=configfile();
+ my $intranetdir=$configfile->{'intranetdir'};
  my $query = new CGI;
  my $flagsrequired;
***************
*** 18,22 ****
  print "<p align=left>Logged in as: $loggedinuser [<a 
href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>\n";
  
! open H, "/usr/local/koha/intranet/htdocs/members/index.html";
  while (<H>) {
      print $_;
--- 21,25 ----
  print "<p align=left>Logged in as: $loggedinuser [<a 
href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>\n";
  
! open H, "$intranetdir/htdocs/members/index.html";
  while (<H>) {
      print $_;

Index: reports-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/Attic/reports-home.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** reports-home.pl     11 Jul 2002 18:05:28 -0000      1.1.2.1
--- reports-home.pl     26 Aug 2002 17:08:56 -0000      1.1.2.2
***************
*** 5,8 ****
--- 5,12 ----
  use C4::Auth;
  use C4::Output;
+ use C4::Database;
+ 
+ my $configfile=configfile();
+ my $intranetdir=$configfile->{'intranetdir'};
  
  my $query = new CGI;
***************
*** 16,20 ****
  print "<p align=left>Logged in as: $loggedinuser [<a 
href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>\n";
  
! open H, "/usr/local/koha/intranet/htdocs/reports/index.html";
  while (<H>) {
      print $_;
--- 20,24 ----
  print "<p align=left>Logged in as: $loggedinuser [<a 
href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>\n";
  
! open H, "$intranetdir/htdocs/reports/index.html";
  while (<H>) {
      print $_;
reply via email to
[Prev in Thread] Current Thread [Next in Thread]