(bug #4051) separate firstname and surname

[koha.git] / admin / systempreferences.pl

diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl
index 4009a10..13f92f9 100755 (executable)
--- a/admin/systempreferences.pl
+++ b/admin/systempreferences.pl
@@ -80,6 +80,7 @@ $tabsysprefs{FrameworksLoaded}      = "Admin";
 $tabsysprefs{libraryAddress}        = "Admin";
 $tabsysprefs{delimiter}             = "Admin";
 $tabsysprefs{IndependantBranches}   = "Admin";
+$tabsysprefs{IndependentBranchPatron}= "Admin";
 $tabsysprefs{insecure}              = "Admin";
 $tabsysprefs{KohaAdmin}             = "Admin";
 $tabsysprefs{KohaAdminEmailAddress} = "Admin";
@@ -100,27 +101,27 @@ $tabsysprefs{dontmerge}             = "Authorities";
 $tabsysprefs{BiblioAddsAuthorities} = "Authorities";
 
 # Cataloguing
-$tabsysprefs{advancedMARCeditor}          = "Cataloguing";
-$tabsysprefs{autoBarcode}                 = "Cataloguing";
-$tabsysprefs{hide_marc}                   = "Cataloguing";
-$tabsysprefs{IntranetBiblioDefaultView}   = "Cataloguing";
-$tabsysprefs{ISBD}                        = "Cataloguing";
-$tabsysprefs{itemcallnumber}              = "Cataloguing";
-$tabsysprefs{LabelMARCView}               = "Cataloguing";
-$tabsysprefs{marc}                        = "Cataloguing";
-$tabsysprefs{marcflavour}                 = "Cataloguing";
-$tabsysprefs{MARCOrgCode}                 = "Cataloguing";
-$tabsysprefs{z3950AuthorAuthFields}       = "Cataloguing";
-$tabsysprefs{z3950NormalizeAuthor}        = "Cataloguing";
-$tabsysprefs{Stemming}                    = "Cataloguing";
-$tabsysprefs{WeightFields}                = "Cataloguing";
-$tabsysprefs{NoZebra}                     = "Cataloguing";
-$tabsysprefs{NoZebraIndexes}              = "Cataloguing";
-$tabsysprefs{ReceiveBackIssues}           = "Cataloguing";
-$tabsysprefs{DefaultClassificationSource} = "Cataloguing";
-$tabsysprefs{RoutingSerials}              = "Cataloguing";
-$tabsysprefs{'item-level_itypes'}         = "Cataloguing";
-$tabsysprefs{OpacSuppression}             = "Cataloguing";
+$tabsysprefs{advancedMARCeditor}          = "Cataloging";
+$tabsysprefs{autoBarcode}                 = "Cataloging";
+$tabsysprefs{hide_marc}                   = "Cataloging";
+$tabsysprefs{IntranetBiblioDefaultView}   = "Cataloging";
+$tabsysprefs{ISBD}                        = "Cataloging";
+$tabsysprefs{itemcallnumber}              = "Cataloging";
+$tabsysprefs{LabelMARCView}               = "Cataloging";
+$tabsysprefs{marc}                        = "Cataloging";
+$tabsysprefs{marcflavour}                 = "Cataloging";
+$tabsysprefs{MARCOrgCode}                 = "Cataloging";
+$tabsysprefs{z3950AuthorAuthFields}       = "Cataloging";
+$tabsysprefs{z3950NormalizeAuthor}        = "Cataloging";
+$tabsysprefs{Stemming}                    = "Cataloging";
+$tabsysprefs{WeightFields}                = "Cataloging";
+$tabsysprefs{NoZebra}                     = "Cataloging";
+$tabsysprefs{NoZebraIndexes}              = "Cataloging";
+#$tabsysprefs{ReceiveBackIssues}           = "Cataloging";
+$tabsysprefs{DefaultClassificationSource} = "Cataloging";
+$tabsysprefs{RoutingSerials}              = "Cataloging";
+$tabsysprefs{'item-level_itypes'}         = "Cataloging";
+$tabsysprefs{OpacSuppression}             = "Cataloging";
 
 # Circulation
 $tabsysprefs{maxoutstanding}                 = "Circulation";
@@ -150,6 +151,7 @@ $tabsysprefs{finesCalendar}                  = "Circulation";
 $tabsysprefs{previousIssuesDefaultSortOrder} = "Circulation";
 $tabsysprefs{todaysIssuesDefaultSortOrder}   = "Circulation";
 $tabsysprefs{HomeOrHoldingBranch}            = "Circulation";
+$tabsysprefs{HomeOrHoldingBranchReturn}      = "Circulation";
 $tabsysprefs{RandomizeHoldsQueueWeight}      = "Circulation";
 $tabsysprefs{StaticHoldsQueueWeight}         = "Circulation";
 $tabsysprefs{AllowOnShelfHolds}              = "Circulation";
@@ -171,7 +173,7 @@ $tabsysprefs{checkdigit}                   = "Patrons";
 $tabsysprefs{intranetreadinghistory}       = "Patrons";
 $tabsysprefs{NotifyBorrowerDeparture}      = "Patrons";
 $tabsysprefs{memberofinstitution}          = "Patrons";
-$tabsysprefs{ReadingHistory}               = "Patrons";
+#$tabsysprefs{ReadingHistory}               = "Patrons";
 $tabsysprefs{BorrowerMandatoryField}       = "Patrons";
 $tabsysprefs{borrowerRelationship}         = "Patrons";
 $tabsysprefs{BorrowersTitles}              = "Patrons";
@@ -214,9 +216,11 @@ $tabsysprefs{AdvancedSearchTypes}     = "Searching";
 # EnhancedContent
 $tabsysprefs{AmazonContent}          = "EnhancedContent";
 $tabsysprefs{AWSAccessKeyID}         = "EnhancedContent";
+$tabsysprefs{AWSPrivateKey}          = "EnhancedContent";
 $tabsysprefs{AmazonLocale}           = "EnhancedContent";
 $tabsysprefs{AmazonAssocTag}         = "EnhancedContent";
 $tabsysprefs{AmazonSimilarItems}     = "EnhancedContent";
+$tabsysprefs{OPACAmazonCoverImages}  = "EnhancedContent";
 $tabsysprefs{OPACAmazonContent}      = "EnhancedContent";
 $tabsysprefs{OPACAmazonSimilarItems} = "EnhancedContent";
 
@@ -285,6 +289,7 @@ $tabsysprefs{AnonSuggestions}      = "OPAC";
 $tabsysprefs{suggestion}           = "OPAC";
 $tabsysprefs{OpacTopissue}         = "OPAC";
 $tabsysprefs{OpacBrowser}          = "OPAC";
+$tabsysprefs{OpacRecentAcquisitions} = "OPAC";
 $tabsysprefs{kohaspsuggest}        = "OPAC";
 $tabsysprefs{OpacRenewalAllowed}   = "OPAC";
 $tabsysprefs{OPACItemHolds}        = "OPAC";
@@ -673,18 +678,11 @@ if ( $op eq 'add_form' ) {
     my $tab = $input->param('tab');
     $template->param( $tab => 1 );
     my ( $count, $results ) = StringSearch( $searchfield, $tab );
-    my $toggle    = 0;
     my @loop_data = ();
     for ( my $i = $offset ; $i < ( $offset + $pagesize < $count ? $offset + $pagesize : $count ) ; $i++ ) {
-        if ( $toggle == 0 ) {
-            $toggle = 1;
-        } else {
-            $toggle = 0;
-        }
         my $row_data = $results->[$i];
         $row_data->{'lang'} = $template->param('lang');
         $row_data           = GetPrefParams($row_data);                                                         # get a fresh hash for the row data
-        $row_data->{toggle} = $toggle;
         $row_data->{edit}   = "$script_name?op=add_form&amp;searchfield=" . $results->[$i]{'variable'};
         $row_data->{delete} = "$script_name?op=delete_confirm&amp;searchfield=" . $results->[$i]{'variable'};
         push( @loop_data, $row_data );