Just some more fixed notice

[friendica.git] / mod / ostatus_subscribe.php

diff --git a/mod/ostatus_subscribe.php b/mod/ostatus_subscribe.php
index 963f43693954c0290c4250f6467a8cb88314e298..e8ba144a1633a7b2e5d30d4a35ffb502096eab73 100644 (file)
--- a/mod/ostatus_subscribe.php
+++ b/mod/ostatus_subscribe.php
@@ -1,17 +1,24 @@
 <?php
-
-require_once('include/Scrape.php');
-require_once('include/follow.php');
-
-function ostatus_subscribe_content(&$a) {
+/**
+ * @file mod/ostatus_subscribe.php
+ */
+use Friendica\App;
+use Friendica\Core\L10n;
+use Friendica\Core\PConfig;
+use Friendica\Core\System;
+use Friendica\Model\Contact;
+use Friendica\Network\Probe;
+use Friendica\Util\Network;
+
+function ostatus_subscribe_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("Subscribing to OStatus contacts")."</h2>";
+       $o = "<h2>".L10n::t("Subscribing to OStatus contacts")."</h2>";
 
        $uid = local_user();
 
@@ -19,36 +26,42 @@ function ostatus_subscribe_content(&$a) {
 
        $counter = intval($_REQUEST['counter']);
 
-       if (get_pconfig($uid, "ostatus", "legacy_friends") == "") {
+       if (PConfig::get($uid, "ostatus", "legacy_friends") == "") {
 
-               if ($_REQUEST["url"] == "")
-                       return $o.t("No contact provided.");
+               if ($_REQUEST["url"] == "") {
+                       PConfig::delete($uid, "ostatus", "legacy_contact");
+                       return $o.L10n::t("No contact provided.");
+               }
 
-               $contact = probe_url($_REQUEST["url"]);
+               $contact = Probe::uri($_REQUEST["url"]);
 
-               if (!$contact)
-                       return $o.t("Couldn't fetch information for contact.");
+               if (!$contact) {
+                       PConfig::delete($uid, "ostatus", "legacy_contact");
+                       return $o.L10n::t("Couldn't fetch information for contact.");
+               }
 
                $api = $contact["baseurl"]."/api/";
 
                // Fetching friends
-               $data = z_fetch_url($api."statuses/friends.json?screen_name=".$contact["nick"]);
+               $data = Network::curl($api."statuses/friends.json?screen_name=".$contact["nick"]);
 
-               if (!$data["success"])
-                       return $o.t("Couldn't fetch friends for contact.");
+               if (!$data["success"]) {
+                       PConfig::delete($uid, "ostatus", "legacy_contact");
+                       return $o.L10n::t("Couldn't fetch friends for contact.");
+               }
 
-               set_pconfig($uid, "ostatus", "legacy_friends", $data["body"]);
+               PConfig::set($uid, "ostatus", "legacy_friends", $data["body"]);
        }
 
-       $friends = json_decode(get_pconfig($uid, "ostatus", "legacy_friends"));
+       $friends = json_decode(PConfig::get($uid, "ostatus", "legacy_friends"));
 
        $total = sizeof($friends);
 
        if ($counter >= $total) {
-               $a->page['htmlhead'] = '<meta http-equiv="refresh" content="0; URL='.App::get_baseurl().'/settings/connectors">';
-               del_pconfig($uid, "ostatus", "legacy_friends");
-               del_pconfig($uid, "ostatus", "legacy_contact");
-               $o .= t("Done");
+               $a->page['htmlhead'] = '<meta http-equiv="refresh" content="0; URL='.System::baseUrl().'/settings/connectors">';
+               PConfig::delete($uid, "ostatus", "legacy_friends");
+               PConfig::delete($uid, "ostatus", "legacy_contact");
+               $o .= L10n::t("Done");
                return $o;
        }
 
@@ -58,21 +71,23 @@ function ostatus_subscribe_content(&$a) {
 
        $o .= "<p>".$counter."/".$total.": ".$url;
 
-       $data = probe_url($url);
+       $data = Probe::uri($url);
        if ($data["network"] == NETWORK_OSTATUS) {
-               $result = new_contact($uid,$url,true);
-               if ($result["success"])
-                       $o .= " - ".t("success");
-               else
-                       $o .= " - ".t("failed");
-       } else
-               $o .= " - ".t("ignored");
+               $result = Contact::createFromProbe($uid, $url, true, NETWORK_OSTATUS);
+               if ($result["success"]) {
+                       $o .= " - ".L10n::t("success");
+               } else {
+                       $o .= " - ".L10n::t("failed");
+               }
+       } else {
+               $o .= " - ".L10n::t("ignored");
+       }
 
        $o .= "</p>";
 
-       $o .= "<p>".t("Keep this window open until done.")."</p>";
+       $o .= "<p>".L10n::t("Keep this window open until done.")."</p>";
 
-       $a->page['htmlhead'] = '<meta http-equiv="refresh" content="0; URL='.App::get_baseurl().'/ostatus_subscribe?counter='.$counter.'">';
+       $a->page['htmlhead'] = '<meta http-equiv="refresh" content="0; URL='.System::baseUrl().'/ostatus_subscribe?counter='.$counter.'">';
 
        return $o;
 }