X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Frepair_ostatus.php;h=51a6aadaad6659753ad30b62584c1ea266b3b266;hb=41663c7592abe55a958632c3a48265e0a8544d2b;hp=7531ad35c23e811af063df354f239d48ad579b5f;hpb=37253656e3f1403b25c5f0fee6c9631140c4507a;p=friendica.git diff --git a/mod/repair_ostatus.php b/mod/repair_ostatus.php index 7531ad35c2..51a6aadaad 100644 --- a/mod/repair_ostatus.php +++ b/mod/repair_ostatus.php @@ -5,6 +5,7 @@ use Friendica\App; use Friendica\Core\L10n; +use Friendica\Core\Protocol; use Friendica\Core\System; use Friendica\Database\DBA; use Friendica\Model\Contact; @@ -13,7 +14,7 @@ function repair_ostatus_content(App $a) { if (! local_user()) { notice(L10n::t('Permission denied.') . EOL); - goaway($_SESSION['return_url']); + $a->internalRedirect('ostatus_repair'); // NOTREACHED } @@ -21,32 +22,33 @@ function repair_ostatus_content(App $a) { $uid = local_user(); - $a = get_app(); + $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), - DBA::escape(NETWORK_OSTATUS), - intval(Contact::FRIEND), - intval(Contact::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.L10n::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), - DBA::escape(NETWORK_OSTATUS), - intval(Contact::FRIEND), - intval(Contact::SHARING), $counter++); + intval($uid), + DBA::escape(Protocol::OSTATUS), + intval(Contact::FRIEND), + intval(Contact::SHARING), $counter++); - if (!$r) { + if (!DBA::isResult($r)) { $o .= L10n::t("Done"); return $o; } @@ -55,7 +57,7 @@ function repair_ostatus_content(App $a) { $o .= "
".L10n::t("Keep this window open until done.")."
"; - $result = Contact::createFromProbe($uid, $r[0]["url"], true); + Contact::createFromProbe($uid, $r[0]["url"], true); $a->page['htmlhead'] = '';