X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FDatabase%2FPostUpdate.php;h=0a75a0f195d8c57a80e59467afc17c06dc894dad;hb=4db98eb43d90a56b1e983628910641c9cc567b8a;hp=4f186ecbe3b2457aa1f3a5217595cc963ed995b6;hpb=38160a48b0226a3ece01d5a28d59d2c02e8bb8e5;p=friendica.git

diff --git a/src/Database/PostUpdate.php b/src/Database/PostUpdate.php
index 4f186ecbe3..0a75a0f195 100644
--- a/src/Database/PostUpdate.php
+++ b/src/Database/PostUpdate.php
@@ -5,10 +5,9 @@
 namespace Friendica\Database;
 
 use Friendica\Core\Config;
-use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
-use dba;
+use Friendica\Model\PermissionSet;
 
 require_once 'include/dba.php';
 
@@ -31,7 +30,7 @@ class PostUpdate
 		if (!self::update1206()) {
 			return;
 		}
-		if (!self::update1274()) {
+		if (!self::update1279()) {
 			return;
 		}
 	}
@@ -125,7 +124,7 @@ class PostUpdate
 
 		// Check if the first step is done (Setting "author-id" and "owner-id" in the item table)
 		$fields = ['author-link', 'author-name', 'author-avatar', 'owner-link', 'owner-name', 'owner-avatar', 'network', 'uid'];
-		$r = dba::select('item', $fields, ['author-id' => 0, 'owner-id' => 0], ['limit' => 1000]);
+		$r = DBA::select('item', $fields, ['author-id' => 0, 'owner-id' => 0], ['limit' => 1000]);
 		if (!$r) {
 			// Are there unfinished entries in the thread table?
 			$r = q("SELECT COUNT(*) AS `total` FROM `thread`
@@ -181,7 +180,7 @@ class PostUpdate
 			if ($owner_id == 0) {
 				$owner_id = -1;
 			}
-			dba::update('item', ['author-id' => $author_id, 'owner-id' => $owner_id], ['uid' => $item['uid'], 'author-link' => $item['author-link'], 'owner-link' => $item['owner-link'], 'author-id' => 0, 'owner-id' => 0]);
+			DBA::update('item', ['author-id' => $author_id, 'owner-id' => $owner_id], ['uid' => $item['uid'], 'author-link' => $item['author-link'], 'owner-link' => $item['owner-link'], 'author-id' => 0, 'owner-id' => 0]);
 		}
 
 		logger("Updated items", LOGGER_DEBUG);
@@ -213,7 +212,7 @@ class PostUpdate
 		}
 		foreach ($r as $user) {
 			if (!empty($user["lastitem_date"]) && ($user["lastitem_date"] > $user["last-item"])) {
-				dba::update('contact', ['last-item' => $user['lastitem_date']], ['id' => $user['id']]);
+				DBA::update('contact', ['last-item' => $user['lastitem_date']], ['id' => $user['id']]);
 			}
 		}
 
@@ -223,42 +222,78 @@ class PostUpdate
 	}
 
 	/**
-	 * @brief update the "item-content" table
+	 * @brief update the item related tables
 	 *
 	 * @return bool "true" when the job is done
 	 */
-	private static function update1274()
+	private static function update1279()
 	{
 		// Was the script completed?
-		if (Config::get("system", "post_update_version") >= 1274) {
+		if (Config::get("system", "post_update_version") >= 1279) {
 			return true;
 		}
 
-		logger("Start", LOGGER_DEBUG);
+		$id = Config::get("system", "post_update_version_1279_id", 0);
+
+		logger("Start from item " . $id, LOGGER_DEBUG);
 
-		$fields = ['id', 'title', 'content-warning', 'body', 'location', 'tag', 'file',
-			'coord', 'app', 'rendered-hash', 'rendered-html', 'verb',
-			'object-type', 'object', 'target-type', 'target', 'plink'];
+		$fields = array_merge(Item::MIXED_CONTENT_FIELDLIST, ['network', 'author-id', 'owner-id', 'tag', 'file',
+			'author-name', 'author-avatar', 'author-link', 'owner-name', 'owner-avatar', 'owner-link', 'id',
+			'uid', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'psid', 'post-type', 'bookmark', 'type',
+			'inform']);
 
-		$condition = ["`icid` IS NULL"];
-		$params = ['limit' => 10000];
+		$start_id = $id;
+		$rows = 0;
+		$condition = ["`id` > ?", $id];
+		$params = ['order' => ['id'], 'limit' => 10000];
 		$items = Item::select($fields, $condition, $params);
+		while ($item = Item::fetch($items)) {
+			$id = $item['id'];
 
-		if (!DBM::is_result($items)) {
-			Config::set("system", "post_update_version", 1274);
-			logger("Done", LOGGER_DEBUG);
-			return true;
-		}
+			if (empty($item['author-id'])) {
+				$default = ['url' => $item['author-link'], 'name' => $item['author-name'],
+					'photo' => $item['author-avatar'], 'network' => $item['network']];
 
-		$rows = 0;
+				$item['author-id'] = Contact::getIdForURL($item["author-link"], 0, false, $default);
+			}
+
+			if (empty($item['owner-id'])) {
+				$default = ['url' => $item['owner-link'], 'name' => $item['owner-name'],
+					'photo' => $item['owner-avatar'], 'network' => $item['network']];
+
+				$item['owner-id'] = Contact::getIdForURL($item["owner-link"], 0, false, $default);
+			}
+
+			if (empty($item['psid'])) {
+				$item['psid'] = PermissionSet::fetchIDForPost($item);
+			}
+
+			if ($item['post-type'] == 0) {
+				if (!empty($item['type']) && ($item['type'] == 'note')) {
+					$item['post-type'] = Item::PT_PERSONAL_NOTE;
+				} elseif (!empty($item['type']) && ($item['type'] == 'photo')) {
+					$item['post-type'] = Item::PT_IMAGE;
+				} elseif (!empty($item['bookmark']) && $item['bookmark']) {
+					$item['post-type'] = Item::PT_PAGE;
+				}
+			}
+
+			Item::update($item, ['id' => $id]);
 
-		while ($item = Item::fetch($items)) {
-			Item::update($item, ['id' => $item['id']]);
 			++$rows;
 		}
-		dba::close($items);
+		DBA::close($items);
 
-		logger("Processed rows: " . $rows, LOGGER_DEBUG);
-		return true;
+		Config::set("system", "post_update_version_1279_id", $id);
+
+		logger("Processed rows: " . $rows . " - last processed item:  " . $id, LOGGER_DEBUG);
+
+		if ($start_id == $id) {
+			Config::set("system", "post_update_version", 1279);
+			logger("Done", LOGGER_DEBUG);
+			return true;
+		}
+
+		return false;
 	}
 }