[Koha-cvs] CVS: koha/members member.pl,1.2,1.3 members-home.pl,1.1,1.2

[Owen Leonard]

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

Modified Files:
	member.pl members-home.pl 
Log Message:
Adding option to output using quicksearch template if the quicksearch parameter is present (uses member-quicksearch.tmpl and member-quicksearch-results.tmpl)

Index: member.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/member.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** member.pl	5 Sep 2004 22:34:05 -0000	1.2
--- member.pl	13 Jan 2005 21:48:49 -0000	1.3
***************
*** 33,45 ****
  
  my $input = new CGI;
! 
! my $theme = $input->param('theme') || "default";
! 			# only used if allowthemeoverride is set
! #my %tmpldata = pathtotemplate ( template => 'member.tmpl', theme => $theme, language => 'fi' );
! 	# FIXME - Error-checking
! #my $template = HTML::Template->new( filename => $tmpldata{'path'},
! #				    die_on_bad_params => 0,
! #				    loop_context_vars => 1 );
! my ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "members/member.tmpl",
  			     query => $input,
--- 33,49 ----
  
  my $input = new CGI;
! my $quicksearch = $input->param('quicksearch');
! my ($template, $loggedinuser, $cookie);
! if($quicksearch){
! 	($template, $loggedinuser, $cookie)
!     = get_template_and_user({template_name => "members/member-quicksearch-results.tmpl",
! 			     query => $input,
! 			     type => "intranet",
! 			     authnotrequired => 0,
! 			     flagsrequired => {borrowers => 1},
! 			     debug => 1,
! 			     });
! } else {
! 	($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "members/member.tmpl",
  			     query => $input,
***************
*** 49,52 ****
--- 53,65 ----
  			     debug => 1,
  			     });
+ }
+ my $theme = $input->param('theme') || "default";
+ 			# only used if allowthemeoverride is set
+ #my %tmpldata = pathtotemplate ( template => 'member.tmpl', theme => $theme, language => 'fi' );
+ 	# FIXME - Error-checking
+ #my $template = HTML::Template->new( filename => $tmpldata{'path'},
+ #				    die_on_bad_params => 0,
+ #				    loop_context_vars => 1 );
+ 
  
  my $member=$input->param('member');

Index: members-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/members-home.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** members-home.pl	10 Mar 2004 15:13:45 -0000	1.1
--- members-home.pl	13 Jan 2005 21:48:50 -0000	1.2
***************
*** 10,14 ****
  
  my $query = new CGI;
! my ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "members/members-home.tmpl",
  			     query => $query,
--- 10,28 ----
  
  my $query = new CGI;
! my $quicksearch = $query->param('quicksearch');
! my ($template, $loggedinuser, $cookie);
! my $template_name;
! 
! if($quicksearch){
! ($template, $loggedinuser, $cookie)
!     = get_template_and_user({template_name => "members/member-quicksearch.tmpl",
! 			     query => $query,
! 			     type => "intranet",
! 			     authnotrequired => 0,
! 			     flagsrequired => {borrowers => 1},
! 			     debug => 1,
! 			     });
! } else {
! ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "members/members-home.tmpl",
  			     query => $query,
***************
*** 18,21 ****
--- 32,37 ----
  			     debug => 1,
  			     });
+ }
+ 
  
  output_html_with_http_headers $query, $cookie, $template->output;