X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Frepair_ostatus.php;h=0d30fc298dea1c83be9183906b7a2aa23dc801e9;hb=a7d75702cc43b13b6100d993df6d8d409e5e2351;hp=8315a25142cf2c326dcfb48712fdc53deb893ffb;hpb=ead9d8623683f8ecdbe9b75bb7fd031d89d54ebe;p=friendica.git

diff --git a/mod/repair_ostatus.php b/mod/repair_ostatus.php
index 8315a25142..0d30fc298d 100644
--- a/mod/repair_ostatus.php
+++ b/mod/repair_ostatus.php
@@ -1,61 +1,78 @@
 <?php
 /**
- * @file mod/repair_ostatus.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @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;
-use Friendica\Core\L10n;
-use Friendica\Core\System;
+use Friendica\Core\Protocol;
+use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Contact;
 
 function repair_ostatus_content(App $a) {
 
 	if (! local_user()) {
-		notice(L10n::t('Permission denied.') . EOL);
-		goaway($_SESSION['return_url']);
+		notice(DI::l10n()->t('Permission denied.'));
+		DI::baseUrl()->redirect('ostatus_repair');
 		// NOTREACHED
 	}
 
-	$o = "<h2>".t("Resubscribing to OStatus contacts")."</h2>";
+	$o = "<h2>".DI::l10n()->t("Resubscribing to OStatus contacts")."</h2>";
 
 	$uid = local_user();
 
-	$a = get_app();
-
 	$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 . 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)
+	$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 .= L10n::t("Done");
+	if (!DBA::isResult($r)) {
+		$o .= DI::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>".DI::l10n()->t("Keep this window open until done.")."</p>";
 
-	$result = Contact::createFromProbe($uid, $r[0]["url"], true);
+	Contact::createFromProbe($a->user, $r[0]["url"], true);
 
-	$a->page['htmlhead'] = '<meta http-equiv="refresh" content="1; URL='.System::baseUrl().'/repair_ostatus?counter='.$counter.'">';
+	DI::page()['htmlhead'] = '<meta http-equiv="refresh" content="1; URL=' . DI::baseUrl() . '/repair_ostatus?counter='.$counter.'">';
 
 	return $o;
 }