X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=admin%2Fauth_subfields_structure.pl;h=ffa74f2746645d3ac2ddc05173c17ae072fbaa2b;hb=dc4617ba3b57913123689b7bb9cf1342fcc7c84c;hp=a172c25dd37afa288d6911b0e165ac811ce838a6;hpb=93ff09d081d2fb6d2732ad8d6522517508ae31ed;p=koha.git

diff --git a/admin/auth_subfields_structure.pl b/admin/auth_subfields_structure.pl
index a172c25dd3..ffa74f2746 100755
--- a/admin/auth_subfields_structure.pl
+++ b/admin/auth_subfields_structure.pl
@@ -1,70 +1,71 @@
 #!/usr/bin/perl
 
-
 # Copyright 2000-2002 Katipo Communications
 #
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
-use strict;
+use Modern::Perl;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Auth;
-use CGI;
-use C4::Search;
+use CGI qw ( -utf8 );
 use C4::Context;
-use HTML::Template;
+use C4::Koha;
+
+use Koha::Authority::Types;
+
+use List::MoreUtils qw( uniq );
 
-sub StringSearch  {
-	my ($env,$searchstring,$authtypecode)=@_;
+sub string_search  {
+	my ($searchstring,$authtypecode)=@_;
 	my $dbh = C4::Context->dbh;
 	$searchstring=~ s/\'/\\\'/g;
 	my @data=split(' ',$searchstring);
-	my $count=@data;
-	my $sth=$dbh->prepare("Select tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,tab,seealso,authorised_value,value_builder from auth_subfield_structure where (tagfield like ? and authtypecode=?) order by tagfield");
+	my $sth=$dbh->prepare("Select * from auth_subfield_structure where (tagfield like ? and authtypecode=?) order by tagfield");
 	$sth->execute("$searchstring%",$authtypecode);
-	my @results;
-	my $cnt=0;
-	while (my $data=$sth->fetchrow_hashref){
-		push(@results,$data);
-		$cnt ++;
-	}
-	$sth->finish;
-	$dbh->disconnect;
-	return ($cnt,\@results);
+	my $results = $sth->fetchall_arrayref({});
+	return (scalar(@$results), $results);
 }
 
-my $input = new CGI;
-my $tagfield=$input->param('tagfield');
-my $tagsubfield=$input->param('tagsubfield');
-my $authtypecode=$input->param('authtypecode');
-my $pkfield="tagfield";
-my $offset=$input->param('offset');
-my $script_name="/cgi-bin/koha/admin/auth_subfields_structure.pl";
+sub auth_subfield_structure_exists {
+	my ($authtypecode, $tagfield, $tagsubfield) = @_;
+	my $dbh  = C4::Context->dbh;
+	my $sql  = "select tagfield from auth_subfield_structure where authtypecode = ? and tagfield = ? and tagsubfield = ?";
+	my $rows = $dbh->selectall_arrayref($sql, {}, $authtypecode, $tagfield, $tagsubfield);
+	return @$rows > 0;
+}
 
-my ($template, $borrowernumber, $cookie)
-    = get_template_and_user({template_name => "parameters/auth_subfields_structure.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {parameters => 1},
-			     debug => 1,
-			     });
-my $pagesize=30;
-my $op = $input->param('op');
-$tagfield=~ s/\,//g;
+my $input        = new CGI;
+my $tagfield     = $input->param('tagfield');
+my $tagsubfield  = $input->param('tagsubfield');
+my $authtypecode = $input->param('authtypecode');
+my $offset       = $input->param('offset') || 0;
+my $op           = $input->param('op') || '';
+my $script_name  = "/cgi-bin/koha/admin/auth_subfields_structure.pl";
+
+my ($template, $borrowernumber, $cookie) = get_template_and_user(
+    {   template_name   => "admin/auth_subfields_structure.tt",
+        query           => $input,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => { parameters => 'parameters_remaining_permissions' },
+        debug           => 1,
+    }
+);
+my $pagesize = 30;
+$tagfield =~ s/\,//g;
 
 if ($op) {
 $template->param(script_name => $script_name,
@@ -78,124 +79,131 @@ $template->param(script_name => $script_name,
 						else              => 1); # we show only the TMPL_VAR names $op
 }
 
+my $dbh = C4::Context->dbh;
 ################## ADD_FORM ##################################
 # called by default. Used to create form to add or  modify a record
 if ($op eq 'add_form') {
-	my $data;
-	my $dbh = C4::Context->dbh;
-	my $more_subfields = $input->param("more_subfields")+1;
-	
-	# build authorised value list
-	my $sth2 = $dbh->prepare("select distinct category from authorised_values");
+	# builds kohafield tables
+	my @kohafields;
+	push @kohafields, "";
+	my $sth2=$dbh->prepare("SHOW COLUMNS from auth_header");
 	$sth2->execute;
-	my @authorised_values;
-	push @authorised_values,"";
-	while ((my $category) = $sth2->fetchrow_array) {
-		push @authorised_values, $category;
+	while ((my $field) = $sth2->fetchrow_array) {
+		push @kohafields, "auth_header.".$field;
 	}
-	push (@authorised_values,"branches");
-	push (@authorised_values,"itemtypes");
+	
+        # build authorised value list
+        my $authorised_values = C4::Koha::GetAuthorisedValueCategories;
+        unshift @$authorised_values, '';
+        push @$authorised_values, 'branches';
+        push @$authorised_values, 'itemtypes';
+
+        # build thesaurus categories list
+        my @authtypes = uniq( "", map { $_->authtypecode } Koha::Authority::Types->search );
+
 	# build value_builder list
 	my @value_builder=('');
-	opendir(DIR, "../value_builder") || die "can't opendir ../value_builder: $!";
+
+	# read value_builder directory.
+	# 2 cases here : on CVS install, $cgidir does not need a /cgi-bin
+	# on a standard install, /cgi-bin need to be added. 
+	# test one, then the other
+    my $cgidir = C4::Context->config('intranetdir') ."/cgi-bin";
+	unless (opendir(DIR, "$cgidir/cataloguing/value_builder")) {
+        $cgidir = C4::Context->config('intranetdir');
+		opendir(DIR, "$cgidir/cataloguing/value_builder") || die "can't opendir $cgidir/value_builder: $!";
+	} 
 	while (my $line = readdir(DIR)) {
-		if ($line =~ /\.pl$/) {
-			push (@value_builder,$line);
+        if ( $line =~ /\.pl$/ &&
+             $line !~ /EXAMPLE\.pl$/ ) { # documentation purposes
+            push (@value_builder,$line);
 		}
 	}
+        @value_builder= sort {$a cmp $b} @value_builder;
 	closedir DIR;
 
 	# build values list
-	my $sth=$dbh->prepare("select tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,tab,seealso,authorised_value,value_builder from auth_subfield_structure where tagfield=? and authtypecode=?"); # and tagsubfield='$tagsubfield'");
+	my $sth=$dbh->prepare("select * from auth_subfield_structure where tagfield=? and authtypecode=?"); # and tagsubfield='$tagsubfield'");
 	$sth->execute($tagfield,$authtypecode);
 	my @loop_data = ();
-	my $toggle="white";
 	my $i=0;
-	while ($data =$sth->fetchrow_hashref) {
-		my %row_data;  # get a fresh hash for the row data
-		if ($toggle eq 'white'){
-			$toggle="#ffffcc";
-	  	} else {
-			$toggle="white";
-	  	}
-		$row_data{tab} = CGI::scrolling_list(-name=>'tab',
-					-values=>['-1','0'],
-					-labels => {'-1' =>'No (ignore)','0'=>'yes'
-									},
-					-default=>$data->{'tab'},
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{tagsubfield} =$data->{'tagsubfield'}."<input type='hidden' name='tagsubfield' value='".$data->{'tagsubfield'}."'>";
-		$row_data{liblibrarian} = CGI::escapeHTML($data->{'liblibrarian'});
-		$row_data{libopac} = CGI::escapeHTML($data->{'libopac'});
-		$row_data{seealso} = CGI::escapeHTML($data->{'seealso'});
-		$row_data{authorised_value}  = CGI::scrolling_list(-name=>'authorised_value',
-					-values=> \@authorised_values,
-					-default=>$data->{'authorised_value'},
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{value_builder}  = CGI::scrolling_list(-name=>'value_builder',
-					-values=> \@value_builder,
-					-default=>$data->{'value_builder'},
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{repeatable} = CGI::checkbox("repeatable$i",$data->{'repeatable'}?'checked':'',1,'');
-		$row_data{mandatory} = CGI::checkbox("mandatory$i",$data->{'mandatory'}?'checked':'',1,'');
-		$row_data{bgcolor} = $toggle;
-		push(@loop_data, \%row_data);
-		$i++;
-	}
-	# add more_subfields empty lines for add if needed
-	for (my $i=1;$i<=$more_subfields;$i++) {
-		my %row_data;  # get a fresh hash for the row data
-		$row_data{tab} = CGI::scrolling_list(-name=>'tab',
-					-values=>['-1','0'],
-					-labels => {'-1' =>'no (ignore)','0'=>'yes',
-									},
-					-default=>"",
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{tagsubfield} = "<input type=\"text\" name=\"tagsubfield\" value=\"".$data->{'tagsubfield'}."\" size=\"3\" maxlength=\"1\">";
-		$row_data{liblibrarian} = "";
-		$row_data{libopac} = "";
-		$row_data{seealso} = "";
-		$row_data{repeatable} = CGI::checkbox('repeatable','',1,'');
-		$row_data{mandatory} = CGI::checkbox('mandatory','',1,'');
-		$row_data{authorised_value}  = CGI::scrolling_list(-name=>'authorised_value',
-					-values=> \@authorised_values,
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{bgcolor} = $toggle;
-		push(@loop_data, \%row_data);
-	}
-	$template->param('use-heading-flags-p' => 1);
-	$template->param('heading-edit-subfields-p' => 1);
+    while ( my $data = $sth->fetchrow_hashref ) {
+        my %row_data;    # get a fresh hash for the row data
+        $row_data{defaultvalue}      = $data->{defaultvalue};
+        $row_data{tab}               = $data->{tab};
+        $row_data{ohidden}           = $data->{'hidden'};
+        $row_data{tagsubfield}       = $data->{'tagsubfield'};
+        $row_data{liblibrarian}      = $data->{'liblibrarian'};
+        $row_data{libopac}           = $data->{'libopac'};
+        $row_data{seealso}           = $data->{'seealso'};
+        $row_data{kohafields}        = \@kohafields;
+        $row_data{kohafield}         = $data->{'kohafield'};
+        $row_data{authorised_values} = $authorised_values;
+        $row_data{authorised_value}  = $data->{'authorised_value'};
+        $row_data{frameworkcodes}    = \@authtypes;
+        $row_data{frameworkcode}     = $data->{'frameworkcode'};
+        $row_data{value_builders}    = \@value_builder;
+        $row_data{value_builder}     = $data->{'value_builder'};
+        $row_data{repeatable}        = $data->{repeatable};
+        $row_data{mandatory}         = $data->{mandatory};
+        $row_data{hidden}            = $data->{hidden};
+        $row_data{isurl}             = $data->{isurl};
+        $row_data{row}               = $i;
+        push( @loop_data, \%row_data );
+        $i++;
+    }
+
+    # Add a new row for the "New" tab
+    my %row_data;    # get a fresh hash for the row data
+    $row_data{'new_subfield'} = 1;
+    $row_data{tab} = -1; # ignore
+    $row_data{ohidden} = 0; # show all
+    $row_data{tagsubfield}      = "";
+    $row_data{liblibrarian}     = "";
+    $row_data{libopac}          = "";
+    $row_data{seealso}          = "";
+    $row_data{hidden}           = "000";
+    $row_data{repeatable}       = 0;
+    $row_data{mandatory}        = 0;
+    $row_data{isurl}            = 0;
+    $row_data{kohafields} = \@kohafields,
+    $row_data{authorised_values} = $authorised_values;
+    $row_data{frameworkcodes} = \@authtypes;
+    $row_data{value_builders} = \@value_builder;
+    $row_data{row} = $i;
+    push( @loop_data, \%row_data );
+
+	$template->param('use_heading_flags_p' => 1);
+	$template->param('heading_edit_subfields_p' => 1);
 	$template->param(action => "Edit subfields",
-							tagfield => "<input type=\"hidden\" name=\"tagfield\" value=\"$tagfield\">$tagfield",
+							tagfield => $tagfield,
+							tagfieldinput => "<input type=\"hidden\" name=\"tagfield\" value=\"$tagfield\" />",
 							loop => \@loop_data,
-							more_subfields => $more_subfields,
 							more_tag => $tagfield);
 
 												# END $OP eq ADD_FORM
 ################## ADD_VALIDATE ##################################
 # called by add_form, used to insert/modify data in DB
 } elsif ($op eq 'add_validate') {
-	my $dbh = C4::Context->dbh;
 	$template->param(tagfield => "$input->param('tagfield')");
-	my $sth=$dbh->prepare("replace auth_subfield_structure (tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,tab,seealso,authorised_value,value_builder,authtypecode)
-									values (?,?,?,?,?,?,?,?,?,?,?)");
-	my @tagsubfield	= $input->param('tagsubfield');
-	my @liblibrarian	= $input->param('liblibrarian');
-	my @libopac		= $input->param('libopac');
-	my @tab				= $input->param('tab');
-	my @seealso		= $input->param('seealso');
-	my @authorised_values	= $input->param('authorised_value');
-	my @value_builder	=$input->param('value_builder');
+#	my $sth=$dbh->prepare("replace auth_subfield_structure (authtypecode,tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,seealso,authorised_value,frameworkcode,value_builder,hidden,isurl)
+#									values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
+    my $sth_insert = $dbh->prepare("insert into auth_subfield_structure (authtypecode,tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,seealso,authorised_value,frameworkcode,value_builder,hidden,isurl,defaultvalue)
+                                    values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
+    my $sth_update = $dbh->prepare("update auth_subfield_structure set authtypecode=?, tagfield=?, tagsubfield=?, liblibrarian=?, libopac=?, repeatable=?, mandatory=?, kohafield=?, tab=?, seealso=?, authorised_value=?, frameworkcode=?, value_builder=?, hidden=?, isurl=?, defaultvalue=?
+                                    where authtypecode=? and tagfield=? and tagsubfield=?");
+	my @tagsubfield	= $input->multi_param('tagsubfield');
+	my @liblibrarian	= $input->multi_param('liblibrarian');
+	my @libopac		= $input->multi_param('libopac');
+	my @kohafield		= ''.$input->param('kohafield');
+	my @tab				= $input->multi_param('tab');
+	my @seealso		= $input->multi_param('seealso');
+    my @ohidden             = $input->multi_param('ohidden');
+	my @authorised_values	= $input->multi_param('authorised_value');
+	my $authtypecode	= $input->param('authtypecode');
+	my @frameworkcodes	= $input->multi_param('frameworkcode');
+	my @value_builder	=$input->multi_param('value_builder');
+    my @defaultvalue = $input->multi_param('defaultvalue');
 	for (my $i=0; $i<= $#tagsubfield ; $i++) {
 		my $tagfield			=$input->param('tagfield');
 		my $tagsubfield		=$tagsubfield[$i];
@@ -204,38 +212,74 @@ if ($op eq 'add_form') {
 		my $libopac			=$libopac[$i];
 		my $repeatable		=$input->param("repeatable$i")?1:0;
 		my $mandatory		=$input->param("mandatory$i")?1:0;
+		my $kohafield		=$kohafield[$i];
 		my $tab				=$tab[$i];
 		my $seealso				=$seealso[$i];
 		my $authorised_value		=$authorised_values[$i];
+		my $frameworkcode		=$frameworkcodes[$i];
 		my $value_builder=$value_builder[$i];
+        my $defaultvalue = $defaultvalue[$i];
+		my $hidden = $ohidden[$i]; #collate from 3 hiddens;
+		my $isurl = $input->param("isurl$i")?1:0;
 		if ($liblibrarian) {
-			unless (C4::Context->config('demo') eq 1) {
-				$sth->execute ($tagfield,
-									$tagsubfield,
-									$liblibrarian,
-									$libopac,
-									$repeatable,
-									$mandatory,
-									$tab,
-									$seealso,
-									$authorised_value,
-									$value_builder,$authtypecode);
+			unless (C4::Context->config('demo') or C4::Context->config('demo') eq 1) {
+				if (auth_subfield_structure_exists($authtypecode, $tagfield, $tagsubfield)) {
+					$sth_update->execute(
+						$authtypecode,
+						$tagfield,
+						$tagsubfield,
+						$liblibrarian,
+						$libopac,
+						$repeatable,
+						$mandatory,
+						$kohafield,
+						$tab,
+						$seealso,
+						$authorised_value,
+						$frameworkcode,
+						$value_builder,
+						$hidden,
+						$isurl,
+                        $defaultvalue,
+						(
+							$authtypecode,
+							$tagfield,
+							$tagsubfield
+						),
+					);
+				} else {
+					$sth_insert->execute(
+						$authtypecode,
+						$tagfield,
+						$tagsubfield,
+						$liblibrarian,
+						$libopac,
+						$repeatable,
+						$mandatory,
+						$kohafield,
+						$tab,
+						$seealso,
+						$authorised_value,
+						$frameworkcode,
+						$value_builder,
+						$hidden,
+						$isurl,
+                        $defaultvalue,
+					);
+				}
 			}
 		}
 	}
-	$sth->finish;
-	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=auth_subfields_structure.pl?tagfield=$tagfield&authtypecode=$authtypecode\"></html>";
-	exit;
+    print $input->redirect("/cgi-bin/koha/admin/auth_subfields_structure.pl?tagfield=$tagfield&amp;authtypecode=$authtypecode");
+    exit;
 
 													# END $OP eq ADD_VALIDATE
 ################## DELETE_CONFIRM ##################################
 # called by default form, used to confirm deletion of data in DB
 } elsif ($op eq 'delete_confirm') {
-	my $dbh = C4::Context->dbh;
-	my $sth=$dbh->prepare("select tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,tab,authorised_value,value_builder from auth_subfield_structure where tagfield=? and tagsubfield=? and authtypecode=?");
+	my $sth=$dbh->prepare("select * from auth_subfield_structure where tagfield=? and tagsubfield=? and authtypecode=?");
 	$sth->execute($tagfield,$tagsubfield,$authtypecode);
 	my $data=$sth->fetchrow_hashref;
-	$sth->finish;
 	$template->param(liblibrarian => $data->{'liblibrarian'},
 							tagsubfield => $data->{'tagsubfield'},
 							delete_link => $script_name,
@@ -247,56 +291,50 @@ if ($op eq 'add_form') {
 ################## DELETE_CONFIRMED ##################################
 # called by delete_confirm, used to effectively confirm deletion of data in DB
 } elsif ($op eq 'delete_confirmed') {
-	my $dbh = C4::Context->dbh;
-	unless (C4::Context->config('demo') eq 1) {
+	unless (C4::Context->config('demo') or C4::Context->config('demo') eq 1) {
 		my $sth=$dbh->prepare("delete from auth_subfield_structure where tagfield=? and tagsubfield=? and authtypecode=?");
 		$sth->execute($tagfield,$tagsubfield,$authtypecode);
-		warn "DEL : $tagfield,$tagsubfield,$authtypecode";
-		$sth->finish;
 	}
-	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=auth_subfields_structure.pl?tagfield=$tagfield&authtypecode=$authtypecode\"></html>";
-	exit;
-	$template->param(tagfield => $tagfield);
+    print $input->redirect("/cgi-bin/koha/admin/auth_subfields_structure.pl?tagfield=$tagfield&amp;authtypecode=$authtypecode");
+    exit;
 													# END $OP eq DELETE_CONFIRMED
 ################## DEFAULT ##################################
 } else { # DEFAULT
-	my $env;
-	my ($count,$results)=StringSearch($env,$tagfield,$authtypecode);
-	my $toggle="white";
+	my ($count,$results)=string_search($tagfield,$authtypecode);
 	my @loop_data = ();
 	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
-	  	if ($toggle eq 'white'){
-			$toggle="#ffffcc";
-	  	} else {
-			$toggle="white";
-	  	}
 		my %row_data;  # get a fresh hash for the row data
 		$row_data{tagfield} = $results->[$i]{'tagfield'};
 		$row_data{tagsubfield} = $results->[$i]{'tagsubfield'};
 		$row_data{liblibrarian} = $results->[$i]{'liblibrarian'};
+		$row_data{kohafield} = $results->[$i]{'kohafield'};
 		$row_data{repeatable} = $results->[$i]{'repeatable'};
 		$row_data{mandatory} = $results->[$i]{'mandatory'};
 		$row_data{tab} = $results->[$i]{'tab'};
 		$row_data{seealso} = $results->[$i]{'seealso'};
 		$row_data{authorised_value} = $results->[$i]{'authorised_value'};
+		$row_data{authtypecode}	= $results->[$i]{'authtypecode'};
 		$row_data{value_builder}	= $results->[$i]{'value_builder'};
-		$row_data{delete} = "$script_name?op=delete_confirm&amp;tagfield=$tagfield&amp;tagsubfield=".$results->[$i]{'tagsubfield'}."&authtypecode=$authtypecode";
-		$row_data{bgcolor} = $toggle;
+		$row_data{hidden}	= $results->[$i]{'hidden'} if($results->[$i]{'hidden'} gt "000") ;
+		$row_data{isurl}	= $results->[$i]{'isurl'};
+		$row_data{delete} = "$script_name?op=delete_confirm&amp;tagfield=$tagfield&amp;tagsubfield=".$results->[$i]{'tagsubfield'}."&amp;authtypecode=$authtypecode";
 		if ($row_data{tab} eq -1) {
 			$row_data{subfield_ignored} = 1;
 		}
+
 		push(@loop_data, \%row_data);
 	}
 	$template->param(loop => \@loop_data);
-	$template->param(edit => "<a href=\"$script_name?op=add_form&amp;tagfield=$tagfield&authtypecode=$authtypecode\">");
+	$template->param(edit_tagfield => $tagfield,
+		edit_authtypecode => $authtypecode);
+	
 	if ($offset>0) {
 		my $prevpage = $offset-$pagesize;
-		$template->param(prev =>"<a href=\"$script_name?offset=$prevpage&amp;tagfield=$tagfield&authtypecode=$authtypecode\">");
+		$template->param(prev =>"<a href=\"$script_name?offset=$prevpage\">");
 	}
 	if ($offset+$pagesize<$count) {
 		my $nextpage =$offset+$pagesize;
-		$template->param(next => "<a href=\"$script_name?offset=$nextpage&amp;tagfield=$tagfield&authtypecode=$authtypecode\">");
+		$template->param(next => "<a href=\"$script_name?offset=$nextpage\">");
 	}
 } #---- END $OP eq DEFAULT
-
 output_html_with_http_headers $input, $cookie, $template->output;