X-Git-Url: https://reisub.nsupdate.info/git/?a=blobdiff_plain;f=update.php;h=e619ec89dd9bbb569c3ecb4db27c863c16fdcab2;hb=4315fec7566b79d05334afe18f0dfadaf7e6dd4f;hp=22d1809fea8ef75e4cc8af9f96043c255e420dbf;hpb=acaee626f5f23f4c1dc19c31896a0797a251b58f;p=friendica.git%2F.git

diff --git a/update.php b/update.php
index 22d1809fea..e619ec89dd 100644
--- a/update.php
+++ b/update.php
@@ -3,11 +3,13 @@
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
 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;
@@ -36,30 +38,34 @@ use Friendica\Util\DateTimeFormat;
  * If you need to run a script before the database update, name the function "pre_update_4712()"
  */
 
-function update_1178() {
+function update_1178()
+{
 	require_once 'mod/profiles.php';
 
 	$profiles = q("SELECT `uid`, `about`, `locality`, `pub_keywords`, `gender` FROM `profile` WHERE `is-default`");
 
-	foreach ($profiles AS $profile) {
-		if ($profile["about"].$profile["locality"].$profile["pub_keywords"].$profile["gender"] == "")
+	foreach ($profiles as $profile) {
+		if ($profile["about"].$profile["locality"].$profile["pub_keywords"].$profile["gender"] == "") {
 			continue;
+		}
 
 		$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",
-				DBA::escape($profile["about"]),
-				DBA::escape($profile["locality"]),
-				DBA::escape($profile["pub_keywords"]),
-				DBA::escape($profile["gender"]),
-				intval($profile["uid"])
-			);
+			DBA::escape($profile["about"]),
+			DBA::escape($profile["locality"]),
+			DBA::escape($profile["pub_keywords"]),
+			DBA::escape($profile["gender"]),
+			intval($profile["uid"])
+		);
 	}
 }
 
