X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=admin%2Fauth_subfields_structure.pl;h=e8451363d39aac841bb90b81abeec1ec53c95733;hb=2292bff781305dc8a16328c43394fb2c3aaa34f6;hp=432d49667fa4bec4fb046fd5adea3d686e554b9f;hpb=bdd0e225bc291280cc40b4a8326a33a21638338b;p=koha.git

diff --git a/admin/auth_subfields_structure.pl b/admin/auth_subfields_structure.pl
index 432d49667f..e8451363d3 100755
--- a/admin/auth_subfields_structure.pl
+++ b/admin/auth_subfields_structure.pl
@@ -21,8 +21,9 @@ use strict;
 #use warnings; FIXME - Bug 2505
 use C4::Output;
 use C4::Auth;
-use CGI;
+use CGI qw ( -utf8 );
 use C4::Context;
+use C4::Koha;
 
 
 sub string_search  {
@@ -53,11 +54,11 @@ 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.tmpl",
+    {   template_name   => "admin/auth_subfields_structure.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
-        flagsrequired   => { parameters => 1 },
+        flagsrequired   => { parameters => 'parameters_remaining_permissions' },
         debug           => 1,
     }
 );
@@ -91,25 +92,14 @@ if ($op eq 'add_form') {
 		push @kohafields, "auth_header.".$field;
 	}
 	
-	# build authorised value list
-	$sth2 = $dbh->prepare("select distinct category from authorised_values");
-	$sth2->execute;
-	my @authorised_values;
-	push @authorised_values,"";
-	while ((my $category) = $sth2->fetchrow_array) {
-		push @authorised_values, $category;
-	}
-	push (@authorised_values,"branches");
-	push (@authorised_values,"itemtypes");
-    
-    # build thesaurus categories list
-    $sth2 = $dbh->prepare("select authtypecode from auth_types");
-    $sth2->execute;
-    my @authtypes;
-    push @authtypes, "";
-    while ( ( my $authtypecode ) = $sth2->fetchrow_array ) {
-        push @authtypes, $authtypecode;
-    }
+        # 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 = (sort keys %{C4::Koha::getauthtypes()});
 
 	# build value_builder list
 	my @value_builder=('');
