X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=update.php;h=f86fea8dfd4c227b34327acb36d45fdf2a4bb312;hb=dd8d9d7c70acc27bff59877f5782c2a455f6c3f4;hp=6dc2772682fdd94f47a770fa6c0a6d66aaaa4e35;hpb=e157859dfbe68a16f097b2f2ad2cc9f6a331fea6;p=friendica.git

diff --git a/update.php b/update.php
index 6dc2772682..f86fea8dfd 100644
--- a/update.php
+++ b/update.php
@@ -1,28 +1,29 @@
 <?php
 
 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\DI;
 use Friendica\Model\Contact;
+use Friendica\Model\GContact;
 use Friendica\Model\Item;
 use Friendica\Model\User;
+use Friendica\Model\Storage;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Worker\Delivery;
 
 /**
+ * update.php - automatic post-databse structure change updates
  *
- * update.php - automatic system update
+ * These functions are responsible for doing critical post update changes to the data (not the structure) in the database.
  *
- * This function is responsible for doing post update changes to the data
- * (not the structure) in the database.
+ * Database structure changes are done in static/dbstructure.config.php
  *
- * Database structure changes are done in config/dbstructure.config.php
+ * For non-critical database migrations, please add a method in the Database\PostUpdate class
  *
- * If there is a need for a post process to a structure change, update this file
+ * If there is a need for a post update to a structure change, update this file
  * by adding a new function at the end with the number of the new DB_UPDATE_VERSION.
  *
  * The numbered script in this file has to be exactly like the DB_UPDATE_VERSION
@@ -31,8 +32,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()"
  */
@@ -50,8 +51,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"]),
@@ -63,8 +63,8 @@ function update_1178()
 
 function update_1179()
 {
-	if (Config::get('system', 'no_community_page')) {
-		Config::set('system', 'community_page_style', CP_NO_COMMUNITY_PAGE);
+	if (DI::config()->get('system', 'no_community_page')) {
+		DI::config()->set('system', 'community_page_style', CP_NO_COMMUNITY_PAGE);
 	}
 
 	// Update the central item storage with uid=0
@@ -85,10 +85,10 @@ function update_1181()
 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(DI::config()->get('system', 'directory_submit_url')) &&
+		!strlen(DI::config()->get('system', 'directory'))) {
+		DI::config()->set('system', 'directory', dirname(DI::config()->get('system', 'directory_submit_url')));
+		DI::config()->delete('system', 'directory_submit_url');
 	}
 
 	return Update::SUCCESS;
@@ -96,11 +96,11 @@ function update_1189()
 
 function update_1191()
 {
-	Config::set('system', 'maintenance', 1);
+	DI::config()->set('system', 'maintenance', 1);
 
 	if (Addon::isEnabled('forumlist')) {
 		$addon = 'forumlist';
-		$addons = Config::get('system', 'addon');
+		$addons = DI::config()->get('system', 'addon');
 		$addons_arr = [];
 
 		if ($addons) {
@@ -113,14 +113,13 @@ function update_1191()
 				// 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));
+				DI::config()->set('system', 'addon', implode(", ", $addons_arr));
 			}
 		}
 	}
 
 	// 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')
 	);
 
@@ -133,39 +132,38 @@ function update_1191()
 			$value = $rr['v'];
 
 			if ($key === 'randomise') {
-				PConfig::delete($uid, $family, $key);
+				DI::pConfig()->delete($uid, $family, $key);
 			}
 
 			if ($key === 'show_on_profile') {
 				if ($value) {
-					PConfig::set($uid, feature, forumlist_profile, $value);
+					DI::pConfig()->set($uid, feature, forumlist_profile, $value);
 				}
 
-				PConfig::delete($uid, $family, $key);
+				DI::pConfig()->delete($uid, $family, $key);
 			}
 
 			if ($key === 'show_on_network') {
 				if ($value) {
-					PConfig::set($uid, feature, forumlist_widget, $value);
+					DI::pConfig()->set($uid, feature, forumlist_widget, $value);
 				}
 
-				PConfig::delete($uid, $family, $key);
+				DI::pConfig()->delete($uid, $family, $key);
 			}
 		}
 	}
 
-	Config::set('system', 'maintenance', 0);
+	DI::config()->set('system', 'maintenance', 0);
 
 	return Update::SUCCESS;
 }
 
 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)
 	);
 }
 
