# Copyright 2000-2002 Katipo Communications
+# Copyright 2011 MJ Ray and software.coop
#
# This file is part of Koha.
#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY 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.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# 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;
+use JSON qw( to_json );
+
use C4::Context;
-use C4::Dates qw(format_date);
+use Koha::DateUtils;
+use Koha::Logger;
-use vars qw($VERSION @ISA @EXPORT);
+use vars qw(@ISA @EXPORT);
BEGIN {
- # set the version for version checking
- $VERSION = 3.01;
- require Exporter;
- @ISA = qw(Exporter);
- @EXPORT = qw(&logaction &GetLogStatus &displaylog &GetLogs);
+ require Exporter;
+ @ISA = qw(Exporter);
+ @EXPORT = qw(&logaction &cronlogaction &GetLogStatus &displaylog &GetLogs);
}
=head1 NAME
#'
sub logaction {
- my ($modulename, $actionname, $objectnumber, $infos)=@_;
+ my ($modulename, $actionname, $objectnumber, $infos, $interface)=@_;
# Get ID of logged in user. if called from a batch job,
# no user session exists and C4::Context->userenv() returns
# the scalar '0'.
my $userenv = C4::Context->userenv();
my $usernumber = (ref($userenv) eq 'HASH') ? $userenv->{'number'} : 0;
+ $usernumber ||= 0;
+ $interface //= C4::Context->interface;
my $dbh = C4::Context->dbh;
- my $sth=$dbh->prepare("Insert into action_logs (timestamp,user,module,action,object,info) values (now(),?,?,?,?,?)");
- $sth->execute($usernumber,$modulename,$actionname,$objectnumber,$infos);
+ my $sth=$dbh->prepare("Insert into action_logs (timestamp,user,module,action,object,info,interface) values (now(),?,?,?,?,?,?)");
+ $sth->execute($usernumber,$modulename,$actionname,$objectnumber,$infos,$interface);
$sth->finish;
+
+ my $logger = Koha::Logger->get(
+ {
+ interface => 'intranet',
+ category => "ActionLogs.$modulename.$actionname"
+ }
+ );
+ $logger->debug(
+ sub {
+ "ACTION LOG: " . to_json(
+ {
+ user => $usernumber,
+ module => $modulename,
+ action => $actionname,
+ object => $objectnumber,
+ info => $infos
+ }
+ );
+ }
+ );
+}
+
+=item cronlogaction
+
+ &cronlogaction($infos);
+
+Convenience routine to add a record into action_logs table from a cron job.
+Logs the path and name of the calling script plus the information privided by param $infos.
+
+=cut
+
+#'
+sub cronlogaction {
+ my ($infos)=@_;
+ my $loginfo = (caller(0))[1];
+ $loginfo .= ' ' . $infos if $infos;
+ logaction( 'CRONJOBS', 'Run', undef, $loginfo ) if C4::Context->preference('CronjobLog');
}
+
=item GetLogStatus
$status = GetLogStatus;
my %hash;
$hash{BorrowersLog} = C4::Context->preference("BorrowersLog");
$hash{CataloguingLog} = C4::Context->preference("CataloguingLog");
+ $hash{HoldsLog} = C4::Context->preference("HoldsLog");
$hash{IssueLog} = C4::Context->preference("IssueLog");
$hash{ReturnLog} = C4::Context->preference("ReturnLog");
$hash{SubscriptionLog} = C4::Context->preference("SubscriptionLog");
SELECT action_logs.timestamp, action_logs.action, action_logs.info,
borrowers.cardnumber, borrowers.surname, borrowers.firstname, borrowers.userid,
biblio.biblionumber, biblio.title, biblio.author
- FROM action_logs
- LEFT JOIN borrowers ON borrowers.borrowernumber=action_logs.user
+ FROM action_logs
+ LEFT JOIN borrowers ON borrowers.borrowernumber=action_logs.user
LEFT JOIN biblio ON action_logs.object=biblio.biblionumber
- WHERE action_logs.module = 'cataloguing'
+ WHERE action_logs.module = 'cataloguing'
|;
my %filtermap = ();
if ($modulename eq "catalogue" or $modulename eq "acqui") {
);
} elsif ($modulename eq "members") {
$strsth=qq|
- SELECT action_logs.timestamp, action_logs.action, action_logs.info,
+ SELECT action_logs.timestamp, action_logs.action, action_logs.info,
borrowers.cardnumber, borrowers.surname, borrowers.firstname, borrowers.userid,
bor2.cardnumber, bor2.surname, bor2.firstname, bor2.userid
- FROM action_logs
- LEFT JOIN borrowers ON borrowers.borrowernumber=action_logs.user
+ FROM action_logs
+ LEFT JOIN borrowers ON borrowers.borrowernumber=action_logs.user
LEFT JOIN borrowers as bor2 ON action_logs.object=bor2.borrowernumber
- WHERE action_logs.module = 'members'
+ WHERE action_logs.module = 'members'
|;
%filtermap = (
user => 'borrowers.surname',
while (my $data = $sth->fetchrow_hashref){
$data->{hilighted} = ($hilighted>0);
$data->{info} =~ s/\n/<br\/>/g;
- $data->{day} = format_date($data->{timestamp});
+ $data->{day} = output_pref({ str => $data->{timestamp} });
push @results, $data;
$count++;
$hilighted = -$hilighted;
$logs = GetLogs($datefrom,$dateto,$user,\@modules,$action,$object,$info);
-Return:
+Return:
C<$logs> is a ref to a hash which containts all columns from action_logs
=cut
my $datefrom = shift;
my $dateto = shift;
my $user = shift;
- my $modules = shift;
+ my $modules = shift;
my $action = shift;
my $object = shift;
my $info = shift;
-
- my $iso_datefrom = C4::Dates->new($datefrom,C4::Context->preference("dateformat"))->output('iso');
- my $iso_dateto = C4::Dates->new($dateto,C4::Context->preference("dateformat"))->output('iso');
+ my $interfaces = shift;
- my $dbh = C4::Context->dbh;
+ my $iso_datefrom = $datefrom ? output_pref({ dt => dt_from_string( $datefrom ), dateformat => 'iso', dateonly => 1 }) : undef;
+ my $iso_dateto = $dateto ? output_pref({ dt => dt_from_string( $dateto ), dateformat => 'iso', dateonly => 1 }) : undef;
+
+ $user ||= q{};
+
+ my $dbh = C4::Context->dbh;
my $query = "
SELECT *
FROM action_logs
";
my @parameters;
- $query .= " AND DATE_FORMAT(timestamp, '%Y-%m-%d') >= \"".$iso_datefrom."\" " if $iso_datefrom; #fix me - mysql specific
- $query .= " AND DATE_FORMAT(timestamp, '%Y-%m-%d') <= \"".$iso_dateto."\" " if $iso_dateto;
- if($user ne "") {
- $query .= " AND user = ? ";
- push(@parameters,$user);
+ $query .=
+ " AND DATE_FORMAT(timestamp, '%Y-%m-%d') >= \"" . $iso_datefrom . "\" "
+ if $iso_datefrom; #fix me - mysql specific
+ $query .=
+ " AND DATE_FORMAT(timestamp, '%Y-%m-%d') <= \"" . $iso_dateto . "\" "
+ if $iso_dateto;
+ if ( $user ne q{} ) {
+ $query .= " AND user = ? ";
+ push( @parameters, $user );
+ }
+ if ( $modules && scalar(@$modules) ) {
+ $query .=
+ " AND module IN (" . join( ",", map { "?" } @$modules ) . ") ";
+ push( @parameters, @$modules );
}
- if(scalar @$modules > 1 or @$modules[0] ne "") {
- $query .= " AND module IN (".join(",",map {"?"} @$modules).") ";
- push(@parameters,@$modules);
+ if ( $action && scalar(@$action) ) {
+ $query .= " AND action IN (" . join( ",", map { "?" } @$action ) . ") ";
+ push( @parameters, @$action );
}
- if($action && scalar(@$action)) {
- $query .= " AND action IN (".join(",",map {"?"} @$action).") ";
- push(@parameters,@$action);
+ if ($object) {
+ $query .= " AND object = ? ";
+ push( @parameters, $object );
}
- if($object) {
- $query .= " AND object = ? ";
- push(@parameters,$object);
+ if ($info) {
+ $query .= " AND info LIKE ? ";
+ push( @parameters, "%" . $info . "%" );
}
- if($info) {
- $query .= " AND info LIKE ? ";
- push(@parameters,"%".$info."%");
+ if ( $interfaces && scalar(@$interfaces) ) {
+ $query .=
+ " AND interface IN (" . join( ",", map { "?" } @$interfaces ) . ") ";
+ push( @parameters, @$interfaces );
}
-
+
my $sth = $dbh->prepare($query);
$sth->execute(@parameters);
-
+
my @logs;
- while( my $row = $sth->fetchrow_hashref ) {
- $row->{$row->{module}} = 1;
- push @logs , $row;
+ while ( my $row = $sth->fetchrow_hashref ) {
+ push @logs, $row;
}
return \@logs;
}
projects / koha.git / blobdiff