[Koha-cvs] CVS: koha boraccount.pl,1.5,1.6 jmemberentry.pl,1.5,1.6 mancredit.pl,1.6,1.7 maninvoice.pl,1.4,1.5 memberentry.pl,1.16,1.17 member.pl,1.7,1.8 members-home.pl,1.2,1.3 moremember.pl,1.21,1.22 readingrec.pl,1.4,1.5 reports-home.pl,1.2,1.3

Paul POULAIN tipaul at users.sourceforge.net
Fri Dec 13 11:22:01 CET 2002


Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1:/tmp/cvs-serv1662

Modified Files:
	boraccount.pl jmemberentry.pl mancredit.pl maninvoice.pl 
	memberentry.pl member.pl members-home.pl moremember.pl 
	readingrec.pl reports-home.pl 
Log Message:
adding authentification with Auth.pm

Index: boraccount.pl
===================================================================
RCS file: /cvsroot/koha/koha/boraccount.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** boraccount.pl	13 Oct 2002 07:31:30 -0000	1.5
--- boraccount.pl	13 Dec 2002 10:21:58 -0000	1.6
***************
*** 25,28 ****
--- 25,29 ----
  
  use strict;
+ use C4::Auth;
  use C4::Output;
  use CGI;
***************
*** 33,38 ****
  
  my $theme = $input->param('theme'); # only used if allowthemeoverride is set
! my %tmpldata = pathtotemplate ( template => 'boraccount.tmpl', theme => $theme );
! my $template = HTML::Template->new(filename => $tmpldata{'path'}, die_on_bad_params => 0);
  
  my $bornum=$input->param('bornum');
--- 34,47 ----
  
  my $theme = $input->param('theme'); # only used if allowthemeoverride is set
! #my %tmpldata = pathtotemplate ( template => 'boraccount.tmpl', theme => $theme );
! #my $template = HTML::Template->new(filename => $tmpldata{'path'}, die_on_bad_params => 0);
! my ($template, $loggedinuser, $cookie)
!     = get_template_and_user({template_name => "boraccount.tmpl",
! 			     query => $input,
! 			     type => "intranet",
! 			     authnotrequired => 0,
! 			     flagsrequired => {borrowers => 1},
! 			     debug => 1,
! 			     });
  
  my $bornum=$input->param('bornum');
***************
*** 63,68 ****
  }
  
! $template->param( startmenumember => startmenu('member'),
! 			endmenumember   => endmenu('member'),
  			firstname       => $data->{'firstname'},
  			surname         => $data->{'surname'},
--- 72,77 ----
  }
  
! $template->param( startmenumember => join('', startmenu('member')),
! 			 endmenumember   => join('', endmenu('member')),
  			firstname       => $data->{'firstname'},
  			surname         => $data->{'surname'},
***************
*** 71,73 ****
  			accounts        => \@accountrows );
  
! print "Content-Type: text/html\n\n", $template->output;
--- 80,82 ----
  			accounts        => \@accountrows );
  
! print $input->header(-cookie => $cookie),$template->output;

Index: jmemberentry.pl
===================================================================
RCS file: /cvsroot/koha/koha/jmemberentry.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** jmemberentry.pl	28 Oct 2002 18:00:58 -0000	1.5
--- jmemberentry.pl	13 Dec 2002 10:21:58 -0000	1.6
***************
*** 23,26 ****
--- 23,27 ----
  
  use strict;
+ use C4::Auth;
  use C4::Output;
  use CGI;
***************
*** 30,34 ****
  my $input = new CGI;
  
! my $template = gettemplate("members/jmemberentry.tmpl");
  
  my $member=$input->param('bornum');
--- 31,42 ----
  my $input = new CGI;
  
! my ($template, $loggedinuser, $cookie)
!     = get_template_and_user({template_name => "members/jmemberentry.tmpl",
! 			     query => $input,
! 			     type => "intranet",
! 			     authnotrequired => 0,
! 			     flagsrequired => {borrowers => 1},
! 			     debug => 1,
! 			     });
  
  my $member=$input->param('bornum');
***************
*** 66,72 ****
  
  
! $template->param( startmenumember => startmenu('member'),
  			endmenumember   => endmenu('member'),
! 			member          => $member,
  			firstname       => $data->{'firstname'},
  			surname         => $data->{'surname'},
--- 74,81 ----
  
  
! $template->param( startmenumember => join('', startmenu('member')),
! 			 endmenumember   => join('', endmenu('member')),
  			endmenumember   => endmenu('member'),
! 			member         => $member,
  			firstname       => $data->{'firstname'},
  			surname         => $data->{'surname'},
***************
*** 86,88 ****
  			cmemloop        => \@cmemdata );
  
! print "Content-Type: text/html\n\n", $template->output;
--- 95,97 ----
  			cmemloop        => \@cmemdata );
  
! print $input->header(-cookie => $cookie),$template->output;

