]> git.mxchange.org Git - friendica.git/commitdiff
apply coding standard
authorrabuzarus <>
Mon, 8 May 2017 15:06:57 +0000 (17:06 +0200)
committerrabuzarus <>
Mon, 8 May 2017 15:06:57 +0000 (17:06 +0200)
src/Network/Probe.php

index fe48d383f57387f846a75f0ce08c4860e308848f..30d7ef898c9c433759b6c4d1fcbc6dc847e49b5e 100644 (file)
@@ -12,9 +12,9 @@ use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 
-require_once("include/feed.php");
-require_once('include/email.php');
-require_once('include/network.php');
+require_once 'include/feed.php';
+require_once 'include/email.php';
+require_once 'include/network.php';
 
 /**
  * @brief This class contain functions for probing URL
@@ -38,11 +38,13 @@ class Probe {
                                "priority", "network", "pubkey", "baseurl");
 
                $newdata = array();
-               foreach ($fields AS $field)
-                       if (isset($data[$field]))
+               foreach ($fields as $field) {
+                       if (isset($data[$field])) {
                                $newdata[$field] = $data[$field];
-                       else
+                       } else {
                                $newdata[$field] = "";
+                       }
+               }
 
                // We don't use the "priority" field anymore and replace it with a dummy.
                $newdata["priority"] = 0;
@@ -52,9 +54,9 @@ class Probe {
 
        /**
         * @brief Probes for XRD data
-        * 
+        *
         * @param string $host The host part of an url
-        * 
+        *
         * @return array
         *      'lrdd' => Link to LRDD endpoint
         *      'lrdd-xml' => Link to LRDD endpoint in XML format
@@ -68,7 +70,7 @@ class Probe {
                $ssl_url = "https://".$host."/.well-known/host-meta";
                $url = "http://".$host."/.well-known/host-meta";
 
-               $xrd_timeout = Config::get('system','xrd_timeout', 20);
+               $xrd_timeout = Config::get('system', 'xrd_timeout', 20);
                $redirects = 0;
 
                $ret = z_fetch_url($ssl_url, false, $redirects, array('timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml'));
@@ -87,31 +89,35 @@ class Probe {
                        $xml = $ret['body'];
                        $xrd = parse_xml_string($xml, false);
                }
-               if (!is_object($xrd))
+               if (!is_object($xrd)) {
                        return false;
+               }
 
                $links = \xml::element_to_array($xrd);
-               if (!isset($links["xrd"]["link"]))
+               if (!isset($links["xrd"]["link"])) {
                        return false;
+               }
 
                $xrd_data = array();
 
-               foreach ($links["xrd"]["link"] AS $value => $link) {
-                       if (isset($link["@attributes"]))
+               foreach ($links["xrd"]["link"] as $value => $link) {
+                       if (isset($link["@attributes"])) {
                                $attributes = $link["@attributes"];
-                       elseif ($value == "@attributes")
+                       } elseif ($value == "@attributes") {
                                $attributes = $link;
-                       else
+                       } else {
                                continue;
+                       }
 
                        if (($attributes["rel"] == "lrdd") AND
-                               ($attributes["type"] == "application/xrd+xml"))
+                               ($attributes["type"] == "application/xrd+xml")) {
                                $xrd_data["lrdd-xml"] = $attributes["template"];
-                       elseif (($attributes["rel"] == "lrdd") AND
-                               ($attributes["type"] == "application/json"))
+                       elseif (($attributes["rel"] == "lrdd") AND
+                               ($attributes["type"] == "application/json")) {
                                $xrd_data["lrdd-json"] = $attributes["template"];
-                       elseif ($attributes["rel"] == "lrdd")
+                       } elseif ($attributes["rel"] == "lrdd") {
                                $xrd_data["lrdd"] = $attributes["template"];
+                       }
                }
 
                self::$baseurl = "http://".$host;
@@ -145,15 +151,18 @@ class Probe {
                $profile_link = '';
 
                $links = self::lrdd($webbie);
-               logger('webfingerDfrn: '.$webbie.':'.print_r($links,true), LOGGER_DATA);
+               logger('webfingerDfrn: '.$webbie.':'.print_r($links, true), LOGGER_DATA);
                if (count($links)) {
                        foreach ($links as $link) {
-                               if ($link['@attributes']['rel'] === NAMESPACE_DFRN)
+                               if ($link['@attributes']['rel'] === NAMESPACE_DFRN) {
                                        $profile_link = $link['@attributes']['href'];
-                               if (($link['@attributes']['rel'] === NAMESPACE_OSTATUSSUB) AND ($profile_link == ""))
+                               }
+                               if (($link['@attributes']['rel'] === NAMESPACE_OSTATUSSUB) AND ($profile_link == "")) {
                                        $profile_link = 'stat:'.$link['@attributes']['template'];
-                               if ($link['@attributes']['rel'] === 'http://microformats.org/profile/hcard')
+                               }
+                               if ($link['@attributes']['rel'] === 'http://microformats.org/profile/hcard') {
                                        $hcard = $link['@attributes']['href'];
+                               }
                        }
                }
                return $profile_link;
@@ -176,8 +185,9 @@ class Probe {
 
                if (!$lrdd) {
                        $parts = @parse_url($uri);
-                       if (!$parts)
+                       if (!$parts) {
                                return array();
+                       }
 
                        $host = $parts["host"];
                        if (isset($parts["port"])) {
@@ -194,15 +204,18 @@ class Probe {
                        } while (!$lrdd AND (sizeof($path_parts) > 0));
                }
 
-               if (!$lrdd)
+               if (!$lrdd) {
                        return array();
+               }
 
-               foreach ($lrdd AS $key => $link) {
-                       if ($webfinger)
+               foreach ($lrdd as $key => $link) {
+                       if ($webfinger) {
                                continue;
+                       }
 
-                       if (!in_array($key, array("lrdd", "lrdd-xml", "lrdd-json")))
+                       if (!in_array($key, array("lrdd", "lrdd-xml", "lrdd-json"))) {
                                continue;
+                       }
 
                        $path = str_replace('{uri}', urlencode($uri), $link);
                        $webfinger = self::webfinger($path);
@@ -226,19 +239,23 @@ class Probe {
                        }
                }
 
-               if (!is_array($webfinger["links"]))
+               if (!is_array($webfinger["links"])) {
                        return false;
+               }
 
                $data = array();
 
-               foreach ($webfinger["links"] AS $link)
+               foreach ($webfinger["links"] as $link) {
                        $data[] = array("@attributes" => $link);
+               }
 
-               if (is_array($webfinger["aliases"]))
-                       foreach ($webfinger["aliases"] AS $alias)
+               if (is_array($webfinger["aliases"])) {
+                       foreach ($webfinger["aliases"] as $alias) {
                                $data[] = array("@attributes" =>
                                                        array("rel" => "alias",
                                                                "href" => $alias));
+                       }
+               }
 
                return $data;
        }
@@ -262,32 +279,38 @@ class Probe {
                        }
                }
 
-               if ($uid == 0)
+               if ($uid == 0) {
                        $uid = local_user();
+               }
 
                $data = self::detect($uri, $network, $uid);
 
-               if (!isset($data["url"]))
+               if (!isset($data["url"])) {
                        $data["url"] = $uri;
+               }
 
-               if ($data["photo"] != "")
+               if ($data["photo"] != "") {
                        $data["baseurl"] = matching_url(normalise_link($data["baseurl"]), normalise_link($data["photo"]));
-               else
+               } else {
                        $data["photo"] = App::get_baseurl().'/images/person-175.jpg';
+               }
 
                if (!isset($data["name"]) OR ($data["name"] == "")) {
-                       if (isset($data["nick"]))
+                       if (isset($data["nick"])) {
                                $data["name"] = $data["nick"];
+                       }
 
-                       if ($data["name"] == "")
+                       if ($data["name"] == "") {
                                $data["name"] = $data["url"];
+                       }
                }
 
                if (!isset($data["nick"]) OR ($data["nick"] == "")) {
                        $data["nick"] = strtolower($data["name"]);
 
-                       if (strpos($data['nick'], ' '))
+                       if (strpos($data['nick'], ' ')) {
                                $data['nick'] = trim(substr($data['nick'], 0, strpos($data['nick'], ' ')));
+                       }
                }
 
                if (self::$baseurl != "") {
@@ -308,7 +331,7 @@ class Probe {
                        /// The biggest problem is the avatar picture that could have a reduced image size.
                        /// It should only be updated if the existing picture isn't existing anymore.
                        if (($data['network'] != NETWORK_FEED) AND ($mode == PROBE_NORMAL) AND
-                               $data["name"] AND $data["nick"] AND $data["url"] AND $data["addr"] AND $data["poll"])
+                               $data["name"] AND $data["nick"] AND $data["url"] AND $data["addr"] AND $data["poll"]) {
                                q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `url` = '%s', `addr` = '%s',
                                                `notify` = '%s', `poll` = '%s', `alias` = '%s', `success_update` = '%s'
                                        WHERE `nurl` = '%s' AND NOT `self` AND `uid` = 0",
@@ -321,7 +344,8 @@ class Probe {
                                        dbesc($data["alias"]),
                                        dbesc(datetime_convert()),
                                        dbesc(normalise_link($data['url']))
-                       );
+                               );
+                       }
                }
 
                return $data;
@@ -342,7 +366,6 @@ class Probe {
                $parts = parse_url($uri);
 
                if (isset($parts["scheme"]) AND isset($parts["host"]) AND isset($parts["path"])) {
-
                        $host = $parts["host"];
                        if (isset($parts["port"])) {
                                $host .= ':'.$parts["port"];
@@ -368,9 +391,10 @@ class Probe {
                        $nick = ltrim($nick, '@');
 
                        $addr = $nick."@".$host;
+
                } elseif (strstr($uri, '@')) {
                        // If the URI starts with "mailto:" then jump directly to the mail detection
-                       if (strpos($url,'mailto:') !== false) {
+                       if (strpos($url, 'mailto:') !== false) {
                                $uri = str_replace('mailto:', '', $url);
                                return self::mail($uri, $uid);
                        }
@@ -381,8 +405,8 @@ class Probe {
                        // Remove "acct:" from the URI
                        $uri = str_replace('acct:', '', $uri);
 
-                       $host = substr($uri,strpos($uri, '@') + 1);
-                       $nick = substr($uri,0, strpos($uri, '@'));
+                       $host = substr($uri, strpos($uri, '@') + 1);
+                       $nick = substr($uri, 0, strpos($uri, '@'));
 
                        if (strpos($uri, '@twitter.com')) {
                                return array("network" => NETWORK_TWITTER);
@@ -393,6 +417,7 @@ class Probe {
                                return self::mail($uri, $uid);
                        }
                        $addr = $uri;
+
                } else {
                        return false;
                }
@@ -401,7 +426,7 @@ class Probe {
 
                /// @todo Do we need the prefix "acct:" or "acct://"?
 
-               foreach ($lrdd AS $key => $link) {
+               foreach ($lrdd as $key => $link) {
                        if ($webfinger) {
                                continue;
                        }
@@ -438,32 +463,39 @@ class Probe {
 
                logger("Probing ".$uri, LOGGER_DEBUG);
 
-               if (in_array($network, array("", NETWORK_DFRN)))
+               if (in_array($network, array("", NETWORK_DFRN))) {
                        $result = self::dfrn($webfinger);
-               if ((!$result AND ($network == "")) OR ($network == NETWORK_DIASPORA))
+               }
+               if ((!$result AND ($network == "")) OR ($network == NETWORK_DIASPORA)) {
                        $result = self::diaspora($webfinger);
-               if ((!$result AND ($network == "")) OR ($network == NETWORK_OSTATUS))
+               }
+               if ((!$result AND ($network == "")) OR ($network == NETWORK_OSTATUS)) {
                        $result = self::ostatus($webfinger);
-               if ((!$result AND ($network == "")) OR ($network == NETWORK_PUMPIO))
+               }
+               if ((!$result AND ($network == "")) OR ($network == NETWORK_PUMPIO)) {
                        $result = self::pumpio($webfinger);
-               if ((!$result AND ($network == "")) OR ($network == NETWORK_FEED))
+               }
+               if ((!$result AND ($network == "")) OR ($network == NETWORK_FEED)) {
                        $result = self::feed($uri);
-               else {
+               else {
                        // We overwrite the detected nick with our try if the previois routines hadn't detected it.
                        // Additionally it is overwritten when the nickname doesn't make sense (contains spaces).
-                       if ((!isset($result["nick"]) OR ($result["nick"] == "") OR (strstr($result["nick"], " "))) AND ($nick != ""))
+                       if ((!isset($result["nick"]) OR ($result["nick"] == "") OR (strstr($result["nick"], " "))) AND ($nick != "")) {
                                $result["nick"] = $nick;
+                       }
 
-                       if ((!isset($result["addr"]) OR ($result["addr"] == "")) AND ($addr != ""))
+                       if ((!isset($result["addr"]) OR ($result["addr"] == "")) AND ($addr != "")) {
                                $result["addr"] = $addr;
+                       }
                }
 
                logger($uri." is ".$result["network"], LOGGER_DEBUG);
 
                if (!isset($result["baseurl"]) OR ($result["baseurl"] == "")) {
                        $pos = strpos($result["url"], $host);
-                       if ($pos)
+                       if ($pos) {
                                $result["baseurl"] = substr($result["url"], 0, $pos).$host;
+                       }
                }
 
                return $result;
@@ -480,7 +512,7 @@ class Probe {
         */
        private function webfinger($url) {
 
-               $xrd_timeout = Config::get('system','xrd_timeout', 20);
+               $xrd_timeout = Config::get('system', 'xrd_timeout', 20);
                $redirects = 0;
 
                $ret = z_fetch_url($url, false, $redirects, array('timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml'));
@@ -495,33 +527,38 @@ class Probe {
                        // If it is not XML, maybe it is JSON
                        $webfinger = json_decode($data, true);
 
-                       if (!isset($webfinger["links"]))
+                       if (!isset($webfinger["links"])) {
                                return false;
+                       }
 
                        return $webfinger;
                }
 
                $xrd_arr = \xml::element_to_array($xrd);
-               if (!isset($xrd_arr["xrd"]["link"]))
+               if (!isset($xrd_arr["xrd"]["link"])) {
                        return false;
+               }
 
                $webfinger = array();
 
-               if (isset($xrd_arr["xrd"]["subject"]))
+               if (isset($xrd_arr["xrd"]["subject"])) {
                        $webfinger["subject"] = $xrd_arr["xrd"]["subject"];
+               }
 
-               if (isset($xrd_arr["xrd"]["alias"]))
+               if (isset($xrd_arr["xrd"]["alias"])) {
                        $webfinger["aliases"] = $xrd_arr["xrd"]["alias"];
+               }
 
                $webfinger["links"] = array();
 
-               foreach ($xrd_arr["xrd"]["link"] AS $value => $data) {
-                       if (isset($data["@attributes"]))
+               foreach ($xrd_arr["xrd"]["link"] as $value => $data) {
+                       if (isset($data["@attributes"])) {
                                $attributes = $data["@attributes"];
-                       elseif ($value == "@attributes")
+                       } elseif ($value == "@attributes") {
                                $attributes = $data;
-                       else
+                       } else {
                                continue;
+                       }
 
                        $webfinger["links"][] = $attributes;
                }
@@ -550,51 +587,65 @@ class Probe {
                }
 
                $json = json_decode($content, true);
-               if (!is_array($json))
+               if (!is_array($json)) {
                        return false;
+               }
 
-               if (isset($json["fn"]))
+               if (isset($json["fn"])) {
                        $data["name"] = $json["fn"];
+               }
 
-               if (isset($json["addr"]))
+               if (isset($json["addr"])) {
                        $data["addr"] = $json["addr"];
+               }
 
-               if (isset($json["nick"]))
+               if (isset($json["nick"])) {
                        $data["nick"] = $json["nick"];
+               }
 
-               if (isset($json["comm"]))
+               if (isset($json["comm"])) {
                        $data["community"] = $json["comm"];
+               }
 
                if (isset($json["tags"])) {
                        $keywords = implode(" ", $json["tags"]);
-                       if ($keywords != "")
+                       if ($keywords != "") {
                                $data["keywords"] = $keywords;
+                       }
                }
 
                $location = formatted_location($json);
-               if ($location)
+               if ($location) {
                        $data["location"] = $location;
+               }
 
-               if (isset($json["about"]))
+               if (isset($json["about"])) {
                        $data["about"] = $json["about"];
+               }
 
-               if (isset($json["key"]))
+               if (isset($json["key"])) {
                        $data["pubkey"] = $json["key"];
+               }
 
-               if (isset($json["photo"]))
+               if (isset($json["photo"])) {
                        $data["photo"] = $json["photo"];
+               }
 
-               if (isset($json["dfrn-request"]))
+               if (isset($json["dfrn-request"])) {
                        $data["request"] = $json["dfrn-request"];
+               }
 
-               if (isset($json["dfrn-confirm"]))
+               if (isset($json["dfrn-confirm"])) {
                        $data["confirm"] = $json["dfrn-confirm"];
+               }
 
-               if (isset($json["dfrn-notify"]))
+               if (isset($json["dfrn-notify"])) {
                        $data["notify"] = $json["dfrn-notify"];
+               }
 
-               if (isset($json["dfrn-poll"]))
+               if (isset($json["dfrn-poll"])) {
                        $data["poll"] = $json["dfrn-poll"];
+               }
 
                return $data;
        }
@@ -608,16 +659,21 @@ class Probe {
         */
        public static function validDfrn($data) {
                $errors = 0;
-               if(!isset($data['key']))
+               if (!isset($data['key'])) {
                        $errors ++;
-               if(!isset($data['dfrn-request']))
+               }
+               if (!isset($data['dfrn-request'])) {
                        $errors ++;
-               if(!isset($data['dfrn-confirm']))
+               }
+               if (!isset($data['dfrn-confirm'])) {
                        $errors ++;
-               if(!isset($data['dfrn-notify']))
+               }
+               if (!isset($data['dfrn-notify'])) {
                        $errors ++;
-               if(!isset($data['dfrn-poll']))
+               }
+               if (!isset($data['dfrn-poll'])) {
                        $errors ++;
+               }
                return $errors;
        }
 
@@ -641,8 +697,9 @@ class Probe {
                if (!isset($data["notify"]) OR !isset($data["confirm"]) OR
                        !isset($data["request"]) OR !isset($data["poll"]) OR
                        !isset($data["poco"]) OR !isset($data["name"]) OR
-                       !isset($data["photo"]))
+                       !isset($data["photo"])) {
                        $data = self::pollHcard($profile, $data, true);
+               }
 
                $prof_data = array();
                $prof_data["addr"] = $data["addr"];
@@ -672,44 +729,45 @@ class Probe {
 
                $hcard = "";
                $data = array();
-               foreach ($webfinger["links"] AS $link) {
-                       if (($link["rel"] == NAMESPACE_DFRN) AND ($link["href"] != ""))
+               foreach ($webfinger["links"] as $link) {
+                       if (($link["rel"] == NAMESPACE_DFRN) AND ($link["href"] != "")) {
                                $data["network"] = NETWORK_DFRN;
-                       elseif (($link["rel"] == NAMESPACE_FEED) AND ($link["href"] != ""))
+                       } elseif (($link["rel"] == NAMESPACE_FEED) AND ($link["href"] != "")) {
                                $data["poll"] = $link["href"];
-                       elseif (($link["rel"] == "http://webfinger.net/rel/profile-page") AND
-                               ($link["type"] == "text/html") AND ($link["href"] != ""))
+                       } elseif (($link["rel"] == "http://webfinger.net/rel/profile-page") AND ($link["type"] == "text/html") AND ($link["href"] != "")) {
                                $data["url"] = $link["href"];
-                       elseif (($link["rel"] == "http://microformats.org/profile/hcard") AND ($link["href"] != ""))
+                       } elseif (($link["rel"] == "http://microformats.org/profile/hcard") AND ($link["href"] != "")) {
                                $hcard = $link["href"];
-                       elseif (($link["rel"] == NAMESPACE_POCO) AND ($link["href"] != ""))
+                       } elseif (($link["rel"] == NAMESPACE_POCO) AND ($link["href"] != "")) {
                                $data["poco"] = $link["href"];
-                       elseif (($link["rel"] == "http://webfinger.net/rel/avatar") AND ($link["href"] != ""))
+                       } elseif (($link["rel"] == "http://webfinger.net/rel/avatar") AND ($link["href"] != "")) {
                                $data["photo"] = $link["href"];
-
-                       elseif (($link["rel"] == "http://joindiaspora.com/seed_location") AND ($link["href"] != ""))
+                       } elseif (($link["rel"] == "http://joindiaspora.com/seed_location") AND ($link["href"] != "")) {
                                $data["baseurl"] = trim($link["href"], '/');
-                       elseif (($link["rel"] == "http://joindiaspora.com/guid") AND ($link["href"] != ""))
+                       } elseif (($link["rel"] == "http://joindiaspora.com/guid") AND ($link["href"] != "")) {
                                $data["guid"] = $link["href"];
-                       elseif (($link["rel"] == "diaspora-public-key") AND ($link["href"] != "")) {
+                       elseif (($link["rel"] == "diaspora-public-key") AND ($link["href"] != "")) {
                                $data["pubkey"] = base64_decode($link["href"]);
 
                                //if (strstr($data["pubkey"], 'RSA ') OR ($link["type"] == "RSA"))
-                               if (strstr($data["pubkey"], 'RSA '))
+                               if (strstr($data["pubkey"], 'RSA ')) {
                                        $data["pubkey"] = rsatopem($data["pubkey"]);
+                               }
                        }
                }
 
-               if (!isset($data["network"]) OR ($hcard == ""))
+               if (!isset($data["network"]) OR ($hcard == "")) {
                        return false;
+               }
 
                // Fetch data via noscrape - this is faster
                $noscrape = str_replace("/hcard/", "/noscrape/", $hcard);
                $data = self::pollNoscrape($noscrape, $data);
 
                if (isset($data["notify"]) AND isset($data["confirm"]) AND isset($data["request"]) AND
-                       isset($data["poll"]) AND isset($data["name"]) AND isset($data["photo"]))
+                       isset($data["poll"]) AND isset($data["name"]) AND isset($data["photo"])) {
                        return $data;
+               }
 
                $data = self::pollHcard($hcard, $data, true);
 
@@ -736,14 +794,16 @@ class Probe {
                }
 
                $doc = new \DOMDocument();
-               if (!@$doc->loadHTML($content))
+               if (!@$doc->loadHTML($content)) {
                        return false;
+               }
 
                $xpath = new \DomXPath($doc);
 
                $vcards = $xpath->query("//div[contains(concat(' ', @class, ' '), ' vcard ')]");
-               if (!is_object($vcards))
+               if (!is_object($vcards)) {
                        return false;
+               }
 
                if ($vcards->length > 0) {
                        $vcard = $vcards->item(0);
@@ -751,36 +811,42 @@ class Probe {
                        // We have to discard the guid from the hcard in favour of the guid from lrdd
                        // Reason: Hubzilla doesn't use the value "uid" in the hcard like Diaspora does.
                        $search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' uid ')]", $vcard); // */
-                       if (($search->length > 0) AND ($data["guid"] == ""))
+                       if (($search->length > 0) AND ($data["guid"] == "")) {
                                $data["guid"] = $search->item(0)->nodeValue;
+                       }
 
                        $search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' nickname ')]", $vcard); // */
-                       if ($search->length > 0)
+                       if ($search->length > 0) {
                                $data["nick"] = $search->item(0)->nodeValue;
+                       }
 
                        $search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' fn ')]", $vcard); // */
-                       if ($search->length > 0)
+                       if ($search->length > 0) {
                                $data["name"] = $search->item(0)->nodeValue;
+                       }
 
                        $search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' searchable ')]", $vcard); // */
