X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=update.php;h=22d1809fea8ef75e4cc8af9f96043c255e420dbf;hb=12dd7b552f382dff38389344b279e3faf6e57281;hp=6976bcb1bc75d46dc78f438bd942534ea954fdc4;hpb=0ec44f3e8a73229c3aadea86f61b5571a701c6b7;p=friendica.git

diff --git a/update.php b/update.php
index 6976bcb1bc..22d1809fea 100644
--- a/update.php
+++ b/update.php
@@ -4,6 +4,7 @@ use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Core\Update;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
@@ -11,8 +12,6 @@ use Friendica\Model\Item;
 use Friendica\Model\User;
 use Friendica\Util\DateTimeFormat;
 
-require_once 'include/dba.php';
-
 /**
  *
  * update.php - automatic system update
@@ -20,7 +19,7 @@ require_once 'include/dba.php';
  * This function is responsible for doing post update changes to the data
  * (not the structure) in the database.
  *
- * Database structure changes are done in src/Database/DBStructure.php
+ * Database structure changes are done in config/dbstructure.config.php
  *
  * If there is a need for a post process to a structure change, update this file
  * by adding a new function at the end with the number of the new DB_UPDATE_VERSION.
@@ -31,8 +30,8 @@ require_once 'include/dba.php';
  * 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 src/Database/DBStructure.php
- * 3. Set DB_UPDATE_VERSION in boot.php to 4712.
+ * 2. Apply the needed structural changes in config/dbStructure.php
+ * 3. Set DB_UPDATE_VERSION in config/dbstructure.config.php to 4712.
  *
  * If you need to run a script before the database update, name the function "pre_update_4712()"
  */
@@ -49,10 +48,10 @@ 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",
-				dbesc($profile["about"]),
-				dbesc($profile["locality"]),
-				dbesc($profile["pub_keywords"]),
-				dbesc($profile["gender"]),
+				DBA::escape($profile["about"]),
+				DBA::escape($profile["locality"]),
+				DBA::escape($profile["pub_keywords"]),
+				DBA::escape($profile["gender"]),
 				intval($profile["uid"])
 			);
 	}
@@ -65,7 +64,7 @@ function update_1179() {
 	// Update the central item storage with uid=0
 	Worker::add(PRIORITY_LOW, "threadupdate");
 
-	return UPDATE_SUCCESS;
+	return Update::SUCCESS;
 }
 
 function update_1181() {
@@ -73,7 +72,7 @@ function update_1181() {
 	// Fill the new fields in the term table.
 	Worker::add(PRIORITY_LOW, "TagUpdate");
 
-	return UPDATE_SUCCESS;
+	return Update::SUCCESS;
 }
 
 function update_1189() {
@@ -84,7 +83,7 @@ function update_1189() {
 		Config::delete('system','directory_submit_url');
 	}
 
-	return UPDATE_SUCCESS;
+	return Update::SUCCESS;
 }
 
 function update_1191() {
@@ -112,11 +111,11 @@ function update_1191() {
 
 	// select old formlist addon entries
 	$r = q("SELECT `uid`, `cat`, `k`, `v` FROM `pconfig` WHERE `cat` = '%s' ",
-		dbesc('forumlist')
+		DBA::escape('forumlist')
 	);
 
 	// convert old forumlist addon entries in new config entries
-	if (DBA::is_result($r)) {
+	if (DBA::isResult($r)) {
 		foreach ($r as $rr) {
 			$uid = $rr['uid'];
 			$family = $rr['cat'];
@@ -144,12 +143,12 @@ function update_1191() {
 
 	Config::set('system', 'maintenance', 0);
 
-	return UPDATE_SUCCESS;
+	return Update::SUCCESS;
 }
 
 function update_1203() {
 	$r = q("UPDATE `user` SET `account-type` = %d WHERE `page-flags` IN (%d, %d)",
-		dbesc(ACCOUNT_TYPE_COMMUNITY), dbesc(PAGE_COMMUNITY), dbesc(PAGE_PRVGROUP));
+		DBA::escape(Contact::ACCOUNT_TYPE_COMMUNITY), DBA::escape(Contact::PAGE_COMMUNITY), DBA::escape(Contact::PAGE_PRVGROUP));
 }
 
 function update_1244() {
@@ -165,19 +164,19 @@ function update_1244() {
 	// Logged in users are forcibly logged out
 	DBA::delete('session', ['1 = 1']);
 
-	return UPDATE_SUCCESS;
+	return Update::SUCCESS;
 }
 
 function update_1245() {
 	$rino = Config::get('system', 'rino_encrypt');
 
 	if (!$rino) {
-		return UPDATE_SUCCESS;
+		return Update::SUCCESS;
 	}
 
 	Config::set('system', 'rino_encrypt', 1);
 
-	return UPDATE_SUCCESS;
+	return Update::SUCCESS;
 }
 
 function update_1247() {
@@ -226,13 +225,13 @@ function update_1260() {
 		SET `thread`.`author-id` = `item`.`author-id` WHERE `thread`.`author-id` = 0");
 
 	Config::set('system', 'maintenance', 0);
-	return UPDATE_SUCCESS;
+	return Update::SUCCESS;
 }
 
 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;
+	return Update::SUCCESS;
 }
 
 function update_1278() {
@@ -244,5 +243,14 @@ function update_1278() {
 
 	Config::set('system', 'maintenance', 0);
 
-	return UPDATE_SUCCESS;
+	return Update::SUCCESS;
+}
+
+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");
+	DBA::e("UPDATE `item-content` INNER JOIN `item` ON `item`.`icid` = `item-content`.`id` SET `item-content`.`uri-id` = `item`.`uri-id` WHERE `item-content`.`uri-id` IS NULL OR `item-content`.`uri-id` = 0");
+
+	return Update::SUCCESS;
 }