Index: mancredit.pl
===================================================================
RCS file: /cvsroot/koha/koha/mancredit.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** mancredit.pl	14 Nov 2002 18:48:14 -0000	1.6
--- mancredit.pl	13 Dec 2002 10:21:59 -0000	1.7
***************
*** 23,26 ****
--- 23,27 ----
  
  use strict;
+ use C4::Auth;
  use C4::Output;
  use CGI;
***************
*** 44,49 ****
    print $input->redirect("/cgi-bin/koha/moremember.pl?bornum=$bornum");
  } else {
! 	my $template = gettemplate("mancredit.tmpl");
  	$template->param( bornum => $bornum);
! 	print "Content-Type: text/html\n\n", $template->output;
  }
--- 45,58 ----
    print $input->redirect("/cgi-bin/koha/moremember.pl?bornum=$bornum");
  } else {
! 	my ($template, $loggedinuser, $cookie)
! 	= get_template_and_user({template_name => "mancredit.tmpl",
! 					query => $input,
! 					type => "intranet",
! 					authnotrequired => 0,
! 					flagsrequired => {borrowers => 1},
! 					debug => 1,
! 					});
  	$template->param( bornum => $bornum);
! 	print $input->header(-cookie => $cookie),$template->output;
! 
  }

Index: maninvoice.pl
===================================================================
RCS file: /cvsroot/koha/koha/maninvoice.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** maninvoice.pl	14 Nov 2002 18:48:14 -0000	1.4
--- maninvoice.pl	13 Dec 2002 10:21:59 -0000	1.5
***************
*** 23,26 ****
--- 23,27 ----
  
  use strict;
+ use C4::Auth;
  use C4::Output;
  use CGI;
***************
*** 44,49 ****
    print $input->redirect("/cgi-bin/koha/moremember.pl?bornum=$bornum");
  } else {
!   my $template=gettemplate("maninvoice.tmpl");
!   $template->param( bornum => $bornum);
!   print "Content-Type: text/html\n\n", $template->output;
  }
--- 45,58 ----
    print $input->redirect("/cgi-bin/koha/moremember.pl?bornum=$bornum");
  } else {
! 	my ($template, $loggedinuser, $cookie)
! 	= get_template_and_user({template_name => "maninvoice.tmpl",
! 					query => $input,
! 					type => "intranet",
! 					authnotrequired => 0,
! 					flagsrequired => {borrowers => 1},
! 					debug => 1,
! 					});
! 	$template->param(bornum => $bornum);
! 	print $input->header(-cookie => $cookie),$template->output;
! 
  }

Index: memberentry.pl
===================================================================
RCS file: /cvsroot/koha/koha/memberentry.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** memberentry.pl	28 Oct 2002 18:00:58 -0000	1.16
--- memberentry.pl	13 Dec 2002 10:21:59 -0000	1.17
***************
*** 25,28 ****
--- 25,29 ----
  
  use strict;
+ use C4::Auth;
  use C4::Context;
  use C4::Output;
***************
*** 34,38 ****
  my $input = new CGI;
  
! my $template = gettemplate("members/memberentry.tmpl");
  
  my $member=$input->param('bornum');
--- 35,46 ----
  my $input = new CGI;
  
! my ($template, $loggedinuser, $cookie)
!     = get_template_and_user({template_name => "members/memberentry.tmpl",
! 			     query => $input,
! 			     type => "intranet",
! 			     authnotrequired => 0,
! 			     flagsrequired => {borrowers => 1},
! 			     debug => 1,
! 			     });
  
  my $member=$input->param('bornum');
***************
*** 235,239 ****
    			dateofbirth	=> $data->{'dateofbirth'});
  
!   print "Content-Type: text/html\n\n", $template->output;
  
  
--- 243,247 ----
    			dateofbirth	=> $data->{'dateofbirth'});
  
! print $input->header(-cookie => $cookie),$template->output;
  
  

Index: member.pl
===================================================================
RCS file: /cvsroot/koha/koha/member.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** member.pl	28 Oct 2002 18:00:58 -0000	1.7
--- member.pl	13 Dec 2002 10:21:59 -0000	1.8
***************
*** 25,28 ****
--- 25,29 ----
  
  use strict;
+ use C4::Auth;
  use C4::Output;
  use CGI;
***************
*** 39,43 ****
  #				    die_on_bad_params => 0,
  #				    loop_context_vars => 1 );
! my $template = gettemplate("members/member.tmpl");
  
  my $member=$input->param('member');
--- 40,51 ----
  #				    die_on_bad_params => 0,
  #				    loop_context_vars => 1 );
! my ($template, $loggedinuser, $cookie)
!     = get_template_and_user({template_name => "members/member.tmpl",
! 			     query => $input,
! 			     type => "intranet",
! 			     authnotrequired => 0,
! 			     flagsrequired => {borrowers => 1},
! 			     debug => 1,
! 			     });
  
  my $member=$input->param('member');
***************
*** 71,73 ****
  			resultsloop     => \@resultsdata );
  
