X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=update.php;h=18442f79588ecea0d6cd154f74c1f161ac4d8c4b;hb=8ad109b05fde53c736d0b51e5885de5973ac91a6;hp=dfda25979791bf20af6e2dea4ac57993e7a2bebd;hpb=fe8f0e00454919e3ee1150a2e75badb55a273c3a;p=friendica.git

diff --git a/update.php b/update.php
index dfda259797..18442f7958 100644
--- a/update.php
+++ b/update.php
@@ -1,9 +1,9 @@
 <?php
 
 use Friendica\Core\Addon;
-use Friendica\BaseObject;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
 use Friendica\Core\Update;
 use Friendica\Core\Worker;
@@ -13,6 +13,7 @@ use Friendica\Model\GContact;
 use Friendica\Model\Item;
 use Friendica\Model\User;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Worker\Delivery;
 
 /**
  *
@@ -21,7 +22,7 @@ use Friendica\Util\DateTimeFormat;
  * This function is responsible for doing post update changes to the data
  * (not the structure) in the database.
  *
- * Database structure changes are done in config/dbstructure.config.php
+ * Database structure changes are done in static/dbstructure.config.php
  *
  * If there is a need for a post process to a structure change, update this file
  * by adding a new function at the end with the number of the new DB_UPDATE_VERSION.
@@ -32,8 +33,8 @@ use Friendica\Util\DateTimeFormat;
  * You are currently on version 4711 and you are preparing changes that demand an update script.
  *
  * 1. Create a function "update_4712()" here in the update.php
- * 2. Apply the needed structural changes in config/dbStructure.php
- * 3. Set DB_UPDATE_VERSION in config/dbstructure.config.php to 4712.
+ * 2. Apply the needed structural changes in static/dbStructure.php
+ * 3. Set DB_UPDATE_VERSION in static/dbstructure.config.php to 4712.
  *
  * If you need to run a script before the database update, name the function "pre_update_4712()"
  */
@@ -161,9 +162,9 @@ function update_1191()
 function update_1203()
 {
 	$r = q("UPDATE `user` SET `account-type` = %d WHERE `page-flags` IN (%d, %d)",
-		DBA::escape(Contact::ACCOUNT_TYPE_COMMUNITY),
-		DBA::escape(Contact::PAGE_COMMUNITY),
-		DBA::escape(Contact::PAGE_PRVGROUP)
+		DBA::escape(User::ACCOUNT_TYPE_COMMUNITY),
+		DBA::escape(User::PAGE_FLAGS_COMMUNITY),
+		DBA::escape(User::PAGE_FLAGS_PRVGROUP)
 	);
 }
 
@@ -332,11 +333,9 @@ function update_1298()
 					$fail++;
 				} else {
 					DBA::update('profile', [$translateKey => $key], ['id' => $data['id']]);
-					BaseObject::getApp()
-						->getLogger()
-						->notice('Updated contact', ['action' => 'update', 'contact' => $data['id'], "$translateKey" => $key,
+					Logger::notice('Updated contact', ['action' => 'update', 'contact' => $data['id'], "$translateKey" => $key,
 						'was' => $data[$translateKey]]);
-					Worker::add(PRIORITY_LOW, 'ProfileUpdate', $data['id']);		
+					Worker::add(PRIORITY_LOW, 'ProfileUpdate', $data['id']);
 					Contact::updateSelfFromUserID($data['id']);
 					GContact::updateForUser($data['id']);
 					$success++;
@@ -344,9 +343,44 @@ function update_1298()
 			}
 		}
 
-		BaseObject::getApp()
-			->getLogger()
-			->notice($translateKey . " fix completed", ['action' => 'update', 'translateKey' => $translateKey, 'Success' => $success, 'Fail' => $fail ]);
+		Logger::notice($translateKey . " fix completed", ['action' => 'update', 'translateKey' => $translateKey, 'Success' => $success, 'Fail' => $fail ]);
 	}
 	return Update::SUCCESS;
 }
+
+function update_1309()
+{
+	$queue = DBA::select('queue', ['id', 'cid', 'guid']);
+	while ($entry = DBA::fetch($queue)) {
+		$contact = DBA::selectFirst('contact', ['uid'], ['id' => $entry['cid']]);
+		if (!DBA::isResult($contact)) {
+			continue;
+		}
+
+		$item = Item::selectFirst(['id', 'gravity'], ['uid' => $contact['uid'], 'guid' => $entry['guid']]);
+		if (!DBA::isResult($item)) {
+			continue;
+		}
+
+		$deliver_options = ['priority' => PRIORITY_MEDIUM, 'dont_fork' => true];
+		Worker::add($deliver_options, 'Delivery', Delivery::POST, $item['id'], $entry['cid']);
+		Logger::info('Added delivery worker', ['command' => $cmd, 'item' => $item['id'], 'contact' => $entry['cid']]);
+		DBA::delete('queue', ['id' => $entry['id']]);
+	}
+	return Update::SUCCESS;
+}
+
+function update_1315()
+{
+	DBA::delete('item-delivery-data', ['postopts' => '', 'inform' => '', 'queue_count' => 0, 'queue_done' => 0]);
+	return Update::SUCCESS;
+}
+
+function update_1318()
+{
+	DBA::update('profile', ['marital' => "In a relation"], ['marital' => "Unavailable"]);
+	DBA::update('profile', ['marital' => "Single"], ['marital' => "Available"]);
+
+	Worker::add(PRIORITY_LOW, 'ProfileUpdate');
+	return Update::SUCCESS;
+}