X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fthreads.php;h=7c20018259e005a0ea4d2a10a6b359f74460e896;hb=e36f2bb1fb3439e9993c7568e57140c4f954b772;hp=e776a37e7e068a56878591666dc081ab9db5893d;hpb=ec02af593db87e78b0b388047ac4265aa5f987b1;p=friendica.git

diff --git a/include/threads.php b/include/threads.php
index e776a37e7e..7c20018259 100644
--- a/include/threads.php
+++ b/include/threads.php
@@ -3,7 +3,7 @@
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
-use Friendica\Object\Contact;
+use Friendica\Model\Contact;
 
 function add_thread($itemid, $onlyshadow = false) {
 	$items = q("SELECT `uid`, `created`, `edited`, `commented`, `received`, `changed`, `wall`, `private`, `pubmail`,
@@ -54,7 +54,7 @@ function add_shadow_thread($itemid) {
 	}
 
 	// is it an entry from a connector? Only add an entry for natively connected networks
-	if (!in_array($item["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""))) {
+	if (!in_array($item["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""])) {
 		return;
 	}
 
@@ -99,7 +99,6 @@ function add_shadow_thread($itemid) {
 		if (!DBM::is_result($r)) {
 			// Preparing public shadow (removing user specific data)
 			require_once("include/items.php");
-			require_once("include/Contact.php");
 
 			unset($item[0]['id']);
 			$item[0]['uid'] = 0;
@@ -107,7 +106,7 @@ function add_shadow_thread($itemid) {
 			$item[0]['wall'] = 0;
 			$item[0]['contact-id'] = Contact::getIdForURL($item[0]['author-link'], 0);
 
-			if (in_array($item[0]['type'], array("net-comment", "wall-comment"))) {
+			if (in_array($item[0]['type'], ["net-comment", "wall-comment"])) {
 				$item[0]['type'] = 'remote-comment';
 			} elseif ($item[0]['type'] == 'wall') {
 				$item[0]['type'] = 'remote';
@@ -159,7 +158,6 @@ function add_shadow_entry($itemid) {
 
 	// Preparing public shadow (removing user specific data)
 	require_once("include/items.php");
-	require_once("include/Contact.php");
 
 	unset($item['id']);
 	$item['uid'] = 0;
@@ -167,7 +165,7 @@ function add_shadow_entry($itemid) {
 	$item['wall'] = 0;
 	$item['contact-id'] = Contact::getIdForURL($item['author-link'], 0);
 
-	if (in_array($item['type'], array("net-comment", "wall-comment"))) {
+	if (in_array($item['type'], ["net-comment", "wall-comment"])) {
 		$item['type'] = 'remote-comment';
 	} elseif ($item['type'] == 'wall') {
 		$item['type'] = 'remote';
@@ -205,7 +203,7 @@ function update_thread($itemid, $setmention = false) {
 	$sql = "";
 
 	foreach ($item AS $field => $data)
-		if (!in_array($field, array("guid", "title", "body", "rendered-html", "rendered-hash"))) {
+		if (!in_array($field, ["guid", "title", "body", "rendered-html", "rendered-hash"])) {
 			if ($sql != "") {
 				$sql .= ", ";
 			}
@@ -253,7 +251,7 @@ function delete_thread($itemid, $itemuri = "") {
 	}
 
 	// Using dba::delete at this time could delete the associated item entries
-	$result = q("DELETE FROM `thread` WHERE `iid` = %d", intval($itemid));
+	$result = dba::e("DELETE FROM `thread` WHERE `iid` = ?", $itemid);
 
 	logger("delete_thread: Deleted thread for item ".$itemid." - ".print_r($result, true), LOGGER_DEBUG);
 
@@ -263,7 +261,7 @@ function delete_thread($itemid, $itemuri = "") {
 				intval($item["uid"])
 			);
 		if (!DBM::is_result($r)) {
-			dba::delete('item', array('uri' => $itemuri, 'uid' => 0));
+			dba::delete('item', ['uri' => $itemuri, 'uid' => 0]);
 			logger("delete_thread: Deleted shadow for item ".$itemuri, LOGGER_DEBUG);
 		}
 	}
@@ -272,7 +270,7 @@ function delete_thread($itemid, $itemuri = "") {
 function update_threads() {
 	logger("update_threads: start");
 
-	$messages = dba::select('item', array('id'), array("`id` = `parent`"));
+	$messages = dba::select('item', ['id'], ["`id` = `parent`"]);
 
 	logger("update_threads: fetched messages: ".dba::num_rows($messages));
 
@@ -303,8 +301,8 @@ function update_shadow_copy() {
 	logger("start");
 
 	$condition = "`uid` != 0 AND `network` IN ('', ?, ?, ?) AND `visible` AND NOT `deleted` AND NOT `moderated` AND NOT `private`";
-	$messages = dba::select('thread', array('iid'), array($condition, NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS),
-				array('order' => 'created'));
+	$messages = dba::select('thread', ['iid'], [$condition, NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS],
+				['order' => 'created']);
 
 	logger("fetched messages: ".dba::num_rows($messages));
 	while ($message = dba::fetch($messages))