From 2c4277790b3f4326d17fee4236d8f45c7591ae71 Mon Sep 17 00:00:00 2001
From: Aaron van Geffen <aaron@aaronweb.net>
Date: Fri, 2 Sep 2016 21:41:01 +0200
Subject: [PATCH] Import photo ownership.

---
 TODO.md           | 1 -
 import_albums.php | 7 ++++---
 models/Asset.php  | 6 ++++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/TODO.md b/TODO.md
index eea36969..0441b8b4 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,7 +1,6 @@
 TODO:
 
 * Draaiing van foto's bij importeren goedzetten
-* Import asset ownership
 * Pagina om één foto te bekijken
 * Taggen door gebruikers
 * Uploaden door gebruikers
diff --git a/import_albums.php b/import_albums.php
index c19bc6b0..cbca61c8 100644
--- a/import_albums.php
+++ b/import_albums.php
@@ -155,7 +155,7 @@ for ($i = 0; $i < $num_photos; $i += 50)
 	echo 'Offset ' . $i . "...\n";
 
 	$photos = $pdb->query('
-		SELECT id, parent_id, captured, created, name, title, description, relative_url_cache, width, height, mime_type, weight
+		SELECT id, owner_id, parent_id, captured, created, name, title, description, relative_url_cache, width, height, mime_type, weight
 		FROM items
 		WHERE type = {string:photo}
 		ORDER BY id ASC
@@ -166,13 +166,14 @@ for ($i = 0; $i < $num_photos; $i += 50)
 	{
 		$res = $db->query('
 			INSERT INTO assets
-			(subdir, filename, title, slug, mimetype, image_width, image_height, date_captured, priority)
+			(id_user_uploaded, subdir, filename, title, slug, mimetype, image_width, image_height, date_captured, priority)
 			VALUES
-			({string:subdir}, {string:filename}, {string:title}, {string:slug}, {string:mimetype},
+			({int:id_user_uploaded}, {string:subdir}, {string:filename}, {string:title}, {string:slug}, {string:mimetype},
 			 {int:image_width}, {int:image_height},
 			 IF({int:date_captured} > 0, FROM_UNIXTIME({int:date_captured}), NULL),
 			 {int:priority})',
 			[
+				'id_user_uploaded' => $old_user_id_to_new_user_id[$photo['owner_id']],
 				'subdir' => $dirnames_by_old_album_id[$photo['parent_id']],
 				'filename' => $photo['name'],
 				'title' => $photo['title'],
diff --git a/models/Asset.php b/models/Asset.php
index 5aec2308..dfc12c32 100644
--- a/models/Asset.php
+++ b/models/Asset.php
@@ -9,6 +9,7 @@
 class Asset
 {
 	protected $id_asset;
+	protected $id_user_uploaded;
 	protected $subdir;
 	protected $filename;
 	protected $title;
@@ -186,13 +187,14 @@ class Asset
 		$db = Registry::get('db');
 		$res = $db->query('
 			INSERT INTO assets
-			(subdir, filename, title, slug, mimetype, image_width, image_height, date_captured, priority)
+			(id_user_uploaded, subdir, filename, title, slug, mimetype, image_width, image_height, date_captured, priority)
 			VALUES
-			({string:subdir}, {string:filename}, {string:title}, {string:slug}, {string:mimetype},
+			({int:id_user_uploaded}, {string:subdir}, {string:filename}, {string:title}, {string:slug}, {string:mimetype},
 			 {int:image_width}, {int:image_height},
 			 IF({int:date_captured} > 0, FROM_UNIXTIME({int:date_captured}), NULL),
 			 {int:priority})',
 			[
+				'id_user_uploaded' => isset($id_user) ? $id_user : Registry::get('user')->getUserId(),
 				'subdir' => $preferred_subdir,
 				'filename' => $new_filename,
 				'title' => $title,