X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=admin%2Fauth_subfields_structure.pl;h=866e5f74076d0143adbc29ef05df912e7a02f16c;hb=refs%2Fheads%2Fkoha_ffzg;hp=3833b481f5d807a3313057519c6c72f4bdb73f66;hpb=a6c9bd0eb55c32d5632625144775271f20aa15f7;p=koha.git

diff --git a/admin/auth_subfields_structure.pl b/admin/auth_subfields_structure.pl
index 3833b481f5..866e5f7407 100755
--- a/admin/auth_subfields_structure.pl
+++ b/admin/auth_subfields_structure.pl
@@ -17,14 +17,17 @@
 # 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 warnings; FIXME - Bug 2505
+use Modern::Perl;
 use C4::Output;
 use C4::Auth;
 use CGI qw ( -utf8 );
 use C4::Context;
 use C4::Koha;
 
+use Koha::Authority::Types;
+use Koha::AuthorisedValues;
+
+use List::MoreUtils qw( uniq );
 
 sub string_search  {
 	my ($searchstring,$authtypecode)=@_;
@@ -50,6 +53,7 @@ my $tagfield     = $input->param('tagfield');
 my $tagsubfield  = $input->param('tagsubfield');
 my $authtypecode = $input->param('authtypecode');
 my $offset       = $input->param('offset');
+$offset = 0 if not defined $offset or $offset < 0;
 my $op           = $input->param('op') || '';
 my $script_name  = "/cgi-bin/koha/admin/auth_subfields_structure.pl";
 
@@ -58,7 +62,7 @@ my ($template, $borrowernumber, $cookie) = get_template_and_user(
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
-        flagsrequired   => { parameters => 'parameters_remaining_permissions' },
+        flagsrequired   => { parameters => 'manage_marc_frameworks' },
         debug           => 1,
     }
 );
@@ -81,8 +85,6 @@ 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 $more_subfields = $input->param("more_subfields")+1;
 	# builds kohafield tables
 	my @kohafields;
 	push @kohafields, "";
@@ -92,14 +94,14 @@ if ($op eq 'add_form') {
 		push @kohafields, "auth_header.".$field;
 	}
 	
-        # build authorised value list
-        my $authorised_values = C4::Koha::GetAuthorisedValueCategories;
-        unshift @$authorised_values, '';
-        push @$authorised_values, 'branches';
-        push @$authorised_values, 'itemtypes';
+        # build authorised value category list
+        my @authorised_value_categories = Koha::AuthorisedValues->new->categories;
+        unshift @authorised_value_categories, '';
+        push @authorised_value_categories, 'branches';
+        push @authorised_value_categories, 'itemtypes';
 
         # build thesaurus categories list
-        my @authtypes = (sort keys %{C4::Koha::getauthtypes()});
+        my @authtypes = uniq( "", map { $_->authtypecode } Koha::Authority::Types->search );
 
 	# build value_builder list
 	my @value_builder=('');