-function update_1179() {
-	if (Config::get('system','no_community_page'))
-		Config::set('system','community_page_style', CP_NO_COMMUNITY_PAGE);
+function update_1179()
+{
+	if (Config::get('system', 'no_community_page')) {
+		Config::set('system', 'community_page_style', CP_NO_COMMUNITY_PAGE);
+	}
 
 	// Update the central item storage with uid=0
 	Worker::add(PRIORITY_LOW, "threadupdate");
@@ -67,7 +73,8 @@ function update_1179() {
 	return Update::SUCCESS;
 }
 
-function update_1181() {
+function update_1181()
+{
 
 	// Fill the new fields in the term table.
 	Worker::add(PRIORITY_LOW, "TagUpdate");
@@ -75,18 +82,20 @@ function update_1181() {
 	return Update::SUCCESS;
 }
 
-function update_1189() {
+function update_1189()
+{
 
-	if (strlen(Config::get('system','directory_submit_url')) &&
-		!strlen(Config::get('system','directory'))) {
-		Config::set('system','directory', dirname(Config::get('system','directory_submit_url')));
-		Config::delete('system','directory_submit_url');
+	if (strlen(Config::get('system', 'directory_submit_url')) &&
+		!strlen(Config::get('system', 'directory'))) {
+		Config::set('system', 'directory', dirname(Config::get('system', 'directory_submit_url')));
+		Config::delete('system', 'directory_submit_url');
 	}
 
 	return Update::SUCCESS;
 }
 
-function update_1191() {
+function update_1191()
+{
 	Config::set('system', 'maintenance', 1);
 
 	if (Addon::isEnabled('forumlist')) {
@@ -95,16 +104,16 @@ function update_1191() {
 		$addons_arr = [];
 
 		if ($addons) {
-			$addons_arr = explode(",",str_replace(" ", "", $addons));
+			$addons_arr = explode(",", str_replace(" ", "", $addons));
 
 			$idx = array_search($addon, $addons_arr);
-			if ($idx !== false){
+			if ($idx !== false) {
 				unset($addons_arr[$idx]);
 				//delete forumlist manually from addon and hook table
 				// since Addon::uninstall() don't work here
 				q("DELETE FROM `addon` WHERE `name` = 'forumlist' ");
 				q("DELETE FROM `hook` WHERE `file` = 'addon/forumlist/forumlist.php' ");
-				Config::set('system','addon', implode(", ", $addons_arr));
+				Config::set('system', 'addon', implode(", ", $addons_arr));
 			}
 		}
 	}
@@ -122,21 +131,24 @@ function update_1191() {
 			$key = $rr['k'];
 			$value = $rr['v'];
 
-			if ($key === 'randomise')
-				PConfig::delete($uid,$family,$key);
+			if ($key === 'randomise') {
+				PConfig::delete($uid, $family, $key);
+			}
 
 			if ($key === 'show_on_profile') {
-				if ($value)
-					PConfig::set($uid,feature,forumlist_profile,$value);
+				if ($value) {
+					PConfig::set($uid, feature, forumlist_profile, $value);
+				}
 
-				PConfig::delete($uid,$family,$key);
+				PConfig::delete($uid, $family, $key);
 			}
 
 			if ($key === 'show_on_network') {
-				if ($value)
-					PConfig::set($uid,feature,forumlist_widget,$value);
+				if ($value) {
+					PConfig::set($uid, feature, forumlist_widget, $value);
+				}
 
-				PConfig::delete($uid,$family,$key);
+				PConfig::delete($uid, $family, $key);
 			}
 		}
 	}
@@ -146,18 +158,23 @@ function update_1191() {
 	return Update::SUCCESS;
 }
 
-function update_1203() {
+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)
+	);
 }
 
-function update_1244() {
+function update_1244()
+{
 	// Sets legacy_password for all legacy hashes
 	DBA::update('user', ['legacy_password' => true], ['SUBSTR(password, 1, 4) != "$2y$"']);
 
 	// All legacy hashes are re-hashed using the new secure hashing function
 	$stmt = DBA::select('user', ['uid', 'password'], ['legacy_password' => true]);
-	while($user = DBA::fetch($stmt)) {
+	while ($user = DBA::fetch($stmt)) {
 		DBA::update('user', ['password' => User::hashPassword($user['password'])], ['uid' => $user['uid']]);
 	}
 
@@ -167,7 +184,8 @@ function update_1244() {
 	return Update::SUCCESS;
 }
 
-function update_1245() {
+function update_1245()
+{
 	$rino = Config::get('system', 'rino_encrypt');
 
 	if (!$rino) {
@@ -179,7 +197,8 @@ function update_1245() {
 	return Update::SUCCESS;
 }
 
-function update_1247() {
+function update_1247()
+{
 	// Removing hooks with the old name
 	DBA::e("DELETE FROM `hook`
 WHERE `hook` LIKE 'plugin_%'");
@@ -188,9 +207,17 @@ WHERE `hook` LIKE 'plugin_%'");
 	Addon::reload();
 }
 
-function update_1260() {
+function update_1260()
+{
 	Config::set('system', 'maintenance', 1);
-	Config::set('system', 'maintenance_reason', L10n::t('%s: Updating author-id and owner-id in item and thread table. ', DateTimeFormat::utcNow().' '.date('e')));
+	Config::set(
+		'system',
+		'maintenance_reason',
+		L10n::t(
+			'%s: Updating author-id and owner-id in item and thread table. ',
+			DateTimeFormat::utcNow().' '.date('e')
+		)
+	);
 
 	$items = DBA::p("SELECT `id`, `owner-link`, `owner-name`, `owner-avatar`, `network` FROM `item`
 		WHERE `owner-id` = 0 AND `owner-link` != ''");
@@ -228,15 +255,24 @@ function update_1260() {
 	return Update::SUCCESS;
 }
 
-function update_1261() {
+function update_1261()
+{
 	// This fixes the results of an issue in the develop branch of 2018-05.
 	DBA::update('contact', ['blocked' => false, 'pending' => false], ['uid' => 0, 'blocked' => true, 'pending' => true]);
 	return Update::SUCCESS;
 }
 
-function update_1278() {
+function update_1278()
+{
 	Config::set('system', 'maintenance', 1);
-	Config::set('system', 'maintenance_reason', L10n::t('%s: Updating post-type.', DateTimeFormat::utcNow().' '.date('e')));
+	Config::set(
+		'system',
+		'maintenance_reason',
+		L10n::t(
+			'%s: Updating post-type.',
+			DateTimeFormat::utcNow().' '.date('e')
+		)
+	);
 
 	Item::update(['post-type' => Item::PT_PAGE], ['bookmark' => true]);
 	Item::update(['post-type' => Item::PT_PERSONAL_NOTE], ['type' => 'note']);
@@ -246,7 +282,8 @@ function update_1278() {
 	return Update::SUCCESS;
 }
 
-function update_1288() {
+function update_1288()
+{
 	// Updates missing `uri-id` values
 
 	DBA::e("UPDATE `item-activity` INNER JOIN `item` ON `item`.`iaid` = `item-activity`.`id` SET `item-activity`.`uri-id` = `item`.`uri-id` WHERE `item-activity`.`uri-id` IS NULL OR `item-activity`.`uri-id` = 0");
@@ -254,3 +291,58 @@ function update_1288() {
 
 	return Update::SUCCESS;
 }
+
+// Post-update script of PR 5751
+function update_1298()
+{
+	$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 ($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++;
+				}
+			}
+		}
+
+		Logger::notice($translateKey . " fix completed", ['action' => 'update', 'translateKey' => $translateKey, 'Success' => $success, 'Fail' => $fail ]);
+	}
+	return Update::SUCCESS;
+}