diff --git a/src/Database/PostUpdate.php b/src/Database/PostUpdate.php
index 99974a414..e4bfa710a 100644
--- a/src/Database/PostUpdate.php
+++ b/src/Database/PostUpdate.php
@@ -16,199 +16,199 @@ require_once 'include/dba.php';
*/
class PostUpdate
{
- /**
- * @brief Calls the post update functions
- */
- public static function update()
- {
- if (!self::update1194()) {
- return;
- }
- if (!self::update1198()) {
- return;
- }
- if (!self::update1206()) {
- return;
- }
- }
+ /**
+ * @brief Calls the post update functions
+ */
+ public static function update()
+ {
+ if (!self::update1194()) {
+ return;
+ }
+ if (!self::update1198()) {
+ return;
+ }
+ if (!self::update1206()) {
+ return;
+ }
+ }
- /**
- * @brief Updates the "global" field in the item table
- *
- * @return bool "true" when the job is done
- */
- private static function update1194()
- {
- // Was the script completed?
- if (Config::get("system", "post_update_version") >= 1194) {
- return true;
- }
+ /**
+ * @brief Updates the "global" field in the item table
+ *
+ * @return bool "true" when the job is done
+ */
+ private static function update1194()
+ {
+ // Was the script completed?
+ if (Config::get("system", "post_update_version") >= 1194) {
+ return true;
+ }
- logger("Start", LOGGER_DEBUG);
+ logger("Start", LOGGER_DEBUG);
- $end_id = Config::get("system", "post_update_1194_end");
- if (!$end_id) {
- $r = q("SELECT `id` FROM `item` WHERE `uid` != 0 ORDER BY `id` DESC LIMIT 1");
- if ($r) {
- Config::set("system", "post_update_1194_end", $r[0]["id"]);
- $end_id = Config::get("system", "post_update_1194_end");
- }
- }
+ $end_id = Config::get("system", "post_update_1194_end");
+ if (!$end_id) {
+ $r = q("SELECT `id` FROM `item` WHERE `uid` != 0 ORDER BY `id` DESC LIMIT 1");
+ if ($r) {
+ Config::set("system", "post_update_1194_end", $r[0]["id"]);
+ $end_id = Config::get("system", "post_update_1194_end");
+ }
+ }
- logger("End ID: ".$end_id, LOGGER_DEBUG);
+ logger("End ID: ".$end_id, LOGGER_DEBUG);
- $start_id = Config::get("system", "post_update_1194_start");
+ $start_id = Config::get("system", "post_update_1194_start");
- $query1 = "SELECT `item`.`id` FROM `item` ";
+ $query1 = "SELECT `item`.`id` FROM `item` ";
- $query2 = "INNER JOIN `item` AS `shadow` ON `item`.`uri` = `shadow`.`uri` AND `shadow`.`uid` = 0 ";
+ $query2 = "INNER JOIN `item` AS `shadow` ON `item`.`uri` = `shadow`.`uri` AND `shadow`.`uid` = 0 ";
- $query3 = "WHERE `item`.`uid` != 0 AND `item`.`id` >= %d AND `item`.`id` <= %d
- AND `item`.`visible` AND NOT `item`.`private`
- AND NOT `item`.`deleted` AND NOT `item`.`moderated`
- AND `item`.`network` IN ('%s', '%s', '%s', '')
- AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = ''
- AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''
- AND NOT `item`.`global`";
+ $query3 = "WHERE `item`.`uid` != 0 AND `item`.`id` >= %d AND `item`.`id` <= %d
+ AND `item`.`visible` AND NOT `item`.`private`
+ AND NOT `item`.`deleted` AND NOT `item`.`moderated`
+ AND `item`.`network` IN ('%s', '%s', '%s', '')
+ AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = ''
+ AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''
+ AND NOT `item`.`global`";
- $r = q($query1.$query2.$query3." ORDER BY `item`.`id` LIMIT 1",
- intval($start_id), intval($end_id),
- dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_OSTATUS));
- if (!$r) {
- Config::set("system", "post_update_version", 1194);
- logger("Update is done", LOGGER_DEBUG);
- return true;
- } else {
- Config::set("system", "post_update_1194_start", $r[0]["id"]);
- $start_id = Config::get("system", "post_update_1194_start");
- }
+ $r = q($query1.$query2.$query3." ORDER BY `item`.`id` LIMIT 1",
+ intval($start_id), intval($end_id),
+ dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_OSTATUS));
+ if (!$r) {
+ Config::set("system", "post_update_version", 1194);
+ logger("Update is done", LOGGER_DEBUG);
+ return true;
+ } else {
+ Config::set("system", "post_update_1194_start", $r[0]["id"]);
+ $start_id = Config::get("system", "post_update_1194_start");
+ }
- logger("Start ID: ".$start_id, LOGGER_DEBUG);
+ logger("Start ID: ".$start_id, LOGGER_DEBUG);
- $r = q($query1.$query2.$query3." ORDER BY `item`.`id` LIMIT 1000,1",
- intval($start_id), intval($end_id),
- dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_OSTATUS));
- if ($r)
- $pos_id = $r[0]["id"];
- else
- $pos_id = $end_id;
+ $r = q($query1.$query2.$query3." ORDER BY `item`.`id` LIMIT 1000,1",
+ intval($start_id), intval($end_id),
+ dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_OSTATUS));
+ if ($r) {
+ $pos_id = $r[0]["id"];
+ } else {
+ $pos_id = $end_id;
+ }
+ logger("Progress: Start: ".$start_id." position: ".$pos_id." end: ".$end_id, LOGGER_DEBUG);
- logger("Progress: Start: ".$start_id." position: ".$pos_id." end: ".$end_id, LOGGER_DEBUG);
+ q("UPDATE `item` ".$query2." SET `item`.`global` = 1 ".$query3,
+ intval($start_id), intval($pos_id),
+ dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_OSTATUS));
- q("UPDATE `item` ".$query2." SET `item`.`global` = 1 ".$query3,
- intval($start_id), intval($pos_id),
- dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_OSTATUS));
+ logger("Done", LOGGER_DEBUG);
+ }
- logger("Done", LOGGER_DEBUG);
- }
+ /**
+ * @brief set the author-id and owner-id in all item entries
+ *
+ * This job has to be started multiple times until all entries are set.
+ * It isn't started in the update function since it would consume too much time and can be done in the background.
+ *
+ * @return bool "true" when the job is done
+ */
+ private static function update1198()
+ {
+ // Was the script completed?
+ if (Config::get("system", "post_update_version") >= 1198) {
+ return true;
+ }
- /**
- * @brief set the author-id and owner-id in all item entries
- *
- * This job has to be started multiple times until all entries are set.
- * It isn't started in the update function since it would consume too much time and can be done in the background.
- *
- * @return bool "true" when the job is done
- */
- private static function update1198()
- {
- // Was the script completed?
- if (Config::get("system", "post_update_version") >= 1198) {
- return true;
- }
+ logger("Start", LOGGER_DEBUG);
- logger("Start", LOGGER_DEBUG);
+ // Check if the first step is done (Setting "author-id" and "owner-id" in the item table)
+ $r = dba::select('item', ['author-link', 'owner-link', 'uid'], ['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`
+ INNER JOIN `item` ON `item`.`id` =`thread`.`iid`
+ WHERE `thread`.`author-id` = 0 AND `thread`.`owner-id` = 0 AND
+ (`thread`.`uid` IN (SELECT `uid` from `user`) OR `thread`.`uid` = 0)");
- // Check if the first step is done (Setting "author-id" and "owner-id" in the item table)
- $r = dba::select('item', ['author-link', 'owner-link', 'uid'], ['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`
- INNER JOIN `item` ON `item`.`id` =`thread`.`iid`
- WHERE `thread`.`author-id` = 0 AND `thread`.`owner-id` = 0 AND
- (`thread`.`uid` IN (SELECT `uid` from `user`) OR `thread`.`uid` = 0)");
+ if ($r && ($r[0]["total"] == 0)) {
+ Config::set("system", "post_update_version", 1198);
+ logger("Done", LOGGER_DEBUG);
+ return true;
+ }
- if ($r && ($r[0]["total"] == 0)) {
- Config::set("system", "post_update_version", 1198);
- logger("Done", LOGGER_DEBUG);
- return true;
- }
+ // Update the thread table from the item table
+ $r = q("UPDATE `thread` INNER JOIN `item` ON `item`.`id`=`thread`.`iid`
+ SET `thread`.`author-id` = `item`.`author-id`,
+ `thread`.`owner-id` = `item`.`owner-id`
+ WHERE `thread`.`author-id` = 0 AND `thread`.`owner-id` = 0 AND
+ (`thread`.`uid` IN (SELECT `uid` from `user`) OR `thread`.`uid` = 0)");
- // Update the thread table from the item table
- $r = q("UPDATE `thread` INNER JOIN `item` ON `item`.`id`=`thread`.`iid`
- SET `thread`.`author-id` = `item`.`author-id`,
- `thread`.`owner-id` = `item`.`owner-id`
- WHERE `thread`.`author-id` = 0 AND `thread`.`owner-id` = 0 AND
- (`thread`.`uid` IN (SELECT `uid` from `user`) OR `thread`.`uid` = 0)");
+ logger("Updated threads", LOGGER_DEBUG);
+ if (DBM::is_result($r)) {
+ Config::set("system", "post_update_version", 1198);
+ logger("Done", LOGGER_DEBUG);
+ return true;
+ }
+ return false;
+ }
- logger("Updated threads", LOGGER_DEBUG);
- if (DBM::is_result($r)) {
- Config::set("system", "post_update_version", 1198);
- logger("Done", LOGGER_DEBUG);
- return true;
- }
- return false;
- }
+ logger("Query done", LOGGER_DEBUG);
- logger("Query done", LOGGER_DEBUG);
+ $item_arr = [];
+ foreach ($r as $item) {
+ $index = $item["author-link"]."-".$item["owner-link"]."-".$item["uid"];
+ $item_arr[$index] = ["author-link" => $item["author-link"],
+ "owner-link" => $item["owner-link"],
+ "uid" => $item["uid"]];
+ }
- $item_arr = [];
- foreach ($r as $item) {
- $index = $item["author-link"]."-".$item["owner-link"]."-".$item["uid"];
- $item_arr[$index] = ["author-link" => $item["author-link"],
- "owner-link" => $item["owner-link"],
- "uid" => $item["uid"]];
- }
+ // Set the "author-id" and "owner-id" in the item table and add a new public contact entry if needed
+ foreach ($item_arr as $item) {
+ $author_id = Contact::getIdForURL($item["author-link"]);
+ $owner_id = Contact::getIdForURL($item["owner-link"]);
- // Set the "author-id" and "owner-id" in the item table and add a new public contact entry if needed
- foreach ($item_arr as $item) {
- $author_id = Contact::getIdForURL($item["author-link"]);
- $owner_id = Contact::getIdForURL($item["owner-link"]);
+ if ($author_id == 0) {
+ $author_id = -1;
+ }
+ 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]);
+ }
- if ($author_id == 0)
- $author_id = -1;
+ logger("Updated items", LOGGER_DEBUG);
+ return false;
+ }
- if ($owner_id == 0)
- $owner_id = -1;
+ /**
+ * @brief update the "last-item" field in the "self" contact
+ *
+ * This field avoids cost intensive calls in the admin panel and in "nodeinfo"
+ *
+ * @return bool "true" when the job is done
+ */
+ private static function update1206()
+ {
+ // Was the script completed?
+ if (Config::get("system", "post_update_version") >= 1206) {
+ return true;
+ }
- 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("Start", LOGGER_DEBUG);
+ $r = q("SELECT `contact`.`id`, `contact`.`last-item`,
+ (SELECT MAX(`changed`) FROM `item` USE INDEX (`uid_wall_changed`) WHERE `wall` AND `uid` = `user`.`uid`) AS `lastitem_date`
+ FROM `user`
+ INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid` AND `contact`.`self`");
- logger("Updated items", LOGGER_DEBUG);
- return false;
- }
+ if (!DBM::is_result($r)) {
+ return false;
+ }
+ 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']]);
+ }
+ }
- /**
- * @brief update the "last-item" field in the "self" contact
- *
- * This field avoids cost intensive calls in the admin panel and in "nodeinfo"
- *
- * @return bool "true" when the job is done
- */
- private static function update1206()
- {
- // Was the script completed?
- if (Config::get("system", "post_update_version") >= 1206) {
- return true;
- }
-
- logger("Start", LOGGER_DEBUG);
- $r = q("SELECT `contact`.`id`, `contact`.`last-item`,
- (SELECT MAX(`changed`) FROM `item` USE INDEX (`uid_wall_changed`) WHERE `wall` AND `uid` = `user`.`uid`) AS `lastitem_date`
- FROM `user`
- INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid` AND `contact`.`self`");
-
- if (!DBM::is_result($r)) {
- return false;
- }
- 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']]);
- }
- }
-
- Config::set("system", "post_update_version", 1206);
- logger("Done", LOGGER_DEBUG);
- return true;
- }
+ Config::set("system", "post_update_version", 1206);
+ logger("Done", LOGGER_DEBUG);
+ return true;
+ }
}
diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php
index aa3eabf57..e42612cd3 100644
--- a/src/Worker/OnePoll.php
+++ b/src/Worker/OnePoll.php
@@ -78,7 +78,7 @@ class OnePoll
$last_updated = $contact['last-item'];
}
- $fields = ['last-item' => $last_updated, 'last-update' => $updated, 'success_update' => $updated];
+ $fields = ['last-item' => DateTimeFormat::utc($last_updated), 'last-update' => $updated, 'success_update' => $updated];
self::updateContact($contact, $fields);
Contact::unmarkForArchival($contact);
} else {