@@ -108,9 +110,9 @@ if ($op eq 'add_form') {
 	# 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->intranetdir ."/cgi-bin";
+    my $cgidir = C4::Context->config('intranetdir') ."/cgi-bin";
 	unless (opendir(DIR, "$cgidir/cataloguing/value_builder")) {
-		$cgidir = C4::Context->intranetdir;
+        $cgidir = C4::Context->config('intranetdir');
 		opendir(DIR, "$cgidir/cataloguing/value_builder") || die "can't opendir $cgidir/value_builder: $!";
 	} 
 	while (my $line = readdir(DIR)) {
@@ -127,133 +129,58 @@ if ($op eq 'add_form') {
 	$sth->execute($tagfield,$authtypecode);
 	my @loop_data = ();
 	my $i=0;
-	while ($data =$sth->fetchrow_hashref) {
-
-		my %row_data;  # get a fresh hash for the row data
-        $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} = {
-                    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':'',
-	-value => 1,
-	-label => '',
-	-id => "repeatable$i");
-		$row_data{mandatory} = CGI::checkbox(-name => "mandatory$i",
-	-checked => $data->{'mandatory'}?'checked':'',
-	-value => 1,
-	-label => '',
-	-id => "mandatory$i");
-		$row_data{hidden} = CGI::escapeHTML($data->{hidden}) ;
-		$row_data{isurl} = CGI::checkbox( -name => "isurl$i",
-			-id => "isurl$i",
-			-checked => $data->{'isurl'}?'checked':'',
-			-value => 1,
-			-label => '');
-		$row_data{row} = $i;
-		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{'new_subfield'} = 1;
-        $row_data{tab} = {
-                    id      => "tab$i",
-                    default => $data->{'tab'},
-                    };
-        $row_data{ohidden} = {
-                    id      => "ohidden$i",
-                    default => $data->{'hidden'}
-                    };
+    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_value_categories;
+        $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++;
+    }
 
-		$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=\""
-                        . $data->{'tagsubfield'}
-                        . "\" size=\"1\" id=\"tagsubfield\" maxlength=\"1\" /></label>";
-		$row_data{tagsubfield} = $data->{'tagsubfield'};
-		$row_data{liblibrarian} = "";
-		$row_data{libopac} = "";
-		$row_data{seealso} = "";
-		$row_data{hidden} = "000";
-		$row_data{repeatable} = CGI::checkbox( -name=> 'repeatable',
-				-id => "repeatable$i",
-				-checked => '',
-				-value => 1,
-				-label => '');
-		$row_data{mandatory} = CGI::checkbox( -name=> 'mandatory',
-			-id => "mandatory$i",
-			-checked => '',
-			-value => 1,
-			-label => '');
-		$row_data{isurl} = CGI::checkbox(-name => 'isurl',
-			-id => "isurl$i",
-			-checked => '',
-			-value => 1,
-			-label => '');
-        $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'},
-        };
+    # 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_value_categories;
+    $row_data{frameworkcodes} = \@authtypes;
+    $row_data{value_builders} = \@value_builder;
+    $row_data{row} = $i;
+    push( @loop_data, \%row_data );
 
-		$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 => $tagfield,
 							tagfieldinput => "<input type=\"hidden\" name=\"tagfield\" value=\"$tagfield\" />",
 							loop => \@loop_data,
-							more_subfields => $more_subfields,
 							more_tag => $tagfield);
 
 												# END $OP eq ADD_FORM
@@ -267,21 +194,18 @@ if ($op eq 'add_form') {
                                     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');
+	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->param('tab');
-	my @seealso		= $input->param('seealso');
-	my @hidden;
-	my @ohidden		= $input->param('ohidden');
-	#my @ihidden		= $input->param('ihidden');
-	#my @ehidden		= $input->param('ehidden');
-	my @authorised_values	= $input->param('authorised_value');
+	my @tab				= $input->multi_param('tab');
+	my @seealso		= $input->multi_param('seealso');
+    my @ohidden             = $input->multi_param('ohidden');
+    my @authorised_value_categories = $input->multi_param('authorised_value');
 	my $authtypecode	= $input->param('authtypecode');
-	my @frameworkcodes	= $input->param('frameworkcode');
-	my @value_builder	=$input->param('value_builder');
-    my @defaultvalue = $input->param('defaultvalue');
+	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];
@@ -293,15 +217,13 @@ if ($op eq 'add_form') {
 		my $kohafield		=$kohafield[$i];
 		my $tab				=$tab[$i];
 		my $seealso				=$seealso[$i];
-		my $authorised_value		=$authorised_values[$i];
+        my $authorised_value = $authorised_value_categories[$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;
 		if ($liblibrarian) {
-			unless (C4::Context->config('demo') eq 1) {
 				if (auth_subfield_structure_exists($authtypecode, $tagfield, $tagsubfield)) {
 					$sth_update->execute(
 						$authtypecode,
@@ -346,7 +268,6 @@ if ($op eq 'add_form') {
                         $defaultvalue,
 					);
 				}
-			}
 		}
 	}
     print $input->redirect("/cgi-bin/koha/admin/auth_subfields_structure.pl?tagfield=$tagfield&amp;authtypecode=$authtypecode");
@@ -370,10 +291,8 @@ 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') {
-	unless (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);
-	}
+    my $sth=$dbh->prepare("delete from auth_subfield_structure where tagfield=? and tagsubfield=? and authtypecode=?");
+    $sth->execute($tagfield,$tagsubfield,$authtypecode);
     print $input->redirect("/cgi-bin/koha/admin/auth_subfields_structure.pl?tagfield=$tagfield&amp;authtypecode=$authtypecode");
     exit;
 													# END $OP eq DELETE_CONFIRMED
@@ -396,7 +315,6 @@ if ($op eq 'add_form') {
 		$row_data{value_builder}	= $results->[$i]{'value_builder'};
 		$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;
 		}