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

diff --git a/mod/repair_ostatus.php b/mod/repair_ostatus.php
index b4c6a9cbd6..edbd2e940a 100644
--- a/mod/repair_ostatus.php
+++ b/mod/repair_ostatus.php
@@ -1,6 +1,22 @@
 <?php
 /**
- * @file mod/repair_ostatus.php
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
 
 use Friendica\App;
@@ -11,52 +27,38 @@ use Friendica\Model\Contact;
 
 function repair_ostatus_content(App $a) {
 
-	if (! local_user()) {
-		notice(DI::l10n()->t('Permission denied.') . EOL);
+	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($uid, $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;
 }