X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Frepair_ostatus.php;h=3a3ce42067f0af5ec6db0e4e3bee6a56e06463df;hb=761e94d134cf841a013127ba5070dcba525e0c6d;hp=3e9130e0e8e42a233b5bd5090a383adc3ff599ff;hpb=fef61a28cc7dc8d11774ca0233739f5c5f694a1a;p=friendica.git

diff --git a/mod/repair_ostatus.php b/mod/repair_ostatus.php
index 3e9130e0e8..3a3ce42067 100644
--- a/mod/repair_ostatus.php
+++ b/mod/repair_ostatus.php
@@ -1,17 +1,24 @@
 <?php
+/**
+ * @file mod/repair_ostatus.php
+ */
 
-require_once('include/Scrape.php');
-require_once('include/follow.php');
+use Friendica\App;
+use Friendica\Core\L10n;
+use Friendica\Core\Protocol;
+use Friendica\Core\System;
+use Friendica\Database\DBA;
+use Friendica\Model\Contact;
 
 function repair_ostatus_content(App $a) {
 
 	if (! local_user()) {
-		notice( t('Permission denied.') . EOL);
-		goaway($_SESSION['return_url']);
+		notice(L10n::t('Permission denied.') . EOL);
+		$a->internalRedirect('ostatus_repair');
 		// NOTREACHED
 	}
 
-	$o = "<h2>".t("Resubscribing to OStatus contacts")."</h2>";
+	$o = "<h2>".L10n::t("Resubscribing to OStatus contacts")."</h2>";
 
 	$uid = local_user();
 
@@ -19,39 +26,40 @@ function repair_ostatus_content(App $a) {
 
 	$counter = intval($_REQUEST['counter']);
 
-        $r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE
-                `uid` = %d AND `network` = '%s' AND `rel` IN (%d, %d)",
-                intval($uid),
-                dbesc(NETWORK_OSTATUS),
-                intval(CONTACT_IS_FRIEND),
-                intval(CONTACT_IS_SHARING));
+	$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));
 
-	if (!$r)
-		return($o.t("Error"));
+	if (!DBA::isResult($r)) {
+		return ($o . L10n::t("Error"));
+	}
 
 	$total = $r[0]["total"];
 
-        $r = q("SELECT `url` FROM `contact` WHERE
-                `uid` = %d AND `network` = '%s' AND `rel` IN (%d, %d)
+	$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),
-                dbesc(NETWORK_OSTATUS),
-                intval(CONTACT_IS_FRIEND),
-                intval(CONTACT_IS_SHARING), $counter++);
+		intval($uid),
+		DBA::escape(Protocol::OSTATUS),
+		intval(Contact::FRIEND),
+		intval(Contact::SHARING), $counter++);
 
-	if (!$r) {
-		$o .= t("Done");
+	if (!DBA::isResult($r)) {
+		$o .= L10n::t("Done");
 		return $o;
 	}
 
 	$o .= "<p>".$counter."/".$total.": ".$r[0]["url"]."</p>";
 
-	$o .= "<p>".t("Keep this window open until done.")."</p>";
+	$o .= "<p>".L10n::t("Keep this window open until done.")."</p>";
 
-	$result = new_contact($uid,$r[0]["url"],true);
+	$result = Contact::createFromProbe($uid, $r[0]["url"], true);
 
-	$a->page['htmlhead'] = '<meta http-equiv="refresh" content="1; URL='.App::get_baseurl().'/repair_ostatus?counter='.$counter.'">';
+	$a->page['htmlhead'] = '<meta http-equiv="refresh" content="1; URL='.System::baseUrl().'/repair_ostatus?counter='.$counter.'">';
 
 	return $o;
 }