! print "Content-Type: text/html\n\n", $template->output;
--- 79,81 ----
  			resultsloop     => \@resultsdata );
  
! print $input->header(-cookie => $cookie),$template->output;

Index: members-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/members-home.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** members-home.pl	10 Oct 2002 16:15:39 -0000	1.2
--- members-home.pl	13 Dec 2002 10:21:59 -0000	1.3
***************
*** 9,18 ****
  
  my $query = new CGI;
! my $flagsrequired;
! $flagsrequired->{borrowers}=1;
! my ($loggedinuser, $cookie, $sessionID) = checkauth($query, 0, $flagsrequired);
! 
! my $template = gettemplate("members/members-home.tmpl");
! $template->param(loggedinuser => $loggedinuser);
  
  print $query->header(-cookie => $cookie),$template->output;
--- 9,20 ----
  
  my $query = new CGI;
! my ($template, $loggedinuser, $cookie)
!     = get_template_and_user({template_name => "members/members-home.tmpl",
! 			     query => $query,
! 			     type => "intranet",
! 			     authnotrequired => 0,
! 			     flagsrequired => {borrowers => 1},
! 			     debug => 1,
! 			     });
  
  print $query->header(-cookie => $cookie),$template->output;

Index: moremember.pl
===================================================================
RCS file: /cvsroot/koha/koha/moremember.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** moremember.pl	28 Oct 2002 18:00:59 -0000	1.21
--- moremember.pl	13 Dec 2002 10:21:59 -0000	1.22
***************
*** 32,35 ****
--- 32,36 ----
  
  use strict;
+ use C4::Auth;
  use C4::Context;
  use C4::Output;
***************
*** 47,51 ****
  my $input = new CGI;
  
! my $template = gettemplate("members/moremember.tmpl");
  
  my $bornum=$input->param('bornum');
--- 48,59 ----
  my $input = new CGI;
  
! my ($template, $loggedinuser, $cookie)
!     = get_template_and_user({template_name => "members/moremember.tmpl",
! 			     query => $input,
! 			     type => "intranet",
! 			     authnotrequired => 0,
! 			     flagsrequired => {borrowers => 1},
! 			     debug => 1,
! 			     });
  
  my $bornum=$input->param('bornum');
***************
*** 196,198 ****
  		 reserveloop     => \@reservedata);
  
! print "Content-Type: text/html\n\n", $template->output;
--- 204,206 ----
  		 reserveloop     => \@reservedata);
  
! print $input->header(-cookie => $cookie),$template->output;

Index: readingrec.pl
===================================================================
RCS file: /cvsroot/koha/koha/readingrec.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** readingrec.pl	28 Oct 2002 21:15:11 -0000	1.4
--- readingrec.pl	13 Dec 2002 10:21:59 -0000	1.5
***************
*** 24,27 ****
--- 24,28 ----
  
  use strict;
+ use C4::Auth;
  use C4::Output;
  use CGI;
***************
*** 47,55 ****
  my ($count,$issues)=allissues($bornum,$order2,$limit);
  
! 
! #print $input->header;
! #print startpage();
! #print startmenu('member');
! my $template = gettemplate("members/readingrec.tmpl");
  
  my @loop_reading;
--- 48,59 ----
  my ($count,$issues)=allissues($bornum,$order2,$limit);
  
! my ($template, $loggedinuser, $cookie)
! = get_template_and_user({template_name => "members/readingrec.tmpl",
! 				query => $input,
! 				type => "intranet",
! 				authnotrequired => 0,
! 				flagsrequired => {borrowers => 1},
! 				debug => 1,
! 				});
  
  my @loop_reading;
***************
*** 69,73 ****
  						limit => $limit,
  						loop_reading => \@loop_reading);
! print "Content-Type: text/html\n\n", $template->output;
  
  
--- 73,77 ----
  						limit => $limit,
  						loop_reading => \@loop_reading);
! print $input->header(-cookie => $cookie),$template->output;
  
  

Index: reports-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/reports-home.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** reports-home.pl	10 Oct 2002 16:15:39 -0000	1.2
--- reports-home.pl	13 Dec 2002 10:21:59 -0000	1.3
***************
*** 9,16 ****
  
  my $query = new CGI;
! my ($loggedinuser, $cookie, $sessionID) = checkauth($query);
! 
! my $template = gettemplate("reports/reports-home.tmpl");
! $template->param(loggedinuser => $loggedinuser);
! 
  print $query->header(-cookie => $cookie),$template->output;
--- 9,19 ----
  
  my $query = new CGI;
! my ($template, $loggedinuser, $cookie)
! = get_template_and_user({template_name => "reports/reports-home.tmpl",
! 				query => $query,
! 				type => "intranet",
! 				authnotrequired => 0,
! 				flagsrequired => {permissions => 1},
! 				debug => 1,
! 				});
  print $query->header(-cookie => $cookie),$template->output;





More information about the Koha-cvs mailing list