More usage of dbm::is_result($r) instead of count($r):

[friendica.git] / include / Contact.php

diff --git a/include/Contact.php b/include/Contact.php
index e1fd296852daf54ee38bad3337ee2ede938341ca..03294f04072db906d0fb59234b58d4c4a1c778d1 100644 (file)
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -64,7 +64,7 @@ function contact_remove($id) {
        $r = q("select uid from contact where id = %d limit 1",
                intval($id)
        );
-       if((! count($r)) || (! intval($r[0]['uid'])))
+       if((! dbm::is_result($r)) || (! intval($r[0]['uid'])))
                return;
 
        $archive = get_pconfig($r[0]['uid'], 'system','archive_removed_contacts');
@@ -249,7 +249,7 @@ function get_contact_details_by_url($url, $uid = -1, $default = array()) {
                        FROM `gcontact` WHERE `nurl` = '%s'",
                                dbesc(normalise_link($url)));
 
-       if ($r) {
+       if (dbm::is_result($r)) {
                // If there is more than one entry we filter out the connector networks
                if (count($r) > 1) {
                        foreach ($r AS $id => $result) {
@@ -435,7 +435,7 @@ function random_profile() {
                        ORDER BY rand() LIMIT 1",
                dbesc(NETWORK_DFRN));
 
-       if(count($r))
+       if(dbm::is_result($r))
                return dirname($r[0]['url']);
        return '';
 }
@@ -670,7 +670,7 @@ function posts_from_gcontact($a, $gcontact_id) {
  * @brief Returns posts from a given contact url
  *
  * @param App $a argv application class
- * @param int $contact_url Contact URL
+ * @param string $contact_url Contact URL
  *
  * @return string posts in HTML
  */
@@ -683,10 +683,11 @@ function posts_from_contact_url($a, $contact_url) {
        $r = q("SELECT `network`, `id` AS `author-id` FROM `contact`
                WHERE `contact`.`nurl` = '%s' AND `contact`.`uid` = 0",
                dbesc(normalise_link($contact_url)));
-       if (in_array($r[0]["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, "")))
-               $sql = "(`item`.`uid` = 0 OR  (`item`.`uid` = %d AND `item`.`private`))";
-       else
+       if (in_array($r[0]["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""))) {
+               $sql = "(`item`.`uid` = 0 OR (`item`.`uid` = %d AND `item`.`private`))";
+       } else {
                $sql = "`item`.`uid` = %d";
+       }
 
        $author_id = intval($r[0]["author-id"]);
 
@@ -699,16 +700,6 @@ function posts_from_contact_url($a, $contact_url) {
                $a->set_pager_total($r[0]['total']);
        }
 
-/*
-"SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`,
-                       `author-name` AS `name`, `owner-avatar` AS `photo`,
-                       `owner-link` AS `url`, `owner-avatar` AS `thumb`
-               FROM `item` FORCE INDEX (`authorid_created`)
-               WHERE `item`.`author-id` = %d AND $sql
-               AND NOT `deleted` AND NOT `moderated` AND `visible`
-
-*/
-
        $r = q(item_query()." AND `item`.`author-id` = %d AND ".$sql.
                " ORDER BY `item`.`created` DESC LIMIT %d, %d",
                intval($author_id),
@@ -719,7 +710,7 @@ function posts_from_contact_url($a, $contact_url) {
 
        $o = conversation($a,$r,'community',false);
 
-       if(!get_config('system', 'old_pager')) {
+       if (!get_config('system', 'old_pager')) {
                $o .= alt_pager($a,count($r));
        } else {
                $o .= paginate($a);