X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=update.php;h=82b184c9f4c1dc791fe759329632482bfaa37cb3;hb=01c6179feb8d8de25515858aaaf2c237031a7969;hp=22ed4ae9e3cfe3027a4f7edb58f1cfeb31375bcb;hpb=b7527a803a5eda9a383b6fc95c522d1ebf8580eb;p=friendica.git

diff --git a/update.php b/update.php
index 22ed4ae9e3..82b184c9f4 100644
--- a/update.php
+++ b/update.php
@@ -1,21 +1,23 @@
 <?php
-
-use Friendica\Core\Addon;
-use Friendica\Core\Logger;
-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
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * Automatic post-databse structure change updates
  *
  * These functions are responsible for doing critical post update changes to the data (not the structure) in the database.
  *
@@ -38,28 +40,19 @@ use Friendica\Worker\Delivery;
  * If you need to run a script before the database update, name the function "pre_update_4712()"
  */
 
-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"] == "") {
-			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"])
-		);
-	}
-}
+use Friendica\Core\Addon;
+use Friendica\Core\Logger;
+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;
 
 function update_1179()
 {
@@ -99,23 +92,7 @@ function update_1191()
 	DI::config()->set('system', 'maintenance', 1);
 
 	if (Addon::isEnabled('forumlist')) {
-		$addon = 'forumlist';
-		$addons = DI::config()->get('system', 'addon');
-		$addons_arr = [];
-
-		if ($addons) {
-			$addons_arr = explode(",", str_replace(" ", "", $addons));
-
-			$idx = array_search($addon, $addons_arr);
-			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' ");
-				DI::config()->set('system', 'addon', implode(", ", $addons_arr));
-			}
-		}
+		Addon::uninstall('forumlist');
 	}
 
 	// select old formlist addon entries
@@ -137,7 +114,7 @@ function update_1191()
 
 			if ($key === 'show_on_profile') {
 				if ($value) {
-					DI::pConfig()->set($uid, feature, forumlist_profile, $value);
+					DI::pConfig()->set($uid, 'feature', 'forumlist_profile', $value);
 				}
 
 				DI::pConfig()->delete($uid, $family, $key);
@@ -145,7 +122,7 @@ function update_1191()
 
 			if ($key === 'show_on_network') {
 				if ($value) {
-					DI::pConfig()->set($uid, feature, forumlist_widget, $value);
+					DI::pConfig()->set($uid, 'feature', 'forumlist_widget', $value);
 				}
 
 				DI::pConfig()->delete($uid, $family, $key);
@@ -363,7 +340,7 @@ function update_1309()
 
 		$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']]);
+		Logger::info('Added delivery worker', ['item' => $item['id'], 'contact' => $entry['cid']]);
 		DBA::delete('queue', ['id' => $entry['id']]);
 	}
 	return Update::SUCCESS;
@@ -430,3 +407,18 @@ function update_1330()
 
 	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;
+}