Revert logUpload and logDownload to include filenames, because they c…

…ome from storageFileItems and not from storageFiles where we want to eliminate them
zotero · May 30, 2018 · 6619177 · 6619177
1 parent 0d6b96b
commit 6619177
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/model/Storage.inc.php b/model/Storage.inc.php
@@ -183,18 +183,20 @@ public static function logDownload($item, $downloadUserID, $ipAddress) {
 
 		$info = self::getLocalFileItemInfo($item);
 		$storageFileID = $info['storageFileID'];
+		$filename = $info['filename'];
 		$size = $info['size'];
 
 		$sql = "INSERT INTO storageDownloadLog
-				(ownerUserID, downloadUserID, ipAddress, storageFileID, size)
-				VALUES (?, ?, INET_ATON(?), ?, ?)";
+				(ownerUserID, downloadUserID, ipAddress, storageFileID, filename, size)
+				VALUES (?, ?, INET_ATON(?), ?, ?, ?)";
 		Zotero_DB::query(
 			$sql,
 			[
 				$ownerUserID,
 				$downloadUserID,
 				$ipAddress,
 				$storageFileID,
+				$filename,
 				$size
 			],
 			0,
@@ -284,15 +286,16 @@ public static function logUpload($uploadUserID, $item, $key, $ipAddress) {
 
 		$info = self::getLocalFileItemInfo($item);
 		$storageFileID = $info['storageFileID'];
+		$filename = $info['filename'];
 		$size = $info['size'];
 
 		$sql = "DELETE FROM storageUploadQueue WHERE uploadKey=?";
 		Zotero_DB::query($sql, $key);
 
 		$sql = "INSERT INTO storageUploadLog
-				(ownerUserID, uploadUserID, ipAddress, storageFileID, size)
-				VALUES (?, ?, INET_ATON(?), ?, ?)";
-		Zotero_DB::query($sql, array($ownerUserID, $uploadUserID, $ipAddress, $storageFileID, $size));
+				(ownerUserID, uploadUserID, ipAddress, storageFileID, filename, size)
+				VALUES (?, ?, INET_ATON(?), ?, ?, ?)";
+		Zotero_DB::query($sql, array($ownerUserID, $uploadUserID, $ipAddress, $storageFileID, $filename, $size));
 	}