[Koha-cvs] CVS: koha/admin aqbookfund.pl,1.8,1.9 aqbudget.pl,1.7,1.8 authorised_values.pl,1.3,1.4 branches.pl,1.9,1.10 koha2marclinks.pl,1.3,1.4 marc_subfields_structure.pl,1.6,1.7 marctagstructure.pl,1.7,1.8 systempreferences.pl,1.8,1.9 thesaurus.pl,1.4,1.5

[Paul POULAIN]

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

Modified Files:
        aqbookfund.pl aqbudget.pl authorised_values.pl branches.pl 
        koha2marclinks.pl marc_subfields_structure.pl 
        marctagstructure.pl systempreferences.pl thesaurus.pl 
Log Message:
adding authentification with Auth.pm
(note : i want to stay the 1st commiter in december as in november :-) )

Index: aqbookfund.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/aqbookfund.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** aqbookfund.pl       16 Nov 2002 21:37:03 -0000      1.8
--- aqbookfund.pl       10 Dec 2002 17:35:49 -0000      1.9
***************
*** 40,43 ****
--- 40,44 ----
  use strict;
  use CGI;
+ use C4::Auth;
  use C4::Context;
  use C4::Output;
***************
*** 74,78 ****
  $searchfield=~ s/\,//g;
  
