X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=admin%2Fsystempreferences.pl;h=b33c7ece4c051202cf12acd8abc4249f1c7d5f69;hb=3b5aa120d71ebc7c3db7fb2177d360df03d5ed35;hp=250374ebf57ef60b2ae22ceb8fc1f1ae90e86fec;hpb=04586395664ee7889f946a02134e2c9dd416f0d4;p=koha_gimpoz diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl index 250374ebf5..b33c7ece4c 100755 --- a/admin/systempreferences.pl +++ b/admin/systempreferences.pl @@ -17,13 +17,13 @@ # 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, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. =head1 systempreferences.pl -ALGO : +ALSO : this script use an $op to know what to do. if $op is empty or none of the above values, - the default screen is build (with all records, or filtered datas). @@ -44,6 +44,7 @@ use strict; use warnings; use CGI; +use MIME::Base64; use C4::Auth; use C4::Context; use C4::Koha; @@ -51,6 +52,8 @@ use C4::Languages qw(getTranslatedLanguages); use C4::ClassSource; use C4::Log; use C4::Output; +use YAML::Syck qw( Dump LoadFile ); + # use Smart::Comments; @@ -67,9 +70,12 @@ use C4::Output; my %tabsysprefs; # Acquisitions -$tabsysprefs{acquisitions} = "Acquisitions"; -$tabsysprefs{gist} = "Acquisitions"; -$tabsysprefs{emailPurchaseSuggestions} = "Acquisitions"; + $tabsysprefs{gist}="Acquisitions"; + $tabsysprefs{emailPurchaseSuggestions}="Acquisitions"; + $tabsysprefs{RenewSerialAddsSuggestion}="Acquisitions"; + $tabsysprefs{AcqCreateItem}="Acquisitions"; + $tabsysprefs{OrderPdfFormat}="Acquisitions"; + $tabsysprefs{CurrencyFormat}="Acquisitions"; # Admin $tabsysprefs{singleBranchMode} = "Admin"; @@ -77,21 +83,46 @@ $tabsysprefs{staffClientBaseURL} = "Admin"; $tabsysprefs{Version} = "Admin"; $tabsysprefs{OpacMaintenance} = "Admin"; $tabsysprefs{FrameworksLoaded} = "Admin"; -$tabsysprefs{libraryAddress} = "Admin"; $tabsysprefs{delimiter} = "Admin"; $tabsysprefs{IndependantBranches} = "Admin"; $tabsysprefs{insecure} = "Admin"; $tabsysprefs{KohaAdmin} = "Admin"; $tabsysprefs{KohaAdminEmailAddress} = "Admin"; -$tabsysprefs{MIME} = "Admin"; $tabsysprefs{timeout} = "Admin"; $tabsysprefs{Intranet_includes} = "Admin"; $tabsysprefs{AutoLocation} = "Admin"; $tabsysprefs{DebugLevel} = "Admin"; $tabsysprefs{SessionStorage} = "Admin"; + +# This script is depricated so all of these prefs are lumped here to avoid their being displayed in the local use prefs tab + $tabsysprefs{noItemTypeImages} = "Admin"; $tabsysprefs{OPACBaseURL} = "Admin"; -$tabsysprefs{GranularPermissions} = "Admin"; +$tabsysprefs{AnonymousPatron} = "Admin"; +$tabsysprefs{casAuthentication} = "Admin"; +$tabsysprefs{casLogout} = "Admin"; +$tabsysprefs{casServerUrl} = "Admin"; +$tabsysprefs{Disable_Dictionary} = "Admin"; +$tabsysprefs{EnableOpacSearchHistory} = "Admin"; +$tabsysprefs{Intranetbookbag} = "Admin"; +$tabsysprefs{maxitemsinSearchResults} = "Admin"; +$tabsysprefs{noOPACUserLogin} = "Admin"; +$tabsysprefs{'OAI-PMH:ConfFile'} = "Admin"; +$tabsysprefs{OpacAddMastheadLibraryPulldown} = "Admin"; +$tabsysprefs{opaclargeimage} = "Admin"; +$tabsysprefs{OPACXSLTDetailsDisplay} = "Admin"; +$tabsysprefs{OPACXSLTResultsDisplay} = "Admin"; +$tabsysprefs{PDFFontType} = "Admin"; +$tabsysprefs{PrintNoticesMaxLines} = "Admin"; +$tabsysprefs{ReservesControlBranch} = "Admin"; +$tabsysprefs{ResultsDisplay} = "Admin"; +$tabsysprefs{NoReturnSetLost} = "Admin"; +$tabsysprefs{SearchURL} = "Admin"; +$tabsysprefs{ShowPictures} = "Admin"; +$tabsysprefs{soundon} = "Admin"; +$tabsysprefs{SpineLabelShowPrintOnBibDetails} = "Admin"; +$tabsysprefs{WebBasedSelfCheckHeader} = "Admin"; +$tabsysprefs{WebBasedSelfCheckTimeout} = "Admin"; # Authorities $tabsysprefs{authoritysep} = "Authorities"; @@ -107,7 +138,6 @@ $tabsysprefs{IntranetBiblioDefaultView} = "Cataloging"; $tabsysprefs{ISBD} = "Cataloging"; $tabsysprefs{itemcallnumber} = "Cataloging"; $tabsysprefs{LabelMARCView} = "Cataloging"; -$tabsysprefs{marc} = "Cataloging"; $tabsysprefs{marcflavour} = "Cataloging"; $tabsysprefs{MARCOrgCode} = "Cataloging"; $tabsysprefs{z3950AuthorAuthFields} = "Cataloging"; @@ -146,14 +176,15 @@ $tabsysprefs{finesMode} = "Circulation"; $tabsysprefs{numReturnedItemsToShow} = "Circulation"; $tabsysprefs{emailLibrarianWhenHoldIsPlaced} = "Circulation"; $tabsysprefs{globalDueDate} = "Circulation"; -$tabsysprefs{holdCancelLength} = "Circulation"; $tabsysprefs{itemBarcodeInputFilter} = "Circulation"; $tabsysprefs{WebBasedSelfCheck} = "Circulation"; +$tabsysprefs{ShowPatronImageInWebBasedSelfCheck} = "Circulation"; $tabsysprefs{CircControl} = "Circulation"; $tabsysprefs{finesCalendar} = "Circulation"; $tabsysprefs{previousIssuesDefaultSortOrder} = "Circulation"; $tabsysprefs{todaysIssuesDefaultSortOrder} = "Circulation"; $tabsysprefs{HomeOrHoldingBranch} = "Circulation"; +$tabsysprefs{HomeOrHoldingBranchReturn} = "Circulation"; $tabsysprefs{RandomizeHoldsQueueWeight} = "Circulation"; $tabsysprefs{StaticHoldsQueueWeight} = "Circulation"; $tabsysprefs{AllowOnShelfHolds} = "Circulation"; @@ -165,9 +196,17 @@ $tabsysprefs{AllowNotForLoanOverride} = "Circulation"; $tabsysprefs{RenewalPeriodBase} = "Circulation"; $tabsysprefs{FilterBeforeOverdueReport} = "Circulation"; $tabsysprefs{AllowHoldDateInFuture} = "Circulation"; +$tabsysprefs{OPACFineNoRenewals} = "Circulation"; +$tabsysprefs{InProcessingToShelvingCart} = "Circulation"; +$tabsysprefs{NewItemsDefaultLocation} = "Circulation"; +$tabsysprefs{ReturnToShelvingCart} = "Circulation"; +$tabsysprefs{DisplayClearScreenButton} = "Circulation"; +$tabsysprefs{AllowAllMessageDeletion} = "Circulation"; +$tabsysprefs{OverdueNoticeBcc} = "Circulation"; +$tabsysprefs{OverduesBlockCirc} = "Circulation"; + # Staff Client -$tabsysprefs{TemplateEncoding} = "StaffClient"; $tabsysprefs{template} = "StaffClient"; $tabsysprefs{intranetstylesheet} = "StaffClient"; $tabsysprefs{IntranetNav} = "StaffClient"; @@ -185,7 +224,6 @@ $tabsysprefs{checkdigit} = "Patrons"; $tabsysprefs{intranetreadinghistory} = "Patrons"; $tabsysprefs{NotifyBorrowerDeparture} = "Patrons"; $tabsysprefs{memberofinstitution} = "Patrons"; -$tabsysprefs{ReadingHistory} = "Patrons"; $tabsysprefs{BorrowerMandatoryField} = "Patrons"; $tabsysprefs{borrowerRelationship} = "Patrons"; $tabsysprefs{BorrowersTitles} = "Patrons"; @@ -201,6 +239,8 @@ $tabsysprefs{AutoEmailOpacUser} = "Patrons"; $tabsysprefs{AutoEmailPrimaryAddress} = "Patrons"; $tabsysprefs{EnhancedMessagingPreferences} = "Patrons"; $tabsysprefs{'SMSSendDriver'} = 'Patrons'; +$tabsysprefs{HidePatronName} = "Patrons"; + # I18N/L10N $tabsysprefs{dateformat} = "I18N/L10N"; @@ -220,10 +260,10 @@ $tabsysprefs{QueryFuzzy} = "Searching"; $tabsysprefs{QueryStemming} = "Searching"; $tabsysprefs{QueryWeightFields} = "Searching"; $tabsysprefs{expandedSearchOption} = "Searching"; -$tabsysprefs{sortbynonfiling} = "Searching"; $tabsysprefs{QueryAutoTruncate} = "Searching"; $tabsysprefs{QueryRemoveStopwords} = "Searching"; $tabsysprefs{AdvancedSearchTypes} = "Searching"; +$tabsysprefs{DisplayMultiPlaceHold} = "Searching"; # EnhancedContent $tabsysprefs{AmazonEnabled} = "EnhancedContent"; @@ -231,6 +271,7 @@ $tabsysprefs{OPACAmazonEnabled} = "EnhancedContent"; $tabsysprefs{AmazonCoverImages} = "EnhancedContent"; $tabsysprefs{OPACAmazonCoverImages} = "EnhancedContent"; $tabsysprefs{AWSAccessKeyID} = "EnhancedContent"; +$tabsysprefs{AWSPrivateKey} = "EnhancedContent"; $tabsysprefs{AmazonLocale} = "EnhancedContent"; $tabsysprefs{AmazonAssocTag} = "EnhancedContent"; $tabsysprefs{AmazonSimilarItems} = "EnhancedContent"; @@ -248,8 +289,8 @@ $tabsysprefs{BakerTaylorPassword} = 'EnhancedContent'; $tabsysprefs{BakerTaylorUsername} = 'EnhancedContent'; # Library Thing for Libraries -$tabsysprefs{LibraryThingForLibrariesID} = "EnhancedContent"; -$tabsysprefs{LibraryThingForLibrariesEnabled} = "EnhancedContent"; +$tabsysprefs{LibraryThingForLibrariesID} = "EnhancedContent"; +$tabsysprefs{LibraryThingForLibrariesEnabled} = "EnhancedContent"; $tabsysprefs{LibraryThingForLibrariesTabbedView} = "EnhancedContent"; # Syndetics @@ -272,7 +313,6 @@ $tabsysprefs{FRBRizeEditions} = "EnhancedContent"; $tabsysprefs{XISBN} = "EnhancedContent"; $tabsysprefs{OCLCAffiliateID} = "EnhancedContent"; $tabsysprefs{XISBNDailyLimit} = "EnhancedContent"; -$tabsysprefs{PINESISBN} = "EnhancedContent"; $tabsysprefs{ThingISBN} = "EnhancedContent"; $tabsysprefs{OPACFRBRizeEditions} = "EnhancedContent"; @@ -306,9 +346,16 @@ $tabsysprefs{OPACUserCSS} = "OPAC"; $tabsysprefs{OPACHighlightedWords} = "OPAC"; $tabsysprefs{OPACViewOthersSuggestions} = "OPAC"; $tabsysprefs{URLLinkText} = "OPAC"; +$tabsysprefs{OPACSearchForTitleIn} = "OPAC"; $tabsysprefs{OPACShelfBrowser} = "OPAC"; $tabsysprefs{OPACDisplayRequestPriority} = "OPAC"; $tabsysprefs{OPACAllowHoldDateInFuture} = "OPAC"; +$tabsysprefs{OPACPatronDetails} = "OPAC"; +$tabsysprefs{OPACFinesTab} = "OPAC"; +$tabsysprefs{DisplayOPACiconsXSLT} = "OPAC"; +$tabsysprefs{AutoSelfCheckAllowed} = "OPAC"; +$tabsysprefs{AutoSelfCheckID} = "OPAC"; +$tabsysprefs{AutoSelfCheckPass} = "OPAC"; # OPAC $tabsysprefs{SearchMyLibraryFirst} = "OPAC"; @@ -327,7 +374,6 @@ $tabsysprefs{AnonSuggestions} = "OPAC"; $tabsysprefs{suggestion} = "OPAC"; $tabsysprefs{OpacTopissue} = "OPAC"; $tabsysprefs{OpacBrowser} = "OPAC"; -$tabsysprefs{kohaspsuggest} = "OPAC"; $tabsysprefs{OpacRenewalAllowed} = "OPAC"; $tabsysprefs{OPACItemHolds} = "OPAC"; $tabsysprefs{OPACGroupResults} = "OPAC"; @@ -336,10 +382,9 @@ $tabsysprefs{XSLTResultsDisplay} = "OPAC"; $tabsysprefs{OPACShowCheckoutName} = "OPAC"; # Serials +$tabsysprefs{RoutingListAddReserves} = "Serials"; $tabsysprefs{OPACSerialIssueDisplayCount} = "Serials"; $tabsysprefs{StaffSerialIssueDisplayCount} = "Serials"; -$tabsysprefs{OPACDisplayExtendedSubInfo} = "Serials"; -$tabsysprefs{OPACSubscriptionDisplay} = "Serials"; $tabsysprefs{RenewSerialAddsSuggestion} = "Serials"; $tabsysprefs{SubscriptionHistory} = "Serials"; @@ -356,8 +401,14 @@ $tabsysprefs{FinesLog} = "Logs"; $tabsysprefs{'OAI-PMH'} = "OAI-PMH"; $tabsysprefs{'OAI-PMH:archiveID'} = "OAI-PMH"; $tabsysprefs{'OAI-PMH:MaxCount'} = "OAI-PMH"; -$tabsysprefs{'OAI-PMH:Set'} = "OAI-PMH"; -$tabsysprefs{'OAI-PMH:Subset'} = "OAI-PMH"; + +# ILS-DI variables +$tabsysprefs{'ILS-DI'} = "ILS-DI"; +$tabsysprefs{'ILS-DI:AuthorizedIPs'} = "Admin"; + +# Creator variables + +$tabsysprefs{'ImageLimit'} = "Creators"; sub StringSearch { my ( $searchstring, $type ) = @_; @@ -390,17 +441,19 @@ sub StringSearch { if ( $type and $type eq 'all' ) { $sth = $dbh->prepare( " SELECT * - FROM systempreferences - WHERE variable LIKE ? OR explanation LIKE ? + FROM systempreferences + WHERE variable LIKE ? OR explanation LIKE ? ORDER BY VARIABLE" ); $sth->execute( "%$searchstring%", "%$searchstring%" ); } else { - my $strsth = "Select variable,value,explanation,type,options from systempreferences where variable not in ("; - foreach my $syspref ( keys %tabsysprefs ) { - $strsth .= $dbh->quote($syspref) . ","; + my $strsth = "Select variable,value,explanation,type,options from systempreferences where variable in ("; + my $first = 1; + for my $name ( get_local_prefs() ) { + $strsth .= ',' unless $first; + $strsth .= "'$name'"; + $first = 0; } - $strsth =~ s/,$/) /; - $strsth .= " order by variable"; + $strsth .= ") order by variable"; $sth = $dbh->prepare($strsth); $sth->execute(); } @@ -433,28 +486,30 @@ sub GetPrefParams { $params->{'prefoptions'} = $data->{'options'}; if ( not defined( $data->{'type'} ) ) { - $params->{'type-free'} = 1; + $params->{'type_free'} = 1; $params->{'fieldlength'} = ( defined( $data->{'options'} ) and $data->{'options'} and $data->{'options'} > 0 ); + } elsif ( $data->{'type'} eq 'Upload' ) { + $params->{'type_upload'} = 1; } elsif ( $data->{'type'} eq 'Choice' ) { - $params->{'type-choice'} = 1; + $params->{'type_choice'} = 1; } elsif ( $data->{'type'} eq 'YesNo' ) { - $params->{'type-yesno'} = 1; + $params->{'type_yesno'} = 1; $data->{'value'} = C4::Context->boolean_preference( $data->{'variable'} ); if ( defined( $data->{'value'} ) and $data->{'value'} eq '1' ) { - $params->{'value-yes'} = 1; + $params->{'value_yes'} = 1; } else { - $params->{'value-no'} = 1; + $params->{'value_no'} = 1; } } elsif ( $data->{'type'} eq 'Integer' || $data->{'type'} eq 'Float' ) { - $params->{'type-free'} = 1; + $params->{'type_free'} = 1; $params->{'fieldlength'} = ( defined( $data->{'options'} ) and $data->{'options'} and $data->{'options'} > 0 ) ? $data->{'options'} : 10; } elsif ( $data->{'type'} eq 'Textarea' ) { - $params->{'type-textarea'} = 1; + $params->{'type_textarea'} = 1; $data->{options} =~ /(.*)\|(.*)/; $params->{'cols'} = $1; $params->{'rows'} = $2; } elsif ( $data->{'type'} eq 'Themes' ) { - $params->{'type-choice'} = 1; + $params->{'type_choice'} = 1; my $type = ''; ( $data->{'variable'} =~ m#opac#i ) ? ( $type = 'opac' ) : ( $type = 'intranet' ); @options = (); @@ -472,7 +527,7 @@ sub GetPrefParams { $counter++; } } elsif ( $data->{'type'} eq 'ClassSources' ) { - $params->{'type-choice'} = 1; + $params->{'type_choice'} = 1; my $type = ''; @options = (); my $sources = GetClassSources(); @@ -509,13 +564,13 @@ sub GetPrefParams { my $languages_loop = getTranslatedLanguages( $interface, $theme, $lang, $currently_selected_languages ); $params->{'languages_loop'} = $languages_loop; - $params->{'type-langselector'} = 1; + $params->{'type_langselector'} = 1; } else { - $params->{'type-free'} = 1; + $params->{'type_free'} = 1; $params->{'fieldlength'} = ( defined( $data->{'options'} ) and $data->{'options'} and $data->{'options'} > 0 ) ? $data->{'options'} : 30; } - if ( $params->{'type-choice'} || $params->{'type-free'} || $params->{'type-yesno'} ) { + if ( $params->{'type_choice'} || $params->{'type_free'} || $params->{'type_yesno'} ) { $params->{'oneline'} = 1; } @@ -667,6 +722,13 @@ if ( $op eq 'add_form' ) { $value = $params->{'value'}; } } + + if ( $input->param('preftype') eq 'Upload' ) { + my $lgtfh = $input->upload('value'); + $value = join '', <$lgtfh>; + $value = encode_base64($value); + } + if ( $sth->rows ) { unless ( C4::Context->config('demo') ) { my $sth = $dbh->prepare("update systempreferences set value=?,explanation=?,type=?,options=? where variable=?"); @@ -725,7 +787,7 @@ if ( $op eq 'add_form' ) { $row_data->{delete} = "$script_name?op=delete_confirm&searchfield=" . $results->[$i]{'variable'}; push( @loop_data, $row_data ); } - $tab = ( $tab ? $tab : "Local Use" ); + $tab = ( $tab ? $tab : "local_use" ); $template->param( loop => \@loop_data, $tab => 1 ); if ( $offset > 0 ) { my $prevpage = $offset - $pagesize; @@ -738,3 +800,79 @@ if ( $op eq 'add_form' ) { $template->param( tab => $tab, ); } #---- END $OP eq DEFAULT output_html_with_http_headers $input, $cookie, $template->output; + + +# Return an array containing all preferences defined in current Koha instance +# .pref files. + +sub get_prefs_from_files { + my $context = C4::Context->new(); + my $path_pref_en = $context->config('intrahtdocs') . + '/prog/en/modules/admin/preferences'; + # Get all .pref file names + opendir ( my $fh, $path_pref_en ); + my @pref_files = grep { /.pref/ } readdir($fh); + close $fh; + + my @names = (); + my $append = sub { + my $prefs = shift; + for my $pref ( @$prefs ) { + for my $element ( @$pref ) { + if ( ref( $element) eq 'HASH' ) { + my $name = $element->{pref}; + next unless $name; + push @names, $name; + next; + } + } + } + }; + for my $file (@pref_files) { + my $pref = LoadFile( "$path_pref_en/$file" ); + for my $tab ( keys %$pref ) { + my $content = $pref->{$tab}; + if ( ref($content) eq 'ARRAY' ) { + $append->($content); + next; + } + for my $section ( keys %$content ) { + my $syspref = $content->{$section}; + $append->($syspref); + } + } + } + return @names; +} + + +# Return an array containg all preferences defined in DB + +sub get_prefs_from_db { + my $dbh = C4::Context->dbh; + my $sth = $dbh->prepare("SELECT variable FROM systempreferences"); + $sth->execute; + my @names = (); + while ( (my $name) = $sth->fetchrow_array ) { + push @names, $name if $name; + } + return @names; +} + + +# Return an array containing all local preferences: those which are defined in +# DB and not defined in Koha .pref files. + +sub get_local_prefs { + my @prefs_file = get_prefs_from_files(); + my @prefs_db = get_prefs_from_db(); + + my %prefs_file = map { $_ => 1 } @prefs_file; + my @names = (); + foreach my $name (@prefs_db) { + push @names, $name unless $prefs_file{$name}; + } + + return @names; +} +