X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=update.php;h=40a3e8ff0d22ee39328b8eddcd39621144af1e00;hb=295d90d496a56217383481fa7a0153e0ac48e38a;hp=b497e04021f5ba5eab46c2b08a5c4d066f8b3421;hpb=82a7611488ea883149c0ac4a932dc82f90450b00;p=friendica.git

diff --git a/update.php b/update.php
index b497e04021..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;
 
 /**
  *
@@ -50,8 +52,7 @@ function update_1178()
 
 		$profile["pub_keywords"] = profile_clean_keywords($profile["pub_keywords"]);
 
-		$r = q(
-			"UPDATE `contact` SET `about` = '%s', `location` = '%s', `keywords` = '%s', `gender` = '%s' WHERE `self` AND `uid` = %d",
+		$r = q("UPDATE `contact` SET `about` = '%s', `location` = '%s', `keywords` = '%s', `gender` = '%s' WHERE `self` AND `uid` = %d",
 			DBA::escape($profile["about"]),
 			DBA::escape($profile["locality"]),
 			DBA::escape($profile["pub_keywords"]),
@@ -119,8 +120,7 @@ function update_1191()
 	}
 
 	// select old formlist addon entries
-	$r = q(
-		"SELECT `uid`, `cat`, `k`, `v` FROM `pconfig` WHERE `cat` = '%s' ",
+	$r = q("SELECT `uid`, `cat`, `k`, `v` FROM `pconfig` WHERE `cat` = '%s' ",
 		DBA::escape('forumlist')
 	);
 
@@ -161,11 +161,10 @@ 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)
+	$r = q("UPDATE `user` SET `account-type` = %d WHERE `page-flags` IN (%d, %d)",
+		DBA::escape(User::ACCOUNT_TYPE_COMMUNITY),
+		DBA::escape(User::PAGE_FLAGS_COMMUNITY),
+		DBA::escape(User::PAGE_FLAGS_PRVGROUP)
 	);
 }
 
@@ -294,51 +293,85 @@ function update_1288()
 	return Update::SUCCESS;
 }
 
-	
 // Post-update script of PR 5751
-function update_1293()
+function update_1298()
 {
-	$allGenders = DBA::select('contact', ['id', 'gender']);
-	$allLangs = L10n::getAvailableLanguages();
-	$success = 0;
-	$fail = 0;
-	foreach ($allGenders as $key => $gender) {
-		if ($gender['gender'] != '') {
-			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";
+	$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 = '';
 				}
-				if (file_exists("addon/morechoice/lang/$lang/strings.php")) {
-					include "addon/morechoice/lang/$lang/strings.php";
+
+				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++;
 				}
+			}
+		}
 
-				$localizedStrings = $a->strings;
-				unset($a);
+		Logger::notice($translateKey . " fix completed", ['action' => 'update', 'translateKey' => $translateKey, 'Success' => $success, 'Fail' => $fail ]);
+	}
+	return Update::SUCCESS;
+}
 
-				$key = array_search($gender['gender'], $localizedStrings);
-				if ($key !== false) {
-					break;
-				}
+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;
+		}
 
-				// 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('contact', ['gender' => $key], ['id' => $gender['id']]);
-				logger::log('Updated contact ' . $gender['id'] . ' to gender ' . $key .
-					' (was: ' . $gender['gender'] . ')');
-				$success++;
-			}
+		if ($item['gravity'] == GRAVITY_PARENT) {
+			$cmd = Delivery::POST;
+		} else {
+			$cmd = Delivery::COMMENT;
 		}
-	}
 
-	Logger::log("Gender 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;
 }