X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=update.php;h=40a3e8ff0d22ee39328b8eddcd39621144af1e00;hb=9bc87e408feb3e07a33a5e1c379c3c372779c1fd;hp=d608669f169f66dda39b8e6af07bdd06ccf38a32;hpb=5cb56a6b120a1aed376dda79252c218679ca6b2c;p=friendica.git

diff --git a/update.php b/update.php
index d608669f16..40a3e8ff0d 100644
--- a/update.php
+++ b/update.php
@@ -9,9 +9,11 @@ use Friendica\Core\Update;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
+use Friendica\Model\GContact;
 use Friendica\Model\Item;
 use Friendica\Model\User;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Worker\Delivery;
 
 /**
  *
@@ -160,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)
 	);
 }
 
@@ -292,159 +294,84 @@ function update_1288()
 }
 
 // Post-update script of PR 5751
-function update_1296()
+function update_1298()
 {
-	$translateKey = 'gender';
-	$allData = DBA::select('profile', ['id', $translateKey]);
-	$allLangs = L10n::getAvailableLanguages();
-	$success = 0;
-	$fail = 0;
-	foreach ($allData as $key => $data) {
-		$toTranslate = $data[$translateKey];
-		if ($toTranslate != '') {
-			foreach ($allLangs as $key => $lang) {
-				$a = new \stdClass();
-				$a->strings = [];
-
-				// First we get the the localizations
-				if (file_exists("view/lang/$lang/strings.php")) {
-					include "view/lang/$lang/strings.php";
-				}
-				if (file_exists("addon/morechoice/lang/$lang/strings.php")) {
-					include "addon/morechoice/lang/$lang/strings.php";
+	$keys = ['gender', 'marital', 'sexual'];
+	foreach ($keys as $translateKey) {
+		$allData = DBA::select('profile', ['id', $translateKey]);
+		$allLangs = L10n::getAvailableLanguages();
+		$success = 0;
+		$fail = 0;
+		foreach ($allData as $key => $data) {
+			$toTranslate = $data[$translateKey];
+			if ($toTranslate != '') {
+				foreach ($allLangs as $key => $lang) {
+					$a = new \stdClass();
+					$a->strings = [];
+
+					// First we get the the localizations
+					if (file_exists("view/lang/$lang/strings.php")) {
+						include "view/lang/$lang/strings.php";
+					}
+					if (file_exists("addon/morechoice/lang/$lang/strings.php")) {
+						include "addon/morechoice/lang/$lang/strings.php";
+					}
+
+					$localizedStrings = $a->strings;
+					unset($a);
+
+					$key = array_search($toTranslate, $localizedStrings);
+					if ($key !== false) {
+						break;
+					}
+
+					// defaulting to empty string
+					$key = '';
 				}
 
-				$localizedStrings = $a->strings;
-				unset($a);
-
-				$key = array_search($toTranslate, $localizedStrings);
-				if ($key !== false) {
-					break;
+				if ($key == '') {
+					$fail++;
+				} else {
+					DBA::update('profile', [$translateKey => $key], ['id' => $data['id']]);
+					Logger::notice('Updated contact', ['action' => 'update', 'contact' => $data['id'], "$translateKey" => $key,
+						'was' => $data[$translateKey]]);
+					Worker::add(PRIORITY_LOW, 'ProfileUpdate', $data['id']);
+					Contact::updateSelfFromUserID($data['id']);
+					GContact::updateForUser($data['id']);
+					$success++;
 				}
-
-				// defaulting to empty string
-				$key = '';
-			}
-
-			if ($key == '') {
-				$fail++;
-			} else {
-				DBA::update('profile', [$translateKey => $key], ['id' => $data['id']]);
-				logger::log('Updated contact ' . $data['id'] . " to $translateKey " . $key .
-					' (was: ' . $data[$translateKey] . ')');
-				Worker::add(PRIORITY_LOW, 'ProfileUpdate', $data['id']);		
-				Contact::updateSelfFromUserID($data['id']);
-				GContact::updateForUser($data['id']);
-				$success++;
 			}
 		}
-	}
-
-	Logger::log($translateKey . " fix completed. Success: $success. Fail: $fail");
-	return Update::SUCCESS;
-}
-// Post-update script of PR 5751
-function update_1297()
-{
-	$translateKey = 'marital';
-	$allData = DBA::select('profile', ['id', $translateKey]);
-	$allLangs = L10n::getAvailableLanguages();
-	$success = 0;
-	$fail = 0;
-	foreach ($allData as $key => $data) {
-		$toTranslate = $data[$translateKey];
-		if ($toTranslate != '') {
-			foreach ($allLangs as $key => $lang) {
-				$a = new \stdClass();
-				$a->strings = [];
-
-				// First we get the the localizations
-				if (file_exists("view/lang/$lang/strings.php")) {
-					include "view/lang/$lang/strings.php";
-				}
-				if (file_exists("addon/morechoice/lang/$lang/strings.php")) {
-					include "addon/morechoice/lang/$lang/strings.php";
-				}
-
-				$localizedStrings = $a->strings;
-				unset($a);
-
-				$key = array_search($toTranslate, $localizedStrings);
-				if ($key !== false) {
-					break;
-				}
-
-				// defaulting to empty string
-				$key = '';
-			}
 
-			if ($key == '') {
-				$fail++;
-			} else {
-				DBA::update('profile', [$translateKey => $key], ['id' => $data['id']]);
-				logger::log('Updated contact ' . $data['id'] . " to $translateKey " . $key .
-					' (was: ' . $data[$translateKey] . ')');
-				Worker::add(PRIORITY_LOW, 'ProfileUpdate', $data['id']);		
-				Contact::updateSelfFromUserID($data['id']);
-				GContact::updateForUser($data['id']);
-				$success++;
-			}
-		}
+		Logger::notice($translateKey . " fix completed", ['action' => 'update', 'translateKey' => $translateKey, 'Success' => $success, 'Fail' => $fail ]);
 	}
-
-	Logger::log($translateKey . " fix completed. Success: $success. Fail: $fail");
 	return Update::SUCCESS;
 }
 
-// Post-update script of PR 5751
-function update_1298()
+function update_1309()
 {
-	$translateKey = 'sexual';
-	$allData = DBA::select('profile', ['id', $translateKey]);
-	$allLangs = L10n::getAvailableLanguages();
-	$success = 0;
-	$fail = 0;
-	foreach ($allData as $key => $data) {
-		$toTranslate = $data[$translateKey];
-		if ($toTranslate != '') {
-			foreach ($allLangs as $key => $lang) {
-				$a = new \stdClass();
-				$a->strings = [];
-
-				// First we get the the localizations
-				if (file_exists("view/lang/$lang/strings.php")) {
-					include "view/lang/$lang/strings.php";
-				}
-				if (file_exists("addon/morechoice/lang/$lang/strings.php")) {
-					include "addon/morechoice/lang/$lang/strings.php";
-				}
-
-				$localizedStrings = $a->strings;
-				unset($a);
-
-				$key = array_search($toTranslate, $localizedStrings);
-				if ($key !== false) {
-					break;
-				}
+	$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;
+		}
 
-				// defaulting to empty string
-				$key = '';
-			}
+		$item = Item::selectFirst(['id', 'gravity'], ['uid' => $contact['uid'], 'guid' => $entry['guid']]);
+		if (!DBA::isResult($item)) {
+			continue;
+		}
 
-			if ($key == '') {
-				$fail++;
-			} else {
-				DBA::update('profile', [$translateKey => $key], ['id' => $data['id']]);
-				logger::log('Updated contact ' . $data['id'] . " to $translateKey " . $key .
-					' (was: ' . $data[$translateKey] . ')');
-				Worker::add(PRIORITY_LOW, 'ProfileUpdate', $data['id']);		
-				Contact::updateSelfFromUserID($data['id']);
-				GContact::updateForUser($data['id']);
-				$success++;
-			}
+		if ($item['gravity'] == GRAVITY_PARENT) {
+			$cmd = Delivery::POST;
+		} else {
+			$cmd = Delivery::COMMENT;
 		}
-	}
 
-	Logger::log($translateKey . " fix completed. Success: $success. Fail: $fail");
+		$deliver_options = ['priority' => PRIORITY_MEDIUM, 'dont_fork' => true];
+		Worker::add($deliver_options, 'Delivery', $cmd, $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;
-}
\ No newline at end of file
+}