X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=C4%2FContext.pm;h=1aec1232f3bbdd897c10e84d534c89491f8c1896;hb=d00d07cae751986a220d114ff165cbf5206a0283;hp=07e81854bd4b9b999633c393ce1d386c08deae8c;hpb=4cdf3e38afd608bcd0f8a1c7b6918d40ad84859f;p=koha-ffzg.git
diff --git a/C4/Context.pm b/C4/Context.pm
index 07e81854bd..1aec1232f3 100644
--- a/C4/Context.pm
+++ b/C4/Context.pm
@@ -21,89 +21,34 @@ use Modern::Perl;
use vars qw($AUTOLOAD $context @context_stack);
BEGIN {
- if ($ENV{'HTTP_USER_AGENT'}) {
- require CGI::Carp;
- # FIXME for future reference, CGI::Carp doc says
- # "Note that fatalsToBrowser does not work with mod_perl version 2.0 and higher."
- import CGI::Carp qw(fatalsToBrowser);
- sub handle_errors {
- my $msg = shift;
- my $debug_level;
- eval {C4::Context->dbh();};
- if ($@){
- $debug_level = 1;
- }
- else {
- $debug_level = C4::Context->preference("DebugLevel");
- }
-
- print q(
-
- Koha Error
-
- );
- if ($debug_level eq "2"){
- # debug 2 , print extra info too.
- my %versions = get_versions();
-
- # a little example table with various version info";
- print "
- Koha error
- The following fatal error has occurred:
- $msg
-
- | Apache | $versions{apacheVersion} |
|---|
- | Koha | $versions{kohaVersion} |
|---|
- | Koha DB | $versions{kohaDbVersion} |
|---|
- | MySQL | $versions{mysqlVersion} |
|---|
- | OS | $versions{osVersion} |
|---|
- | Perl | $versions{perlVersion} |
|---|
-
";
-
- } elsif ($debug_level eq "1"){
- print "
- Koha error
- The following fatal error has occurred:
- $msg
";
- } else {
- print "production mode - trapped fatal error
";
- }
- print "";
- }
- #CGI::Carp::set_message(\&handle_errors);
- ## give a stack backtrace if KOHA_BACKTRACES is set
- ## can't rely on DebugLevel for this, as we're not yet connected
- if ($ENV{KOHA_BACKTRACES}) {
- $main::SIG{__DIE__} = \&CGI::Carp::confess;
- }
+ if ( $ENV{'HTTP_USER_AGENT'} ) { # Only hit when plack is not enabled
# Redefine multi_param if cgi version is < 4.08
# Remove the "CGI::param called in list context" warning in this case
- require CGI; # Can't check version without the require.
- if (!defined($CGI::VERSION) || $CGI::VERSION < 4.08) {
+ require CGI; # Can't check version without the require.
+ if ( !defined($CGI::VERSION) || $CGI::VERSION < 4.08 ) {
no warnings 'redefine';
*CGI::multi_param = \&CGI::param;
use warnings 'redefine';
$CGI::LIST_CONTEXT_WARN = 0;
}
- } # else there is no browser to send fatals to!
-}
+ }
+};
+use Carp qw( carp );
+use DateTime::TimeZone;
use Encode;
+use File::Spec;
+use POSIX;
+use YAML::XS;
use ZOOM;
-use Koha::Caches;
-use POSIX ();
-use DateTime::TimeZone;
-use Module::Load::Conditional qw(can_load);
-use Carp;
+use List::MoreUtils qw(any);
-use C4::Boolean;
-use C4::Debug;
-use Koha;
-use Koha::Config;
+use Koha::Caches;
use Koha::Config::SysPref;
use Koha::Config::SysPrefs;
+use Koha::Config;
+use Koha;
=head1 NAME
@@ -173,22 +118,6 @@ environment variable to the pathname of a configuration file to use.
$context = undef; # Initially, no context is set
@context_stack = (); # Initially, no saved contexts
-=head2 db_scheme2dbi
-
- my $dbd_driver_name = C4::Context::db_schema2dbi($scheme);
-
-This routines translates a database type to part of the name
-of the appropriate DBD driver to use when establishing a new
-database connection. It recognizes 'mysql' and 'Pg'; if any
-other scheme is supplied it defaults to 'mysql'.
-
-=cut
-
-sub db_scheme2dbi {
- my $scheme = shift // '';
- return $scheme eq 'Pg' ? $scheme : 'mysql';
-}
-
sub import {
# Create the default context ($C4::Context::Context)
# the first time the module is called
@@ -209,8 +138,8 @@ sub import {
=head2 new
- $context = new C4::Context;
- $context = new C4::Context("/path/to/koha-conf.xml");
+ $context = C4::Context->new;
+ $context = C4::Context->new("/path/to/koha-conf.xml");
Allocates a new context. Initializes the context from the specified
file, which defaults to either the file given by the C<$KOHA_CONF>
@@ -231,7 +160,6 @@ that, use C<&set_context>.
sub new {
my $class = shift;
my $conf_fname = shift; # Config file to load
- my $self = {};
# check that the specified config file exists and is not empty
undef $conf_fname unless
@@ -245,20 +173,9 @@ sub new {
}
}
- my $conf_cache = Koha::Caches->get_instance('config');
- my $config_from_cache;
- if ( $conf_cache->cache ) {
- $self = $conf_cache->get_from_cache('koha_conf');
- }
- unless ( $self and %$self ) {
- $self = Koha::Config->read_from_file($conf_fname);
- if ( $conf_cache->memcached_cache ) {
- # FIXME it may be better to use the memcached servers from the config file
- # to cache it
- $conf_cache->set_in_cache('koha_conf', $self)
- }
- }
- unless ( exists $self->{config} or defined $self->{config} ) {
+ my $self = {};
+ $self->{config} = Koha::Config->get_instance($conf_fname);
+ unless ( defined $self->{config} ) {
warn "The config file ($conf_fname) has not been parsed correctly";
return;
}
@@ -270,7 +187,6 @@ sub new {
$self->{tz} = undef; # local timezone object
bless $self, $class;
- $self->{db_driver} = db_scheme2dbi($self->config('db_scheme')); # cache database driver
return $self;
}
@@ -352,28 +268,17 @@ sub restore_context
$value = C4::Context->config("config_variable");
- $value = C4::Context->config_variable;
-
Returns the value of a variable specified in the configuration file
from which the current context was created.
-The second form is more compact, but of course may conflict with
-method names. If there is a configuration variable called "new", then
-Cnew> will not return it.
-
=cut
sub _common_config {
- my $var = shift;
- my $term = shift;
- return if !defined($context->{$term});
- # Presumably $self->{$term} might be
- # undefined if the config file given to &new
- # didn't exist, and the caller didn't bother
- # to check the return value.
-
- # Return the value of the requested config variable
- return $context->{$term}->{$var};
+ my ($var, $term) = @_;
+
+ return unless defined $context and defined $context->{config};
+
+ return $context->{config}->get($var, $term);
}
sub config {
@@ -382,9 +287,6 @@ sub config {
sub zebraconfig {
return _common_config($_[1],'server');
}
-sub ModZebrations {
- return _common_config($_[1],'serverinfo');
-}
=head2 preference
@@ -402,19 +304,18 @@ with this method.
=cut
-my $syspref_cache = Koha::Caches->get_instance('syspref');
my $use_syspref_cache = 1;
sub preference {
my $self = shift;
my $var = shift; # The system preference to return
- return $ENV{"OVERRIDE_SYSPREF_$var"}
+ return Encode::decode_utf8($ENV{"OVERRIDE_SYSPREF_$var"})
if defined $ENV{"OVERRIDE_SYSPREF_$var"};
$var = lc $var;
if ($use_syspref_cache) {
- $syspref_cache = Koha::Caches->get_instance('syspref') unless $syspref_cache;
+ my $syspref_cache = Koha::Caches->get_instance('syspref');
my $cached_var = $syspref_cache->get_from_cache("syspref_$var");
return $cached_var if defined $cached_var;
}
@@ -424,16 +325,30 @@ sub preference {
my $value = $syspref ? $syspref->value() : undef;
if ( $use_syspref_cache ) {
+ my $syspref_cache = Koha::Caches->get_instance('syspref');
$syspref_cache->set_in_cache("syspref_$var", $value);
}
return $value;
}
-sub boolean_preference {
- my $self = shift;
- my $var = shift; # The system preference to return
- my $it = preference($self, $var);
- return defined($it)? C4::Boolean::true_p($it): undef;
+=head2 yaml_preference
+
+Retrieves the required system preference value, and converts it
+from YAML into a Perl data structure. It throws an exception if
+the value cannot be properly decoded as YAML.
+
+=cut
+
+sub yaml_preference {
+ my ( $self, $preference ) = @_;
+
+ my $yaml = eval { YAML::XS::Load( Encode::encode_utf8( $self->preference( $preference ) ) ); };
+ if ($@) {
+ warn "Unable to parse $preference syspref : $@";
+ return;
+ }
+
+ return $yaml;
}
=head2 enable_syspref_cache
@@ -479,6 +394,7 @@ will not be seen by this process.
sub clear_syspref_cache {
return unless $use_syspref_cache;
+ my $syspref_cache = Koha::Caches->get_instance('syspref');
$syspref_cache->flush_all;
}
@@ -532,6 +448,7 @@ sub set_preference {
}
if ( $use_syspref_cache ) {
+ my $syspref_cache = Koha::Caches->get_instance('syspref');
$syspref_cache->set_in_cache( "syspref_$variable", $value );
}
@@ -553,6 +470,7 @@ sub delete_preference {
if ( Koha::Config::SysPrefs->find( $var )->delete ) {
if ( $use_syspref_cache ) {
+ my $syspref_cache = Koha::Caches->get_instance('syspref');
$syspref_cache->clear_from_cache("syspref_$var");
}
@@ -561,6 +479,26 @@ sub delete_preference {
return 0;
}
+=head2 csv_delimiter
+
+ $delimiter = C4::Context->csv_delimiter;
+
+ Returns preferred CSV delimiter, using system preference 'CSVDelimiter'.
+ If this preference is missing or empty, comma will be returned.
+ This method is needed because of special behavior for tabulation.
+
+ You can, optionally, pass a value parameter to this routine
+ in the case of existing delimiter.
+
+=cut
+
+sub csv_delimiter {
+ my ( $self, $value ) = @_;
+ my $delimiter = $value || $self->preference('CSVDelimiter') || ',';
+ $delimiter = "\t" if $delimiter eq 'tabulation';
+ return $delimiter;
+}
+
=head2 Zconn
$Zconn = C4::Context->Zconn
@@ -607,42 +545,30 @@ sub _new_Zconn {
my $tried=0; # first attempt
my $Zconn; # connection object
my $elementSetName;
- my $index_mode;
my $syntax;
$server //= "biblioserver";
- if ( $server eq 'biblioserver' ) {
- $index_mode = $context->{'config'}->{'zebra_bib_index_mode'} // 'dom';
- } elsif ( $server eq 'authorityserver' ) {
- $index_mode = $context->{'config'}->{'zebra_auth_index_mode'} // 'dom';
- }
-
- if ( $index_mode eq 'grs1' ) {
- $elementSetName = 'F';
- $syntax = ( $context->preference("marcflavour") eq 'UNIMARC' )
- ? 'unimarc'
- : 'usmarc';
+ $syntax = 'xml';
+ $elementSetName = 'marcxml';
- } else { # $index_mode eq 'dom'
- $syntax = 'xml';
- $elementSetName = 'marcxml';
- }
-
- my $host = $context->{'listen'}->{$server}->{'content'};
- my $user = $context->{"serverinfo"}->{$server}->{"user"};
- my $password = $context->{"serverinfo"}->{$server}->{"password"};
+ my $host = _common_config($server, 'listen')->{content};
+ my $serverinfo = _common_config($server, 'serverinfo');
+ my $user = $serverinfo->{user};
+ my $password = $serverinfo->{password};
eval {
# set options
- my $o = new ZOOM::Options();
+ my $o = ZOOM::Options->new();
$o->option(user => $user) if $user && $password;
$o->option(password => $password) if $user && $password;
$o->option(async => 1) if $async;
- $o->option(cqlfile=> $context->{"server"}->{$server}->{"cql2rpn"});
- $o->option(cclfile=> $context->{"serverinfo"}->{$server}->{"ccl2rpn"});
+ $o->option(cqlfile=> _common_config($server, 'server')->{cql2rpn});
+ $o->option(cclfile=> $serverinfo->{ccl2rpn});
$o->option(preferredRecordSyntax => $syntax);
$o->option(elementSetName => $elementSetName) if $elementSetName;
- $o->option(databaseName => $context->{"config"}->{$server}||"biblios");
+ $o->option(databaseName => _common_config($server, 'config') || 'biblios');
+ my $timeout = C4::Context->config('zebra_connection_timeout') || 30;
+ $o->option(timeout => $timeout);
# create a new connection object
$Zconn= create ZOOM::Connection($o);
@@ -688,7 +614,6 @@ sub dbh
{
my $self = shift;
my $params = shift;
- my $sth;
unless ( $params->{new} ) {
return Koha::Database->schema->storage->dbh;
@@ -776,53 +701,6 @@ sub restore_dbh
# return something, then this function should, too.
}
-=head2 queryparser
-
- $queryparser = C4::Context->queryparser
-
-Returns a handle to an initialized Koha::QueryParser::Driver::PQF object.
-
-=cut
-
-sub queryparser {
- my $self = shift;
- unless (defined $context->{"queryparser"}) {
- $context->{"queryparser"} = &_new_queryparser();
- }
-
- return
- defined( $context->{"queryparser"} )
- ? $context->{"queryparser"}->new
- : undef;
-}
-
-=head2 _new_queryparser
-
-Internal helper function to create a new QueryParser object. QueryParser
-is loaded dynamically so as to keep the lack of the QueryParser library from
-getting in anyone's way.
-
-=cut
-
-sub _new_queryparser {
- my $qpmodules = {
- 'OpenILS::QueryParser' => undef,
- 'Koha::QueryParser::Driver::PQF' => undef
- };
- if ( can_load( 'modules' => $qpmodules ) ) {
- my $QParser = Koha::QueryParser::Driver::PQF->new();
- my $config_file = $context->config('queryparser_config');
- $config_file ||= '/etc/koha/searchengine/queryparser.yaml';
- if ( $QParser->load_config($config_file) ) {
- # Set 'keyword' as the default search class
- $QParser->default_search_class('keyword');
- # TODO: allow indexes to be configured in the database
- return $QParser;
- }
- }
- return;
-}
-
=head2 userenv
C4::Context->userenv;
@@ -849,7 +727,9 @@ sub userenv {
C4::Context->set_userenv($usernum, $userid, $usercnum,
$userfirstname, $usersurname,
$userbranch, $branchname, $userflags,
- $emailaddress, $branchprinter, $shibboleth);
+ $emailaddress, $shibboleth
+ $desk_id, $desk_name,
+ $register_id, $register_name);
Establish a hash of user environment variables.
@@ -860,9 +740,13 @@ set_userenv is called in Auth.pm
#'
sub set_userenv {
shift @_;
- my ($usernum, $userid, $usercnum, $userfirstname, $usersurname, $userbranch, $branchname, $userflags, $emailaddress, $branchprinter, $shibboleth)=
- map { Encode::is_utf8( $_ ) ? $_ : Encode::decode('UTF-8', $_) } # CGI::Session doesn't handle utf-8, so we decode it here
- @_;
+ my (
+ $usernum, $userid, $usercnum, $userfirstname,
+ $usersurname, $userbranch, $branchname, $userflags,
+ $emailaddress, $shibboleth, $desk_id, $desk_name,
+ $register_id, $register_name
+ ) = @_;
+
my $var=$context->{"activeuser"} || '';
my $cell = {
"number" => $usernum,
@@ -870,38 +754,22 @@ sub set_userenv {
"cardnumber" => $usercnum,
"firstname" => $userfirstname,
"surname" => $usersurname,
+
#possibly a law problem
- "branch" => $userbranch,
- "branchname" => $branchname,
- "flags" => $userflags,
- "emailaddress" => $emailaddress,
- "branchprinter" => $branchprinter,
- "shibboleth" => $shibboleth,
+ "branch" => $userbranch,
+ "branchname" => $branchname,
+ "flags" => $userflags,
+ "emailaddress" => $emailaddress,
+ "shibboleth" => $shibboleth,
+ "desk_id" => $desk_id,
+ "desk_name" => $desk_name,
+ "register_id" => $register_id,
+ "register_name" => $register_name
};
$context->{userenv}->{$var} = $cell;
return $cell;
}
-sub set_shelves_userenv {
- my ($type, $shelves) = @_ or return;
- my $activeuser = $context->{activeuser} or return;
- $context->{userenv}->{$activeuser}->{barshelves} = $shelves if $type eq 'bar';
- $context->{userenv}->{$activeuser}->{pubshelves} = $shelves if $type eq 'pub';
- $context->{userenv}->{$activeuser}->{totshelves} = $shelves if $type eq 'tot';
-}
-
-sub get_shelves_userenv {
- my $active;
- unless ($active = $context->{userenv}->{$context->{activeuser}}) {
- $debug and warn "get_shelves_userenv cannot retrieve context->{userenv}->{context->{activeuser}}";
- return;
- }
- my $totshelves = $active->{totshelves} or undef;
- my $pubshelves = $active->{pubshelves} or undef;
- my $barshelves = $active->{barshelves} or undef;
- return ($totshelves, $pubshelves, $barshelves);
-}
-
=head2 _new_userenv
C4::Context->_new_userenv($session); # FIXME: This calling style is wrong for what looks like an _internal function
@@ -936,7 +804,7 @@ Destroys the hash for activeuser user environment variables.
sub _unset_userenv
{
my ($sessionID)= @_;
- undef $context->{"activeuser"} if ($context->{"activeuser"} eq $sessionID);
+ undef $context->{activeuser} if $sessionID && $context->{activeuser} && $context->{activeuser} eq $sessionID;
}
@@ -969,22 +837,6 @@ sub get_versions {
return %versions;
}
-=head2 timezone
-
- my $C4::Context->timzone
-
- Returns a timezone code for the instance of Koha
-
-=cut
-
-sub timezone {
- my $self = shift;
-
- my $timezone = C4::Context->config('timezone') || $ENV{TZ} || 'local';
-
- return $timezone;
-}
-
=head2 tz
C4::Context->tz
@@ -996,7 +848,7 @@ sub timezone {
sub tz {
my $self = shift;
if (!defined $context->{tz}) {
- my $timezone = $self->timezone;
+ my $timezone = $context->{config}->timezone;
$context->{tz} = DateTime::TimeZone->new(name => $timezone);
}
return $context->{tz};
@@ -1038,7 +890,13 @@ sub interface {
if (defined $interface) {
$interface = lc $interface;
- if ($interface eq 'opac' || $interface eq 'intranet' || $interface eq 'sip' || $interface eq 'commandline') {
+ if ( $interface eq 'api'
+ || $interface eq 'opac'
+ || $interface eq 'intranet'
+ || $interface eq 'sip'
+ || $interface eq 'cron'
+ || $interface eq 'commandline' )
+ {
$context->{interface} = $interface;
} else {
warn "invalid interface : '$interface'";
@@ -1071,8 +929,109 @@ sub only_my_library {
&& C4::Context->userenv->{branch};
}
+=head3 temporary_directory
+
+Returns root directory for temporary storage
+
+=cut
+
+sub temporary_directory {
+ my ( $class ) = @_;
+ return C4::Context->config('tmp_path') || File::Spec->tmpdir;
+}
+
+=head3 set_remote_address
+
+set_remote_address should be called at the beginning of every script
+that is *not* running under plack in order to the REMOTE_ADDR environment
+variable to be set correctly.
+
+=cut
+
+sub set_remote_address {
+ if ( C4::Context->config('koha_trusted_proxies') ) {
+ require CGI;
+ my $header = CGI->http('HTTP_X_FORWARDED_FOR');
+
+ if ($header) {
+ require Koha::Middleware::RealIP;
+ $ENV{REMOTE_ADDR} = Koha::Middleware::RealIP::get_real_ip( $ENV{REMOTE_ADDR}, $header );
+ }
+ }
+}
+
+=head3 https_enabled
+
+https_enabled should be called when checking if a HTTPS connection
+is used.
+
+Note that this depends on a HTTPS environmental variable being defined
+by the web server. This function may not return the expected result,
+if your web server or reverse proxies are not setting the correct
+X-Forwarded-Proto headers and HTTPS environmental variable.
+
+Note too that the HTTPS value can vary from web server to web server.
+We are relying on the convention of the value being "on" or "ON" here.
+
+=cut
+
+sub https_enabled {
+ my $https_enabled = 0;
+ my $env_https = $ENV{HTTPS};
+ if ($env_https){
+ if ($env_https =~ /^ON$/i){
+ $https_enabled = 1;
+ }
+ }
+ return $https_enabled;
+}
+
1;
+=head3 needs_install
+
+ if ( $context->needs_install ) { ... }
+
+This method returns a boolean representing the install status of the Koha instance.
+
+=cut
+
+sub needs_install {
+ my ($self) = @_;
+ return ($self->preference('Version')) ? 0 : 1;
+}
+
+=head3 psgi_env
+
+psgi_env returns true if there is an environmental variable
+prefixed with "psgi" or "plack". This is useful for detecting whether
+this is a PSGI app or a CGI app, and implementing code as appropriate.
+
+=cut
+
+sub psgi_env {
+ my ( $self ) = @_;
+ return any { /^(psgi\.|plack\.|PLACK_ENV$)/i } keys %ENV;
+}
+
+=head3 is_internal_PSGI_request
+
+is_internal_PSGI_request is used to detect if this request was made
+from within the individual PSGI app or externally from the mounted PSGI
+app
+
+=cut
+
+#NOTE: This is not a very robust method but it's the best we have so far
+sub is_internal_PSGI_request {
+ my ( $self ) = @_;
+ my $is_internal = 0;
+ if( $self->psgi_env && ( $ENV{REQUEST_URI} !~ /^(\/intranet|\/opac)/ ) ) {
+ $is_internal = 1;
+ }
+ return $is_internal;
+}
+
__END__
=head1 ENVIRONMENT
@@ -1081,10 +1040,6 @@ __END__
Specifies the configuration file to read.
-=head1 SEE ALSO
-
-XML::Simple
-
=head1 AUTHORS
Andrew Arensburger