! my $template = gettemplate("parameters/aqbookfund.tmpl",0);
  if ($op) {
  $template->param(script_name => $script_name,
--- 75,87 ----
  $searchfield=~ s/\,//g;
  
! my ($template, $borrowernumber, $cookie)
!     = get_template_and_user({template_name => "parameters/aqbookfund.tmpl",
!                            query => $input,
!                            type => "intranet",
!                            authnotrequired => 0,
!                            flagsrequired => {parameters => 1},
!                            debug => 1,
!                            });
! 
  if ($op) {
  $template->param(script_name => $script_name,
***************
*** 197,201 ****
  } #---- END $OP eq DEFAULT
  
! 
! 
! print "Content-Type: text/html\n\n", $template->output;
--- 206,208 ----
  } #---- END $OP eq DEFAULT
  
! print $input->header(-cookie => $cookie), $template->output;

Index: aqbudget.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/aqbudget.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** aqbudget.pl 16 Nov 2002 21:40:53 -0000      1.7
--- aqbudget.pl 10 Dec 2002 17:35:51 -0000      1.8
***************
*** 40,43 ****
--- 40,44 ----
  use strict;
  use CGI;
+ use C4::Auth;
  use C4::Context;
  use C4::Output;
***************
*** 76,80 ****
  $searchfield=~ s/\,//g;
  
! my $template = gettemplate("parameters/aqbudget.tmpl",0);
  if ($op) {
  $template->param(script_name => $script_name,
--- 77,89 ----
  $searchfield=~ s/\,//g;
  
! my ($template, $borrowernumber, $cookie)
!     = get_template_and_user({template_name => "parameters/aqbudget.tmpl",
!                            query => $input,
!                            type => "intranet",
!                            authnotrequired => 0,
!                            flagsrequired => {parameters => 1},
!                            debug => 1,
!                            });
! 
  if ($op) {
  $template->param(script_name => $script_name,
***************
*** 218,220 ****
  } #---- END $OP eq DEFAULT
  
! print "Content-Type: text/html\n\n", $template->output;
--- 227,230 ----
  } #---- END $OP eq DEFAULT
  
! print $input->header(-cookie => $cookie), $template->output;
! 

Index: authorised_values.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/authorised_values.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** authorised_values.pl        10 Dec 2002 13:29:32 -0000      1.3
--- authorised_values.pl        10 Dec 2002 17:35:52 -0000      1.4
***************
*** 20,23 ****
--- 20,24 ----
  use strict;
  use CGI;
+ use C4::Auth;
  use C4::Context;
  use C4::Output;
***************
*** 56,60 ****
  my $dbh = C4::Context->dbh;
  
! my $template = gettemplate("parameters/authorised_values.tmpl",0);
  my $pagesize=20;
  my $op = $input->param('op');
--- 57,68 ----
  my $dbh = C4::Context->dbh;
  
! my ($template, $borrowernumber, $cookie)
!     = get_template_and_user({template_name => 
"parameters/authorised_values.tmpl",
!                            query => $input,
!                            type => "intranet",
!                            authnotrequired => 0,
!                            flagsrequired => {parameters => 1},
!                            debug => 1,
!                            });
  my $pagesize=20;
  my $op = $input->param('op');
***************
*** 181,183 ****
  } #---- END $OP eq DEFAULT
  
! print "Content-Type: text/html\n\n", $template->output;
--- 189,191 ----
  } #---- END $OP eq DEFAULT
  
! print $input->header(-cookie => $cookie), $template->output;

Index: branches.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/branches.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** branches.pl 9 Nov 2002 17:37:01 -0000       1.9
--- branches.pl 10 Dec 2002 17:35:52 -0000      1.10
***************
*** 24,27 ****
--- 24,28 ----
  use strict;
  use CGI;
+ use C4::Auth;
  use C4::Context;
  use C4::Output;
***************
*** 43,47 ****
  my $op = $input->param('op');
  
! my $template = gettemplate("parameters/branches.tmpl",0);
  if ($op) {
  $template->param(script_name => $script_name,
--- 44,55 ----
  my $op = $input->param('op');
  
! my ($template, $borrowernumber, $cookie)
!     = get_template_and_user({template_name => "parameters/branches.tmpl",
!                            query => $input,
!                            type => "intranet",
!                            authnotrequired => 0,
!                            flagsrequired => {parameters => 1},
!                            debug => 1,
!                            });
  if ($op) {
  $template->param(script_name => $script_name,
***************
*** 54,58 ****
  
  if ($op eq 'add') {
! # If the user has pressed the "add new branch" button. 
      heading("Branches: Add Branch");
      editbranchform();
--- 62,66 ----
  
  if ($op eq 'add') {
! # If the user has pressed the "add new branch" button.
      heading("Branches: Add Branch");
      editbranchform();
***************
*** 369,371 ****
  }
  
! print "Content-Type: text/html\n\n", $template->output;
--- 377,379 ----
  }
  
! print $input->header(-cookie => $cookie), $template->output;

Index: koha2marclinks.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/koha2marclinks.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** koha2marclinks.pl   18 Nov 2002 09:42:54 -0000      1.3
--- koha2marclinks.pl   10 Dec 2002 17:35:53 -0000      1.4
***************
*** 21,24 ****
--- 21,25 ----
  use strict;
  use C4::Output;
+ use C4::Auth;
  use CGI;
  use C4::Search;
***************
*** 34,38 ****
  my $script_name = 'koha2marclinks.pl';
  
! my $template = gettemplate("parameters/koha2marclinks.tmpl",0);
  
  if ($op) {
--- 35,46 ----
  my $script_name = 'koha2marclinks.pl';
  
! my ($template, $borrowernumber, $cookie)
!     = get_template_and_user({template_name => 
"parameters/koha2marclinks.tmpl",
!                            query => $input,
!                            type => "intranet",
!                            authnotrequired => 0,
!                            flagsrequired => {parameters => 1},
!                            debug => 1,
!                            });
  
  if ($op) {
***************
*** 128,130 ****
  } #---- END $OP eq DEFAULT
  
! print "Content-Type: text/html\n\n", $template->output;
--- 136,138 ----
  } #---- END $OP eq DEFAULT
  
! print $input->header(-cookie => $cookie), $template->output;

Index: marc_subfields_structure.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/marc_subfields_structure.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** marc_subfields_structure.pl 10 Dec 2002 13:29:32 -0000      1.6
--- marc_subfields_structure.pl 10 Dec 2002 17:35:53 -0000      1.7
***************
*** 21,24 ****
--- 21,25 ----
  use strict;
  use C4::Output;
+ use C4::Auth;
  use CGI;
  use C4::Search;
***************
*** 56,60 ****
  my $script_name="/cgi-bin/koha/admin/marc_subfields_structure.pl";
  
! my $template = gettemplate("parameters/marc_subfields_structure.tmpl",0);
  my $pagesize=30;
  my $op = $input->param('op');
--- 57,68 ----
  my $script_name="/cgi-bin/koha/admin/marc_subfields_structure.pl";
  
! my ($template, $borrowernumber, $cookie)
!     = get_template_and_user({template_name => 
"parameters/marc_subfields_structure.tmpl",
!                            query => $input,
!                            type => "intranet",
!                            authnotrequired => 0,
!                            flagsrequired => {parameters => 1},
!                            debug => 1,
!                            });
  my $pagesize=30;
  my $op = $input->param('op');
***************
*** 340,342 ****
  } #---- END $OP eq DEFAULT
  
! print "Content-Type: text/html\n\n", $template->output;
--- 348,350 ----
  } #---- END $OP eq DEFAULT
  
! print $input->header(-cookie => $cookie), $template->output;

Index: marctagstructure.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/marctagstructure.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** marctagstructure.pl 12 Nov 2002 16:43:16 -0000      1.7
--- marctagstructure.pl 10 Dec 2002 17:35:54 -0000      1.8
***************
*** 21,24 ****
--- 21,25 ----
  use strict;
  use CGI;
+ use C4::Auth;
  use C4::Context;
  use C4::Output;
***************
*** 56,60 ****
  my $dbh = C4::Context->dbh;
  
! my $template = gettemplate("parameters/marctagstructure.tmpl",0);
  my $pagesize=20;
  my $op = $input->param('op');
--- 57,68 ----
  my $dbh = C4::Context->dbh;
  
! my ($template, $loggedinuser, $cookie)
!     = get_template_and_user({template_name => 
"parameters/marctagstructure.tmpl",
!                            query => $input,
!                            type => "intranet",
!                            authnotrequired => 0,
!                            flagsrequired => {parameters => 1},
!                            debug => 1,
!                            });
  my $pagesize=20;
  my $op = $input->param('op');
***************
*** 187,189 ****
  } #---- END $OP eq DEFAULT
  
! print "Content-Type: text/html\n\n", $template->output;
--- 195,198 ----
  } #---- END $OP eq DEFAULT
  
! $template->param(loggeninuser => $loggedinuser);
! print $input->header(-cookie => $cookie), $template->output;

Index: systempreferences.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/systempreferences.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** systempreferences.pl        7 Oct 2002 09:35:48 -0000       1.8
--- systempreferences.pl        10 Dec 2002 17:35:54 -0000      1.9
***************
*** 40,43 ****
--- 40,44 ----
  use strict;
  use CGI;
+ use C4::Auth;
  use C4::Context;
  use C4::Output;
***************
*** 74,78 ****
  my $script_name="/cgi-bin/koha/admin/systempreferences.pl";
  
! my $template = gettemplate("parameters/systempreferences.tmpl",0);
  my $pagesize=20;
  my $op = $input->param('op');
--- 75,86 ----
  my $script_name="/cgi-bin/koha/admin/systempreferences.pl";
  
! my ($template, $borrowernumber, $cookie)
!     = get_template_and_user({template_name => 
"parameters/systempreferences.tmpl",
!                            query => $input,
!                            type => "intranet",
!                            authnotrequired => 0,
!                            flagsrequired => {parameters => 1},
!                            debug => 1,
!                            });
  my $pagesize=20;
  my $op = $input->param('op');
***************
*** 177,179 ****
  } #---- END $OP eq DEFAULT
  
! print "Content-Type: text/html\n\n", $template->output;
--- 185,187 ----
  } #---- END $OP eq DEFAULT
  
