From eb7cbb9adafa003a06f2e2d2df70b4f1a46b1a85 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Thu, 10 Aug 2017 05:07:23 +0000
Subject: [PATCH] Now there are fewer than 300 updates left ...

---
 include/diaspora.php | 35 +++++++++++------------------------
 include/plugin.php   |  9 ++-------
 2 files changed, 13 insertions(+), 31 deletions(-)

diff --git a/include/diaspora.php b/include/diaspora.php
index 60c613178b..7cc3e81226 100644
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -928,11 +928,9 @@ class Diaspora {
 		 * Normally this should have handled by getting a request - but this could get lost
 		 */
 		if ($contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) {
-			q("UPDATE `contact` SET `rel` = %d, `writable` = 1 WHERE `id` = %d AND `uid` = %d",
-				intval(CONTACT_IS_FRIEND),
-				intval($contact["id"]),
-				intval($importer["uid"])
-			);
+			dba::update('contact', array('rel' => CONTACT_IS_FRIEND, 'writable' => true),
+					array('id' => $contact["id"], 'uid' => $contact["uid"]));
+
 			$contact["rel"] = CONTACT_IS_FRIEND;
 			logger("defining user ".$contact["nick"]." as friend");
 		}
@@ -1557,10 +1555,7 @@ class Diaspora {
 
 		dba::unlock();
 
-		q("UPDATE `conv` SET `updated` = '%s' WHERE `id` = %d",
-			dbesc(datetime_convert()),
-			intval($conversation["id"])
-		);
+		dba::update('conv', array('updated' => datetime_convert()), array('id' => $conversation["id"]));
 
 		notification(array(
 			"type" => NOTIFY_MAIL,
@@ -1865,11 +1860,7 @@ class Diaspora {
 
 		dba::unlock();
 
-		q("UPDATE `conv` SET `updated` = '%s' WHERE `id` = %d",
-			dbesc(datetime_convert()),
-			intval($conversation["id"])
-		);
-
+		dba::update('conv', array('updated' => datetime_convert()), array('id' => $conversation["id"]));
 		return true;
 	}
 
@@ -2013,11 +2004,8 @@ class Diaspora {
 		$a = get_app();
 
 		if ($contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) {
-			q("UPDATE `contact` SET `rel` = %d, `writable` = 1 WHERE `id` = %d AND `uid` = %d",
-				intval(CONTACT_IS_FRIEND),
-				intval($contact["id"]),
-				intval($importer["uid"])
-			);
+			dba::update('contact', array('rel' => CONTACT_IS_FRIEND, 'writable' => true),
+					array('id' => $contact["id"], 'uid' => $importer["uid"]));
 		}
 		// send notification
 
@@ -2468,11 +2456,10 @@ class Diaspora {
 		}
 
 		// Currently we don't have a central deletion function that we could use in this case. The function "item_drop" doesn't work for that case
-		q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s', `body` = '' , `title` = '' WHERE `id` = %d",
-			dbesc(datetime_convert()),
-			dbesc(datetime_convert()),
-			intval($r[0]["id"])
-		);
+		dba::update('item', array('deleted' => true, 'title' => '', 'body' => '',
+					'edited' => datetime_convert(), 'changed' => datetime_convert()),
+				array('id' => $r[0]["id"]));
+
 		delete_thread($r[0]["id"], $r[0]["parent-uri"]);
 
 		logger("Deleted target ".$target_guid." (".$r[0]["id"].") from user ".$importer["uid"]." parent: ".$p[0]["id"], LOGGER_DEBUG);
diff --git a/include/plugin.php b/include/plugin.php
index 3a24235754..25e65ec248 100644
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -56,9 +56,7 @@ function install_plugin($plugin) {
 		// This way the system won't fall over dead during the update.
 
 		if (file_exists('addon/' . $plugin . '/.hidden')) {
-			q("UPDATE `addon` SET `hidden` = 1 WHERE `name` = '%s'",
-				dbesc($plugin)
-			);
+			dba::update('addon', array('hidden' => true), array('name' => $plugin));
 		}
 		return true;
 	}
@@ -106,10 +104,7 @@ function reload_plugins() {
 								$func = $pl . '_install';
 								$func();
 							}
-							q("UPDATE `addon` SET `timestamp` = %d WHERE `id` = %d",
-								intval($t),
-								intval($i['id'])
-							);
+							dba::update('addon', array('timestamp' => $t), array('id' => $i['id']));
 						}
 					}
 				}