X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Frepair_ostatus.php;h=edbd2e940acbc57d779158975db98608a12b69cb;hb=dd3f573fecdc465e7e3f78d4bb672f4a35568bdb;hp=054a19640b153d19cfb6d43953f5738f7f8d7cc1;hpb=53e38b03130ea798bba44db44ccb7f331dc4b91d;p=friendica.git

diff --git a/mod/repair_ostatus.php b/mod/repair_ostatus.php
index 054a19640b..edbd2e940a 100644
--- a/mod/repair_ostatus.php
+++ b/mod/repair_ostatus.php
@@ -27,52 +27,38 @@ use Friendica\Model\Contact;
 
 function repair_ostatus_content(App $a) {
 
-	if (! local_user()) {
+	if (!local_user()) {
 		notice(DI::l10n()->t('Permission denied.'));
 		DI::baseUrl()->redirect('ostatus_repair');
 		// NOTREACHED
 	}
 
-	$o = "<h2>".DI::l10n()->t("Resubscribing to OStatus contacts")."</h2>";
+	$o = "<h2>" . DI::l10n()->t("Resubscribing to OStatus contacts") . "</h2>";
 
 	$uid = local_user();
 
-	$counter = intval($_REQUEST['counter']);
+	$counter = intval($_REQUEST['counter'] ?? 0);
 
-	$r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE
-	`uid` = %d AND `network` = '%s' AND `rel` IN (%d, %d)",
-		intval($uid),
-		DBA::escape(Protocol::OSTATUS),
-		intval(Contact::FRIEND),
-		intval(Contact::SHARING));
+	$condition = ['uid' => $uid, 'network' => Protocol::OSTATUS, 'rel' => [Contact::FRIEND, Contact::SHARING]];
+	$total = DBA::count('contact', $condition);
 
-	if (!DBA::isResult($r)) {
+	if (!$total) {
 		return ($o . DI::l10n()->t("Error"));
 	}
 
-	$total = $r[0]["total"];
-
-	$r = q("SELECT `url` FROM `contact` WHERE
-		`uid` = %d AND `network` = '%s' AND `rel` IN (%d, %d)
-		ORDER BY `url`
-		LIMIT %d, 1",
-		intval($uid),
-		DBA::escape(Protocol::OSTATUS),
-		intval(Contact::FRIEND),
-		intval(Contact::SHARING), $counter++);
-
-	if (!DBA::isResult($r)) {
+	$contact = Contact::selectToArray(['url'], $condition, ['order' => ['url'], 'limit' => [$counter++, 1]]);
+	if (!DBA::isResult($contact)) {
 		$o .= DI::l10n()->t("Done");
 		return $o;
 	}
 
-	$o .= "<p>".$counter."/".$total.": ".$r[0]["url"]."</p>";
+	$o .= "<p>" . $counter . "/" . $total . ": " . $contact[0]["url"] . "</p>";
 
-	$o .= "<p>".DI::l10n()->t("Keep this window open until done.")."</p>";
+	$o .= "<p>" . DI::l10n()->t("Keep this window open until done.") . "</p>";
 
-	Contact::createFromProbe($a->user, $r[0]["url"], true);
+	Contact::createFromProbeForUser($a->getLoggedInUserId(), $contact[0]["url"]);
 
-	DI::page()['htmlhead'] = '<meta http-equiv="refresh" content="1; URL=' . DI::baseUrl() . '/repair_ostatus?counter='.$counter.'">';
+	DI::page()['htmlhead'] = '<meta http-equiv="refresh" content="1; URL=' . DI::baseUrl() . '/repair_ostatus?counter=' . $counter . '">';
 
 	return $o;
 }