[Koha-cvs] CVS: koha/C4 Auth.pm,1.17,1.18 Output.pm,1.33,1.34

[Paul POULAIN]

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

Modified Files:
        Auth.pm Output.pm 
Log Message:
authentification bugfix :
the api in pod-auth.pm has "type => 'opac' "parameter.
If called from intranet, should be type => 'intranet'.
Output.pm checked for type existed, and not it's value. Now, Output compares 
checks for type value.
If type='intranet', then the intranet template is called, else it's an opac 
template.
Finlay, please validate this commit.

Index: Auth.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Auth.pm,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** Auth.pm     4 Dec 2002 04:32:35 -0000       1.17
--- Auth.pm     10 Dec 2002 15:52:49 -0000      1.18
***************
*** 76,80 ****
  =item get_template_and_user
  
!   my ($template, $borrowernumber, $cookie) 
      = get_template_and_user({template_name   => "opac-main.tmpl",
                               query           => $query,
--- 76,80 ----
  =item get_template_and_user
  
!   my ($template, $borrowernumber, $cookie)
      = get_template_and_user({template_name   => "opac-main.tmpl",
                               query           => $query,
***************
*** 116,120 ****
        my @bordat;
        $bordat[0] = $borr;
!     
        $template->param(USER_INFO => address@hidden);
      }
--- 116,120 ----
        my @bordat;
        $bordat[0] = $borr;
! 
        $template->param(USER_INFO => address@hidden);
      }
***************
*** 180,184 ****
      } else {
        $template_name = "auth.tmpl";
!     } 
  
      # state variables
--- 180,184 ----
      } else {
        $template_name = "auth.tmpl";
!     }
  
      # state variables

Index: Output.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Output.pm,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** Output.pm   10 Dec 2002 13:42:00 -0000      1.33
--- Output.pm   10 Dec 2002 15:52:49 -0000      1.34
***************
*** 82,86 ****
  
      my $htdocs;
!     if ($opac) {
        $htdocs = C4::Context->config('opachtdocs');
      } else {
--- 82,86 ----
  
      my $htdocs;
!     if ($opac ne "intranet") {
        $htdocs = C4::Context->config('opachtdocs');
      } else {