X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Frepair_ostatus.php;h=3acaa687a712942a959edbfaee62e5141a79cb91;hb=635c8d7450866cb8b77a6d1d42260257e286a940;hp=b3d5a402b5a192219160a7ada345d0adb4e7a328;hpb=a59ab5552e21c927d861b2b4ef193a545b956b2c;p=friendica.git

diff --git a/mod/repair_ostatus.php b/mod/repair_ostatus.php
index b3d5a402b5..3acaa687a7 100644
--- a/mod/repair_ostatus.php
+++ b/mod/repair_ostatus.php
@@ -2,19 +2,23 @@
 /**
  * @file mod/repair_ostatus.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);
+		notice(L10n::t('Permission denied.') . EOL);
 		goaway($_SESSION['return_url']);
 		// NOTREACHED
 	}
 
-	$o = "<h2>".t("Resubscribing to OStatus contacts")."</h2>";
+	$o = "<h2>".L10n::t("Resubscribing to OStatus contacts")."</h2>";
 
 	$uid = local_user();
 
@@ -22,37 +26,38 @@ 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 = Contact::new($uid,$r[0]["url"],true);
+	$result = Contact::createFromProbe($uid, $r[0]["url"], true);
 
 	$a->page['htmlhead'] = '<meta http-equiv="refresh" content="1; URL='.System::baseUrl().'/repair_ostatus?counter='.$counter.'">';