! print $input->header(-cookie => $cookie), $template->output;

Index: thesaurus.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/thesaurus.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** thesaurus.pl        10 Dec 2002 13:29:32 -0000      1.4
--- thesaurus.pl        10 Dec 2002 17:35:56 -0000      1.5
***************
*** 20,23 ****
--- 20,24 ----
  use strict;
  use CGI;
+ use C4::Auth;
  use C4::Context;
  use C4::Output;
***************
*** 44,48 ****
  my $authoritysep = C4::Context->preference("authoritysep");
  
! my $template = gettemplate("parameters/thesaurus.tmpl",0);
  my $pagesize=20;
  
--- 45,57 ----
  my $authoritysep = C4::Context->preference("authoritysep");
  
! my ($template, $borrowernumber, $cookie)
!     = get_template_and_user({template_name => "parameters/thesaurus.tmpl",
!                            query => $input,
!                            type => "intranet",
!                            authnotrequired => 0,
!                            flagsrequired => {parameters => 1},
!                            debug => 1,
!                            });
! 
  my $pagesize=20;
  
***************
*** 248,250 ****
  } #---- END $OP eq DEFAULT
  
! print "Content-Type: text/html\n\n", $template->output;
--- 257,259 ----
  } #---- END $OP eq DEFAULT
  
! print $input->header(-cookie => $cookie), $template->output;