-                       if ($search->length > 0)
+                       if ($search->length > 0) {
                                $data["searchable"] = $search->item(0)->nodeValue;
+                       }
 
                        $search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' key ')]", $vcard); // */
                        if ($search->length > 0) {
                                $data["pubkey"] = $search->item(0)->nodeValue;
-                               if (strstr($data["pubkey"], 'RSA '))
+                               if (strstr($data["pubkey"], 'RSA ')) {
                                        $data["pubkey"] = rsatopem($data["pubkey"]);
+                               }
                        }
 
                        $search = $xpath->query("//*[@id='pod_location']", $vcard); // */
-                       if ($search->length > 0)
+                       if ($search->length > 0) {
                                $data["baseurl"] = trim($search->item(0)->nodeValue, "/");
+                       }
                }
 
                $avatar = array();
                $photos = $xpath->query("//*[contains(concat(' ', @class, ' '), ' photo ') or contains(concat(' ', @class, ' '), ' avatar ')]", $vcard); // */
-               foreach ($photos AS $photo) {
+               foreach ($photos as $photo) {
                        $attr = array();
                        foreach ($photo->attributes as $attribute) {
                                $attr[$attribute->name] = trim($attribute->value);
@@ -806,19 +872,21 @@ class Probe {
                        // Poll DFRN specific data
                        $search = $xpath->query("//link[contains(concat(' ', @rel), ' dfrn-')]");
                        if ($search->length > 0) {
-                               foreach ($search AS $link) {
+                               foreach ($search as $link) {
                                        //$data["request"] = $search->item(0)->nodeValue;
                                        $attr = array();
-                                       foreach ($link->attributes as $attribute)
+                                       foreach ($link->attributes as $attribute) {
                                                $attr[$attribute->name] = trim($attribute->value);
+                                       }
 
                                        $data[substr($attr["rel"], 5)] = $attr["href"];
                                }
                        }
 
                        // Older Friendica versions had used the "uid" field differently than newer versions
-                       if ($data["nick"] == $data["guid"])
+                       if ($data["nick"] == $data["guid"]) {
                                unset($data["guid"]);
+                       }
                }
 
 
@@ -836,44 +904,49 @@ class Probe {
 
                $hcard = "";
                $data = array();
-               foreach ($webfinger["links"] AS $link) {
-                       if (($link["rel"] == "http://microformats.org/profile/hcard") AND ($link["href"] != ""))
+               foreach ($webfinger["links"] as $link) {
+                       if (($link["rel"] == "http://microformats.org/profile/hcard") AND ($link["href"] != "")) {
                                $hcard = $link["href"];
-                       elseif (($link["rel"] == "http://joindiaspora.com/seed_location") AND ($link["href"] != ""))
+                       } elseif (($link["rel"] == "http://joindiaspora.com/seed_location") AND ($link["href"] != "")) {
                                $data["baseurl"] = trim($link["href"], '/');
-                       elseif (($link["rel"] == "http://joindiaspora.com/guid") AND ($link["href"] != ""))
+                       } elseif (($link["rel"] == "http://joindiaspora.com/guid") AND ($link["href"] != "")) {
                                $data["guid"] = $link["href"];
-                       elseif (($link["rel"] == "http://webfinger.net/rel/profile-page") AND
-                               ($link["type"] == "text/html") AND ($link["href"] != ""))
+                       } elseif (($link["rel"] == "http://webfinger.net/rel/profile-page") AND ($link["type"] == "text/html") AND ($link["href"] != "")) {
                                $data["url"] = $link["href"];
-                       elseif (($link["rel"] == NAMESPACE_FEED) AND ($link["href"] != ""))
+                       } elseif (($link["rel"] == NAMESPACE_FEED) AND ($link["href"] != "")) {
                                $data["poll"] = $link["href"];
-                       elseif (($link["rel"] == NAMESPACE_POCO) AND ($link["href"] != ""))
+                       } elseif (($link["rel"] == NAMESPACE_POCO) AND ($link["href"] != "")) {
                                $data["poco"] = $link["href"];
-                       elseif (($link["rel"] == "salmon") AND ($link["href"] != ""))
+                       } elseif (($link["rel"] == "salmon") AND ($link["href"] != "")) {
                                $data["notify"] = $link["href"];
-                       elseif (($link["rel"] == "diaspora-public-key") AND ($link["href"] != "")) {
+                       elseif (($link["rel"] == "diaspora-public-key") AND ($link["href"] != "")) {
                                $data["pubkey"] = base64_decode($link["href"]);
 
                                //if (strstr($data["pubkey"], 'RSA ') OR ($link["type"] == "RSA"))
-                               if (strstr($data["pubkey"], 'RSA '))
+                               if (strstr($data["pubkey"], 'RSA ')) {
                                        $data["pubkey"] = rsatopem($data["pubkey"]);
+                               }
                        }
                }
 
-               if (!isset($data["url"]) OR ($hcard == ""))
+               if (!isset($data["url"]) OR ($hcard == "")) {
                        return false;
+               }
 
-               if (is_array($webfinger["aliases"]))
-                       foreach ($webfinger["aliases"] AS $alias)
-                               if (normalise_link($alias) != normalise_link($data["url"]) AND !strstr($alias, "@"))
+               if (is_array($webfinger["aliases"])) {
+                       foreach ($webfinger["aliases"] as $alias) {
+                               if (normalise_link($alias) != normalise_link($data["url"]) AND ! strstr($alias, "@")) {
                                        $data["alias"] = $alias;
+                               }
+                       }
+               }
 
                // Fetch further information from the hcard
                $data = self::pollHcard($hcard, $data);
 
-               if (!$data)
+               if (!$data) {
                        return false;
+               }
 
                if (isset($data["url"]) AND isset($data["guid"]) AND isset($data["baseurl"]) AND
                        isset($data["pubkey"]) AND ($hcard != "")) {
@@ -883,10 +956,11 @@ class Probe {
                        $data["addr"] = strtolower($data["addr"]);
 
                        // We have to overwrite the detected value for "notify" since Hubzilla doesn't send it
-                       $data["notify"] = $data["baseurl"]."/receive/users/".$data["guid"];
-                       $data["batch"] = $data["baseurl"]."/receive/public";
-               } else
+                       $data["notify"] = $data["baseurl"] . "/receive/users/" . $data["guid"];
+                       $data["batch"] = $data["baseurl"] . "/receive/public";
+               } else {
                        return false;
+               }
 
                return $data;
        }
@@ -901,7 +975,7 @@ class Probe {
        private function ostatus($webfinger) {
                $data = array();
                if (is_array($webfinger["aliases"])) {
-                       foreach ($webfinger["aliases"] AS $alias) {
+                       foreach ($webfinger["aliases"] as $alias) {
                                if (strstr($alias, "@")) {
                                        $data["addr"] = str_replace('acct:', '', $alias);
                                }
@@ -912,7 +986,7 @@ class Probe {
                        $data["addr"] = str_replace('acct:', '', $webfinger["subject"]);
                }
                $pubkey = "";
-               foreach ($webfinger["links"] AS $link) {
+               foreach ($webfinger["links"] as $link) {
                        if (($link["rel"] == "http://webfinger.net/rel/profile-page") AND
                                ($link["type"] == "text/html") AND ($link["href"] != "")) {
                                $data["url"] = $link["href"];
@@ -942,7 +1016,7 @@ class Probe {
                                if (sizeof($key) >= 3) {
                                        $m = base64url_decode($key[1]);
                                        $e = base64url_decode($key[2]);
-                                       $data["pubkey"] = metopem($m,$e);
+                                       $data["pubkey"] = metopem($m, $e);
                                }
                        }
                }
@@ -959,7 +1033,7 @@ class Probe {
                        return false;
                }
                $feed = $ret['body'];
-               $feed_data = feed_import($feed,$dummy1,$dummy2, $dummy3, true);
+               $feed_data = feed_import($feed, $dummy1, $dummy2, $dummy3, true);
                if (!$feed_data) {
                        return false;
                }
@@ -1000,8 +1074,9 @@ class Probe {
        private function pumpioProfileData($profile) {
 
                $doc = new \DOMDocument();
-               if (!@$doc->loadHTMLFile($profile))
+               if (!@$doc->loadHTMLFile($profile)) {
                        return false;
+               }
 
                $xpath = new \DomXPath($doc);
 
@@ -1010,14 +1085,18 @@ class Probe {
                // This is ugly - but pump.io doesn't seem to know a better way for it
                $data["name"] = trim($xpath->query("//h1[@class='media-header']")->item(0)->nodeValue);
                $pos = strpos($data["name"], chr(10));
-               if ($pos)
+               if ($pos) {
                        $data["name"] = trim(substr($data["name"], 0, $pos));
+               }
 
                $avatar = $xpath->query("//img[@class='img-rounded media-object']")->item(0);
-               if ($avatar)
-                       foreach ($avatar->attributes as $attribute)
-                               if ($attribute->name == "src")
+               if ($avatar) {
+                       foreach ($avatar->attributes as $attribute) {
+                               if ($attribute->name == "src") {
                                        $data["photo"] = trim($attribute->value);
+                               }
+                       }
+               }
 
                $data["location"] = $xpath->query("//p[@class='location']")->item(0)->nodeValue;
                $data["about"] = $xpath->query("//p[@class='summary']")->item(0)->nodeValue;
@@ -1035,32 +1114,34 @@ class Probe {
        private function pumpio($webfinger) {
 
                $data = array();
-               foreach ($webfinger["links"] AS $link) {
+               foreach ($webfinger["links"] as $link) {
                        if (($link["rel"] == "http://webfinger.net/rel/profile-page") AND
-                               ($link["type"] == "text/html") AND ($link["href"] != ""))
+                               ($link["type"] == "text/html") AND ($link["href"] != "")) {
                                $data["url"] = $link["href"];
-                       elseif (($link["rel"] == "activity-inbox") AND ($link["href"] != ""))
+                       } elseif (($link["rel"] == "activity-inbox") AND ($link["href"] != "")) {
                                $data["notify"] = $link["href"];
-                       elseif (($link["rel"] == "activity-outbox") AND ($link["href"] != ""))
+                       } elseif (($link["rel"] == "activity-outbox") AND ($link["href"] != "")) {
                                $data["poll"] = $link["href"];
-                       elseif (($link["rel"] == "dialback") AND ($link["href"] != ""))
+                       } elseif (($link["rel"] == "dialback") AND ($link["href"] != "")) {
                                $data["dialback"] = $link["href"];
+                       }
                }
                if (isset($data["poll"]) AND isset($data["notify"]) AND
                        isset($data["dialback"]) AND isset($data["url"])) {
-
                        // by now we use these fields only for the network type detection
                        // So we unset all data that isn't used at the moment
                        unset($data["dialback"]);
 
                        $data["network"] = NETWORK_PUMPIO;
-               } else
+               } else {
                        return false;
+               }
 
                $profile_data = self::pumpioProfileData($data["url"]);
 
-               if (!$profile_data)
+               if (!$profile_data) {
                        return false;
+               }
 
                $data = array_merge($data, $profile_data);
 
@@ -1077,28 +1158,33 @@ class Probe {
        private function getFeedLink($url) {
                $doc = new \DOMDocument();
 
-               if (!@$doc->loadHTMLFile($url))
+               if (!@$doc->loadHTMLFile($url)) {
                        return false;
+               }
 
                $xpath = new \DomXPath($doc);
 
                //$feeds = $xpath->query("/html/head/link[@type='application/rss+xml']");
                $feeds = $xpath->query("/html/head/link[@type='application/rss+xml' and @rel='alternate']");
-               if (!is_object($feeds))
+               if (!is_object($feeds)) {
                        return false;
+               }
 
-               if ($feeds->length == 0)
+               if ($feeds->length == 0) {
                        return false;
+               }
 
                $feed_url = "";
 
-               foreach ($feeds AS $feed) {
+               foreach ($feeds as $feed) {
                        $attr = array();
-                       foreach ($feed->attributes as $attribute)
-                       $attr[$attribute->name] = trim($attribute->value);
+                       foreach ($feed->attributes as $attribute) {
+                               $attr[$attribute->name] = trim($attribute->value);
+                       }
 
-                       if ($feed_url == "")
+                       if ($feed_url == "") {
                                $feed_url = $attr["href"];
+                       }
                }
 
                return $feed_url;
@@ -1121,36 +1207,43 @@ class Probe {
                $feed_data = feed_import($feed, $dummy1, $dummy2, $dummy3, true);
 
                if (!$feed_data) {
-                       if (!$probe)
+                       if (!$probe) {
                                return false;
+                       }
 
                        $feed_url = self::getFeedLink($url);
 
-                       if (!$feed_url)
+                       if (!$feed_url) {
                                return false;
+                       }
 
                        return self::feed($feed_url, false);
                }
 
-               if ($feed_data["header"]["author-name"] != "")
+               if ($feed_data["header"]["author-name"] != "") {
                        $data["name"] = $feed_data["header"]["author-name"];
+               }
 
-               if ($feed_data["header"]["author-nick"] != "")
+               if ($feed_data["header"]["author-nick"] != "") {
                        $data["nick"] = $feed_data["header"]["author-nick"];
+               }
 
-               if ($feed_data["header"]["author-avatar"] != "")
+               if ($feed_data["header"]["author-avatar"] != "") {
                        $data["photo"] = $feed_data["header"]["author-avatar"];
+               }
 
-               if ($feed_data["header"]["author-id"] != "")
+               if ($feed_data["header"]["author-id"] != "") {
                        $data["alias"] = $feed_data["header"]["author-id"];
+               }
 
                $data["url"] = $url;
                $data["poll"] = $url;
 
-               if ($feed_data["header"]["author-link"] != "")
+               if ($feed_data["header"]["author-link"] != "") {
                        $data["baseurl"] = $feed_data["header"]["author-link"];
-               else
+               } else {
                        $data["baseurl"] = $data["url"];
+               }
 
                $data["network"] = NETWORK_FEED;
 
@@ -1167,8 +1260,9 @@ class Probe {
         */
        private function mail($uri, $uid) {
 
-               if (!validate_email($uri))
+               if (!validate_email($uri)) {
                        return false;
+               }
 
                $x = q("SELECT `prvkey` FROM `user` WHERE `uid` = %d LIMIT 1", intval($uid));
 
@@ -1177,49 +1271,54 @@ class Probe {
                if (\dbm::is_result($x) && \dbm::is_result($r)) {
                        $mailbox = construct_mailbox_name($r[0]);
                        $password = '';
-                       openssl_private_decrypt(hex2bin($r[0]['pass']), $password,$x[0]['prvkey']);
-                       $mbox = email_connect($mailbox,$r[0]['user'], $password);
-                       if(!mbox)
+                       openssl_private_decrypt(hex2bin($r[0]['pass']), $password, $x[0]['prvkey']);
+                       $mbox = email_connect($mailbox, $r[0]['user'], $password);
+                       if (!mbox) {
                                return false;
+                       }
                }
 
                $msgs = email_poll($mbox, $uri);
                logger('searching '.$uri.', '.count($msgs).' messages found.', LOGGER_DEBUG);
 
-               if (!count($msgs))
+               if (!count($msgs)) {
                        return false;
+               }
 
                $data = array();
 
                $data["addr"] = $uri;
                $data["network"] = NETWORK_MAIL;
-               $data["name"] = substr($uri, 0, strpos($uri,'@'));
+               $data["name"] = substr($uri, 0, strpos($uri, '@'));
                $data["nick"] = $data["name"];
                $data["photo"] = avatar_img($uri);
 
-               $phost = substr($uri, strpos($uri,'@') + 1);
+               $phost = substr($uri, strpos($uri, '@') + 1);
                $data["url"] = 'http://'.$phost."/".$data["nick"];
                $data["notify"] = 'smtp '.random_string();
                $data["poll"] = 'email '.random_string();
 
                $x = email_msg_meta($mbox, $msgs[0]);
-               if(stristr($x[0]->from, $uri))
+               if (stristr($x[0]->from, $uri)) {
                        $adr = imap_rfc822_parse_adrlist($x[0]->from, '');
-               elseif(stristr($x[0]->to, $uri))
+               } elseif (stristr($x[0]->to, $uri)) {
                        $adr = imap_rfc822_parse_adrlist($x[0]->to, '');
-               if(isset($adr)) {
-                       foreach($adr as $feadr) {
-                               if((strcasecmp($feadr->mailbox, $data["name"]) == 0)
+               }
+               if (isset($adr)) {
+                       foreach ($adr as $feadr) {
+                               if ((strcasecmp($feadr->mailbox, $data["name"]) == 0)
                                        &&(strcasecmp($feadr->host, $phost) == 0)
                                        && (strlen($feadr->personal))) {
 
                                        $personal = imap_mime_header_decode($feadr->personal);
                                        $data["name"] = "";
-                                       foreach($personal as $perspart)
-                                               if ($perspart->charset != "default")
+                                       foreach ($personal as $perspart) {
+                                               if ($perspart->charset != "default") {
                                                        $data["name"] .= iconv($perspart->charset, 'UTF-8//IGNORE', $perspart->text);
-                                               else
+                                               } else {
                                                        $data["name"] .= $perspart->text;
+                                               }
+                                       }
 
                                        $data["name"] = notags($data["name"]);
                                }
@@ -1265,5 +1364,4 @@ class Probe {
 
                return $fixed;
        }
-
 }