[Koha-cvs] CVS: koha member-flags.pl,1.1,1.2 member-password.pl,1.1,1.2 admin-home.pl,1.3,1.4 catalogue-home.pl,1.2,1.3 charges.pl,1.3,1.4 deletemem.pl,1.7,1.8 delitem.pl,1.3,1.4 groups.pl,1.3,1.4

[Steve Tonnesen]

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv29140

Modified Files:
        admin-home.pl catalogue-home.pl charges.pl deletemem.pl 
        delitem.pl groups.pl 
Added Files:
        member-flags.pl member-password.pl 
Log Message:
Merging from rel-1-2 to trunk




Index: admin-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin-home.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** admin-home.pl       11 Oct 2002 07:25:22 -0000      1.3
--- admin-home.pl       28 Oct 2002 17:46:18 -0000      1.4
***************
*** 14,16 ****
  $template->param(loggeninuser => $loggedinuser);
  
! print $query->header(-cookie => $cookie),$template->output;
\ No newline at end of file
--- 14,16 ----
  $template->param(loggeninuser => $loggedinuser);
  
! print $query->header(-cookie => $cookie),$template->output;

Index: catalogue-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/catalogue-home.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** catalogue-home.pl   10 Oct 2002 16:15:37 -0000      1.2
--- catalogue-home.pl   28 Oct 2002 17:46:18 -0000      1.3
***************
*** 9,13 ****
  
  my $query = new CGI;
! my ($loggedinuser, $cookie, $sessionID) = checkauth($query,1);
  my $template = gettemplate("catalogue/catalogue-home.tmpl");
  
--- 9,13 ----
  
  my $query = new CGI;
! my ($loggedinuser, $cookie, $sessionID) = checkauth($query);
  my $template = gettemplate("catalogue/catalogue-home.tmpl");
  

Index: charges.pl
===================================================================
RCS file: /cvsroot/koha/koha/charges.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** charges.pl  5 Oct 2002 09:44:44 -0000       1.3
--- charges.pl  28 Oct 2002 17:46:18 -0000      1.4
***************
*** 26,31 ****
--- 26,39 ----
  use C4::Context;
  use C4::Output;
+ use C4::Database;
+ use C4::Auth;
  
  my $input = new CGI;
+ 
+ my $flagsrequired;
+ $flagsrequired->{circulation}=1;
+ my ($loggedinuser, $cookie, $sessionID) = checkauth($input, 0, 
$flagsrequired);
+ 
+ 
  print $input->header;
  my $type=$input->param('type');

Index: deletemem.pl
===================================================================
RCS file: /cvsroot/koha/koha/deletemem.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** deletemem.pl        13 Oct 2002 11:32:14 -0000      1.7
--- deletemem.pl        28 Oct 2002 17:46:18 -0000      1.8
***************
*** 33,38 ****
--- 33,47 ----
  use C4::Circulation::Circ2;
  #use C4::Acquisitions;
+ use C4::Auth;
+ 
  
  my $input = new CGI;
+ 
+ my $flagsrequired;
+ $flagsrequired->{borrower}=1;
+ my ($loggedinuser, $cookie, $sessionID) = checkauth($input, 0, 
$flagsrequired);
+ 
+ 
+ 
  #print $input->header;
  my $member=$input->param('member');

Index: delitem.pl
===================================================================
RCS file: /cvsroot/koha/koha/delitem.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** delitem.pl  14 Aug 2002 18:12:51 -0000      1.3
--- delitem.pl  28 Oct 2002 17:46:18 -0000      1.4
***************
*** 30,35 ****
--- 30,40 ----
  use C4::Acquisitions;
  use C4::Biblio;
+ use C4::Auth;
  
  my $input = new CGI;
+ my $flagsrequired;
+ $flagsrequired->{editcatalogue}=1;
+ my ($loggedinuser, $cookie, $sessionID) = checkauth($input, 0, 
$flagsrequired);
+ 
  #print $input->header;
  my $item=$input->param('itemnum');

Index: groups.pl
===================================================================
RCS file: /cvsroot/koha/koha/groups.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** groups.pl   13 Oct 2002 07:31:57 -0000      1.3
--- groups.pl   28 Oct 2002 17:46:18 -0000      1.4
***************
*** 30,33 ****
--- 30,38 ----
  use C4::Print;
  use DBI;
+ use C4::Database;
+ 
+ my $configfile=configfile();
+ my $intranetdir=$configfile->{'intranetdir'};
+ 
  
  my $input=new CGI;
***************
*** 234,238 ****
      $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='';
--- 239,243 ----
      $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='';