@@ -124,8 +114,9 @@ if ($op eq 'add_form') {
 		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;
@@ -139,97 +130,40 @@ if ($op eq 'add_form') {
 	while ($data =$sth->fetchrow_hashref) {
 
 		my %row_data;  # get a fresh hash for the row data
-		$row_data{tab} = CGI::scrolling_list(-name=>'tab',
-					-id=>"tab$i",
-                                        -values =>
-                                        [ '-1', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10' ],
-                                        -labels => {
-                                            '-1' => 'ignore',
-                                            '0'  => '0',
-                                            '1'  => '1',
-                                            '2'  => '2',
-                                            '3'  => '3',
-                                            '4'  => '4',
-                                            '5'  => '5',
-                                            '6'  => '6',
-                                            '7'  => '7',
-                                            '8'  => '8',
-                                            '9'  => '9',
-                                        },
-					-default=>$data->{'tab'},
-					-size=>1,
-		 			-tabindex=>'',
-					-multiple=>0,
-					);
-		$row_data{ohidden} = CGI::scrolling_list(-name=>'ohidden',
-					-id=>"ohidden$i",
-					#-values=>['0','1','2'],
-					#-labels => {'0'=>'Show','1'=>'Show Collapsed',
-					#				'2' =>'Hide',
-					#				},
-					-values=>['0','-5'],
-					-labels => {'0'=>'Show All','-5'=>'Hide All',},
-					-default=>$data->{'hidden'},
-					#-default=>"-5",
-					-size=>1,
-					-multiple=>0,
-					);
-		#$row_data{ihidden} = CGI::scrolling_list(-name=>'ihidden',
-		#			-id=>"ihidden$i",
-		#			-values=>['0','1','2'],
-		#			-labels => {'0'=>'Show','1'=>'Show Collapsed',
-		#							'2' =>'Hide',
-		#							},
-		#			-default=>substr($data->{'hidden'},1,1),
-		#			-size=>1,
-		#			-multiple=>0,
-		#			);
-		#$row_data{ehidden} = CGI::scrolling_list(-name=>'ehidden',
-		#			-id=>"ehidden$i",
-		#			-values=>['0','1','2'],
-		#			-labels => {'0'=>'Show','1'=>'Show Collapsed',
-		#							'2' =>'Hide',
-		#							},
-		#			-default=>substr($data->{'hidden'}."  ",2,1),
-		#			-size=>1,
-		#			-multiple=>0,
-		#			);
+        $row_data{defaultvalue} = $data->{defaultvalue};
+        $row_data{tab} = {
+                    id      => "tab$i",
+                    default => $data->{'tab'},
+                    };
+        $row_data{ohidden} = {
+                    id      => "ohidden$i",
+                    default => $data->{'hidden'}
+                    };
 		$row_data{tagsubfieldinput} = "<input type=\"hidden\" name=\"tagsubfield\" value=\"".$data->{'tagsubfield'}."\" id=\"tagsubfield\" />";
 		$row_data{tagsubfield} = $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{kohafield}= CGI::scrolling_list( -name=>"kohafield",
-					-id=>"kohafield$i",
-					-values=> \@kohafields,
-					-default=> "$data->{'kohafield'}",
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{authorised_value}  = CGI::scrolling_list(-name=>'authorised_value',
-					-id=>"authorised_value$i",
-					-values=> \@authorised_values,
-					-default=>$data->{'authorised_value'},
-					-size=>1,
-		 			-tabindex=>'',
-					-multiple=>0,
-					);
-		$row_data{frameworkcode}  = CGI::scrolling_list(-name=>'frameworkcode',
-					-id=>"frameworkcode$i",
-					-values=> \@authtypes,
-					-default=>$data->{'frameworkcode'},
-					-size=>1,
-		 			-tabindex=>'',
-					-multiple=>0,
-					);
-		$row_data{value_builder}  = CGI::scrolling_list(-name=>'value_builder',
-					-id=>"value_builder$i",
-					-values=> \@value_builder,
-					-default=>$data->{'value_builder'},
-					-size=>1,
-		 			-tabindex=>'',
-					-multiple=>0,
-					);
+        $row_data{kohafield} = {
+                    id      => "kohafield$i",
+                    values  => \@kohafields,
+                    default => "$data->{'kohafield'}",
+                    };
+        $row_data{authorised_value} = {
+                    id      => "authorised_value$i",
+                    values  => $authorised_values,
+                    default => $data->{'authorised_value'},
+        };
+        $row_data{frameworkcode} = {
+                    id      => "frameworkcode$i",
+                    values  => \@authtypes,
+                    default => $data->{'frameworkcode'},
+        };
+        $row_data{value_builder} = {
+                    id      => "value_builder$i",
+                    values  => \@value_builder,
+                    default => $data->{'value_builder'},
+        };
 		
 		$row_data{repeatable} = CGI::checkbox(-name=>"repeatable$i",
 	-checked => $data->{'repeatable'}?'checked':'',
@@ -255,63 +189,15 @@ if ($op eq 'add_form') {
 	for (my $i=1;$i<=$more_subfields;$i++) {
 		my %row_data;  # get a fresh hash for the row data
         $row_data{'new_subfield'} = 1;
-		$row_data{tab} = CGI::scrolling_list(-name=>'tab',
-					-id => "tab$i",
-                                        -values =>
-                                        [ '-1', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10' ],
-                                        -labels => {
-                                            '-1' => 'ignore',
-                                            '0'  => '0',
-                                            '1'  => '1',
-                                            '2'  => '2',
-                                            '3'  => '3',
-                                            '4'  => '4',
-                                            '5'  => '5',
-                                            '6'  => '6',
-                                            '7'  => '7',
-                                            '8'  => '8',
-                                            '9'  => '9',
-                                        },
-					-default=>"",
-					-size=>1,
-		 			-tabindex=>'',
-					-multiple=>0,
-					);
-		$row_data{ohidden} = CGI::scrolling_list(-name=>'ohidden',
-					-id=>"ohidden$i",
-					#-values=>['0','1','2'],
-					#-labels => {'0'=>'Show','1'=>'Show Collapsed',
-					#				'2' =>'Hide',
-					#				},
-					-values=>['0','-5'],
-					-labels => {'0'=>'Show All','-5'=>'Hide All',},
-					#-default=>"0",
-					-default=>$data->{'hidden'},
-					#-default=>"-5",
-					-size=>1,
-					-multiple=>0,
-					);
+        $row_data{tab} = {
+                    id      => "tab$i",
+                    default => $data->{'tab'},
+                    };
+        $row_data{ohidden} = {
+                    id      => "ohidden$i",
+                    default => $data->{'hidden'}
+                    };
 
-		#$row_data{ihidden} = CGI::scrolling_list(-name=>'ihidden',
-		#			-id=>"ihidden$i",
-		#			-values=>['0','1','2'],
-		#			-labels => {'0'=>'Show','1'=>'Show Collapsed',
-		#							'2' =>'Hide',
-		#							},
-		#			-default=>"0",
-		#			-size=>1,
-		#			-multiple=>0,
-		#			);
-		#$row_data{ehidden} = CGI::scrolling_list(-name=>'ehidden',
-		#			-id=>"ehidden$i",
-		#			-values=>['0','1','2'],
-		#			-labels => {'0'=>'Show','1'=>'Show Collapsed',
-		#							'2' =>'Hide',
-		#							},
-		#			-default=>"0",
-		#			-size=>1,
-		#			-multiple=>0,
-		#			);
 		$row_data{tagsubfieldinput} = "<input type=\"text\" name=\"tagsubfield\" value=\"".$data->{'tagsubfield'}."\" size=\"1\" id=\"tagsubfield\" maxlength=\"1\" />";
                 $row_data{tagsubfieldinput} = 
                         "<label><input type=\"text\" name=\"tagsubfield\" value=\""
@@ -337,36 +223,27 @@ if ($op eq 'add_form') {
 			-checked => '',
 			-value => 1,
 			-label => '');
-		$row_data{kohafield}= CGI::scrolling_list( -name=>'kohafield',
-					-id => "kohafield$i",
-					-values=> \@kohafields,
-					-default=> "",
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{frameworkcode}  = CGI::scrolling_list(-name=>'frameworkcode',
-					-id=>'frameworkcode',
-					-values=> \@authtypes,
-					-default=>$data->{'frameworkcode'},
-					-size=>1,
-		 			-tabindex=>'',
-					-multiple=>0,
-					);
-		$row_data{authorised_value}  = CGI::scrolling_list(-name=>'authorised_value',
-					-id => 'authorised_value',
-					-values=> \@authorised_values,
-					-size=>1,
-		 			-tabindex=>'',
-					-multiple=>0,
-					);
-		$row_data{value_builder}  = CGI::scrolling_list(-name=>'value_builder',
-					-id=>'value_builder',
-					-values=> \@value_builder,
-					-default=>$data->{'value_builder'},
-					-size=>1,
-		 			-tabindex=>'',
-					-multiple=>0,
-					);
+        $row_data{kohafield} = {
+                    id      => "kohafield$i",
+                    values  => \@kohafields,
+                    default => "",
+                    };
+        $row_data{authorised_value} = {
+                    id      => "authorised_value",
+                    values  => $authorised_values,
+                    default => "",
+        };
+        $row_data{frameworkcode} = {
+                    id      => "frameworkcode",
+                    values  => \@authtypes,
+                    default => $data->{'frameworkcode'},
+        };
+        $row_data{value_builder} = {
+                    id      => "value_builder",
+                    values  => \@value_builder,
+                    default => $data->{'value_builder'},
+        };
+
 		$row_data{row} = $i;
 		push(@loop_data, \%row_data);
 	}
@@ -386,10 +263,10 @@ if ($op eq 'add_form') {
 	$template->param(tagfield => "$input->param('tagfield')");
 #	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)
-									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=?
-									where authtypecode=? and tagfield=? and tagsubfield=?");
+    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->param('tagsubfield');
 	my @liblibrarian	= $input->param('liblibrarian');
 	my @libopac		= $input->param('libopac');
@@ -404,6 +281,7 @@ if ($op eq 'add_form') {
 	my $authtypecode	= $input->param('authtypecode');
 	my @frameworkcodes	= $input->param('frameworkcode');
 	my @value_builder	=$input->param('value_builder');
+    my @defaultvalue = $input->param('defaultvalue');
 	for (my $i=0; $i<= $#tagsubfield ; $i++) {
 		my $tagfield			=$input->param('tagfield');
 		my $tagsubfield		=$tagsubfield[$i];
@@ -418,6 +296,7 @@ if ($op eq 'add_form') {
 		my $authorised_value		=$authorised_values[$i];
 		my $frameworkcode		=$frameworkcodes[$i];
 		my $value_builder=$value_builder[$i];
+        my $defaultvalue = $defaultvalue[$i];
 		#my $hidden = $ohidden[$i].$ihidden[$i].$ehidden[$i]; #collate from 3 hiddens;
 		my $hidden = $ohidden[$i]; #collate from 3 hiddens;
 		my $isurl = $input->param("isurl$i")?1:0;
@@ -440,6 +319,7 @@ if ($op eq 'add_form') {
 						$value_builder,
 						$hidden,
 						$isurl,
+                        $defaultvalue,
 						(
 							$authtypecode,
 							$tagfield,
@@ -463,13 +343,14 @@ if ($op eq 'add_form') {
 						$value_builder,
 						$hidden,
 						$isurl,
+                        $defaultvalue,
 					);
 				}
 			}
 		}
 	}
-	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 ##################################
@@ -493,9 +374,8 @@ if ($op eq 'add_form') {
 		my $sth=$dbh->prepare("delete from auth_subfield_structure where tagfield=? and tagsubfield=? and authtypecode=?");
 		$sth->execute($tagfield,$tagsubfield,$authtypecode);
 	}
-	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