]> git.mxchange.org Git - friendica.git/blobdiff - include/dfrn.php
merged 2 if() into one as requested by CR
[friendica.git] / include / dfrn.php
index fc29d70dd6f512ffd00269d6973c8c4ac347e794..83d76a0ae45cea961b58cd1ea60944fac1f10a0c 100644 (file)
@@ -216,13 +216,10 @@ class dfrn {
                        dbesc($sort)
                );
 
-               if (!dbm::is_result($r)) {
-                       logger("Query failed to execute, no result returned in " . __FUNCTION__);
-                       killme();
-               }
-
-               // Will check further below if this actually returned results.
-               // We will provide an empty feed if that is the case.
+               /*
+                * Will check further below if this actually returned results.
+                * We will provide an empty feed if that is the case.
+                */
 
                $items = $r;
 
@@ -243,10 +240,10 @@ class dfrn {
 
                $root = self::add_header($doc, $owner, $author, $alternatelink, true);
 
-               // This hook can't work anymore
+               /// @TODO This hook can't work anymore
                //      call_hooks('atom_feed', $atom);
 
-               if (!count($items) OR $onlyheader) {
+               if (!dbm::is_result($items) OR $onlyheader) {
                        $atom = trim($doc->saveXML());
 
                        call_hooks('atom_feed_end', $atom);
@@ -689,15 +686,15 @@ class dfrn {
                        }
 
                        if ($r->link) {
-                               if (substr($r->link,0,1) == '<') {
-                                       if (strstr($r->link,'&') && (! strstr($r->link,'&amp;'))) {
-                                               $r->link = str_replace('&','&amp;', $r->link);
+                               if (substr($r->link, 0, 1) == '<') {
+                                       if (strstr($r->link, '&') && (! strstr($r->link, '&amp;'))) {
+                                               $r->link = str_replace('&', '&amp;', $r->link);
                                        }
 
-                                       $r->link = preg_replace('/\<link(.*?)\"\>/','<link$1"/>',$r->link);
+                                       $r->link = preg_replace('/\<link(.*?)\"\>/', '<link$1"/>', $r->link);
 
                                        // XML does need a single element as root element so we add a dummy element here
-                                       $data = parse_xml_string("<dummy>".$r->link."</dummy>", false);
+                                       $data = parse_xml_string("<dummy>" . $r->link . "</dummy>", false);
                                        if (is_object($data)) {
                                                foreach ($data->link AS $link) {
                                                        $attributes = array();
@@ -870,7 +867,7 @@ class dfrn {
 
                // The signed text contains the content in Markdown, the sender handle and the signatur for the content
                // It is needed for relayed comments to Diaspora.
-               if ($item['signed_text']) {
+               if($item['signed_text']) {
                        $sign = base64_encode(json_encode(array('signed_text' => $item['signed_text'],'signature' => $item['signature'],'signer' => $item['signer'])));
                        xml::add_element($doc, $entry, "dfrn:diaspora_signature", $sign);
                }
@@ -918,12 +915,7 @@ class dfrn {
                                intval($owner["uid"]),
                                dbesc(normalise_link($mention)));
 
-                       if (!dbm::is_result($r)) {
-                               /// @TODO Maybe some logging?
-                               killme();
-                       }
-
-                       if ($r[0]["forum"] OR $r[0]["prv"]) {
+                       if (dbm::is_result($r) AND ($r[0]["forum"] OR $r[0]["prv"])) {
                                xml::add_element($doc, $entry, "link", "", array("rel" => "mentioned",
                                                                                        "ostatus:object-type" => ACTIVITY_OBJ_GROUP,
                                                                                        "href" => $mention));
@@ -963,12 +955,12 @@ class dfrn {
                        $idtosend = '1:' . $orig_id;
                }
 
-               $rino = get_config('system','rino_encrypt');
+               $rino = get_config('system', 'rino_encrypt');
                $rino = intval($rino);
 
                // use RINO1 if mcrypt isn't installed and RINO2 was selected
-               if ($rino==2 and !function_exists('mcrypt_create_iv')) {
-                       $rino=1;
+               if ($rino == 2 and !function_exists('mcrypt_create_iv')) {
+                       $rino = 1;
                }
 
                logger("Local rino version: ". $rino, LOGGER_DEBUG);
@@ -976,7 +968,7 @@ class dfrn {
                $ssl_val = intval(get_config('system','ssl_policy'));
                $ssl_policy = '';
 
-               switch($ssl_val){
+               switch ($ssl_val) {
                        case SSL_POLICY_FULL:
                                $ssl_policy = 'full';
                                break;
@@ -1095,13 +1087,13 @@ class dfrn {
                }
 
 
-               if ($rino>0 && $rino_remote_version>0 && (! $dissolve)) {
+               if ($rino > 0 && $rino_remote_version > 0 && (! $dissolve)) {
                        logger('rino version: '. $rino_remote_version);
 
-                       switch($rino_remote_version) {
+                       switch ($rino_remote_version) {
                                case 1:
                                        // Deprecated rino version!
-                                       $key = substr(random_string(),0,16);
+                                       $key = substr(random_string(), 0, 16);
                                        $data = aes_encrypt($postvars['data'],$key);
                                        break;
                                case 2:
@@ -1138,9 +1130,8 @@ class dfrn {
 
                        if ($dfrn_version >= 2.1) {
                                if (($contact['duplex'] && strlen($contact['pubkey']))
-                                       || ($owner['page-flags'] == PAGE_COMMUNITY && strlen($contact['pubkey']))
-                                       || ($contact['rel'] == CONTACT_IS_SHARING && strlen($contact['pubkey']))) {
-
+                                               || ($owner['page-flags'] == PAGE_COMMUNITY && strlen($contact['pubkey']))
+                                               || ($contact['rel'] == CONTACT_IS_SHARING && strlen($contact['pubkey']))) {
                                        openssl_public_encrypt($key,$postvars['key'],$contact['pubkey']);
                                } else {
                                        openssl_private_encrypt($key,$postvars['key'],$contact['prvkey']);
@@ -1182,7 +1173,7 @@ class dfrn {
                        return 3;
                }
 
-               if ($contact['term-date'] != '0000-00-00 00:00:00') {
+               if ($contact['term-date'] > NULL_DATE) {
                        logger("dfrn_deliver: $url back from the dead - removing mark for death");
                        require_once('include/Contact.php');
                        unmark_for_death($contact);
@@ -1277,7 +1268,7 @@ class dfrn {
                        $href = "";
                        $width = 0;
                        foreach ($avatar->attributes AS $attributes) {
-                               /// @TODO Rewrite these similar if () to one switch
+                               /// @TODO Rewrite these similar if() to one switch
                                if ($attributes->name == "href") {
                                        $href = $attributes->textContent;
                                }
@@ -1298,19 +1289,19 @@ class dfrn {
                }
 
                if (dbm::is_result($r) AND !$onlyfetch) {
-                       logger("Check if contact details for contact ".$r[0]["id"]." (".$r[0]["nick"].") have to be updated.", LOGGER_DEBUG);
+                       logger("Check if contact details for contact " . $r[0]["id"] . " (" . $r[0]["nick"] . ") have to be updated.", LOGGER_DEBUG);
 
                        $poco = array("url" => $contact["url"]);
 
                        // When was the last change to name or uri?
-                       $name_element = $xpath->query($element."/atom:name", $context)->item(0);
+                       $name_element = $xpath->query($element . "/atom:name", $context)->item(0);
                        foreach ($name_element->attributes AS $attributes) {
                                if ($attributes->name == "updated") {
                                        $poco["name-date"] = $attributes->textContent;
                                }
                        }
 
-                       $link_element = $xpath->query($element."/atom:link", $context)->item(0);
+                       $link_element = $xpath->query($element . "/atom:link", $context)->item(0);
                        foreach ($link_element->attributes AS $attributes) {
                                if ($attributes->name == "updated") {
                                        $poco["uri-date"] = $attributes->textContent;
@@ -1318,33 +1309,33 @@ class dfrn {
                        }
 
                        // Update contact data
-                       $value = $xpath->evaluate($element."/dfrn:handle/text()", $context)->item(0)->nodeValue;
+                       $value = $xpath->evaluate($element . "/dfrn:handle/text()", $context)->item(0)->nodeValue;
                        if ($value != "") {
                                $poco["addr"] = $value;
                        }
 
-                       $value = $xpath->evaluate($element."/poco:displayName/text()", $context)->item(0)->nodeValue;
+                       $value = $xpath->evaluate($element . "/poco:displayName/text()", $context)->item(0)->nodeValue;
                        if ($value != "") {
                                $poco["name"] = $value;
                        }
 
-                       $value = $xpath->evaluate($element."/poco:preferredUsername/text()", $context)->item(0)->nodeValue;
+                       $value = $xpath->evaluate($element . "/poco:preferredUsername/text()", $context)->item(0)->nodeValue;
                        if ($value != "") {
                                $poco["nick"] = $value;
                        }
 
-                       $value = $xpath->evaluate($element."/poco:note/text()", $context)->item(0)->nodeValue;
+                       $value = $xpath->evaluate($element . "/poco:note/text()", $context)->item(0)->nodeValue;
                        if ($value != "") {
                                $poco["about"] = $value;
                        }
 
-                       $value = $xpath->evaluate($element."/poco:address/poco:formatted/text()", $context)->item(0)->nodeValue;
+                       $value = $xpath->evaluate($element . "/poco:address/poco:formatted/text()", $context)->item(0)->nodeValue;
                        if ($value != "") {
                                $poco["location"] = $value;
                        }
 
                        /// @todo Only search for elements with "poco:type" = "xmpp"
-                       $value = $xpath->evaluate($element."/poco:ims/poco:value/text()", $context)->item(0)->nodeValue;
+                       $value = $xpath->evaluate($element . "/poco:ims/poco:value/text()", $context)->item(0)->nodeValue;
                        if ($value != "") {
                                $poco["xmpp"] = $value;
                        }
@@ -1357,9 +1348,9 @@ class dfrn {
                        /// - poco:country
 
                        // If the "hide" element is present then the profile isn't searchable.
-                       $hide = intval($xpath->evaluate($element."/dfrn:hide/text()", $context)->item(0)->nodeValue == "true");
+                       $hide = intval($xpath->evaluate($element . "/dfrn:hide/text()", $context)->item(0)->nodeValue == "true");
 
-                       logger("Hidden status for contact ".$contact["url"].": ".$hide, LOGGER_DEBUG);
+                       logger("Hidden status for contact " . $contact["url"] . ": " . $hide, LOGGER_DEBUG);
 
                        // If the contact isn't searchable then set the contact to "hidden".
                        // Problem: This can be manually overridden by the user.
@@ -1369,7 +1360,7 @@ class dfrn {
 
                        // Save the keywords into the contact table
                        $tags = array();
-                       $tagelements = $xpath->evaluate($element."/poco:tags/text()", $context);
+                       $tagelements = $xpath->evaluate($element . "/poco:tags/text()", $context);
                        foreach ($tagelements AS $tag) {
                                $tags[$tag->nodeValue] = $tag->nodeValue;
                        }
@@ -1381,7 +1372,7 @@ class dfrn {
                        // "dfrn:birthday" contains the birthday converted to UTC
                        $old_bdyear = $contact["bdyear"];
 
-                       $birthday = $xpath->evaluate($element."/dfrn:birthday/text()", $context)->item(0)->nodeValue;
+                       $birthday = $xpath->evaluate($element . "/dfrn:birthday/text()", $context)->item(0)->nodeValue;
 
                        if (strtotime($birthday) > time()) {
                                $bd_timestamp = strtotime($birthday);
@@ -1390,7 +1381,7 @@ class dfrn {
                        }
 
                        // "poco:birthday" is the birthday in the format "yyyy-mm-dd"
-                       $value = $xpath->evaluate($element."/poco:birthday/text()", $context)->item(0)->nodeValue;
+                       $value = $xpath->evaluate($element . "/poco:birthday/text()", $context)->item(0)->nodeValue;
 
                        if (!in_array($value, array("", "0000-00-00"))) {
                                $bdyear = date("Y");
@@ -1427,20 +1418,20 @@ class dfrn {
                        $datefields = array("name-date", "uri-date");
                        foreach ($datefields AS $field) {
                                if (strtotime($contact[$field]) > strtotime($r[0][$field])) {
-                                       logger("Difference for contact ".$contact["id"]." in field '".$field."'. New value: '".$contact[$field]."', old value '".$r[0][$field]."'", LOGGER_DEBUG);
+                                       logger("Difference for contact " . $contact["id"] . " in field '" . $field . "'. New value: '" . $contact[$field] . "', old value '" . $r[0][$field] . "'", LOGGER_DEBUG);
                                        $update = true;
                                }
                        }
 
                        foreach ($fields AS $field => $data) {
                                if ($contact[$field] != $r[0][$field]) {
-                                       logger("Difference for contact ".$contact["id"]." in field '".$field."'. New value: '".$contact[$field]."', old value '".$r[0][$field]."'", LOGGER_DEBUG);
+                                       logger("Difference for contact " . $contact["id"] . " in field '" . $field . "'. New value: '" . $contact[$field] . "', old value '" . $r[0][$field] . "'", LOGGER_DEBUG);
                                        $update = true;
                                }
                        }
 
                        if ($update) {
-                               logger("Update contact data for contact ".$contact["id"]." (".$contact["nick"].")", LOGGER_DEBUG);
+                               logger("Update contact data for contact " . $contact["id"] . " (" . $contact["nick"] . ")", LOGGER_DEBUG);
 
                                q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `about` = '%s', `location` = '%s',
                                        `addr` = '%s', `keywords` = '%s', `bdyear` = '%s', `bd` = '%s', `hidden` = %d,
@@ -1456,10 +1447,12 @@ class dfrn {
                        update_contact_avatar($author["avatar"], $importer["uid"], $contact["id"],
                                                (strtotime($contact["avatar-date"]) > strtotime($r[0]["avatar-date"])));
 
-                       // The generation is a sign for the reliability of the provided data.
-                       // It is used in the socgraph.php to prevent that old contact data
-                       // that was relayed over several servers can overwrite contact
-                       // data that we received directly.
+                       /*
+                        * The generation is a sign for the reliability of the provided data.
+                        * It is used in the socgraph.php to prevent that old contact data
+                        * that was relayed over several servers can overwrite contact
+                        * data that we received directly.
+                        */
 
                        $poco["generation"] = 2;
                        $poco["photo"] = $author["avatar"];
@@ -1609,8 +1602,14 @@ class dfrn {
                        intval($suggest["uid"])
                );
 
+               /*
+                * The valid result means the friend we're about to send a friend
+                * suggestion already has them in their contact, which means no further
+                * action is required.
+                *
+                * @see https://github.com/friendica/friendica/pull/3254#discussion_r107315246
+                */
                if (dbm::is_result($r)) {
-                       // Has already friend matching description
                        return false;
                }
 
@@ -1630,30 +1629,42 @@ class dfrn {
                                intval($suggest["uid"]),
                                intval($fid)
                        );
-                       /// @TODO Really abort on valid result??? Maybe missed ! here?
+
+                       /*
+                        * The valid result means the friend we're about to send a friend
+                        * suggestion already has them in their contact, which means no further
+                        * action is required.
+                        *
+                        * @see https://github.com/friendica/friendica/pull/3254#discussion_r107315246
+                        */
                        if (dbm::is_result($r)) {
                                return false;
                        }
                }
-               if (!$fid)
+               if (!$fid) {
                        $r = q("INSERT INTO `fcontact` (`name`,`url`,`photo`,`request`) VALUES ('%s', '%s', '%s', '%s')",
-                       dbesc($suggest["name"]),
-                       dbesc($suggest["url"]),
-                       dbesc($suggest["photo"]),
-                       dbesc($suggest["request"])
-               );
+                               dbesc($suggest["name"]),
+                               dbesc($suggest["url"]),
+                               dbesc($suggest["photo"]),
+                               dbesc($suggest["request"])
+                       );
+               }
                $r = q("SELECT `id` FROM `fcontact` WHERE `url` = '%s' AND `name` = '%s' AND `request` = '%s' LIMIT 1",
                        dbesc($suggest["url"]),
                        dbesc($suggest["name"]),
                        dbesc($suggest["request"])
                );
-               if (dbm::is_result($r)) {
-                       $fid = $r[0]["id"];
-               } else {
+
+               /*
+                * If no record in fcontact is found, below INSERT statement will not
+                * link an introduction to it.
+                */
+               if (!dbm::is_result($r)) {
                        // database record did not get created. Quietly give up.
                        killme();
                }
 
+               $fid = $r[0]["id"];
 
                $hash = random_string();
 
@@ -1731,8 +1742,8 @@ class dfrn {
                        intval($importer["importer_uid"]));
 
                if (!dbm::is_result($r)) {
-                       /// @todo Don't die quietly
-                       killme();
+                       logger("Query failed to execute, no result returned in " . __FUNCTION__);
+                       return false;
                }
 
                $old = $r[0];
@@ -1800,7 +1811,7 @@ class dfrn {
                        'author-link' => array($old["url"], $relocate["url"]),
                        //'owner-avatar' => array($old["photo"], $relocate["photo"]),
                        //'author-avatar' => array($old["photo"], $relocate["photo"]),
-                       );
+               );
                foreach ($fields as $n=>$f) {
                        $r = q("SELECT `id` FROM `item` WHERE `%s` = '%s' AND `uid` = %d LIMIT 1",
                                        $n, dbesc($f[0]),
@@ -1812,9 +1823,9 @@ class dfrn {
                                                $n, dbesc($f[0]),
                                                intval($importer["importer_uid"]));
 
-                               if ($x === false) {
-                                       return false;
-                               }
+                                       if ($x === false) {
+                                               return false;
+                                       }
                        }
                }
 
@@ -1833,6 +1844,7 @@ class dfrn {
         * @param array $item the new item record
         * @param array $importer Record of the importer user mixed with contact of the content
         * @param int $entrytype Is it a toplevel entry, a comment or a relayed comment?
+        * @todo set proper type-hints (array?)
         */
        private static function update_content($current, $item, $importer, $entrytype) {
                $changed = false;
@@ -1840,8 +1852,9 @@ class dfrn {
                if (edited_timestamp_is_newer($current, $item)) {
 
                        // do not accept (ignore) an earlier edit than one we currently have.
-                       if (datetime_convert("UTC","UTC",$item["edited"]) < $current["edited"])
-                               return(false);
+                       if (datetime_convert("UTC","UTC",$item["edited"]) < $current["edited"]) {
+                               return false;
+                       }
 
                        $r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s', `changed` = '%s' WHERE `uri` = '%s' AND `uid` = %d",
                                dbesc($item["title"]),
@@ -1886,6 +1899,7 @@ class dfrn {
         * @param array $item the new item record
         *
         * @return int Is it a toplevel entry, a comment or a relayed comment?
+        * @todo set proper type-hints (array?)
         */
        private static function get_entry_type($importer, $item) {
                if ($item["parent-uri"] != $item["uri"]) {
@@ -1926,16 +1940,17 @@ class dfrn {
                                }
                        }
 
-                       // Does this have the characteristics of a community or private group action?
-                       // If it's an action to a wall post on a community/prvgroup page it's a
-                       // valid community action. Also forum_mode makes it valid for sure.
-                       // If neither, it's not.
+                       /*
+                        * Does this have the characteristics of a community or private group action?
+                        * If it's an action to a wall post on a community/prvgroup page it's a
+                        * valid community action. Also forum_mode makes it valid for sure.
+                        * If neither, it's not.
+                        */
 
-                       if ($is_a_remote_action && $community) {
-                               if ((!$r[0]["forum_mode"]) && (!$r[0]["wall"])) {
-                                       $is_a_remote_action = false;
-                                       logger("not a community action");
-                               }
+                       /// @TODO Maybe merge these if() blocks into one?
+                       if ($is_a_remote_action && $community && (!$r[0]["forum_mode"]) && (!$r[0]["wall"])) {
+                               $is_a_remote_action = false;
+                               logger("not a community action");
                        }
 
                        if ($is_a_remote_action) {
@@ -1943,7 +1958,6 @@ class dfrn {
                        } else {
                                return DFRN_REPLY;
                        }
-
                } else {
                        return DFRN_TOP_LEVEL;
                }
@@ -1956,6 +1970,7 @@ class dfrn {
         * @param array $item the new item record
         * @param array $importer Record of the importer user mixed with contact of the content
         * @param int $posted_id The record number of item record that was just posted
+        * @todo set proper type-hints (array?)
         */
        private static function do_poke($item, $importer, $posted_id) {
                $verb = urldecode(substr($item["verb"],strpos($item["verb"], "#")+1));
@@ -1969,7 +1984,7 @@ class dfrn {
                        // somebody was poked/prodded. Was it me?
                        foreach ($xo->link as $l) {
                                $atts = $l->attributes();
-                               switch($atts["rel"]) {
+                               switch ($atts["rel"]) {
                                        case "alternate":
                                                $Blink = $atts["href"];
                                                break;
@@ -1978,7 +1993,7 @@ class dfrn {
                                }
                        }
 
-                       if ($Blink && link_compare($Blink,App::get_baseurl()."/profile/".$importer["nickname"])) {
+                       if ($Blink && link_compare($Blink, App::get_baseurl() . "/profile/" . $importer["nickname"])) {
 
                                // send a notification
                                notification(array(
@@ -2012,6 +2027,7 @@ class dfrn {
         * @param bool $is_like Is the verb a "like"?
         *
         * @return bool Should the processing of the entries be continued?
+        * @todo set proper type-hints (array?)
         */
        private static function process_verbs($entrytype, $importer, &$item, &$is_like) {
 
@@ -2026,22 +2042,22 @@ class dfrn {
 
                        // Big question: Do we need these functions? They were part of the "consume_feed" function.
                        // This function once was responsible for DFRN and OStatus.
-                       if (activity_match($item["verb"],ACTIVITY_FOLLOW)) {
+                       if (activity_match($item["verb"], ACTIVITY_FOLLOW)) {
                                logger("New follower");
                                new_follower($importer, $contact, $item, $nickname);
                                return false;
                        }
-                       if (activity_match($item["verb"],ACTIVITY_UNFOLLOW))  {
+                       if (activity_match($item["verb"], ACTIVITY_UNFOLLOW))  {
                                logger("Lost follower");
                                lose_follower($importer, $contact, $item);
                                return false;
                        }
-                       if (activity_match($item["verb"],ACTIVITY_REQ_FRIEND)) {
+                       if (activity_match($item["verb"], ACTIVITY_REQ_FRIEND)) {
                                logger("New friend request");
                                new_follower($importer, $contact, $item, $nickname, true);
                                return false;
                        }
-                       if (activity_match($item["verb"],ACTIVITY_UNFRIEND))  {
+                       if (activity_match($item["verb"], ACTIVITY_UNFRIEND))  {
                                logger("Lost sharer");
                                lose_sharer($importer, $contact, $item);
                                return false;
@@ -2092,7 +2108,8 @@ class dfrn {
                                        );
 
                                        if (!dbm::is_result($r)) {
-                                               killme();
+                                               logger("Query failed to execute, no result returned in " . __FUNCTION__);
+                                               return false;
                                        }
 
                                        // extract tag, if not duplicate, add to parent item
@@ -2116,7 +2133,7 @@ class dfrn {
         *
         * @param object $links link elements
         * @param array $item the item record
-        * @todo Add type-hints
+        * @todo set proper type-hints
         */
        private static function parse_links($links, &$item) {
                $rel = "";
@@ -2126,7 +2143,7 @@ class dfrn {
                $title = "";
                foreach ($links AS $link) {
                        foreach ($link->attributes AS $attributes) {
-                               /// @TODO Rewrite these repeated (same) if () statements to a switch()
+                               /// @TODO Rewrite these repeated (same) if() statements to a switch()
                                if ($attributes->name == "href") {
                                        $href = $attributes->textContent;
                                }
@@ -2143,8 +2160,8 @@ class dfrn {
                                        $title = $attributes->textContent;
                                }
                        }
-                       if (($rel != "") AND ($href != ""))
-                               switch($rel) {
+                       if (($rel != "") AND ($href != "")) {
+                               switch ($rel) {
                                        case "alternate":
                                                $item["plink"] = $href;
                                                break;
@@ -2154,9 +2171,10 @@ class dfrn {
                                                        $item["attach"] .= ",";
                                                }
 
-                                               $item["attach"] .= '[attach]href="'.$href.'" length="'.$length.'" type="'.$type.'" title="'.$title.'"[/attach]';
+                                               $item["attach"] .= '[attach]href="' . $href . '" length="' . $length . '" type="' . $type . '" title="' . $title . '"[/attach]';
                                                break;
                                }
+                       }
                }
        }
 
@@ -2320,7 +2338,7 @@ class dfrn {
                                                        $item["tag"] .= ",";
                                                }
 
-                                               $item["tag"] .= $termhash."[url=".$termurl."]".$term."[/url]";
+                                               $item["tag"] .= $termhash . "[url=" . $termurl . "]" . $term . "[/url]";
                                        }
                                }
                        }
@@ -2370,11 +2388,12 @@ class dfrn {
                                $item["network"] = $author["network"];
                        }
 
+                       /// @TODO maybe remove this old-lost code then?
                        // This code was taken from the old DFRN code
                        // When activated, forums don't work.
                        // And: Why should we disallow commenting by followers?
                        // the behaviour is now similar to the Diaspora part.
-                       //if ($importer["rel"] == CONTACT_IS_FOLLOWER) {
+                       //if($importer["rel"] == CONTACT_IS_FOLLOWER) {
                        //      logger("Contact ".$importer["id"]." is only follower. Quitting", LOGGER_DEBUG);
                        //      return;
                        //}
@@ -2394,6 +2413,7 @@ class dfrn {
                                $ev = bbtoevent($item["body"]);
                                if ((x($ev, "desc") || x($ev, "summary")) && x($ev, "start")) {
                                        logger("Event in item ".$item["uri"]." was found.", LOGGER_DEBUG);
+                                       /// @TODO Mixure of "/' ahead ...
                                        $ev["cid"] = $importer["id"];
                                        $ev["uid"] = $importer["uid"];
                                        $ev["uri"] = $item["uri"];
@@ -2423,7 +2443,7 @@ class dfrn {
 
                // Update content if 'updated' changes
                if (dbm::is_result($current)) {
-                       if (self::update_content($r[0], $item, $importer, $entrytype))
+                       if (self::update_content($r[0], $item, $importer, $entrytype)) {
                                logger("Item ".$item["uri"]." was updated.", LOGGER_DEBUG);
                        } else {
                                logger("Item ".$item["uri"]." already existed.", LOGGER_DEBUG);
@@ -2473,10 +2493,12 @@ class dfrn {
                        }
                } else { // $entrytype == DFRN_TOP_LEVEL
                        if (!link_compare($item["owner-link"],$importer["url"])) {
-                               // The item owner info is not our contact. It's OK and is to be expected if this is a tgroup delivery,
-                               // but otherwise there's a possible data mixup on the sender's system.
-                               // the tgroup delivery code called from item_store will correct it if it's a forum,
-                               // but we're going to unconditionally correct it here so that the post will always be owned by our contact.
+                               /*
+                                * The item owner info is not our contact. It's OK and is to be expected if this is a tgroup delivery,
+                                * but otherwise there's a possible data mixup on the sender's system.
+                                * the tgroup delivery code called from item_store will correct it if it's a forum,
+                                * but we're going to unconditionally correct it here so that the post will always be owned by our contact.
+                                */
                                logger('Correcting item owner.', LOGGER_DEBUG);
                                $item["owner-name"]   = $importer["senderName"];
                                $item["owner-link"]   = $importer["url"];
@@ -2496,7 +2518,7 @@ class dfrn {
 
                        logger("Item was stored with id ".$posted_id, LOGGER_DEBUG);
 
-                       if (stristr($item["verb"],ACTIVITY_POKE))
+                       if(stristr($item["verb"],ACTIVITY_POKE))
                                self::do_poke($item, $importer, $posted_id);
                }
        }
@@ -2507,6 +2529,7 @@ class dfrn {
         * @param object $xpath XPath object
         * @param object $deletion deletion elements
         * @param array $importer Record of the importer user mixed with contact of the content
+        * @todo set proper type-hints
         */
        private static function process_deletion($xpath, $deletion, $importer) {
 
@@ -2538,7 +2561,7 @@ class dfrn {
                                intval($importer["id"])
                        );
                if (!dbm::is_result($r)) {
-                       logger("Item with uri ".$uri." from contact ".$importer["id"]." for user ".$importer["uid"]." wasn't found.", LOGGER_DEBUG);
+                       logger("Item with uri " . $uri . " from contact " . $importer["id"] . " for user " . $importer["uid"] . " wasn't found.", LOGGER_DEBUG);
                        return;
                } else {
 
@@ -2589,7 +2612,7 @@ class dfrn {
                                                                }
                                                        }
                                                        q("UPDATE `item` SET `tag` = '%s' WHERE `id` = %d",
-                                                               dbesc(implode(',',$newtags)),
+                                                               dbesc(implode(',', $newtags)),
                                                                intval($i[0]["id"])
                                                        );
                                                        create_tags_from_item($i[0]["id"]);
@@ -2622,7 +2645,7 @@ class dfrn {
                                create_tags_from_itemuri($uri, $importer["uid"]);
                                create_files_from_itemuri($uri, $importer["uid"]);
                                update_thread_uri($uri, $importer["importer_uid"]);
-                               if ($item["last-child"]) {
+                               if($item["last-child"]) {
                                        // ensure that last-child is set in case the comment that had it just got wiped.
                                        q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d ",
                                                dbesc(datetime_convert()),
@@ -2644,7 +2667,7 @@ class dfrn {
                                // if this is a relayed delete, propagate it to other recipients
 
                                if ($entrytype == DFRN_REPLY_RC) {
-                                       logger("Notifying followers about deletion of post ".$item["id"], LOGGER_DEBUG);
+                                       logger("Notifying followers about deletion of post " . $item["id"], LOGGER_DEBUG);
                                        proc_run(PRIORITY_HIGH, "include/notifier.php","drop", $item["id"]);
                                }
                        }
@@ -2657,11 +2680,13 @@ class dfrn {
         * @param text $xml The DFRN message
         * @param array $importer Record of the importer user mixed with contact of the content
         * @param bool $sort_by_date Is used when feeds are polled
+        * @todo set proper type-hints
         */
        public static function import($xml,$importer, $sort_by_date = false) {
 
-               if ($xml == "")
+               if ($xml == "") {
                        return;
+               }
 
                if ($importer["readonly"]) {
                        // We aren't receiving stuff from this person. But we will quietly ignore them
@@ -2705,13 +2730,14 @@ class dfrn {
                        self::fetchauthor($xpath, $doc->firstChild, $importer, "dfrn:owner", false, $xml);
                }
 
-               logger("Import DFRN message for user ".$importer["uid"]." from contact ".$importer["id"], LOGGER_DEBUG);
+               logger("Import DFRN message for user " . $importer["uid"] . " from contact " . $importer["id"], LOGGER_DEBUG);
 
                // The account type is new since 3.5.1
                if ($xpath->query("/atom:feed/dfrn:account_type")->length > 0) {
                        $accounttype = intval($xpath->evaluate("/atom:feed/dfrn:account_type/text()", $context)->item(0)->nodeValue);
 
                        if ($accounttype != $importer["contact-type"]) {
+                               /// @TODO this way is the norm or putting ); at the end of the line?
                                q("UPDATE `contact` SET `contact-type` = %d WHERE `id` = %d",
                                        intval($accounttype),
                                        intval($importer["id"])
@@ -2770,7 +2796,6 @@ class dfrn {
                                self::process_entry($header, $xpath, $entry, $importer);
                        }
                }
-               logger("Import done for user ".$importer["uid"]." from contact ".$importer["id"], LOGGER_DEBUG);
+               logger("Import done for user " . $importer["uid"] . " from contact " . $importer["id"], LOGGER_DEBUG);
        }
 }
-?>