@@ -188,13 +186,13 @@ function update_1244()
 
 function update_1245()
 {
-	$rino = Config::get('system', 'rino_encrypt');
+	$rino = DI::config()->get('system', 'rino_encrypt');
 
 	if (!$rino) {
 		return Update::SUCCESS;
 	}
 
-	Config::set('system', 'rino_encrypt', 1);
+	DI::config()->set('system', 'rino_encrypt', 1);
 
 	return Update::SUCCESS;
 }
@@ -211,8 +209,15 @@ WHERE `hook` LIKE 'plugin_%'");
 
 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')));
+	DI::config()->set('system', 'maintenance', 1);
+	DI::config()->set(
+		'system',
+		'maintenance_reason',
+		DI::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` != ''");
@@ -246,7 +251,7 @@ function update_1260()
 	DBA::e("UPDATE `thread` INNER JOIN `item` ON `thread`.`iid` = `item`.`id`
 		SET `thread`.`author-id` = `item`.`author-id` WHERE `thread`.`author-id` = 0");
 
-	Config::set('system', 'maintenance', 0);
+	DI::config()->set('system', 'maintenance', 0);
 	return Update::SUCCESS;
 }
 
@@ -259,13 +264,20 @@ function update_1261()
 
 function update_1278()
 {
-	Config::set('system', 'maintenance', 1);
-	Config::set('system', 'maintenance_reason', L10n::t('%s: Updating post-type.', DateTimeFormat::utcNow().' '.date('e')));
+	DI::config()->set('system', 'maintenance', 1);
+	DI::config()->set(
+		'system',
+		'maintenance_reason',
+		DI::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']);
 
-	Config::set('system', 'maintenance', 0);
+	DI::config()->set('system', 'maintenance', 0);
 
 	return Update::SUCCESS;
 }
@@ -280,50 +292,156 @@ 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 = DI::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++;
-			}
+		$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;
+}
+
+function update_1323()
+{
+	$users = DBA::select('user', ['uid']);
+	while ($user = DBA::fetch($users)) {
+		Contact::updateSelfFromUserID($user['uid']);
+	}
+	DBA::close($users);
+
+	return Update::SUCCESS;
+}
+
+function update_1327()
+{
+	$contacts = DBA::select('contact', ['uid', 'id', 'blocked', 'readonly'], ["`uid` != ? AND (`blocked` OR `readonly`) AND NOT `pending`", 0]);
+	while ($contact = DBA::fetch($contacts)) {
+		Contact::setBlockedForUser($contact['id'], $contact['uid'], $contact['blocked']);
+		Contact::setIgnoredForUser($contact['id'], $contact['uid'], $contact['readonly']);
+	}
+	DBA::close($contacts);
+
+	return Update::SUCCESS;
+}
+
+function update_1330()
+{
+	$currStorage = DI::config()->get('storage', 'class', '');
+
+	// set the name of the storage instead of the classpath as config
+	if (!empty($currStorage)) {
+		/** @var Storage\IStorage $currStorage */
+		if (!DI::config()->set('storage', 'name', $currStorage::getName())) {
+			return Update::FAILED;
 		}
+
+		// try to delete the class since it isn't needed. This won't work with config files
+		DI::config()->delete('storage', 'class');
 	}
 
-	Logger::log("Gender fix completed. Success: $success. Fail: $fail");
+	// Update attachments and photos
+	if (!DBA::p("UPDATE `photo` SET `photo`.`backend-class` = SUBSTR(`photo`.`backend-class`, 25) WHERE `photo`.`backend-class` LIKE 'Friendica\\\Model\\\Storage\\\%' ESCAPE '|'") ||
+	    !DBA::p("UPDATE `attach` SET `attach`.`backend-class` = SUBSTR(`attach`.`backend-class`, 25) WHERE `attach`.`backend-class` LIKE 'Friendica\\\Model\\\Storage\\\%' ESCAPE '|'")) {
+		return Update::FAILED;
+	};
+
+	return Update::SUCCESS;
+}
+
+function update_1332()
+{
+	$condition = ["`is-default` IS NOT NULL"];
+	$profiles = DBA::select('profile', [], $condition);
+
+	while ($profile = DBA::fetch($profiles)) {
+		DI::profileField()->migrateFromLegacyProfile($profile);
+	}
+	DBA::close($profiles);
+
+	DBA::update('contact', ['profile-id' => null], ['`profile-id` IS NOT NULL']);
+
 	return Update::SUCCESS;
 }