Some more caching

[friendica.git] / include / dfrn.php

diff --git a/include/dfrn.php b/include/dfrn.php
index 3a8bf1224e83e9dec925f595deaa9656ef5d359f..5e4f03779682e71367638fe9325170e5a25ad418 100644 (file)
--- a/include/dfrn.php
+++ b/include/dfrn.php
@@ -105,8 +105,9 @@ class dfrn {
                        dbesc($owner_nick)
                );
 
-               if(! dbm::is_result($r))
+               if (! dbm::is_result($r)) {
                        killme();
+               }
 
                $owner = $r[0];
                $owner_id = $owner['uid'];
@@ -139,8 +140,9 @@ class dfrn {
                                intval($owner_id)
                        );
 
-                       if(! dbm::is_result($r))
+                       if (! dbm::is_result($r)) {
                                killme();
+                       }
 
                        $contact = $r[0];
                        require_once('include/security.php');
@@ -1159,7 +1161,7 @@ class dfrn {
 
                // Until now we aren't serving different sizes - but maybe later
                $avatarlist = array();
-               // @todo check if "avatar" or "photo" would be the best field in the specification
+               /// @todo check if "avatar" or "photo" would be the best field in the specification
                $avatars = $xpath->query($element."/atom:link[@rel='avatar']", $context);
                foreach($avatars AS $avatar) {
                        $href = "";
@@ -1379,7 +1381,7 @@ class dfrn {
 
                $objxml = $obj_doc->saveXML($obj_element);
 
-               // @todo This isn't totally clean. We should find a way to transform the namespaces
+               /// @todo This isn't totally clean. We should find a way to transform the namespaces
                $objxml = str_replace("<".$element.' xmlns="http://www.w3.org/2005/Atom">', "<".$element.">", $objxml);
                return($objxml);
        }
@@ -1525,7 +1527,7 @@ class dfrn {
                        "to_email"     => $importer["email"],
                        "uid"          => $importer["importer_uid"],
                        "item"         => $suggest,
-                       "link"         => $a->get_baseurl()."/notifications/intros",
+                       "link"         => App::get_baseurl()."/notifications/intros",
                        "source_name"  => $importer["name"],
                        "source_link"  => $importer["url"],
                        "source_photo" => $importer["photo"],
@@ -1792,8 +1794,6 @@ class dfrn {
         * @param int $posted_id The record number of item record that was just posted
         */
        private function do_poke($item, $importer, $posted_id) {
-               $a = get_app();
-
                $verb = urldecode(substr($item["verb"],strpos($item["verb"], "#")+1));
                if(!$verb)
                        return;
@@ -1813,7 +1813,7 @@ class dfrn {
                                }
                        }
 
-                       if($Blink && link_compare($Blink,$a->get_baseurl()."/profile/".$importer["nickname"])) {
+                       if($Blink && link_compare($Blink,App::get_baseurl()."/profile/".$importer["nickname"])) {
 
                                // send a notification
                                notification(array(
@@ -1824,7 +1824,7 @@ class dfrn {
                                        "to_email"     => $importer["email"],
                                        "uid"          => $importer["importer_uid"],
                                        "item"         => $item,
-                                       "link"         => $a->get_baseurl()."/display/".urlencode(get_item_guid($posted_id)),
+                                       "link"         => App::get_baseurl()."/display/".urlencode(get_item_guid($posted_id)),
                                        "source_name"  => stripslashes($item["author-name"]),
                                        "source_link"  => $item["author-link"],
                                        "source_photo" => ((link_compare($item["author-link"],$importer["url"]))
@@ -2355,7 +2355,7 @@ class dfrn {
                                                dbesc($xt->id),
                                                intval($importer["importer_uid"])
                                        );
-                                       if(count($i)) {
+                                       if (dbm::is_result($i)) {
 
                                                // For tags, the owner cannot remove the tag on the author's copy of the post.