X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Frepair_ostatus.php;h=b0ee0bf575ba3bb9ebd2f5b712f607d344fca7e4;hb=3456ae7809de9381f375e025fbd81dcfdf67dc6e;hp=bc6b177f9528b8a896ca320dbcd435ec50b11067;hpb=536fbe5af17a4a393ea440155e2770f63b5a71f5;p=friendica.git

diff --git a/mod/repair_ostatus.php b/mod/repair_ostatus.php
index bc6b177f95..b0ee0bf575 100644
--- a/mod/repair_ostatus.php
+++ b/mod/repair_ostatus.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -27,52 +27,38 @@ use Friendica\Model\Contact;
 
 function repair_ostatus_content(App $a) {
 
-	if (! local_user()) {
-		notice(DI::l10n()->t('Permission denied.'));
+	if (!DI::userSession()->getLocalUserId()) {
+		DI::sysmsg()->addNotice(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();
+	$uid = DI::userSession()->getLocalUserId();
 
-	$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)) {
-		return ($o . DI::l10n()->t("Error"));
+	if (!$total) {
+		return ($o . DI::l10n()->tt('Error', 'Errors', 1));
 	}
 
-	$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)) {
-		$o .= DI::l10n()->t("Done");
+	$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::createFromProbeForUser($a->getLoggedInUserId(), $r[0]["url"]);
+	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;
 }