bug Fix 3712

[koha.git] / C4 / Log.pm

diff --git a/C4/Log.pm b/C4/Log.pm
index c7088c7..9f4430c 100644 (file)
--- a/C4/Log.pm
+++ b/C4/Log.pm
@@ -52,16 +52,25 @@ The functions in this module perform various functions in order to log all the o
 
 =item logaction
 
-  &logaction($usernumber, $modulename, $actionname, $objectnumber, $infos);
+  &logaction($modulename, $actionname, $objectnumber, $infos);
 
-Adds a record into action_logs table to report the different changes upon the database
+Adds a record into action_logs table to report the different changes upon the database.
+Each log entry includes the number of the user currently logged in.  For batch
+jobs, which operate without authenticating a user and setting up a session, the user
+number is set to 0, which is the same as the superlibrarian's number.
 
 =cut
 
 #'
 sub logaction {
-  my ($usernumber,$modulename, $actionname, $objectnumber, $infos)=@_;
-    $usernumber='' unless $usernumber;
+    my ($modulename, $actionname, $objectnumber, $infos)=@_;
+
+    # 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;
+
     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);
@@ -171,9 +180,9 @@ sub displaylog {
     return ($count, \@results);
 }
 
-=head2 GetLogs
+=item GetLogs
 
-$logs = GetLogs($datefrom,$dateto,$user,$module,$action,$object,$info);
+$logs = GetLogs($datefrom,$dateto,$user,\@modules,$action,$object,$info);
 
 Return: 
 C<$logs> is a ref to a hash which containts all columns from action_logs
@@ -184,7 +193,7 @@ sub GetLogs {
     my $datefrom = shift;
     my $dateto   = shift;
     my $user     = shift;
-    my $module   = shift;
+    my $modules   = shift;
     my $action   = shift;
     my $object   = shift;
     my $info     = shift;
@@ -198,16 +207,38 @@ sub GetLogs {
         FROM   action_logs
         WHERE 1
     ";
-    $query .= " AND DATE_FORMAT(timestamp, '%Y-%m-%d') >= \"".$iso_datefrom."\" " if $iso_datefrom;
+
+    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;
-    $query .= " AND user LIKE \"%".$user."%\" "     if $user;
-    $query .= " AND module LIKE \"%".$module."%\" " if $module;
-    $query .= " AND action LIKE \"%".$action."%\" " if $action;
-    $query .= " AND object LIKE \"%".$object."%\" " if $object;
-    $query .= " AND info LIKE \"%".$info."%\" "     if $info;
+    if($user) {
+       $query .= " AND user LIKE ? ";
+       push(@parameters,"%".$user."%");
+    }
+    if(scalar @$modules > 1 or @$modules[0] ne "") {
+           $query .= " AND (1 = 2";  #always false but used to build the query
+           foreach my $module (@$modules) {
+               next if $module eq "";
+               $query .= " or module = ?";
+               push(@parameters,$module);
+           }
+           $query .= ")";
+    }
+    if($action) {
+       $query .= " AND action LIKE ? ";
+       push(@parameters,"%".$action."%");
+    }
+    if($object) {
+       $query .= " AND object LIKE ? ";
+       push(@parameters,"%".$object."%");
+    }
+    if($info) {
+       $query .= " AND info LIKE ? ";
+       push(@parameters,"%".$info."%");
+    }
    
     my $sth = $dbh->prepare($query);
-    $sth->execute;
+    $sth->execute(@parameters);
     
     my @logs;
     while( my $row = $sth->fetchrow_hashref ) {