Merge pull request #7948 from MrPetovan/bug/7946-frio-contact-tab

[friendica.git] / mod / repair_ostatus.php

diff --git a/mod/repair_ostatus.php b/mod/repair_ostatus.php
index 1d2e202ecf36f149fa04c36801283f0b932abdc8..51a6aadaad6659753ad30b62584c1ea266b3b266 100644 (file)
--- a/mod/repair_ostatus.php
+++ b/mod/repair_ostatus.php
@@ -2,16 +2,19 @@
 /**
  * @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(L10n::t('Permission denied.') . EOL);
-               goaway($_SESSION['return_url']);
+               $a->internalRedirect('ostatus_repair');
                // NOTREACHED
        }
 
@@ -19,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_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.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_IS_FRIEND),
-                intval(CONTACT_IS_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;
        }
@@ -53,7 +57,7 @@ function repair_ostatus_content(App $a) {
 
        $o .= "<p>".L10n::t("Keep this window open until done.")."</p>";
 
-       $result = Contact::createFromProbe($uid, $r[0]["url"], true);
+       Contact::createFromProbe($uid, $r[0]["url"], true);
 
        $a->page['htmlhead'] = '<meta http-equiv="refresh" content="1; URL='.System::baseUrl().'/repair_ostatus?counter='.$counter.'">';