diff --git a/include/Contact.php b/include/Contact.php index 8a33e3fe9..03294f040 100644 --- 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 ''; } diff --git a/include/Core/Config.php b/include/Core/Config.php index 0d29c9956..79424c9a1 100644 --- a/include/Core/Config.php +++ b/include/Core/Config.php @@ -33,7 +33,7 @@ class Config { $a = get_app(); $r = q("SELECT `v`, `k` FROM `config` WHERE `cat` = '%s' ORDER BY `cat`, `k`, `id`", dbesc($family)); - if (count($r)) { + if (dbm::is_result($r)) { foreach ($r as $rr) { $k = $rr['k']; if ($family === 'config') { diff --git a/include/Core/PConfig.php b/include/Core/PConfig.php index 351f63e00..33ec93c0e 100644 --- a/include/Core/PConfig.php +++ b/include/Core/PConfig.php @@ -33,7 +33,7 @@ class PConfig { dbesc($family), intval($uid) ); - if (count($r)) { + if (dbm::is_result($r)) { foreach ($r as $rr) { $k = $rr['k']; $a->config[$uid][$family][$k] = $rr['v']; diff --git a/include/Probe.php b/include/Probe.php index 4e69cc8ef..e0d0be2a8 100644 --- a/include/Probe.php +++ b/include/Probe.php @@ -1084,7 +1084,7 @@ class Probe { $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1", intval($uid)); - if(count($x) && count($r)) { + 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']); diff --git a/include/acl_selectors.php b/include/acl_selectors.php index 71a42478b..6b0a822cc 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -33,7 +33,7 @@ function group_select($selname,$selclass,$preselected = false,$size = 4) { call_hooks($a->module . '_pre_' . $selname, $arr); - if(count($r)) { + if(dbm::is_result($r)) { foreach($r as $rr) { if((is_array($preselected)) && in_array($rr['id'], $preselected)) $selected = " selected=\"selected\" "; @@ -144,7 +144,7 @@ function contact_selector($selname, $selclass, $preselected = false, $options) { call_hooks($a->module . '_pre_' . $selname, $arr); - if(count($r)) { + if(dbm::is_result($r)) { foreach($r as $rr) { if((is_array($preselected)) && in_array($rr['id'], $preselected)) $selected = " selected=\"selected\" "; @@ -220,7 +220,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p $receiverlist = array(); - if(count($r)) { + if(dbm::is_result($r)) { foreach($r as $rr) { if((is_array($preselected)) && in_array($rr['id'], $preselected)) $selected = " selected=\"selected\" "; @@ -314,7 +314,7 @@ function populate_acl($user = null, $show_jotnets = false) { $r = q("SELECT `pubmail` FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1", intval(local_user()) ); - if(count($r)) { + if(dbm::is_result($r)) { $mail_enabled = true; if(intval($r[0]['pubmail'])) $pubmail_enabled = true; @@ -577,7 +577,7 @@ function acl_lookup(&$a, $out_type = 'json') { $r = array(); - if(count($r)) { + if(dbm::is_result($r)) { foreach($r as $g){ $contacts[] = array( "type" => "c", @@ -612,7 +612,7 @@ function acl_lookup(&$a, $out_type = 'json') { dbesc($search), implode("','", $known_contacts) ); - if (is_array($r) && count($r)){ + if (dbm::is_result($r)){ foreach($r as $row) { // nickname.. $up = parse_url($row['author-link']); diff --git a/include/api.php b/include/api.php index 04d614d02..24120018b 100644 --- a/include/api.php +++ b/include/api.php @@ -208,7 +208,7 @@ dbesc(trim($user)), dbesc($encrypted) ); - if(count($r)) + if(dbm::is_result($r)) $record = $r[0]; } @@ -1326,10 +1326,10 @@ if (isset($_GET["q"])) { $r = q("SELECT id FROM `contact` WHERE `uid` = 0 AND `name` = '%s'", dbesc($_GET["q"])); - if (!count($r)) + if (!dbm::is_result($r)) $r = q("SELECT `id` FROM `contact` WHERE `uid` = 0 AND `nick` = '%s'", dbesc($_GET["q"])); - if (count($r)) { + if (dbm::is_result($r)) { $k = 0; foreach ($r AS $user) { $user_info = api_get_user($a, $user["id"], "json"); @@ -3174,7 +3174,7 @@ intval(api_user()) ); - if ((! count($r)) || ($r[0]['network'] !== NETWORK_DFRN)) + if ((! dbm::is_result($r)) || ($r[0]['network'] !== NETWORK_DFRN)) throw new BadRequestException("Unknown contact"); $cid = $r[0]['id']; @@ -3526,7 +3526,7 @@ intval($uid), intval($gid)); // error message if specified gid is not in database - if (count($r) == 0) + if (!dbm::is_result($r)) throw new BadRequestException("gid not available"); } else @@ -3581,7 +3581,7 @@ intval($uid), intval($gid)); // error message if specified gid is not in database - if (count($r) == 0) + if (!dbm::is_result($r)) throw new BadRequestException('gid not available'); // get data of the specified group id and group name @@ -3919,7 +3919,9 @@ $profile_url = $user_info["url"]; // message if nothing was found - if (count($r) == 0) + if (!dbm::is_result($r)) + $success = array('success' => false, 'search_results' => 'problem with query'); + else if (count($r) == 0) $success = array('success' => false, 'search_results' => 'nothing found'); else { $ret = Array(); @@ -3966,7 +3968,7 @@ intval(api_user()), intval($profileid)); // error message if specified gid is not in database - if (count($r) == 0) + if (!dbm::is_result($r)) throw new BadRequestException("profile_id not available"); } else diff --git a/include/auth.php b/include/auth.php index d1917b8b3..2ca9c3efb 100644 --- a/include/auth.php +++ b/include/auth.php @@ -50,7 +50,7 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params' $r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1", intval($_SESSION['visitor_id']) ); - if (count($r)) { + if (dbm::is_result($r)) { $a->contact = $r[0]; } } @@ -73,7 +73,7 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params' intval($_SESSION['uid']) ); - if (!count($r)) { + if (!dbm::is_result($r)) { nuke_session(); goaway(z_root()); } @@ -169,7 +169,7 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params' dbesc(trim($_POST['username'])), dbesc($encrypted) ); - if (count($r)) + if (dbm::is_result($r)) $record = $r[0]; } diff --git a/include/contact_selectors.php b/include/contact_selectors.php index 35c9d983d..8a7dd5606 100644 --- a/include/contact_selectors.php +++ b/include/contact_selectors.php @@ -12,7 +12,7 @@ function contact_profile_assign($current,$foreign_net) { $r = q("SELECT `id`, `profile-name` FROM `profile` WHERE `uid` = %d", intval($_SESSION['uid'])); - if(count($r)) { + if(dbm::is_result($r)) { foreach($r as $rr) { $selected = (($rr['id'] == $current) ? " selected=\"selected\" " : ""); $o .= "\r\n"; diff --git a/include/contact_widgets.php b/include/contact_widgets.php index bbbd941b5..e0a33eee0 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -93,7 +93,7 @@ function networks_widget($baseurl,$selected = '') { ); $nets = array(); - if(count($r)) { + if(dbm::is_result($r)) { require_once('include/contact_selectors.php'); foreach($r as $rr) { if($rr['network']) @@ -204,13 +204,13 @@ function common_friends_visitor_widget($profile_uid) { dbesc(normalise_link(get_my_url())), intval($profile_uid) ); - if(count($r)) + if(dbm::is_result($r)) $cid = $r[0]['id']; else { $r = q("select id from gcontact where nurl = '%s' limit 1", dbesc(normalise_link(get_my_url())) ); - if(count($r)) + if(dbm::is_result($r)) $zcid = $r[0]['id']; } } diff --git a/include/conversation.php b/include/conversation.php index 63db42d93..08350ac89 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -109,7 +109,7 @@ function localize_item(&$item){ $r = q("SELECT * from `item`,`contact` WHERE `item`.`contact-id`=`contact`.`id` AND `item`.`uri`='%s';", dbesc($item['parent-uri'])); - if(count($r)==0) return; + if(!dbm::is_result($r)) return; $obj=$r[0]; $author = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]'; @@ -245,7 +245,7 @@ function localize_item(&$item){ $r = q("SELECT * from `item`,`contact` WHERE `item`.`contact-id`=`contact`.`id` AND `item`.`uri`='%s';", dbesc($item['parent-uri'])); - if(count($r)==0) return; + if(!dbm::is_result($r)) return; $obj=$r[0]; $author = '[url=' . zrl($item['author-link']) . ']' . $item['author-name'] . '[/url]'; @@ -294,7 +294,7 @@ function localize_item(&$item){ dbesc($obj->id), intval($item['uid']) ); - if(count($r) && $r[0]['plink']) { + if(dbm::is_result($r) && $r[0]['plink']) { $target = $r[0]; $Bname = $target['author-name']; $Blink = $target['author-link']; diff --git a/include/datetime.php b/include/datetime.php index 16b134e90..d614818ce 100644 --- a/include/datetime.php +++ b/include/datetime.php @@ -552,7 +552,7 @@ function update_contact_birthdays() { // In-network birthdays are handled within local_delivery $r = q("SELECT * FROM contact WHERE `bd` != '' AND `bd` != '0000-00-00' AND SUBSTRING(`bd`,1,4) != `bdyear` "); - if(count($r)) { + if(dbm::is_result($r)) { foreach($r as $rr) { logger('update_contact_birthday: ' . $rr['bd']); diff --git a/include/delivery.php b/include/delivery.php index 094d0497b..a7aebe709 100644 --- a/include/delivery.php +++ b/include/delivery.php @@ -53,7 +53,7 @@ function delivery_run(&$argv, &$argc){ dbesc($item_id), dbesc($contact_id) ); - if (!count($r)) { + if (!dbm::is_result($r)) { continue; } @@ -131,7 +131,7 @@ function delivery_run(&$argv, &$argc){ intval($item_id) ); - if ((!count($r)) || (!intval($r[0]['parent']))) { + if ((!dbm::is_result($r)) || (!intval($r[0]['parent']))) { continue; } @@ -184,7 +184,7 @@ function delivery_run(&$argv, &$argc){ intval($uid) ); - if (!count($r)) + if (!dbm::is_result($r)) continue; $owner = $r[0]; @@ -254,7 +254,7 @@ function delivery_run(&$argv, &$argc){ intval($contact_id) ); - if (count($r)) + if (dbm::is_result($r)) $contact = $r[0]; if ($contact['self']) @@ -423,7 +423,7 @@ function delivery_run(&$argv, &$argc){ intval($argv[2]), intval($uid) ); - if (count($r)) + if (dbm::is_result($r)) $it = $r[0]; } if (!$it) @@ -478,14 +478,14 @@ function delivery_run(&$argv, &$argc){ dbesc($it['parent-uri']), intval($uid)); - if (count($r) AND ($r[0]['title'] != '')) + if (dbm::is_result($r) AND ($r[0]['title'] != '')) $subject = $r[0]['title']; else { $r = q("SELECT `title` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d LIMIT 1", dbesc($it['parent-uri']), intval($uid)); - if (count($r) AND ($r[0]['title'] != '')) + if (dbm::is_result($r) AND ($r[0]['title'] != '')) $subject = $r[0]['title']; } } diff --git a/include/dfrn.php b/include/dfrn.php index ce7bdc719..27be0c32a 100644 --- a/include/dfrn.php +++ b/include/dfrn.php @@ -105,7 +105,7 @@ class dfrn { dbesc($owner_nick) ); - if(! count($r)) + if(! dbm::is_result($r)) killme(); $owner = $r[0]; @@ -139,7 +139,7 @@ class dfrn { intval($owner_id) ); - if(! count($r)) + if(! dbm::is_result($r)) killme(); $contact = $r[0]; @@ -1463,7 +1463,7 @@ class dfrn { dbesc(normalise_link($suggest["url"])), intval($suggest["uid"]) ); - if(count($r)) + if(dbm::is_result($r)) return false; // Do we already have an fcontact record for this person? @@ -1474,7 +1474,7 @@ class dfrn { dbesc($suggest["name"]), dbesc($suggest["request"]) ); - if(count($r)) { + if(dbm::is_result($r)) { $fid = $r[0]["id"]; // OK, we do. Do we already have an introduction for this person ? @@ -1482,7 +1482,7 @@ class dfrn { intval($suggest["uid"]), intval($fid) ); - if(count($r)) + if(dbm::is_result($r)) return false; } if(!$fid) @@ -1497,7 +1497,7 @@ class dfrn { dbesc($suggest["name"]), dbesc($suggest["request"]) ); - if(count($r)) + if(dbm::is_result($r)) $fid = $r[0]["id"]; else // database record did not get created. Quietly give up. @@ -1746,7 +1746,7 @@ class dfrn { LIMIT 1", dbesc($item["parent-uri"]) ); - if($r && count($r)) { + if(dbm::is_result($r)) { $r = q("SELECT `item`.`forum_mode`, `item`.`wall` FROM `item` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` WHERE `item`.`uri` = '%s' AND (`item`.`parent-uri` = '%s' OR `item`.`thr-parent` = '%s') @@ -1758,7 +1758,7 @@ class dfrn { dbesc($r[0]["parent-uri"]), intval($importer["importer_uid"]) ); - if($r && count($r)) + if(dbm::is_result($r)) $is_a_remote_action = true; } @@ -1898,7 +1898,7 @@ class dfrn { dbesc($item["verb"]), dbesc($item["parent-uri"]) ); - if($r && count($r)) + if(dbm::is_result($r)) return false; $r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `author-link` = '%s' AND `verb` = '%s' AND `thr-parent` = '%s' AND NOT `deleted` LIMIT 1", @@ -1907,7 +1907,7 @@ class dfrn { dbesc($item["verb"]), dbesc($item["parent-uri"]) ); - if($r && count($r)) + if(dbm::is_result($r)) return false; } else $is_like = false; @@ -1923,7 +1923,7 @@ class dfrn { intval($importer["importer_uid"]) ); - if(!count($r)) + if(!dbm::is_result($r)) return false; // extract tag, if not duplicate, add to parent item @@ -2195,7 +2195,7 @@ class dfrn { dbesc($item["uri"]), intval($importer["uid"]) ); - if(count($r)) + if(dbm::is_result($r)) $ev["id"] = $r[0]["id"]; $event_id = event_store($ev); @@ -2216,7 +2216,7 @@ class dfrn { } // Update content if 'updated' changes - if(count($r)) { + if(dbm::is_result($r)) { if (self::update_content($r[0], $item, $importer, $entrytype)) logger("Item ".$item["uri"]." was updated.", LOGGER_DEBUG); else @@ -2238,7 +2238,7 @@ class dfrn { intval($posted_id), intval($importer["importer_uid"]) ); - if(count($r)) { + if(dbm::is_result($r)) { $parent = $r[0]["parent"]; $parent_uri = $r[0]["parent-uri"]; } @@ -2326,7 +2326,7 @@ class dfrn { intval($importer["uid"]), intval($importer["id"]) ); - if(!count($r)) { + if(!dbm::is_result($r)) { logger("Item with uri ".$uri." from contact ".$importer["id"]." for user ".$importer["uid"]." wasn't found.", LOGGER_DEBUG); return; } else { @@ -2420,7 +2420,7 @@ class dfrn { dbesc($item["parent-uri"]), intval($importer["uid"]) ); - if(count($r)) { + if(dbm::is_result($r)) { q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d", intval($r[0]["id"]) ); diff --git a/include/enotify.php b/include/enotify.php index 99258c64c..d548ec1ac 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -411,7 +411,7 @@ function notification($params) { $hash = random_string(); $r = q("SELECT `id` FROM `notify` WHERE `hash` = '%s' LIMIT 1", dbesc($hash)); - if (count($r)) + if (dbm::is_result($r)) $dups = true; } while($dups == true); @@ -733,7 +733,7 @@ function check_item_notification($itemid, $uid, $defaulttype = "") { intval($item[0]['contact-id']), intval($uid) ); - $send_notification = count($r); + $send_notification = dbm::is_result($r); if (!$send_notification) { $tags = q("SELECT `url` FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` = %d AND `uid` = %d", @@ -743,7 +743,7 @@ function check_item_notification($itemid, $uid, $defaulttype = "") { foreach ($tags AS $tag) { $r = q("SELECT `id` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `notify_new_posts`", normalise_link($tag["url"]), intval($uid)); - if (count($r)) + if (dbm::is_result($r)) $send_notification = true; } } diff --git a/include/event.php b/include/event.php index 3a66a4a6d..1f08da5fb 100644 --- a/include/event.php +++ b/include/event.php @@ -271,7 +271,7 @@ function event_store($arr) { intval($arr['id']), intval($arr['uid']) ); - if((! count($r)) || ($r[0]['edited'] === $arr['edited'])) { + if((! dbm::is_result($r)) || ($r[0]['edited'] === $arr['edited'])) { // Nothing has changed. Grab the item id to return. @@ -279,7 +279,7 @@ function event_store($arr) { intval($arr['id']), intval($arr['uid']) ); - return((count($r)) ? $r[0]['id'] : 0); + return((dbm::is_result($r)) ? $r[0]['id'] : 0); } // The event changed. Update it. @@ -312,7 +312,7 @@ function event_store($arr) { intval($arr['id']), intval($arr['uid']) ); - if(count($r)) { + if(dbm::is_result($r)) { $object = '' . xmlify(ACTIVITY_OBJ_EVENT) . '' . xmlify($arr['uri']) . ''; $object .= '' . xmlify(format_event_bbcode($arr)) . ''; $object .= '' . "\n"; @@ -365,7 +365,7 @@ function event_store($arr) { dbesc($arr['uri']), intval($arr['uid']) ); - if(count($r)) + if(dbm::is_result($r)) $event = $r[0]; $item_arr = array(); @@ -407,7 +407,7 @@ function event_store($arr) { $r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($arr['uid']) ); - //if(count($r)) + //if(dbm::is_result($r)) // $plink = $a->get_baseurl() . '/display/' . $r[0]['nickname'] . '/' . $item_id; @@ -515,7 +515,7 @@ function event_by_id($owner_uid = 0, $event_params, $sql_extra = '') { intval($event_params["event_id"]) ); - if(count($r)) + if(dbm::is_result($r)) return $r; } @@ -557,7 +557,7 @@ function events_by_date($owner_uid = 0, $event_params, $sql_extra = '') { dbesc($event_params["adjust_finish"]) ); - if(count($r)) + if(dbm::is_result($r)) return $r; } @@ -750,7 +750,7 @@ function events_by_uid($uid = 0, $sql_extra = '') { ); } - if(count($r)) + if(dbm::is_result($r)) return $r; } @@ -773,7 +773,7 @@ function event_export($uid, $format = 'ical') { // we are allowed to show events // get the timezone the user is in $r = q("SELECT `timezone` FROM `user` WHERE `uid` = %d LIMIT 1", intval($uid)); - if (count($r)) + if (dbm::is_result($r)) $timezone = $r[0]['timezone']; // get all events which are owned by a uid (respects permissions); diff --git a/include/expire.php b/include/expire.php index 873c594e8..5110713cd 100644 --- a/include/expire.php +++ b/include/expire.php @@ -39,7 +39,7 @@ function expire_run(&$argv, &$argc){ logger('expire: start'); $r = q("SELECT `uid`,`username`,`expire` FROM `user` WHERE `expire` != 0"); - if(count($r)) { + if(dbm::is_result($r)) { foreach($r as $rr) { logger('Expire: ' . $rr['username'] . ' interval: ' . $rr['expire'], LOGGER_DEBUG); item_expire($rr['uid'],$rr['expire']); diff --git a/include/fcontact.php b/include/fcontact.php index 8821a985f..037b5ead4 100644 --- a/include/fcontact.php +++ b/include/fcontact.php @@ -10,7 +10,7 @@ function fcontact_store($url,$name,$photo) { dbesc($nurl) ); - if(count($r)) + if(dbm::is_result($r)) return $r[0]['id']; $r = q("INSERT INTO `fcontact` ( `url`, `name`, `photo` ) VALUES ( '%s', '%s', '%s' ) ", @@ -19,11 +19,11 @@ function fcontact_store($url,$name,$photo) { dbesc($photo) ); - if($r) { + if(dbm::is_result($r)) { $r = q("SELECT `id` FROM `fcontact` WHERE `url` = '%s' LIMIT 1", dbesc($nurl) ); - if(count($r)) + if(dbm::is_result($r)) return $r[0]['id']; } diff --git a/include/follow.php b/include/follow.php index 1c33edf80..b775bf200 100644 --- a/include/follow.php +++ b/include/follow.php @@ -173,12 +173,12 @@ function new_contact($uid,$url,$interactive = false) { dbesc($ret['network']) ); - if(!count($r)) + if(!dbm::is_result($r)) $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `network` = '%s' LIMIT 1", intval($uid), dbesc(normalise_link($url)), dbesc($ret['network']) ); - if(count($r)) { + if(dbm::is_result($r)) { // update contact if($r[0]['rel'] == CONTACT_IS_FOLLOWER || ($network === NETWORK_DIASPORA && $r[0]['rel'] == CONTACT_IS_SHARING)) { q("UPDATE `contact` SET `rel` = %d , `subhub` = %d, `readonly` = 0 WHERE `id` = %d AND `uid` = %d", @@ -196,7 +196,7 @@ function new_contact($uid,$url,$interactive = false) { $r = q("select count(*) as total from contact where uid = %d and pending = 0 and self = 0", intval($uid) ); - if(count($r)) + if(dbm::is_result($r)) $total_contacts = $r[0]['total']; if(! service_class_allows($uid,'total_contacts',$total_contacts)) { @@ -208,7 +208,7 @@ function new_contact($uid,$url,$interactive = false) { intval($uid), dbesc($network) ); - if(count($r)) + if(dbm::is_result($r)) $total_network = $r[0]['total']; if(! service_class_allows($uid,'total_contacts_' . $network,$total_network)) { @@ -250,7 +250,7 @@ function new_contact($uid,$url,$interactive = false) { intval($uid) ); - if(! count($r)) { + if(! dbm::is_result($r)) { $result['message'] .= t('Unable to retrieve contact information.') . EOL; return $result; } @@ -295,7 +295,7 @@ function new_contact($uid,$url,$interactive = false) { intval($uid) ); - if(count($r)) { + if(dbm::is_result($r)) { if(($contact['network'] == NETWORK_OSTATUS) && (strlen($contact['notify']))) { require_once('include/salmon.php'); slapper($r[0],$contact['notify'],$slap); diff --git a/include/group.php b/include/group.php index 53c0b78d8..0cef2bf90 100644 --- a/include/group.php +++ b/include/group.php @@ -44,7 +44,7 @@ function group_rmv($uid,$name) { intval($uid), dbesc($name) ); - if(count($r)) + if(dbm::is_result($r)) $group_id = $r[0]['id']; if(! $group_id) return false; @@ -106,7 +106,7 @@ function group_byname($uid,$name) { intval($uid), dbesc($name) ); - if(count($r)) + if(dbm::is_result($r)) return $r[0]['id']; return false; } @@ -139,11 +139,11 @@ function group_add_member($uid,$name,$member,$gid = 0) { intval($gid), intval($member) ); - if(count($r)) + if(dbm::is_result($r)) return true; // You might question this, but // we indicate success because the group member was in fact created // -- It was just created at another time - if(! count($r)) + if(! dbm::is_result($r)) $r = q("INSERT INTO `group_member` (`uid`, `gid`, `contact-id`) VALUES( %d, %d, %d ) ", intval($uid), @@ -164,7 +164,7 @@ function group_get_members($gid) { intval($gid), intval(local_user()) ); - if(count($r)) + if(dbm::is_result($r)) $ret = $r; } return $ret; @@ -181,7 +181,7 @@ function group_public_members($gid) { intval(local_user()), dbesc(NETWORK_OSTATUS) ); - if(count($r)) + if(dbm::is_result($r)) $ret = count($r); } return $ret; @@ -197,7 +197,7 @@ function mini_group_select($uid,$gid = 0, $label = "") { intval($uid) ); $grps[] = array('name' => '', 'id' => '0', 'selected' => ''); - if(count($r)) { + if(dbm::is_result($r)) { foreach($r as $rr) { $grps[] = array('name' => $rr['name'], 'id' => $rr['id'], 'selected' => (($gid == $rr['id']) ? 'true' : '')); } @@ -255,7 +255,7 @@ function group_side($every="contacts",$each="group",$editmode = "standard", $gro $member_of = groups_containing(local_user(),$cid); } - if(count($r)) { + if(dbm::is_result($r)) { foreach($r as $rr) { $selected = (($group_id == $rr['id']) ? ' group-selected' : ''); @@ -316,7 +316,7 @@ function expand_groups($a,$check_dead = false, $use_gcontact = false) { $ret = array(); - if(count($r)) + if(dbm::is_result($r)) foreach($r as $rr) $ret[] = $rr['contact-id']; if($check_dead AND !$use_gcontact) { @@ -345,7 +345,7 @@ function groups_containing($uid,$c) { ); $ret = array(); - if(count($r)) { + if(dbm::is_result($r)) { foreach($r as $rr) $ret[] = $rr['gid']; } diff --git a/include/identity.php b/include/identity.php index a792c4714..fb0f99dd6 100644 --- a/include/identity.php +++ b/include/identity.php @@ -138,7 +138,7 @@ function get_profiledata_by_nick($nickname, $uid = 0, $profile = 0) { $r = q("SELECT `profile-id` FROM `contact` WHERE `id` = %d LIMIT 1", intval($visitor['cid']) ); - if(count($r)) + if(dbm::is_result($r)) $profile = $r[0]['profile-id']; break; } @@ -159,7 +159,7 @@ function get_profiledata_by_nick($nickname, $uid = 0, $profile = 0) { intval($profile_int) ); } - if((!$r) && (!count($r))) { + if(!dbm::is_result($r)) { $r = q("SELECT `contact`.`id` AS `contact_id`, `profile`.`uid` AS `profile_uid`, `profile`.*, `contact`.`avatar-date` AS picdate, `contact`.`addr`, `user`.* FROM `profile` @@ -236,7 +236,7 @@ function profile_sidebar($profile, $block = 0) { $r = q("SELECT * FROM `contact` WHERE NOT `pending` AND `uid` = %d AND `nurl` = '%s'", local_user(), $profile_url); - if (count($r)) + if (dbm::is_result($r)) $connect = false; } @@ -289,7 +289,7 @@ function profile_sidebar($profile, $block = 0) { 'entries' => array(), ); - if(count($r)) { + if(dbm::is_result($r)) { foreach($r as $rr) { $profile['menu']['entries'][] = array( @@ -368,7 +368,7 @@ function profile_sidebar($profile, $block = 0) { if(is_array($a->profile) AND !$a->profile['hide-friends']) { $r = q("SELECT `gcontact`.`updated` FROM `contact` INNER JOIN `gcontact` WHERE `gcontact`.`nurl` = `contact`.`nurl` AND `self` AND `uid` = %d LIMIT 1", intval($a->profile['uid'])); - if(count($r)) + if(dbm::is_result($r)) $updated = date("c", strtotime($r[0]['updated'])); $r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `hidden` AND NOT `archive` @@ -378,7 +378,7 @@ function profile_sidebar($profile, $block = 0) { dbesc(NETWORK_DIASPORA), dbesc(NETWORK_OSTATUS) ); - if(count($r)) + if(dbm::is_result($r)) $contacts = intval($r[0]['total']); } } @@ -460,7 +460,7 @@ function get_birthdays() { dbesc(datetime_convert('UTC','UTC','now')) ); - if($r && count($r)) { + if(dbm::is_result($r)) { $total = 0; $now = strtotime('now'); $cids = array(); @@ -543,7 +543,7 @@ function get_events() { dbesc(datetime_convert('UTC','UTC','now - 1 days')) ); - if($r && count($r)) { + if(dbm::is_result($r)) { $now = strtotime('now'); $istoday = false; foreach($r as $rr) { diff --git a/include/items.php b/include/items.php index c2c4c1029..1689d6d0f 100644 --- a/include/items.php +++ b/include/items.php @@ -451,7 +451,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa /* check for create date and expire time */ $uid = intval($arr['uid']); $r = q("SELECT expire FROM user WHERE uid = %d", intval($uid)); - if (count($r)) { + if (dbm::is_result($r)) { $expire_interval = $r[0]['expire']; if ($expire_interval>0) { $expire_date = new DateTime( '- '.$expire_interval.' days', new DateTimeZone('UTC')); @@ -568,19 +568,19 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa intval($arr['uid']) ); - if (!count($r)) + if (!dbm::is_result($r)) $r = q("SELECT `network` FROM `gcontact` WHERE `network` IN ('%s', '%s', '%s') AND `nurl` = '%s' LIMIT 1", dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_OSTATUS), dbesc(normalise_link($arr['author-link'])) ); - if (!count($r)) + if (!dbm::is_result($r)) $r = q("SELECT `network` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", intval($arr['contact-id']), intval($arr['uid']) ); - if (count($r)) + if (dbm::is_result($r)) $arr['network'] = $r[0]["network"]; // Fallback to friendica (why is it empty in some cases?) @@ -634,7 +634,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa $r = q("SELECT `guid` FROM `item` WHERE `guid` = '%s' AND `network` = '%s' AND `uid` = '%d' LIMIT 1", dbesc($arr['guid']), dbesc($arr['network']), intval($arr['uid'])); - if (count($r)) { + if (dbm::is_result($r)) { logger('found item with guid '.$arr['guid'].' for user '.$arr['uid'].' on network '.$arr['network'], LOGGER_DEBUG); return 0; } @@ -662,7 +662,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa intval($arr['uid']) ); - if (count($r)) { + if (dbm::is_result($r)) { // is the new message multi-level threaded? // even though we don't support it now, preserve the info @@ -1120,7 +1120,7 @@ function item_body_set_hashtags(&$item) { function get_item_guid($id) { $r = q("SELECT `guid` FROM `item` WHERE `id` = %d LIMIT 1", intval($id)); - if (count($r)) + if (dbm::is_result($r)) return($r[0]["guid"]); else return(""); @@ -1139,7 +1139,7 @@ function get_item_id($guid, $uid = 0) { $r = q("SELECT `item`.`id`, `user`.`nickname` FROM `item` INNER JOIN `user` ON `user`.`uid` = `item`.`uid` WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0 AND `item`.`guid` = '%s' AND `item`.`uid` = %d", dbesc($guid), intval($uid)); - if (count($r)) { + if (dbm::is_result($r)) { $id = $r[0]["id"]; $nick = $r[0]["nickname"]; } @@ -1153,7 +1153,7 @@ function get_item_id($guid, $uid = 0) { AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `item`.`guid` = '%s'", dbesc($guid)); - if (count($r)) { + if (dbm::is_result($r)) { $id = $r[0]["id"]; $nick = $r[0]["nickname"]; } @@ -1454,7 +1454,7 @@ function item_is_remote_self($contact, &$datarray) { if ($contact['remote_self'] == 2) { $r = q("SELECT `id`,`url`,`name`,`thumb` FROM `contact` WHERE `uid` = %d AND `self`", intval($contact['uid'])); - if (count($r)) { + if (dbm::is_result($r)) { $datarray['contact-id'] = $r[0]["id"]; $datarray['owner-name'] = $r[0]["name"]; @@ -1531,7 +1531,7 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) { intval($importer['uid']), dbesc($url) ); - if (count($r)) { + if (dbm::is_result($r)) { $contact_record = $r[0]; update_contact_avatar($photo, $importer["uid"], $contact_record["id"], true); } @@ -1541,7 +1541,7 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) { intval($importer['uid']) ); $a = get_app(); - if (count($r) AND !in_array($r[0]['page-flags'], array(PAGE_SOAPBOX, PAGE_FREELOVE))) { + if (dbm::is_result($r) AND !in_array($r[0]['page-flags'], array(PAGE_SOAPBOX, PAGE_FREELOVE))) { // create notification $hash = random_string(); @@ -1580,7 +1580,7 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) { )); } - } elseif (count($r) AND in_array($r[0]['page-flags'], array(PAGE_SOAPBOX, PAGE_FREELOVE))) { + } elseif (dbm::is_result($r) AND in_array($r[0]['page-flags'], array(PAGE_SOAPBOX, PAGE_FREELOVE))) { $r = q("UPDATE `contact` SET `pending` = 0 WHERE `uid` = %d AND `url` = '%s' AND `pending` LIMIT 1", intval($importer['uid']), dbesc($url) @@ -1628,7 +1628,7 @@ function subscribe_to_hub($url,$importer,$contact,$hubmode = 'subscribe') { // through the direct Diaspora protocol. If we try and use // the feed, we'll get duplicates. So don't. - if ((! count($r)) || $contact['network'] === NETWORK_DIASPORA) + if ((! dbm::is_result($r)) || $contact['network'] === NETWORK_DIASPORA) return; $push_url = get_config('system','url') . '/pubsub/' . $r[0]['nickname'] . '/' . $contact['id']; @@ -1846,7 +1846,7 @@ function item_expire($uid, $days, $network = "", $force = false) { intval($days) ); - if (! count($r)) + if (! dbm::is_result($r)) return; $expire_items = get_pconfig($uid, 'expire','items'); @@ -1924,7 +1924,7 @@ function drop_item($id,$interactive = true) { intval($id) ); - if (! count($r)) { + if (! dbm::is_result($r)) { if (! $interactive) return 0; notice( t('Item not found.') . EOL); @@ -2111,7 +2111,7 @@ function drop_item($id,$interactive = true) { dbesc($item['parent-uri']), intval($item['uid']) ); - if (count($r)) { + if (dbm::is_result($r)) { q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d", intval($r[0]['id']) ); @@ -2147,7 +2147,7 @@ function first_post_date($uid,$wall = false) { intval($uid), intval($wall ? 1 : 0) ); - if (count($r)) { + if (dbm::is_result($r)) { // logger('first_post_date: ' . $r[0]['id'] . ' ' . $r[0]['created'], LOGGER_DATA); return substr(datetime_convert('',date_default_timezone_get(),$r[0]['created']),0,10); } diff --git a/include/like.php b/include/like.php index 118ec81ca..ae2addb89 100644 --- a/include/like.php +++ b/include/like.php @@ -57,7 +57,7 @@ function do_like($item_id, $verb) { dbesc($item_id) ); - if(! $item_id || (! count($r))) { + if(! $item_id || (! dbm::is_result($r))) { logger('like: no item ' . $item_id); return false; } @@ -78,7 +78,7 @@ function do_like($item_id, $verb) { intval($item['contact-id']), intval($item['uid']) ); - if(! count($r)) + if(! dbm::is_result($r)) return false; if(! $r[0]['self']) $remote_owner = $r[0]; @@ -90,7 +90,7 @@ function do_like($item_id, $verb) { WHERE `contact`.`self` = 1 AND `contact`.`uid` = %d LIMIT 1", intval($owner_uid) ); - if(count($r)) + if(dbm::is_result($r)) $owner = $r[0]; if(! $owner) { @@ -112,7 +112,7 @@ function do_like($item_id, $verb) { intval($_SESSION['visitor_id']), intval($owner_uid) ); - if(count($r)) + if(dbm::is_result($r)) $contact = $r[0]; } if(! $contact) { @@ -135,7 +135,7 @@ function do_like($item_id, $verb) { dbesc($item_id), dbesc($item_id), dbesc($item['uri']) ); - if(count($r)) { + if(dbm::is_result($r)) { $like_item = $r[0]; // Already voted, undo it diff --git a/include/lock.php b/include/lock.php index 70cf4b787..433363e4f 100644 --- a/include/lock.php +++ b/include/lock.php @@ -16,14 +16,14 @@ function lock_function($fn_name, $block = true, $wait_sec = 2, $timeout = 30) { dbesc($fn_name) ); - if((count($r)) AND (!$r[0]['locked'] OR (strtotime($r[0]['created']) < time() - 3600))) { + if((dbm::is_result($r)) AND (!$r[0]['locked'] OR (strtotime($r[0]['created']) < time() - 3600))) { q("UPDATE `locks` SET `locked` = 1, `created` = '%s' WHERE `name` = '%s'", dbesc(datetime_convert()), dbesc($fn_name) ); $got_lock = true; } - elseif(! $r) { // the Boolean value for count($r) should be equivalent to the Boolean value of $r + elseif(! dbm::is_result($r)) { // the Boolean value for count($r) should be equivalent to the Boolean value of $r q("INSERT INTO `locks` (`name`, `created`, `locked`) VALUES ('%s', '%s', 1)", dbesc($fn_name), dbesc(datetime_convert()) @@ -56,10 +56,10 @@ function block_on_function_lock($fn_name, $wait_sec = 2, $timeout = 30) { dbesc($fn_name) ); - if(count($r) && $r[0]['locked']) + if(dbm::is_result($r) && $r[0]['locked']) sleep($wait_sec); - } while(count($r) && $r[0]['locked'] && ((time() - $start) < $timeout)); + } while(dbm::is_result($r) && $r[0]['locked'] && ((time() - $start) < $timeout)); return; }} diff --git a/include/message.php b/include/message.php index 51f3ad805..041110440 100644 --- a/include/message.php +++ b/include/message.php @@ -41,7 +41,7 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){ dbesc($replyto), dbesc($replyto) ); - if(count($r)) + if(dbm::is_result($r)) $convid = $r[0]['convid']; } @@ -74,7 +74,7 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){ dbesc($conv_guid), intval(local_user()) ); - if(count($r)) + if(dbm::is_result($r)) $convid = $r[0]['id']; } @@ -113,7 +113,7 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){ dbesc($uri), intval(local_user()) ); - if(count($r)) + if(dbm::is_result($r)) $post_id = $r[0]['id']; /** @@ -210,7 +210,7 @@ function send_wallmessage($recipient='', $body='', $subject='', $replyto=''){ dbesc($conv_guid), intval($recipient['uid']) ); - if(count($r)) + if(dbm::is_result($r)) $convid = $r[0]['id']; if(! $convid) { diff --git a/include/nav.php b/include/nav.php index 7a8230cc1..2a9f24ca9 100644 --- a/include/nav.php +++ b/include/nav.php @@ -88,7 +88,7 @@ function nav_info(App $a) // user info $r = q("SELECT `micro` FROM `contact` WHERE `uid` = %d AND `self` = 1", intval($a->user['uid'])); $userinfo = array( - 'icon' => (count($r) ? $a->remove_baseurl($r[0]['micro']) : 'images/person-48.jpg'), + 'icon' => (dbm::is_result($r) ? $a->remove_baseurl($r[0]['micro']) : 'images/person-48.jpg'), 'name' => $a->user['username'], ); } else { diff --git a/include/notifier.php b/include/notifier.php index 812752a55..404280365 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -170,7 +170,7 @@ function notifier_run(&$argv, &$argc){ intval($item_id) ); - if((! count($r)) || (! intval($r[0]['parent']))) { + if((! dbm::is_result($r)) || (! intval($r[0]['parent']))) { return; } @@ -210,7 +210,7 @@ function notifier_run(&$argv, &$argc){ intval($uid) ); - if(! count($r)) + if(! dbm::is_result($r)) return; $owner = $r[0]; @@ -321,7 +321,7 @@ function notifier_run(&$argv, &$argc){ intval($uid), dbesc(NETWORK_DFRN) ); - if(count($r)) + if(dbm::is_result($r)) foreach($r as $rr) $recipients_followup[] = $rr['id']; } @@ -445,7 +445,7 @@ function notifier_run(&$argv, &$argc){ $r = q("SELECT * FROM `contact` WHERE `id` IN ($conversant_str) AND NOT `blocked` AND NOT `pending` AND NOT `archive`".$sql_extra); - if(count($r)) + if(dbm::is_result($r)) $contacts = $r; } else @@ -463,7 +463,7 @@ function notifier_run(&$argv, &$argc){ intval($uid), dbesc(NETWORK_MAIL) ); - if(count($r)) { + if(dbm::is_result($r)) { foreach($r as $rr) $recipients[] = $rr['id']; } @@ -491,7 +491,7 @@ function notifier_run(&$argv, &$argc){ // delivery loop - if(count($r)) { + if(dbm::is_result($r)) { foreach($r as $contact) { if(!$contact['self']) { @@ -592,7 +592,7 @@ function notifier_run(&$argv, &$argc){ $r = array_merge($r2,$r1,$r0); - if(count($r)) { + if(dbm::is_result($r)) { logger('pubdeliver '.$target_item["guid"].': '.print_r($r,true), LOGGER_DEBUG); // throw everything into the queue in case we get killed diff --git a/include/oauth.php b/include/oauth.php index 6a1d72d17..761a7a42c 100644 --- a/include/oauth.php +++ b/include/oauth.php @@ -23,7 +23,7 @@ class FKOAuthDataStore extends OAuthDataStore { $r = q("SELECT client_id, pw, redirect_uri FROM clients WHERE client_id='%s'", dbesc($consumer_key) ); - if (count($r)) + if (dbm::is_result($r)) return new OAuthConsumer($r[0]['client_id'],$r[0]['pw'],$r[0]['redirect_uri']); return null; } @@ -35,7 +35,7 @@ class FKOAuthDataStore extends OAuthDataStore { dbesc($token_type), dbesc($token) ); - if (count($r)){ + if (dbm::is_result($r)){ $ot=new OAuthToken($r[0]['id'],$r[0]['secret']); $ot->scope=$r[0]['scope']; $ot->expires = $r[0]['expires']; @@ -52,7 +52,7 @@ class FKOAuthDataStore extends OAuthDataStore { dbesc($nonce), intval($timestamp) ); - if (count($r)) + if (dbm::is_result($r)) return new OAuthToken($r[0]['id'],$r[0]['secret']); return null; } @@ -136,7 +136,7 @@ class FKOAuth1 extends OAuthServer { $r = q("SELECT * FROM `user` WHERE uid=%d AND `blocked` = 0 AND `account_expired` = 0 AND `account_removed` = 0 AND `verified` = 1 LIMIT 1", intval($uid) ); - if(count($r)){ + if(dbm::is_result($r)){ $record = $r[0]; } else { logger('FKOAuth1::loginUser failure: ' . print_r($_SERVER,true), LOGGER_DEBUG); @@ -162,7 +162,7 @@ class FKOAuth1 extends OAuthServer { $r = q("SELECT * FROM `contact` WHERE `uid` = %s AND `self` = 1 LIMIT 1", intval($_SESSION['uid'])); - if(count($r)) { + if(dbm::is_result($r)) { $a->contact = $r[0]; $a->cid = $r[0]['id']; $_SESSION['cid'] = $a->cid; @@ -219,7 +219,7 @@ class FKOAuth2 extends OAuth2 { $r = q("SELECT client_id, expires, scope FROM tokens WHERE id = '%s'", dbesc($oauth_token)); - if (count($r)) + if (dbm::is_result($r)) return $r[0]; return null; } @@ -247,7 +247,7 @@ class FKOAuth2 extends OAuth2 { $r = q("SELECT id, client_id, redirect_uri, expires, scope FROM auth_codes WHERE id = '%s'", dbesc($code)); - if (count($r)) + if (dbm::is_result($r)) return $r[0]; return null; } diff --git a/include/onepoll.php b/include/onepoll.php index 4ac5f38be..2f9bb35d3 100644 --- a/include/onepoll.php +++ b/include/onepoll.php @@ -93,7 +93,7 @@ function onepoll_run(&$argv, &$argc){ where `cid` = %d and updated > UTC_TIMESTAMP() - INTERVAL 1 DAY", intval($contact['id']) ); - if (count($r)) + if (dbm::is_result($r)) if (!$r[0]['total']) poco_load($contact['id'],$importer_uid,0,$contact['poco']); } @@ -143,7 +143,7 @@ function onepoll_run(&$argv, &$argc){ $r = q("SELECT `contact`.*, `user`.`page-flags` FROM `contact` INNER JOIN `user` on `contact`.`uid` = `user`.`uid` WHERE `user`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1", intval($importer_uid) ); - if(! count($r)) + if(! dbm::is_result($r)) return; $importer = $r[0]; @@ -393,7 +393,7 @@ function onepoll_run(&$argv, &$argc){ dbesc($datarray['uri']) ); - if(count($r)) { + if(dbm::is_result($r)) { logger("Mail: Seen before ".$msg_uid." for ".$mailconf[0]['user']." UID: ".$importer_uid." URI: ".$datarray['uri'],LOGGER_DEBUG); // Only delete when mails aren't automatically moved or deleted @@ -446,7 +446,7 @@ function onepoll_run(&$argv, &$argc){ $r = q("SELECT `uri` , `parent-uri` FROM `item` USE INDEX (`uid_uri`) WHERE `uri` IN ($qstr) AND `uid` = %d LIMIT 1", intval($importer_uid) ); - if(count($r)) + if(dbm::is_result($r)) $datarray['parent-uri'] = $r[0]['parent-uri']; // Set the parent as the top-level item // $datarray['parent-uri'] = $r[0]['uri']; } @@ -479,7 +479,7 @@ function onepoll_run(&$argv, &$argc){ dbesc(protect_sprintf($datarray['title'])), intval($importer_uid), dbesc(NETWORK_MAIL)); - if(count($r)) + if(dbm::is_result($r)) $datarray['parent-uri'] = $r[0]['parent-uri']; } diff --git a/include/plugin.php b/include/plugin.php index f6e4a7a88..3a92b621b 100644 --- a/include/plugin.php +++ b/include/plugin.php @@ -79,7 +79,7 @@ function reload_plugins() { if(strlen($plugins)) { $r = q("SELECT * FROM `addon` WHERE `installed` = 1"); - if(count($r)) + if(dbm::is_result($r)) $installed = $r; else $installed = array(); @@ -150,7 +150,7 @@ function register_hook($hook,$file,$function,$priority=0) { dbesc($file), dbesc($function) ); - if(count($r)) + if(dbm::is_result($r)) return true; $r = q("INSERT INTO `hook` (`hook`, `file`, `function`, `priority`) VALUES ( '%s', '%s', '%s', '%s' ) ", @@ -187,7 +187,7 @@ function load_hooks() { $a = get_app(); $a->hooks = array(); $r = q("SELECT * FROM `hook` WHERE 1 ORDER BY `priority` DESC, `file`"); - if(count($r)) { + if(dbm::is_result($r)) { foreach($r as $rr) { if(! array_key_exists($rr['hook'],$a->hooks)) $a->hooks[$rr['hook']] = array(); @@ -473,7 +473,7 @@ function service_class_allows($uid,$property,$usage = false) { $r = q("SELECT `service_class` FROM `user` WHERE `uid` = %d LIMIT 1", intval($uid) ); - if($r !== false and count($r)) { + if(dbm::is_result($r)) { $service_class = $r[0]['service_class']; } } @@ -503,7 +503,7 @@ function service_class_fetch($uid,$property) { $r = q("SELECT `service_class` FROM `user` WHERE `uid` = %d LIMIT 1", intval($uid) ); - if($r !== false and count($r)) { + if(dbm::is_result($r)) { $service_class = $r[0]['service_class']; } } diff --git a/include/queue_fn.php b/include/queue_fn.php index a68aa8918..241b0bb36 100644 --- a/include/queue_fn.php +++ b/include/queue_fn.php @@ -61,7 +61,7 @@ function add_to_queue($cid,$network,$msg,$batch = false) { WHERE `queue`.`cid` = %d AND `contact`.`self` = 0 ", intval($cid) ); - if($r && count($r)) { + if(dbm::is_result($r)) { if($batch && ($r[0]['total'] > $batch_queue)) { logger('add_to_queue: too many queued items for batch server ' . $cid . ' - discarding message'); return; diff --git a/include/redir.php b/include/redir.php index ab4f3220c..8d8a035f1 100644 --- a/include/redir.php +++ b/include/redir.php @@ -36,7 +36,7 @@ function auto_redir(&$a, $contact_nick) { dbesc($nurl) ); - if((!$r) || (! count($r)) || $r[0]['id'] == remote_user()) + if((! dbm::is_result($r)) || $r[0]['id'] == remote_user()) return; @@ -48,7 +48,7 @@ function auto_redir(&$a, $contact_nick) { dbesc($baseurl) ); - if(! ($r && count($r))) + if(! dbm::is_result($r)) return; $cid = $r[0]['id']; diff --git a/include/security.php b/include/security.php index b52ddeb2d..35a23b3af 100644 --- a/include/security.php +++ b/include/security.php @@ -42,7 +42,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive $r = q("select * from user where uid = %d limit 1", intval($_SESSION['submanage']) ); - if(count($r)) + if(dbm::is_result($r)) $master_record = $r[0]; } @@ -50,7 +50,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive dbesc($master_record['password']), dbesc($master_record['email']) ); - if($r && count($r)) + if(dbm::is_result($r)) $a->identities = $r; else $a->identities = array(); @@ -60,7 +60,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive and `manage`.`uid` = %d", intval($master_record['uid']) ); - if($r && count($r)) + if(dbm::is_result($r)) $a->identities = array_merge($a->identities,$r); if($login_initial) @@ -70,7 +70,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1", intval($_SESSION['uid'])); - if(count($r)) { + if(dbm::is_result($r)) { $a->contact = $r[0]; $a->cid = $r[0]['id']; $_SESSION['cid'] = $a->cid; @@ -156,7 +156,7 @@ function can_write_wall(&$a,$owner) { intval(PAGE_COMMUNITY) ); - if(count($r)) { + if(dbm::is_result($r)) { $verified = 2; return true; } @@ -210,7 +210,7 @@ function permissions_sql($owner_id,$remote_verified = false,$groups = null) { intval($remote_user), intval($owner_id) ); - if(count($r)) { + if(dbm::is_result($r)) { $remote_verified = true; $groups = init_groups_visitor($remote_user); } @@ -292,7 +292,7 @@ function item_permissions_sql($owner_id,$remote_verified = false,$groups = null) intval($remote_user), intval($owner_id) ); - if(count($r)) { + if(dbm::is_result($r)) { $remote_verified = true; $groups = init_groups_visitor($remote_user); } @@ -403,7 +403,7 @@ function init_groups_visitor($contact_id) { WHERE `contact-id` = %d ", intval($contact_id) ); - if(count($r)) { + if(dbm::is_result($r)) { foreach($r as $rr) $groups[] = $rr['gid']; } diff --git a/include/socgraph.php b/include/socgraph.php index d87be91b7..d4a7f5c94 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -40,7 +40,7 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) { $r = q("select `poco`, `uid` from `contact` where `id` = %d limit 1", intval($cid) ); - if(count($r)) { + if(dbm::is_result($r)) { $url = $r[0]['poco']; $uid = $r[0]['uid']; } @@ -213,14 +213,14 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca $r = q("SELECT `network` FROM `contact` WHERE `nurl` = '%s' AND `network` != '' AND `network` != '%s' LIMIT 1", dbesc(normalise_link($profile_url)), dbesc(NETWORK_STATUSNET) ); - if(count($r)) + if(dbm::is_result($r)) $network = $r[0]["network"]; if (($network == "") OR ($network == NETWORK_OSTATUS)) { $r = q("SELECT `network`, `url` FROM `contact` WHERE `alias` IN ('%s', '%s') AND `network` != '' AND `network` != '%s' LIMIT 1", dbesc($profile_url), dbesc(normalise_link($profile_url)), dbesc(NETWORK_STATUSNET) ); - if(count($r)) { + if(dbm::is_result($r)) { $network = $r[0]["network"]; //$profile_url = $r[0]["url"]; } @@ -330,7 +330,7 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca intval($gcid), intval($zcid) ); - if(! count($r)) { + if(! dbm::is_result($r)) { q("INSERT INTO `glink` (`cid`,`uid`,`gcid`,`zcid`, `updated`) VALUES (%d,%d,%d,%d, '%s') ", intval($cid), intval($uid), @@ -976,7 +976,7 @@ function count_common_friends($uid,$cid) { ); // logger("count_common_friends: $uid $cid {$r[0]['total']}"); - if(count($r)) + if(dbm::is_result($r)) return $r[0]['total']; return 0; @@ -1022,7 +1022,7 @@ function count_common_friends_zcid($uid,$zcid) { intval($uid) ); - if(count($r)) + if(dbm::is_result($r)) return $r[0]['total']; return 0; @@ -1061,7 +1061,7 @@ function count_all_friends($uid,$cid) { intval($uid) ); - if(count($r)) + if(dbm::is_result($r)) return $r[0]['total']; return 0; @@ -1133,7 +1133,7 @@ function suggestion_query($uid, $start = 0, $limit = 80) { intval($limit) ); - if (count($r) && count($r) >= ($limit -1)) { + if (dbm::is_result($r) && count($r) >= ($limit -1)) { // Uncommented because the result of the queries are to big to store it in the cache. // We need to decide if we want to change the db column type or if we want to delete it. // Cache::set("suggestion_query:".$uid.":".$start.":".$limit, $r, CACHE_FIVE_MINUTES); @@ -1207,7 +1207,7 @@ function update_suggestions() { dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA) ); - if(count($r)) { + if(dbm::is_result($r)) { foreach($r as $rr) { $base = substr($rr['poco'],0,strrpos($rr['poco'],'/')); if(! in_array($base,$done)) diff --git a/include/text.php b/include/text.php index 61abc359c..5755e3ecb 100644 --- a/include/text.php +++ b/include/text.php @@ -491,7 +491,7 @@ function item_new_uri($hostname,$uid, $guid = "") { $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' LIMIT 1", dbesc($uri)); - if(count($r)) + if(dbm::is_result($r)) $dups = true; } while($dups == true); return $uri; @@ -515,7 +515,7 @@ function photo_new_resource() { $r = q("SELECT `id` FROM `photo` WHERE `resource-id` = '%s' LIMIT 1", dbesc($resource) ); - if(count($r)) + if(dbm::is_result($r)) $found = true; } while($found == true); return $resource; @@ -882,7 +882,7 @@ function contact_block() { dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DIASPORA) ); - if(count($r)) { + if(dbm::is_result($r)) { $total = intval($r[0]['total']); } if(! $total) { @@ -908,7 +908,7 @@ function contact_block() { $r = q("SELECT `id`, `uid`, `addr`, `url`, `name`, `thumb`, `network` FROM `contact` WHERE `id` IN (%s)", dbesc(implode(",", $contacts))); - if(count($r)) { + if(dbm::is_result($r)) { $contacts = sprintf( tt('%d Contact','%d Contacts', $total),$total); $micropro = Array(); foreach($r as $rr) { @@ -1931,7 +1931,7 @@ function file_tag_update_pconfig($uid,$file_old,$file_new,$type = 'file') { // intval($uid) //); - if(count($r)) { + if(dbm::is_result($r)) { unset($deleted_tags[$key]); } else { @@ -1961,7 +1961,7 @@ function file_tag_save_file($uid,$item,$file) { intval($item), intval($uid) ); - if(count($r)) { + if(dbm::is_result($r)) { if(! stristr($r[0]['file'],'[' . file_tag_encode($file) . ']')) q("UPDATE `item` SET `file` = '%s' WHERE `id` = %d AND `uid` = %d", dbesc($r[0]['file'] . '[' . file_tag_encode($file) . ']'), @@ -1999,7 +1999,7 @@ function file_tag_unsave_file($uid,$item,$file,$cat = false) { intval($item), intval($uid) ); - if(! count($r)) + if(! dbm::is_result($r)) return false; q("UPDATE `item` SET `file` = '%s' WHERE `id` = %d AND `uid` = %d", @@ -2019,7 +2019,7 @@ function file_tag_unsave_file($uid,$item,$file,$cat = false) { //$r = q("select file from item where uid = %d and deleted = 0 " . file_tag_file_query('item',$file,(($cat) ? 'category' : 'file')), //); - if(! count($r)) { + if(! dbm::is_result($r)) { $saved = get_pconfig($uid,'system','filetags'); set_pconfig($uid,'system','filetags',str_replace($pattern,'',$saved)); diff --git a/include/threads.php b/include/threads.php index df0f8ee1d..97904cadd 100644 --- a/include/threads.php +++ b/include/threads.php @@ -142,12 +142,12 @@ function add_shadow_entry($itemid) { // Is there a shadow parent? $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = 0 LIMIT 1", dbesc($item['parent-uri'])); - if (!count($r)) + if (!dbm::is_result($r)) return; // Is there already a shadow entry? $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = 0 LIMIT 1", dbesc($item['uri'])); - if (count($r)) + if (dbm::is_result($r)) return; // Preparing public shadow (removing user specific data) @@ -241,7 +241,7 @@ function delete_thread($itemid, $itemuri = "") { dbesc($itemuri), intval($item["uid"]) ); - if (!count($r)) { + if (!dbm::is_result($r)) { $r = q("DELETE FROM `item` WHERE `uri` = '%s' AND `uid` = 0", dbesc($itemuri) ); diff --git a/include/uimport.php b/include/uimport.php index 937a16710..51672d92b 100644 --- a/include/uimport.php +++ b/include/uimport.php @@ -116,7 +116,7 @@ function import_account(&$a, $file) { notice(t('Error! Cannot check nickname')); return; } - if (count($r) > 0) { + if (dbm::is_result($r) > 0) { notice(sprintf(t("User '%s' already exists on this server!"), $account['user']['nickname'])); return; } @@ -127,7 +127,7 @@ function import_account(&$a, $file) { notice(t('Error! Cannot check nickname')); return; } - if (count($r) > 0) { + if (dbm::is_result($r) > 0) { notice(sprintf(t("User '%s' already exists on this server!"), $account['user']['nickname'])); return; } diff --git a/include/user.php b/include/user.php index 5e8014abf..240a8aa50 100644 --- a/include/user.php +++ b/include/user.php @@ -130,7 +130,7 @@ function create_user($arr) { $r = q("SELECT * FROM `user` WHERE `email` = '%s' LIMIT 1", dbesc($email) ); - if(count($r)) + if(dbm::is_result($r)) $result['message'] .= t('Cannot use that email.') . EOL; } @@ -143,7 +143,7 @@ function create_user($arr) { WHERE `nickname` = '%s' LIMIT 1", dbesc($nickname) ); - if(count($r)) + if(dbm::is_result($r)) $result['message'] .= t('Nickname is already registered. Please choose another.') . EOL; // Check deleted accounts that had this nickname. Doesn't matter to us, @@ -153,7 +153,7 @@ function create_user($arr) { WHERE `username` = '%s' LIMIT 1", dbesc($nickname) ); - if(count($r)) + if(dbm::is_result($r)) $result['message'] .= t('Nickname was once registered here and may not be re-used. Please choose another.') . EOL; if(strlen($result['message'])) { @@ -222,7 +222,7 @@ function create_user($arr) { dbesc($username), dbesc($new_password_encoded) ); - if($r !== false && count($r)) { + if(dbm::is_result($r)) { $u = $r[0]; $newuid = intval($r[0]['uid']); } @@ -302,7 +302,7 @@ function create_user($arr) { intval($newuid), dbesc(t('Friends')) ); - if($r && count($r)) { + if(dbm::is_result($r)) { $def_gid = $r[0]['id']; q("UPDATE `user` SET `def_gid` = %d WHERE `uid` = %d", diff --git a/mod/admin.php b/mod/admin.php index f852bd58d..10117b57b 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -1121,7 +1121,7 @@ function admin_page_dbsync(&$a) { $failed = array(); $r = q("SELECT `k`, `v` FROM `config` WHERE `cat` = 'database' "); - if(count($r)) { + if(dbm::is_result($r)) { foreach($r as $rr) { $upd = intval(substr($rr['k'],7)); if($upd < 1139 || $rr['v'] === 'success') diff --git a/mod/allfriends.php b/mod/allfriends.php index 03f78e696..240aa524b 100644 --- a/mod/allfriends.php +++ b/mod/allfriends.php @@ -39,7 +39,7 @@ function allfriends_content(&$a) { $r = all_friends(local_user(), $cid, $a->pager['start'], $a->pager['itemspage']); - if(! count($r)) { + if(! dbm::is_result($r)) { $o .= t('No friends to display.'); return $o; } diff --git a/mod/api.php b/mod/api.php index da2c40c30..406ef26c1 100644 --- a/mod/api.php +++ b/mod/api.php @@ -14,7 +14,7 @@ function oauth_get_client($request){ AND `tokens`.`id`='%s' AND `tokens`.`scope`='request'", dbesc($token)); - if (!count($r)) + if (!dbm::is_result($r)) return null; return $r[0]; diff --git a/mod/attach.php b/mod/attach.php index 03f850f0d..274acfc2b 100644 --- a/mod/attach.php +++ b/mod/attach.php @@ -16,7 +16,7 @@ function attach_init(&$a) { $r = q("SELECT * FROM `attach` WHERE `id` = %d LIMIT 1", intval($item_id) ); - if(! count($r)) { + if(! dbm::is_result($r)) { notice( t('Item was not found.'). EOL); return; } @@ -29,7 +29,7 @@ function attach_init(&$a) { dbesc($item_id) ); - if(! count($r)) { + if(! dbm::is_result($r)) { notice( t('Permission denied.') . EOL); return; } diff --git a/mod/cal.php b/mod/cal.php index 3a229ebad..b57f52f74 100644 --- a/mod/cal.php +++ b/mod/cal.php @@ -132,7 +132,7 @@ function cal_content(&$a) { intval($contact_id), intval($a->profile['profile_uid']) ); - if(count($r)) { + if(dbm::is_result($r)) { $contact = $r[0]; $remote_contact = true; } @@ -227,7 +227,7 @@ function cal_content(&$a) { $links = array(); - if(count($r)) { + if(dbm::is_result($r)) { $r = sort_by_date($r); foreach($r as $rr) { $j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['start'], 'j') : datetime_convert('UTC','UTC',$rr['start'],'j')); @@ -240,7 +240,7 @@ function cal_content(&$a) { $events=array(); // transform the event in a usable array - if(count($r)) + if(dbm::is_result($r)) $r = sort_by_date($r); $events = process_events($r); diff --git a/mod/common.php b/mod/common.php index 063eafe67..9a4560deb 100644 --- a/mod/common.php +++ b/mod/common.php @@ -57,13 +57,13 @@ function common_content(&$a) { dbesc(normalise_link(get_my_url())), intval($profile_uid) ); - if(count($r)) + if(dbm::is_result($r)) $cid = $r[0]['id']; else { $r = q("SELECT `id` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1", dbesc(normalise_link(get_my_url())) ); - if(count($r)) + if(dbm::is_result($r)) $zcid = $r[0]['id']; } } @@ -94,7 +94,7 @@ function common_content(&$a) { $r = common_friends_zcid($uid, $zcid, $a->pager['start'], $a->pager['itemspage']); - if(! count($r)) { + if(! dbm::is_result($r)) { return $o; } diff --git a/mod/community.php b/mod/community.php index c8d1e0c9d..391d9dfd4 100644 --- a/mod/community.php +++ b/mod/community.php @@ -59,7 +59,7 @@ function community_content(&$a, $update = 0) { AND `item`.`private` = 0 AND `item`.`wall` = 1" ); - if(count($r)) + if(dbm::is_result($r)) $a->set_pager_total($r[0]['total']); if(! $r[0]['total']) { @@ -71,7 +71,7 @@ function community_content(&$a, $update = 0) { $r = community_getitems($a->pager['start'], $a->pager['itemspage']); - if(! count($r)) { + if(! dbm::is_result($r)) { info( t('No results.') . EOL); return $o; } diff --git a/mod/contactgroup.php b/mod/contactgroup.php index bf81afe07..99340843d 100644 --- a/mod/contactgroup.php +++ b/mod/contactgroup.php @@ -14,7 +14,7 @@ function contactgroup_content(&$a) { intval($a->argv[2]), intval(local_user()) ); - if(count($r)) + if(dbm::is_result($r)) $change = intval($a->argv[2]); } @@ -24,7 +24,7 @@ function contactgroup_content(&$a) { intval($a->argv[1]), intval(local_user()) ); - if(! count($r)) { + if(! dbm::is_result($r)) { killme(); } diff --git a/mod/contacts.php b/mod/contacts.php index 1c1c21638..22bf83277 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -19,7 +19,7 @@ function contacts_init(&$a) { intval(local_user()), intval($contact_id) ); - if(! count($r)) { + if(! dbm::is_result($r)) { $contact_id = 0; } } @@ -169,7 +169,7 @@ function contacts_post(&$a) { intval($profile_id), intval(local_user()) ); - if(! count($r)) { + if(! dbm::is_result($r)) { notice( t('Could not locate selected profile.') . EOL); return; } @@ -211,7 +211,7 @@ function contacts_post(&$a) { intval($contact_id), intval(local_user()) ); - if($r && count($r)) + if($r && dbm::is_result($r)) $a->data['contact'] = $r[0]; return; @@ -765,7 +765,7 @@ function contacts_content(&$a) { $r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `pending` = 0 $sql_extra $sql_extra2 ", intval($_SESSION['uid'])); - if(count($r)) { + if(dbm::is_result($r)) { $a->set_pager_total($r[0]['total']); $total = $r[0]['total']; } @@ -780,7 +780,7 @@ function contacts_content(&$a) { $contacts = array(); - if(count($r)) { + if(dbm::is_result($r)) { foreach($r as $rr) { $contacts[] = _contact_detail_for_template($rr); } diff --git a/mod/content.php b/mod/content.php index c4b1f2f68..8831f8ef7 100644 --- a/mod/content.php +++ b/mod/content.php @@ -93,7 +93,7 @@ function content_content(&$a, $update = 0) { ); $str = ''; - if(count($r)) + if(dbm::is_result($r)) foreach($r as $rr) $str .= '<' . $rr['id'] . '>'; if(strlen($str)) @@ -113,7 +113,7 @@ function content_content(&$a, $update = 0) { intval($group), intval($_SESSION['uid']) ); - if(! count($r)) { + if(! dbm::is_result($r)) { if($update) killme(); notice( t('No such group') . EOL ); @@ -141,7 +141,7 @@ function content_content(&$a, $update = 0) { AND `blocked` = 0 AND `pending` = 0 LIMIT 1", intval($cid) ); - if(count($r)) { + if(dbm::is_result($r)) { $sql_extra = " AND `item`.`parent` IN ( SELECT DISTINCT(`parent`) FROM `item` WHERE 1 $sql_options AND `contact-id` = " . intval($cid) . " and deleted = 0 ) "; } @@ -259,7 +259,7 @@ function content_content(&$a, $update = 0) { $parents_arr = array(); $parents_str = ''; - if(count($r)) { + if(dbm::is_result($r)) { foreach($r as $rr) if(! in_array($rr['item_id'],$parents_arr)) $parents_arr[] = $rr['item_id']; @@ -782,7 +782,7 @@ function render_content(&$a, $items, $mode, $update, $preview = false) { intval($item['uid']), intval($item['id']) ); - if (count($r)) { + if (dbm::is_result($r)) { $ignore = array( 'do' => t("ignore thread"), 'undo' => t("unignore thread"), diff --git a/mod/crepair.php b/mod/crepair.php index 3abbe343b..b4275f6ba 100644 --- a/mod/crepair.php +++ b/mod/crepair.php @@ -14,7 +14,7 @@ function crepair_init(&$a) { intval(local_user()), intval($contact_id) ); - if(! count($r)) { + if(! dbm::is_result($r)) { $contact_id = 0; } } @@ -43,7 +43,7 @@ function crepair_post(&$a) { ); } - if(! count($r)) + if(! dbm::is_result($r)) return; $contact = $r[0]; @@ -110,7 +110,7 @@ function crepair_content(&$a) { ); } - if(! count($r)) { + if(! dbm::is_result($r)) { notice( t('Contact not found.') . EOL); return; } diff --git a/mod/delegate.php b/mod/delegate.php index 20d2e605e..69af82348 100644 --- a/mod/delegate.php +++ b/mod/delegate.php @@ -26,12 +26,12 @@ function delegate_content(&$a) { $r = q("select `nickname` from user where uid = %d limit 1", intval($id) ); - if(count($r)) { + if(dbm::is_result($r)) { $r = q("select id from contact where uid = %d and nurl = '%s' limit 1", intval(local_user()), dbesc(normalise_link($a->get_baseurl() . '/profile/' . $r[0]['nickname'])) ); - if(count($r)) { + if(dbm::is_result($r)) { q("insert into manage ( uid, mid ) values ( %d , %d ) ", intval($a->argv[2]), intval(local_user()) @@ -64,7 +64,7 @@ function delegate_content(&$a) { dbesc($a->user['email']), dbesc($a->user['password']) ); - if(count($r)) + if(dbm::is_result($r)) $full_managers = $r; $delegates = array(); @@ -75,7 +75,7 @@ function delegate_content(&$a) { intval(local_user()) ); - if(count($r)) + if(dbm::is_result($r)) $delegates = $r; $uids = array(); @@ -97,14 +97,14 @@ function delegate_content(&$a) { dbesc(NETWORK_DFRN) ); - if(! count($r)) { + if(! dbm::is_result($r)) { notice( t('No potential page delegates located.') . EOL); return; } $nicknames = array(); - if(count($r)) { + if(dbm::is_result($r)) { foreach($r as $rr) { $nicknames[] = "'" . dbesc(basename($rr['nurl'])) . "'"; } @@ -118,7 +118,7 @@ function delegate_content(&$a) { $r = q("select `uid`, `username`, `nickname` from user where nickname in ( $nicks )"); - if(count($r)) + if(dbm::is_result($r)) foreach($r as $rr) if(! in_array($rr['uid'],$uids)) $potentials[] = $rr; diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php index 5aea4eede..2f2c5baad 100644 --- a/mod/dfrn_confirm.php +++ b/mod/dfrn_confirm.php @@ -121,7 +121,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { intval($uid) ); - if(! count($r)) { + if(! dbm::is_result($r)) { logger('Contact not found in DB.'); notice( t('Contact not found.') . EOL ); notice( t('This may occasionally happen if contact was requested by both persons and it has already been approved.') . EOL ); @@ -423,7 +423,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { $r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1", intval($contact_id) ); - if(count($r)) + if(dbm::is_result($r)) $contact = $r[0]; else $contact = null; @@ -443,7 +443,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { intval($uid) ); - if((count($r)) && ($r[0]['hide-friends'] == 0) && ($activity) && (! $hidden)) { + if((dbm::is_result($r)) && ($r[0]['hide-friends'] == 0) && ($activity) && (! $hidden)) { require_once('include/items.php'); @@ -553,7 +553,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' LIMIT 1", dbesc($node)); - if(! count($r)) { + if(! dbm::is_result($r)) { $message = sprintf(t('No user record found for \'%s\' '), $node); xml_status(3,$message); // failure // NOTREACHED @@ -629,7 +629,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { $r = q("SELECT * FROM `contact` WHERE `dfrn-id` = '%s' LIMIT 1", dbesc($decrypted_dfrn_id) ); - if(count($r)) { + if(dbm::is_result($r)) { $message = t('The ID provided by your system is a duplicate on our system. It should work if you try again.'); xml_status(1,$message); // Birthday paradox - duplicate dfrn-id // NOTREACHED @@ -640,7 +640,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { dbesc($dfrn_pubkey), intval($dfrn_record) ); - if(! count($r)) { + if(! dbm::is_result($r)) { $message = t('Unable to set your contact credentials on our system.'); xml_status(3,$message); } @@ -661,7 +661,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { $r = q("SELECT `photo` FROM `contact` WHERE `id` = %d LIMIT 1", intval($dfrn_record)); - if(count($r)) + if(dbm::is_result($r)) $photo = $r[0]['photo']; else $photo = $a->get_baseurl() . '/images/person-175.jpg'; @@ -714,10 +714,10 @@ function dfrn_confirm_post(&$a,$handsfree = null) { intval($dfrn_record) ); - if(count($r)) + if(dbm::is_result($r)) $combined = $r[0]; - if((count($r)) && ($r[0]['notify-flags'] & NOTIFY_CONFIRM)) { + if((dbm::is_result($r)) && ($r[0]['notify-flags'] & NOTIFY_CONFIRM)) { $mutual = ($new_relation == CONTACT_IS_FRIEND); notification(array( 'type' => NOTIFY_CONFIRM, @@ -742,7 +742,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { intval($local_uid) ); - if((count($r)) && ($r[0]['hide-friends'] == 0)) { + if((dbm::is_result($r)) && ($r[0]['hide-friends'] == 0)) { require_once('include/items.php'); diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php index 6f6fc41c1..dfa2af18c 100644 --- a/mod/dfrn_notify.php +++ b/mod/dfrn_notify.php @@ -42,7 +42,7 @@ function dfrn_notify_post(&$a) { dbesc($dfrn_id), dbesc($challenge) ); - if(! count($r)) { + if(! dbm::is_result($r)) { logger('dfrn_notify: could not match challenge to dfrn_id ' . $dfrn_id . ' challenge=' . $challenge); xml_status(3); } @@ -88,7 +88,7 @@ function dfrn_notify_post(&$a) { dbesc($a->argv[1]) ); - if(! count($r)) { + if(! dbm::is_result($r)) { logger('dfrn_notify: contact not found for dfrn_id ' . $dfrn_id); xml_status(3); //NOTREACHED @@ -284,7 +284,7 @@ function dfrn_notify_content(&$a) { dbesc($a->argv[1]) ); - if(! count($r)) + if(! dbm::is_result($r)) $status = 1; logger("Remote rino version: ".$rino_remote." for ".$r[0]["url"], LOGGER_DEBUG); diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php index 9613229da..029c1abc5 100644 --- a/mod/dfrn_poll.php +++ b/mod/dfrn_poll.php @@ -79,7 +79,7 @@ function dfrn_poll_init(&$a) { dbesc($a->argv[1]) ); - if(count($r)) { + if(dbm::is_result($r)) { $s = fetch_url($r[0]['poll'] . '?dfrn_id=' . $my_id . '&type=profile-check'); @@ -126,7 +126,7 @@ function dfrn_poll_init(&$a) { $r = q("SELECT * FROM `profile_check` WHERE `sec` = '%s' ORDER BY `expire` DESC LIMIT 1", dbesc($sec) ); - if(! count($r)) { + if(! dbm::is_result($r)) { xml_status(3, 'No ticket'); // NOTREACHED } @@ -190,7 +190,7 @@ function dfrn_poll_init(&$a) { q("DELETE FROM `profile_check` WHERE `expire` < " . intval(time())); $r = q("SELECT * FROM `profile_check` WHERE `dfrn_id` = '%s' ORDER BY `expire` DESC", dbesc($dfrn_id)); - if(count($r)) { + if(dbm::is_result($r)) { xml_status(1); return; // NOTREACHED } @@ -223,7 +223,7 @@ function dfrn_poll_post(&$a) { $r = q("SELECT * FROM `profile_check` WHERE `sec` = '%s' ORDER BY `expire` DESC LIMIT 1", dbesc($sec) ); - if(! count($r)) { + if(! dbm::is_result($r)) { xml_status(3, 'No ticket'); // NOTREACHED } @@ -284,7 +284,7 @@ function dfrn_poll_post(&$a) { dbesc($challenge) ); - if(! count($r)) + if(! dbm::is_result($r)) killme(); $type = $r[0]['type']; @@ -319,7 +319,7 @@ function dfrn_poll_post(&$a) { $r = q("SELECT * FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 $sql_extra LIMIT 1"); - if(! count($r)) + if(! dbm::is_result($r)) killme(); $contact = $r[0]; @@ -335,7 +335,7 @@ function dfrn_poll_post(&$a) { $reputation = 0; $text = ''; - if(count($r)) { + if(dbm::is_result($r)) { $reputation = $r[0]['rating']; $text = $r[0]['reason']; @@ -448,7 +448,7 @@ function dfrn_poll_content(&$a) { dbesc($nickname) ); - if(count($r)) { + if(dbm::is_result($r)) { $challenge = ''; $encrypted_id = ''; @@ -495,7 +495,7 @@ function dfrn_poll_content(&$a) { )); } - $profile = ((count($r) && $r[0]['nickname']) ? $r[0]['nickname'] : $nickname); + $profile = ((dbm::is_result($r) && $r[0]['nickname']) ? $r[0]['nickname'] : $nickname); switch($destination_url) { case 'profile': diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index d7566905b..66c891ef0 100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -91,7 +91,7 @@ function dfrn_request_post(&$a) { dbesc(normalise_link($dfrn_url)) ); - if(count($r)) { + if(dbm::is_result($r)) { if(strlen($r[0]['dfrn-id'])) { /* @@ -185,7 +185,7 @@ function dfrn_request_post(&$a) { dbesc($dfrn_url), $parms['key'] // this was already escaped ); - if(count($r)) { + if(dbm::is_result($r)) { $def_gid = get_default_group(local_user(), $r[0]["network"]); if(intval($def_gid)) group_add_member(local_user(), '', $r[0]['id'], $def_gid); @@ -273,7 +273,7 @@ function dfrn_request_post(&$a) { dbesc(datetime_convert('UTC','UTC','now - 24 hours')), intval($uid) ); - if(count($r) > $maxreq) { + if(dbm::is_result($r) > $maxreq) { notice( sprintf( t('%s has received too many connection requests today.'), $a->profile['name']) . EOL); notice( t('Spam protection measures have been invoked.') . EOL); notice( t('Friends are advised to please try again in 24 hours.') . EOL); @@ -295,7 +295,7 @@ function dfrn_request_post(&$a) { AND `intro`.`datetime` < UTC_TIMESTAMP() - INTERVAL 30 MINUTE ", dbesc(NETWORK_MAIL2) ); - if(count($r)) { + if(dbm::is_result($r)) { foreach($r as $rr) { if(! $rr['rel']) { q("DELETE FROM `contact` WHERE `id` = %d", @@ -320,7 +320,7 @@ function dfrn_request_post(&$a) { AND `intro`.`datetime` < UTC_TIMESTAMP() - INTERVAL 3 DAY ", dbesc(NETWORK_MAIL2) ); - if(count($r)) { + if(dbm::is_result($r)) { foreach($r as $rr) { if(! $rr['rel']) { q("DELETE FROM `contact` WHERE `id` = %d", @@ -370,7 +370,7 @@ function dfrn_request_post(&$a) { $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1", intval($uid) ); - if(! count($r)) { + if(! dbm::is_result($r)) { notice( t('This account has not been configured for email. Request failed.') . EOL); return; @@ -398,7 +398,7 @@ function dfrn_request_post(&$a) { dbesc($poll), intval($uid) ); - if(count($r)) { + if(dbm::is_result($r)) { $contact_id = $r[0]['id']; $def_gid = get_default_group($uid, $r[0]["network"]); @@ -572,7 +572,7 @@ function dfrn_request_post(&$a) { $parms['url'], $parms['issued-id'] ); - if(count($r)) { + if(dbm::is_result($r)) { $contact_record = $r[0]; update_contact_avatar($photo, $uid, $contact_record["id"], true); } @@ -729,7 +729,7 @@ function dfrn_request_content(&$a) { $auto_confirm = false; - if(count($r)) { + if(dbm::is_result($r)) { if(($r[0]['page-flags'] != PAGE_NORMAL) && ($r[0]['page-flags'] != PAGE_PRVGROUP)) $auto_confirm = true; @@ -842,7 +842,7 @@ function dfrn_request_content(&$a) { $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1", intval($a->profile['uid']) ); - if(! count($r)) + if(! dbm::is_result($r)) $mail_disabled = 1; } diff --git a/mod/directory.php b/mod/directory.php index 06aeec622..d83fe244a 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -78,7 +78,7 @@ function directory_content(&$a) { $r = $db->q("SELECT COUNT(*) AS `total` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra "); - if(count($r)) + if(dbm::is_result($r)) $a->set_pager_total($r[0]['total']); $order = " ORDER BY `name` ASC "; @@ -90,7 +90,7 @@ function directory_content(&$a) { LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` LEFT JOIN `contact` ON `contact`.`uid` = `user`.`uid` WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 AND `contact`.`self` $sql_extra $order LIMIT ".$limit); - if(count($r)) { + if(dbm::is_result($r)) { if(in_array('small', $a->argv)) $photo = 'thumb'; diff --git a/mod/editpost.php b/mod/editpost.php index 46a530dce..5322a271c 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -78,7 +78,7 @@ function editpost_content(&$a) { $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1", intval(local_user()) ); - if(count($r)) { + if(dbm::is_result($r)) { $mail_enabled = true; if(intval($r[0]['pubmail'])) $pubmail_enabled = true; diff --git a/mod/events.php b/mod/events.php index 16679ff7e..4a201f43e 100644 --- a/mod/events.php +++ b/mod/events.php @@ -332,7 +332,7 @@ function events_content(&$a) { $links = array(); - if(count($r)) { + if(dbm::is_result($r)) { $r = sort_by_date($r); foreach($r as $rr) { $j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['start'], 'j') : datetime_convert('UTC','UTC',$rr['start'],'j')); @@ -344,7 +344,7 @@ function events_content(&$a) { $events=array(); // transform the event in a usable array - if(count($r)) + if(dbm::is_result($r)) $r = sort_by_date($r); $events = process_events($r); @@ -403,7 +403,7 @@ function events_content(&$a) { intval($event_id), intval(local_user()) ); - if(count($r)) + if(dbm::is_result($r)) $orig_event = $r[0]; } diff --git a/mod/friendica.php b/mod/friendica.php index aad5964ba..8c9e9d7ad 100644 --- a/mod/friendica.php +++ b/mod/friendica.php @@ -24,7 +24,7 @@ function friendica_init(&$a) { $visible_plugins = array(); if(is_array($a->plugins) && count($a->plugins)) { $r = q("select * from addon where hidden = 0"); - if(count($r)) + if(dbm::is_result($r)) foreach($r as $rr) $visible_plugins[] = $rr['name']; } @@ -80,7 +80,7 @@ function friendica_content(&$a) { $visible_plugins = array(); if(is_array($a->plugins) && count($a->plugins)) { $r = q("select * from addon where hidden = 0"); - if(count($r)) + if(dbm::is_result($r)) foreach($r as $rr) $visible_plugins[] = $rr['name']; } diff --git a/mod/fsuggest.php b/mod/fsuggest.php index ad407d5f3..84241e49e 100644 --- a/mod/fsuggest.php +++ b/mod/fsuggest.php @@ -16,7 +16,7 @@ function fsuggest_post(&$a) { intval($contact_id), intval(local_user()) ); - if(! count($r)) { + if(! dbm::is_result($r)) { notice( t('Contact not found.') . EOL); return; } @@ -33,7 +33,7 @@ function fsuggest_post(&$a) { intval($new_contact), intval(local_user()) ); - if(count($r)) { + if(dbm::is_result($r)) { $x = q("INSERT INTO `fsuggest` ( `uid`,`cid`,`name`,`url`,`request`,`photo`,`note`,`created`) VALUES ( %d, %d, '%s','%s','%s','%s','%s','%s')", @@ -50,7 +50,7 @@ function fsuggest_post(&$a) { dbesc($hash), intval(local_user()) ); - if(count($r)) { + if(dbm::is_result($r)) { $fsuggest_id = $r[0]['id']; q("UPDATE `fsuggest` SET `note` = '%s' WHERE `id` = %d AND `uid` = %d", dbesc($note), @@ -88,7 +88,7 @@ function fsuggest_content(&$a) { intval($contact_id), intval(local_user()) ); - if(! count($r)) { + if(! dbm::is_result($r)) { notice( t('Contact not found.') . EOL); return; } diff --git a/mod/group.php b/mod/group.php index 5b28784f5..b888554d2 100644 --- a/mod/group.php +++ b/mod/group.php @@ -43,7 +43,7 @@ function group_post(&$a) { intval($a->argv[1]), intval(local_user()) ); - if(! count($r)) { + if(! dbm::is_result($r)) { notice( t('Group not found.') . EOL ); goaway($a->get_baseurl() . '/contacts'); return; // NOTREACHED @@ -107,7 +107,7 @@ function group_content(&$a) { intval($a->argv[2]), intval(local_user()) ); - if(count($r)) + if(dbm::is_result($r)) $result = group_rmv(local_user(),$r[0]['name']); if($result) info( t('Group removed.') . EOL); @@ -125,7 +125,7 @@ function group_content(&$a) { intval($a->argv[2]), intval(local_user()) ); - if(count($r)) + if(dbm::is_result($r)) $change = intval($a->argv[2]); } @@ -136,7 +136,7 @@ function group_content(&$a) { intval($a->argv[1]), intval(local_user()) ); - if(! count($r)) { + if(! dbm::is_result($r)) { notice( t('Group not found.') . EOL ); goaway($a->get_baseurl() . '/contacts'); } @@ -209,7 +209,7 @@ function group_content(&$a) { intval(local_user()) ); - if(count($r)) { + if(dbm::is_result($r)) { $textmode = (($switchtotext && (count($r) > $switchtotext)) ? true : false); foreach($r as $member) { if(! in_array($member['id'],$preselected)) { diff --git a/mod/ignored.php b/mod/ignored.php index e876b4ef8..ba55c55e3 100644 --- a/mod/ignored.php +++ b/mod/ignored.php @@ -16,7 +16,7 @@ function ignored_init(&$a) { intval(local_user()), intval($message_id) ); - if(! count($r)) + if(! dbm::is_result($r)) killme(); if(! intval($r[0]['ignored'])) diff --git a/mod/install.php b/mod/install.php index d18d4ac3e..da3c17d5f 100755 --- a/mod/install.php +++ b/mod/install.php @@ -165,7 +165,7 @@ function install_content(&$a) { if($db && $db->connected) { $r = q("SELECT COUNT(*) as `total` FROM `user`"); - if($r && count($r) && $r[0]['total']) { + if(dbm::is_result($r) && $r[0]['total']) { $tpl = get_markup_template('install.tpl'); return replace_macros($tpl, array( '$title' => $install_title, diff --git a/mod/item.php b/mod/item.php index 170bed12a..3d6433bec 100644 --- a/mod/item.php +++ b/mod/item.php @@ -102,7 +102,7 @@ function item_post(&$a) { } // if this isn't the real parent of the conversation, find it - if($r !== false && count($r)) { + if(dbm::is_result($r)) { $parid = $r[0]['parent']; $parent_uri = $r[0]['uri']; if($r[0]['id'] != $r[0]['parent']) { @@ -112,7 +112,7 @@ function item_post(&$a) { } } - if(($r === false) || (! count($r))) { + if(! dbm::is_result($r)) { notice( t('Unable to locate original post.') . EOL); if(x($_REQUEST,'return')) goaway($return_path); @@ -141,7 +141,7 @@ function item_post(&$a) { $r = q("SELECT * FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1", dbesc(normalise_link($thrparent[0]["author-link"]))); - if (count($r)) { + if (dbm::is_result($r)) { $parent_contact = $r[0]; $parent_contact["thumb"] = $parent_contact["photo"]; $parent_contact["micro"] = $parent_contact["photo"]; @@ -330,7 +330,7 @@ function item_post(&$a) { $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1", intval(local_user()) ); - if(count($r) && intval($r[0]['pubmail'])) + if(dbm::is_result($r) && intval($r[0]['pubmail'])) $pubmail_enabled = true; } } @@ -464,7 +464,7 @@ function item_post(&$a) { intval($profile_uid) ); - if(! count($r)) + if(! dbm::is_result($r)) continue; $r = q("UPDATE `photo` SET `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s' diff --git a/mod/lockview.php b/mod/lockview.php index 0ae54c8c1..ad4f33d69 100644 --- a/mod/lockview.php +++ b/mod/lockview.php @@ -21,7 +21,7 @@ function lockview_content(&$a) { dbesc($type), intval($item_id) ); - if(! count($r)) + if(! dbm::is_result($r)) killme(); $item = $r[0]; @@ -52,7 +52,7 @@ function lockview_content(&$a) { $r = q("SELECT `name` FROM `group` WHERE `id` IN ( %s )", dbesc(implode(', ', $allowed_groups)) ); - if(count($r)) + if(dbm::is_result($r)) foreach($r as $rr) $l[] = '' . $rr['name'] . ''; } @@ -60,7 +60,7 @@ function lockview_content(&$a) { $r = q("SELECT `name` FROM `contact` WHERE `id` IN ( %s )", dbesc(implode(', ',$allowed_users)) ); - if(count($r)) + if(dbm::is_result($r)) foreach($r as $rr) $l[] = $rr['name']; @@ -70,7 +70,7 @@ function lockview_content(&$a) { $r = q("SELECT `name` FROM `group` WHERE `id` IN ( %s )", dbesc(implode(', ', $deny_groups)) ); - if(count($r)) + if(dbm::is_result($r)) foreach($r as $rr) $l[] = '' . $rr['name'] . ''; } @@ -78,7 +78,7 @@ function lockview_content(&$a) { $r = q("SELECT `name` FROM `contact` WHERE `id` IN ( %s )", dbesc(implode(', ',$deny_users)) ); - if(count($r)) + if(dbm::is_result($r)) foreach($r as $rr) $l[] = '' . $rr['name'] . ''; diff --git a/mod/lostpass.php b/mod/lostpass.php index 938d1cbb0..3dca3a8b8 100644 --- a/mod/lostpass.php +++ b/mod/lostpass.php @@ -15,7 +15,7 @@ function lostpass_post(&$a) { dbesc($loginame) ); - if(! count($r)) { + if(! dbm::is_result($r)) { notice( t('No valid account found.') . EOL); goaway(z_root()); } @@ -88,7 +88,7 @@ function lostpass_content(&$a) { $r = q("SELECT * FROM `user` WHERE `pwdreset` = '%s' LIMIT 1", dbesc($hash) ); - if(! count($r)) { + if(! dbm::is_result($r)) { $o = t("Request could not be verified. \x28You may have previously submitted it.\x29 Password reset failed."); return $o; } diff --git a/mod/manage.php b/mod/manage.php index adcc3d787..a91138f35 100644 --- a/mod/manage.php +++ b/mod/manage.php @@ -15,7 +15,7 @@ function manage_post(&$a) { $r = q("select * from user where uid = %d limit 1", intval($_SESSION['submanage']) ); - if(count($r)) { + if(dbm::is_result($r)) { $uid = intval($r[0]['uid']); $orig_record = $r[0]; } @@ -56,7 +56,7 @@ function manage_post(&$a) { ); } - if(! count($r)) + if(! dbm::is_result($r)) return; unset($_SESSION['authenticated']); diff --git a/mod/match.php b/mod/match.php index 33e07c91c..f7fe325b3 100644 --- a/mod/match.php +++ b/mod/match.php @@ -27,7 +27,7 @@ function match_content(&$a) { $r = q("SELECT `pub_keywords`, `prv_keywords` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1", intval(local_user()) ); - if(! count($r)) + if(! dbm::is_result($r)) return; if(! $r[0]['pub_keywords'] && (! $r[0]['prv_keywords'])) { notice( t('No keywords to match. Please add keywords to your default profile.') . EOL); diff --git a/mod/message.php b/mod/message.php index 4bd73d0ce..d3153de05 100644 --- a/mod/message.php +++ b/mod/message.php @@ -242,7 +242,7 @@ function message_content(&$a) { intval($a->argv[2]), intval(local_user()) ); - if(count($r)) { + if(dbm::is_result($r)) { $parent = $r[0]['parent-uri']; $convid = $r[0]['convid']; @@ -321,7 +321,7 @@ function message_content(&$a) { dbesc(base64_decode($a->argv[2])) ); } - if(count($r)) { + if(dbm::is_result($r)) { $prename = $r[0]['name']; $preurl = $r[0]['url']; $preid = $r[0]['id']; @@ -405,7 +405,7 @@ function message_content(&$a) { intval(local_user()), intval($a->argv[1]) ); - if(count($r)) { + if(dbm::is_result($r)) { $contact_id = $r[0]['contact-id']; $convid = $r[0]['convid']; diff --git a/mod/modexp.php b/mod/modexp.php index bba2c2882..d1dabb101 100644 --- a/mod/modexp.php +++ b/mod/modexp.php @@ -12,7 +12,7 @@ function modexp_init(&$a) { dbesc($nick) ); - if(! count($r)) + if(! dbm::is_result($r)) killme(); $lines = explode("\n",$r[0]['spubkey']); diff --git a/mod/mood.php b/mod/mood.php index f804af0c0..4ddf16e34 100644 --- a/mod/mood.php +++ b/mod/mood.php @@ -36,7 +36,7 @@ function mood_init(&$a) { intval($parent), intval($uid) ); - if(count($r)) { + if(dbm::is_result($r)) { $parent_uri = $r[0]['uri']; $private = $r[0]['private']; $allow_cid = $r[0]['allow_cid']; diff --git a/mod/msearch.php b/mod/msearch.php index 89de5b705..1370b63bf 100644 --- a/mod/msearch.php +++ b/mod/msearch.php @@ -13,7 +13,7 @@ function msearch_post(&$a) { $r = q("SELECT COUNT(*) AS `total` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 AND `user`.`hidewall` = 0 AND MATCH `pub_keywords` AGAINST ('%s') ", dbesc($search) ); - if(count($r)) + if(dbm::is_result($r)) $total = $r[0]['total']; $r = q("SELECT `pub_keywords`, `username`, `nickname`, `user`.`uid` FROM `user` LEFT JOIN `profile` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 AND `user`.`hidewall` = 0 AND MATCH `pub_keywords` AGAINST ('%s') LIMIT %d , %d ", @@ -23,7 +23,7 @@ function msearch_post(&$a) { ); $results = array(); - if(count($r)) { + if(dbm::is_result($r)) { foreach($r as $rr) $results[] = array( 'name' => $rr['name'], diff --git a/mod/network.php b/mod/network.php index cafaa11ae..601b7e7cb 100644 --- a/mod/network.php +++ b/mod/network.php @@ -126,7 +126,7 @@ function network_init(&$a) { intval(local_user()), dbesc($search) ); - if(! count($r)) { + if(! dbm::is_result($r)) { q("INSERT INTO `search` ( `uid`,`term` ) VALUES ( %d, '%s') ", intval(local_user()), dbesc($search) @@ -182,7 +182,7 @@ function saved_searches($search) { $saved = array(); - if(count($r)) { + if(dbm::is_result($r)) { foreach($r as $rr) { $saved[] = array( 'id' => $rr['id'], @@ -381,7 +381,7 @@ function network_content(&$a, $update = 0) { ); $str = ''; - if(count($r)) + if(dbm::is_result($r)) foreach($r as $rr) $str .= '<' . $rr['id'] . '>'; if(strlen($str)) @@ -463,7 +463,7 @@ function network_content(&$a, $update = 0) { intval($group), intval($_SESSION['uid']) ); - if(! count($r)) { + if(! dbm::is_result($r)) { if($update) killme(); notice( t('No such group') . EOL ); @@ -507,7 +507,7 @@ function network_content(&$a, $update = 0) { AND (NOT `blocked` OR `pending`) LIMIT 1", intval($cid) ); - if(count($r)) { + if(dbm::is_result($r)) { $sql_extra = " AND ".$sql_table.".`contact-id` = ".intval($cid); $entries[0] = array( @@ -609,7 +609,7 @@ function network_content(&$a, $update = 0) { intval($_SESSION['uid']) ); - if(count($r)) { + if(dbm::is_result($r)) { $a->set_pager_total($r[0]['total']); } } diff --git a/mod/nogroup.php b/mod/nogroup.php index 2f0985c9d..c34120f0f 100644 --- a/mod/nogroup.php +++ b/mod/nogroup.php @@ -28,11 +28,11 @@ function nogroup_content(&$a) { require_once('include/Contact.php'); $r = contacts_not_grouped(local_user()); - if(count($r)) { + if(dbm::is_result($r)) { $a->set_pager_total($r[0]['total']); } $r = contacts_not_grouped(local_user(),$a->pager['start'],$a->pager['itemspage']); - if(count($r)) { + if(dbm::is_result($r)) { foreach($r as $rr) { $contact_details = get_contact_details_by_url($rr['url'], local_user(), $rr); diff --git a/mod/noscrape.php b/mod/noscrape.php index 2a0460546..a2a71a8e2 100644 --- a/mod/noscrape.php +++ b/mod/noscrape.php @@ -43,7 +43,7 @@ function noscrape_init(&$a) { if(is_array($a->profile) AND !$a->profile['hide-friends']) { $r = q("SELECT `gcontact`.`updated` FROM `contact` INNER JOIN `gcontact` WHERE `gcontact`.`nurl` = `contact`.`nurl` AND `self` AND `uid` = %d LIMIT 1", intval($a->profile['uid'])); - if(count($r)) + if(dbm::is_result($r)) $json_info["updated"] = date("c", strtotime($r[0]['updated'])); $r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 and `pending` = 0 AND `hidden` = 0 AND `archive` = 0 @@ -53,7 +53,7 @@ function noscrape_init(&$a) { dbesc(NETWORK_DIASPORA), dbesc(NETWORK_OSTATUS) ); - if(count($r)) + if(dbm::is_result($r)) $json_info["contacts"] = intval($r[0]['total']); } diff --git a/mod/notes.php b/mod/notes.php index a25d090ed..f1b49ebee 100644 --- a/mod/notes.php +++ b/mod/notes.php @@ -82,7 +82,7 @@ function notes_content(&$a,$update = false) { ); - if(count($r)) { + if(dbm::is_result($r)) { $a->set_pager_total($r[0]['total']); $a->set_pager_itemspage(40); } @@ -102,7 +102,7 @@ function notes_content(&$a,$update = false) { $parents_arr = array(); $parents_str = ''; - if(count($r)) { + if(dbm::is_result($r)) { foreach($r as $rr) $parents_arr[] = $rr['item_id']; $parents_str = implode(', ', $parents_arr); @@ -116,7 +116,7 @@ function notes_content(&$a,$update = false) { dbesc($parents_str) ); - if(count($r)) { + if(dbm::is_result($r)) { $items = conv_sort($r,"`commented`"); $o .= conversation($a,$items,'notes',$update); diff --git a/mod/notice.php b/mod/notice.php index 19cf53189..7fdf4493a 100644 --- a/mod/notice.php +++ b/mod/notice.php @@ -6,7 +6,7 @@ $r = q("SELECT user.nickname FROM user LEFT JOIN item ON item.uid=user.uid WHERE item.id=%d", intval($id) ); - if (count($r)){ + if (dbm::is_result($r)){ $nick = $r[0]['nickname']; $url = $a->get_baseurl()."/display/$nick/$id"; goaway($url); diff --git a/mod/notifications.php b/mod/notifications.php index af44097c1..9760b3470 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -27,7 +27,7 @@ function notifications_post(&$a) { intval(local_user()) ); - if(count($r)) { + if(dbm::is_result($r)) { $intro_id = $r[0]['id']; $contact_id = $r[0]['contact-id']; } diff --git a/mod/notify.php b/mod/notify.php index 938e2ffbe..dceb326a4 100644 --- a/mod/notify.php +++ b/mod/notify.php @@ -47,7 +47,7 @@ function notify_content(&$a) { require_once('include/bbcode.php'); $r = $nm->getAll(array('seen'=>0)); - if ($r!==false && count($r) > 0) { + if (dbm::is_result($r) > 0) { foreach ($r as $it) { $notif_content .= replace_macros($not_tpl,array( '$item_link' => $a->get_baseurl(true).'/notify/view/'. $it['id'], diff --git a/mod/openid.php b/mod/openid.php index 0ebda485d..1b8bcfd0a 100644 --- a/mod/openid.php +++ b/mod/openid.php @@ -38,7 +38,7 @@ function openid_content(&$a) { dbesc($authid), dbesc(normalise_openid($authid)) ); - if($r && count($r)) { + if(dbm::is_result($r)) { // successful OpenID login diff --git a/mod/photo.php b/mod/photo.php index 0d60282d5..63606dc83 100644 --- a/mod/photo.php +++ b/mod/photo.php @@ -76,7 +76,7 @@ function photo_init(&$a) { intval($resolution), intval($uid) ); - if(count($r)) { + if(dbm::is_result($r)) { $data = $r[0]['data']; $mimetype = $r[0]['type']; } @@ -106,7 +106,7 @@ function photo_init(&$a) { dbesc($photo), intval($resolution) ); - if(count($r)) { + if(dbm::is_result($r)) { $sql_extra = permissions_sql($r[0]['uid']); @@ -119,7 +119,7 @@ function photo_init(&$a) { $public = ($r[0]['allow_cid'] == '') AND ($r[0]['allow_gid'] == '') AND ($r[0]['deny_cid'] == '') AND ($r[0]['deny_gid'] == ''); - if(count($r)) { + if(dbm::is_result($r)) { $resolution = $r[0]['scale']; $data = $r[0]['data']; $mimetype = $r[0]['type']; diff --git a/mod/photos.php b/mod/photos.php index d72a82482..a4d5544ef 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -165,7 +165,7 @@ function photos_post(&$a) { intval($page_owner_uid) ); - if (! count($r)) { + if (! dbm::is_result($r)) { notice( t('Contact information unavailable') . EOL); logger('photos_post: unable to locate contact record for page owner. uid=' . $page_owner_uid); killme(); @@ -186,7 +186,7 @@ function photos_post(&$a) { dbesc($album), intval($page_owner_uid) ); - if (! count($r)) { + if (! dbm::is_result($r)) { notice( t('Album not found.') . EOL); goaway($_SESSION['photo_return']); return; // NOTREACHED @@ -748,7 +748,7 @@ function photos_post(&$a) { dbesc($album), intval($page_owner_uid) ); - if ((! count($r)) || ($album == t('Profile Photos'))) + if ((! dbm::is_result($r)) || ($album == t('Profile Photos'))) $visible = 1; else $visible = 0; @@ -1573,7 +1573,7 @@ function photos_content(&$a) { } $comments = ''; - if (! count($r)) { + if (! dbm::is_result($r)) { if ($can_post || can_write_wall($a,$owner_uid)) { if ($link_item['last-child']) { $comments .= replace_macros($cmnt_tpl,array( diff --git a/mod/poco.php b/mod/poco.php index 1ec5b2d4e..94dac77ee 100644 --- a/mod/poco.php +++ b/mod/poco.php @@ -45,7 +45,7 @@ function poco_init(&$a) { where `user`.`nickname` = '%s' and `profile`.`is-default` = 1 limit 1", dbesc($user) ); - if(! count($r) || $r[0]['hidewall'] || $r[0]['hide-friends']) + if(! dbm::is_result($r) || $r[0]['hidewall'] || $r[0]['hide-friends']) http_status_exit(404); $user = $r[0]; @@ -83,7 +83,7 @@ function poco_init(&$a) { dbesc(NETWORK_STATUSNET) ); } - if(count($r)) + if(dbm::is_result($r)) $totalResults = intval($r[0]['total']); else $totalResults = 0; @@ -173,7 +173,7 @@ function poco_init(&$a) { } if(is_array($r)) { - if(count($r)) { + if(count($r) > 0) { foreach($r as $rr) { if (!isset($rr['generation'])) { if ($global) diff --git a/mod/poke.php b/mod/poke.php index 435da4dcd..af5dacabc 100644 --- a/mod/poke.php +++ b/mod/poke.php @@ -52,7 +52,7 @@ function poke_init(&$a) { intval($uid) ); - if(! count($r)) { + if(! dbm::is_result($r)) { logger('poke: no contact ' . $contact_id); return; } @@ -66,7 +66,7 @@ function poke_init(&$a) { intval($parent), intval($uid) ); - if(count($r)) { + if(dbm::is_result($r)) { $parent_uri = $r[0]['uri']; $private = $r[0]['private']; $allow_cid = $r[0]['allow_cid']; @@ -159,7 +159,7 @@ function poke_content(&$a) { intval($_GET['c']), intval(local_user()) ); - if(count($r)) { + if(dbm::is_result($r)) { $name = $r[0]['name']; $id = $r[0]['id']; } diff --git a/mod/post.php b/mod/post.php index c0e783a6a..76282d29a 100644 --- a/mod/post.php +++ b/mod/post.php @@ -23,7 +23,7 @@ function post_post(&$a) { AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1", dbesc($nickname) ); - if(! count($r)) + if(! dbm::is_result($r)) http_status_exit(500); $importer = $r[0]; diff --git a/mod/profile.php b/mod/profile.php index 279f86352..42af1707d 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -13,7 +13,7 @@ function profile_init(&$a) { $which = htmlspecialchars($a->argv[1]); else { $r = q("select nickname from user where blocked = 0 and account_expired = 0 and account_removed = 0 and verified = 1 order by rand() limit 1"); - if(count($r)) { + if(dbm::is_result($r)) { goaway($a->get_baseurl() . '/profile/' . $r[0]['nickname']); } else { @@ -136,7 +136,7 @@ function profile_content(&$a, $update = 0) { intval($contact_id), intval($a->profile['profile_uid']) ); - if(count($r)) { + if(dbm::is_result($r)) { $contact = $r[0]; $remote_contact = true; } @@ -258,7 +258,7 @@ function profile_content(&$a, $update = 0) { intval($a->profile['profile_uid']) ); - if(count($r)) { + if(dbm::is_result($r)) { $a->set_pager_total($r[0]['total']); } } diff --git a/mod/profile_photo.php b/mod/profile_photo.php index 11e671afc..fea6bb167 100644 --- a/mod/profile_photo.php +++ b/mod/profile_photo.php @@ -32,7 +32,7 @@ function profile_photo_post(&$a) { intval($_REQUEST['profile']), intval(local_user()) ); - if(count($r) && (! intval($r[0]['is-default']))) + if(dbm::is_result($r) && (! intval($r[0]['is-default']))) $is_default_profile = 0; } @@ -63,7 +63,7 @@ function profile_photo_post(&$a) { dbesc(local_user()), intval($scale)); - if(count($r)) { + if(dbm::is_result($r)) { $base_image = $r[0]; @@ -195,7 +195,7 @@ function profile_photo_content(&$a) { intval(local_user()), dbesc($resource_id) ); - if (!count($r)){ + if (!dbm::is_result($r)){ notice( t('Permission denied.') . EOL ); return; } diff --git a/mod/profiles.php b/mod/profiles.php index 943742e3a..45bfe937e 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -15,7 +15,7 @@ function profiles_init(&$a) { intval($a->argv[2]), intval(local_user()) ); - if(! count($r)) { + if(! dbm::is_result($r)) { notice( t('Profile not found.') . EOL); goaway('profiles'); return; // NOTREACHED @@ -130,7 +130,7 @@ function profiles_init(&$a) { intval($a->argv[1]), intval(local_user()) ); - if(! count($r)) { + if(! dbm::is_result($r)) { notice( t('Profile not found.') . EOL); killme(); return; @@ -286,7 +286,7 @@ function profiles_post(&$a) { intval(local_user()) ); } - if(count($r)) { + if(dbm::is_result($r)) { $prf = $r[0]['url']; $newname = $r[0]['name']; } @@ -613,7 +613,7 @@ function profiles_content(&$a) { intval($a->argv[1]), intval(local_user()) ); - if(! count($r)) { + if(! dbm::is_result($r)) { notice( t('Profile not found.') . EOL); return; } @@ -767,7 +767,7 @@ function profiles_content(&$a) { "SELECT * FROM `profile` WHERE `uid` = %d AND `is-default`=1", local_user() ); - if(count($r)){ + if(dbm::is_result($r)){ //Go to the default profile. goaway('profiles/'.$r[0]['id']); } @@ -775,7 +775,7 @@ function profiles_content(&$a) { $r = q("SELECT * FROM `profile` WHERE `uid` = %d", local_user()); - if(count($r)) { + if(dbm::is_result($r)) { $tpl = get_markup_template('profile_entry.tpl'); foreach($r as $rr) { diff --git a/mod/profperm.php b/mod/profperm.php index 077f695be..7893bdfa1 100644 --- a/mod/profperm.php +++ b/mod/profperm.php @@ -42,7 +42,7 @@ function profperm_content(&$a) { intval($a->argv[2]), intval(local_user()) ); - if(count($r)) + if(dbm::is_result($r)) $change = intval($a->argv[2]); } @@ -52,7 +52,7 @@ function profperm_content(&$a) { intval($a->argv[1]), intval(local_user()) ); - if(! count($r)) { + if(! dbm::is_result($r)) { notice( t('Invalid profile identifier.') . EOL ); return; } @@ -64,7 +64,7 @@ function profperm_content(&$a) { ); $ingroup = array(); - if(count($r)) + if(dbm::is_result($r)) foreach($r as $member) $ingroup[] = $member['id']; @@ -94,7 +94,7 @@ function profperm_content(&$a) { $members = $r; $ingroup = array(); - if(count($r)) + if(dbm::is_result($r)) foreach($r as $member) $ingroup[] = $member['id']; } @@ -138,7 +138,7 @@ function profperm_content(&$a) { dbesc(NETWORK_DFRN) ); - if(count($r)) { + if(dbm::is_result($r)) { $textmode = (($switchtotext && (count($r) > $switchtotext)) ? true : false); foreach($r as $member) { if(! in_array($member['id'],$ingroup)) { diff --git a/mod/proxy.php b/mod/proxy.php index de2810dd7..612dc910a 100644 --- a/mod/proxy.php +++ b/mod/proxy.php @@ -136,7 +136,7 @@ function proxy_init() { if (!$direct_cache AND ($cachefile == "")) { $r = qu("SELECT * FROM `photo` WHERE `resource-id` = '%s' LIMIT 1", $urlhash); - if (count($r)) { + if (dbm::is_result($r)) { $img_str = $r[0]['data']; $mime = $r[0]["desc"]; if ($mime == "") $mime = "image/jpeg"; @@ -144,7 +144,7 @@ function proxy_init() { } else $r = array(); - if (!count($r)) { + if (!dbm::is_result($r)) { // It shouldn't happen but it does - spaces in URL $_REQUEST['url'] = str_replace(" ", "+", $_REQUEST['url']); $redirects = 0; diff --git a/mod/pubsub.php b/mod/pubsub.php index 6053ee2fb..ddda7ec22 100644 --- a/mod/pubsub.php +++ b/mod/pubsub.php @@ -47,7 +47,7 @@ function pubsub_init(&$a) { $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1", dbesc($nick) ); - if(! count($r)) { + if(! dbm::is_result($r)) { logger('pubsub: local account not found: ' . $nick); hub_return(false, ''); } @@ -62,7 +62,7 @@ function pubsub_init(&$a) { intval($contact_id), intval($owner['uid']) ); - if(! count($r)) { + if(! dbm::is_result($r)) { logger('pubsub: contact '.$contact_id.' not found.'); hub_return(false, ''); } @@ -117,7 +117,7 @@ function pubsub_post(&$a) { $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1", dbesc($nick) ); - if(! count($r)) + if(! dbm::is_result($r)) hub_post_return(); $importer = $r[0]; @@ -131,7 +131,7 @@ function pubsub_post(&$a) { dbesc(NETWORK_FEED) ); - if(! count($r)) { + if(! dbm::is_result($r)) { logger('pubsub: no contact record for "'.$nick.' ('.$contact_id.')" - ignored. '.$xml); hub_post_return(); } diff --git a/mod/pubsubhubbub.php b/mod/pubsubhubbub.php index 5d7621cc7..472cf1d19 100644 --- a/mod/pubsubhubbub.php +++ b/mod/pubsubhubbub.php @@ -55,7 +55,7 @@ function pubsubhubbub_init(&$a) { " AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1", dbesc($nick)); - if(!count($r)) { + if(!dbm::is_result($r)) { logger('pubsubhubbub: local account not found: ' . $nick); http_status_exit(404); } @@ -73,7 +73,7 @@ function pubsubhubbub_init(&$a) { $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND NOT `blocked`". " AND NOT `pending` AND `self` LIMIT 1", intval($owner['uid'])); - if(!count($r)) { + if(!dbm::is_result($r)) { logger('pubsubhubbub: contact not found.'); http_status_exit(404); } @@ -132,7 +132,7 @@ function pubsubhubbub_init(&$a) { // if we are just updating an old subscription, keep the // old values for push and last_update - if (count($r)) { + if (dbm::is_result($r)) { $last_update = $r[0]['last_update']; $push_flag = $r[0]['push']; } diff --git a/mod/qsearch.php b/mod/qsearch.php index c35e253b6..49868f485 100644 --- a/mod/qsearch.php +++ b/mod/qsearch.php @@ -23,7 +23,7 @@ function qsearch_init(&$a) { intval($limit) ); - if(count($r)) { + if(dbm::is_result($r)) { foreach($r as $rr) $results[] = array( 0, (int) $rr['id'], $rr['name'], '', ''); @@ -38,7 +38,7 @@ function qsearch_init(&$a) { ); - if(count($r)) { + if(dbm::is_result($r)) { foreach($r as $rr) $results[] = array( (int) $rr['id'], 0, $rr['name'],$rr['url'],$rr['photo']); diff --git a/mod/receive.php b/mod/receive.php index 4991ac47e..dd4e61ae4 100644 --- a/mod/receive.php +++ b/mod/receive.php @@ -34,7 +34,7 @@ function receive_post(&$a) { $r = q("SELECT * FROM `user` WHERE `guid` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1", dbesc($guid) ); - if(! count($r)) + if(! dbm::is_result($r)) http_status_exit(500); $importer = $r[0]; diff --git a/mod/redir.php b/mod/redir.php index 632c39578..5dc5ad372 100644 --- a/mod/redir.php +++ b/mod/redir.php @@ -18,7 +18,7 @@ function redir_init(&$a) { intval(local_user()) ); - if((! count($r)) || ($r[0]['network'] !== NETWORK_DFRN)) + if((! dbm::is_result($r)) || ($r[0]['network'] !== NETWORK_DFRN)) goaway(z_root()); $cid = $r[0]['id']; @@ -31,7 +31,7 @@ function redir_init(&$a) { intval(local_user()) ); - if((! count($r)) || ($r[0]['network'] !== NETWORK_DFRN)) + if((! dbm::is_result($r)) || ($r[0]['network'] !== NETWORK_DFRN)) goaway(z_root()); } diff --git a/mod/regmod.php b/mod/regmod.php index bbe733003..f37953ac5 100644 --- a/mod/regmod.php +++ b/mod/regmod.php @@ -34,7 +34,7 @@ function user_allow($hash) { $r = q("SELECT * FROM `profile` WHERE `uid` = %d AND `is-default` = 1", intval($user[0]['uid']) ); - if(count($r) && $r[0]['net-publish']) { + if(dbm::is_result($r) && $r[0]['net-publish']) { $url = $a->get_baseurl() . '/profile/' . $user[0]['nickname']; if($url && strlen(get_config('system','directory'))) proc_run(PRIORITY_LOW, "include/directory.php", $url); diff --git a/mod/salmon.php b/mod/salmon.php index 37230a557..e3f57da62 100644 --- a/mod/salmon.php +++ b/mod/salmon.php @@ -31,7 +31,7 @@ function salmon_post(&$a) { $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1", dbesc($nick) ); - if(! count($r)) + if(! dbm::is_result($r)) http_status_exit(500); $importer = $r[0]; @@ -150,7 +150,7 @@ function salmon_post(&$a) { dbesc(normalise_link($author_link)), intval($importer['uid']) ); - if(! count($r)) { + if(! dbm::is_result($r)) { logger('mod-salmon: Author unknown to us.'); if(get_pconfig($importer['uid'],'system','ostatus_autofriend')) { $result = new_contact($importer['uid'],$author_link); @@ -169,8 +169,8 @@ function salmon_post(&$a) { // Have we ignored the person? // If so we can not accept this post. - //if((count($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == CONTACT_IS_FOLLOWER) || ($r[0]['blocked']))) { - if(count($r) && $r[0]['blocked']) { + //if((dbm::is_result($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == CONTACT_IS_FOLLOWER) || ($r[0]['blocked']))) { + if(dbm::is_result($r) && $r[0]['blocked']) { logger('mod-salmon: Ignoring this author.'); http_status_exit(202); // NOTREACHED @@ -179,7 +179,7 @@ function salmon_post(&$a) { // Placeholder for hub discovery. $hub = ''; - $contact_rec = ((count($r)) ? $r[0] : null); + $contact_rec = ((dbm::is_result($r)) ? $r[0] : null); ostatus::import($data,$importer,$contact_rec, $hub); diff --git a/mod/search.php b/mod/search.php index a83725999..91c2ff314 100644 --- a/mod/search.php +++ b/mod/search.php @@ -15,7 +15,7 @@ function search_saved_searches() { intval(local_user()) ); - if(count($r)) { + if(dbm::is_result($r)) { $saved = array(); foreach($r as $rr) { $saved[] = array( @@ -53,7 +53,7 @@ function search_init(&$a) { intval(local_user()), dbesc($search) ); - if(! count($r)) { + if(! dbm::is_result($r)) { q("INSERT INTO `search` (`uid`,`term`) VALUES ( %d, '%s')", intval(local_user()), dbesc($search) @@ -220,7 +220,7 @@ function search_content(&$a) { intval($a->pager['start']), intval($a->pager['itemspage'])); } - if(! count($r)) { + if(! dbm::is_result($r)) { info( t('No results.') . EOL); return $o; } diff --git a/mod/settings.php b/mod/settings.php index 663acd69f..28690f15b 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -225,7 +225,7 @@ function settings_post(&$a) { $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1", intval(local_user()) ); - if(! count($r)) { + if(! dbm::is_result($r)) { q("INSERT INTO `mailacct` (`uid`) VALUES (%d)", intval(local_user()) ); @@ -255,7 +255,7 @@ function settings_post(&$a) { $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1", intval(local_user()) ); - if(count($r)) { + if(dbm::is_result($r)) { $eacct = $r[0]; require_once('include/email.php'); $mb = construct_mailbox_name($eacct); @@ -691,7 +691,7 @@ function settings_content(&$a) { dbesc($a->argv[3]), local_user()); - if (!count($r)){ + if (!dbm::is_result($r)){ notice(t("You can't edit this application.")); return; } @@ -752,7 +752,7 @@ function settings_content(&$a) { $settings_addons = ""; $r = q("SELECT * FROM `hook` WHERE `hook` = 'plugin_settings' "); - if(! count($r)) + if(! dbm::is_result($r)) $settings_addons = t('No Plugin settings configured'); call_hooks('plugin_settings', $settings_addons); @@ -859,15 +859,15 @@ function settings_content(&$a) { $r = null; } - $mail_server = ((count($r)) ? $r[0]['server'] : ''); - $mail_port = ((count($r) && intval($r[0]['port'])) ? intval($r[0]['port']) : ''); - $mail_ssl = ((count($r)) ? $r[0]['ssltype'] : ''); - $mail_user = ((count($r)) ? $r[0]['user'] : ''); - $mail_replyto = ((count($r)) ? $r[0]['reply_to'] : ''); - $mail_pubmail = ((count($r)) ? $r[0]['pubmail'] : 0); - $mail_action = ((count($r)) ? $r[0]['action'] : 0); - $mail_movetofolder = ((count($r)) ? $r[0]['movetofolder'] : ''); - $mail_chk = ((count($r)) ? $r[0]['last_check'] : '0000-00-00 00:00:00'); + $mail_server = ((dbm::is_result($r)) ? $r[0]['server'] : ''); + $mail_port = ((dbm::is_result($r) && intval($r[0]['port'])) ? intval($r[0]['port']) : ''); + $mail_ssl = ((dbm::is_result($r)) ? $r[0]['ssltype'] : ''); + $mail_user = ((dbm::is_result($r)) ? $r[0]['user'] : ''); + $mail_replyto = ((dbm::is_result($r)) ? $r[0]['reply_to'] : ''); + $mail_pubmail = ((dbm::is_result($r)) ? $r[0]['pubmail'] : 0); + $mail_action = ((dbm::is_result($r)) ? $r[0]['action'] : 0); + $mail_movetofolder = ((dbm::is_result($r)) ? $r[0]['movetofolder'] : ''); + $mail_chk = ((dbm::is_result($r)) ? $r[0]['last_check'] : '0000-00-00 00:00:00'); $tpl = get_markup_template("settings_connectors.tpl"); diff --git a/mod/share.php b/mod/share.php index 085da4e30..0a34c6fc5 100644 --- a/mod/share.php +++ b/mod/share.php @@ -12,7 +12,7 @@ function share_init(&$a) { intval($post_id), intval(local_user()) ); - if(! count($r) || ($r[0]['private'] == 1)) + if(! dbm::is_result($r) || ($r[0]['private'] == 1)) killme(); if (!intval(get_config('system','old_share'))) { diff --git a/mod/starred.php b/mod/starred.php index 2a89ac768..27f924e44 100644 --- a/mod/starred.php +++ b/mod/starred.php @@ -18,7 +18,7 @@ function starred_init(&$a) { intval(local_user()), intval($message_id) ); - if(! count($r)) + if(! dbm::is_result($r)) killme(); if(! intval($r[0]['starred'])) diff --git a/mod/subthread.php b/mod/subthread.php index 33cf7489c..4d044f45f 100644 --- a/mod/subthread.php +++ b/mod/subthread.php @@ -20,7 +20,7 @@ function subthread_content(&$a) { dbesc($item_id) ); - if(! $item_id || (! count($r))) { + if(! $item_id || (! dbm::is_result($r))) { logger('subthread: no item ' . $item_id); return; } @@ -41,7 +41,7 @@ function subthread_content(&$a) { intval($item['contact-id']), intval($item['uid']) ); - if(! count($r)) + if(! dbm::is_result($r)) return; if(! $r[0]['self']) $remote_owner = $r[0]; @@ -53,7 +53,7 @@ function subthread_content(&$a) { WHERE `contact`.`self` = 1 AND `contact`.`uid` = %d LIMIT 1", intval($owner_uid) ); - if(count($r)) + if(dbm::is_result($r)) $owner = $r[0]; if(! $owner) { @@ -75,7 +75,7 @@ function subthread_content(&$a) { intval($_SESSION['visitor_id']), intval($owner_uid) ); - if(count($r)) + if(dbm::is_result($r)) $contact = $r[0]; } if(! $contact) { diff --git a/mod/suggest.php b/mod/suggest.php index 4399450ec..8f4315a84 100644 --- a/mod/suggest.php +++ b/mod/suggest.php @@ -67,7 +67,7 @@ function suggest_content(&$a) { $r = suggestion_query(local_user()); - if(! count($r)) { + if(! dbm::is_result($r)) { $o .= t('No suggestions available. If this is a new site, please try again in 24 hours.'); return $o; } diff --git a/mod/tagger.php b/mod/tagger.php index e0ef1ceb0..3ba5e623c 100644 --- a/mod/tagger.php +++ b/mod/tagger.php @@ -27,7 +27,7 @@ function tagger_content(&$a) { dbesc($item_id) ); - if(! $item_id || (! count($r))) { + if(! $item_id || (! dbm::is_result($r))) { logger('tagger: no item ' . $item_id); return; } @@ -39,7 +39,7 @@ function tagger_content(&$a) { $r = q("select `nickname`,`blocktags` from user where uid = %d limit 1", intval($owner_uid) ); - if(count($r)) { + if(dbm::is_result($r)) { $owner_nick = $r[0]['nickname']; $blocktags = $r[0]['blocktags']; } @@ -50,7 +50,7 @@ function tagger_content(&$a) { $r = q("select * from contact where self = 1 and uid = %d limit 1", intval(local_user()) ); - if(count($r)) + if(dbm::is_result($r)) $contact = $r[0]; else { logger('tagger: no contact_id'); @@ -178,7 +178,7 @@ EOT; $r = q("select `tag`,`id`,`uid` from item where `origin` = 1 AND `uri` = '%s' LIMIT 1", dbesc($item['uri']) ); - if(count($r)) { + if(dbm::is_result($r)) { $x = q("SELECT `blocktags` FROM `user` WHERE `uid` = %d limit 1", intval($r[0]['uid']) ); diff --git a/mod/tagrm.php b/mod/tagrm.php index 176986bc3..57024b3c3 100644 --- a/mod/tagrm.php +++ b/mod/tagrm.php @@ -19,7 +19,7 @@ function tagrm_post(&$a) { intval(local_user()) ); - if(! count($r)) + if(! dbm::is_result($r)) goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']); $arr = explode(',', $r[0]['tag']); @@ -68,7 +68,7 @@ function tagrm_content(&$a) { intval(local_user()) ); - if(! count($r)) + if(! dbm::is_result($r)) goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']); $arr = explode(',', $r[0]['tag']); diff --git a/mod/uexport.php b/mod/uexport.php index 3114add7e..0aa9f68b2 100644 --- a/mod/uexport.php +++ b/mod/uexport.php @@ -44,7 +44,7 @@ function uexport_content(&$a){ function _uexport_multirow($query) { $result = array(); $r = q($query); -// if(count($r)) { +// if(dbm::is_result($r)) { if ($r){ foreach($r as $rr){ $p = array(); @@ -130,7 +130,7 @@ function uexport_all(&$a) { $r = q("SELECT count(*) as `total` FROM `item` WHERE `uid` = %d ", intval(local_user()) ); - if(count($r)) + if(dbm::is_result($r)) $total = $r[0]['total']; // chunk the output to avoid exhausting memory @@ -142,7 +142,7 @@ function uexport_all(&$a) { intval($x), intval(500) ); - /*if(count($r)) { + /*if(dbm::is_result($r)) { foreach($r as $rr) foreach($rr as $k => $v) $item[][$k] = $v; diff --git a/mod/videos.php b/mod/videos.php index 1bb59bc54..6550428f9 100644 --- a/mod/videos.php +++ b/mod/videos.php @@ -140,7 +140,7 @@ function videos_post(&$a) { dbesc($video_id) ); - if(count($r)) { + if(dbm::is_result($r)) { q("DELETE FROM `attach` WHERE `uid` = %d AND `id` = '%s'", intval(local_user()), dbesc($video_id) @@ -259,7 +259,7 @@ function videos_content(&$a) { intval($contact_id), intval($owner_uid) ); - if(count($r)) { + if(dbm::is_result($r)) { $can_post = true; $contact = $r[0]; $remote_contact = true; @@ -287,7 +287,7 @@ function videos_content(&$a) { intval($contact_id), intval($owner_uid) ); - if(count($r)) { + if(dbm::is_result($r)) { $contact = $r[0]; $remote_contact = true; } @@ -347,7 +347,7 @@ function videos_content(&$a) { $sql_extra GROUP BY hash", intval($a->data['user']['uid']) ); - if(count($r)) { + if(dbm::is_result($r)) { $a->set_pager_total(count($r)); $a->set_pager_itemspage(20); } @@ -363,7 +363,7 @@ function videos_content(&$a) { $videos = array(); - if(count($r)) { + if(dbm::is_result($r)) { foreach($r as $rr) { if($a->theme['template_engine'] === 'internal') { $alt_e = template_escape($rr['filename']); diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php index 6be1f16de..01a90d3c4 100644 --- a/mod/viewcontacts.php +++ b/mod/viewcontacts.php @@ -16,7 +16,7 @@ function viewcontacts_init(&$a) { dbesc($nick) ); - if(! count($r)) + if(! dbm::is_result($r)) return; $a->data['user'] = $r[0]; @@ -54,7 +54,7 @@ function viewcontacts_content(&$a) { dbesc(NETWORK_DIASPORA), dbesc(NETWORK_OSTATUS) ); - if(count($r)) + if(dbm::is_result($r)) $a->set_pager_total($r[0]['total']); $r = q("SELECT * FROM `contact` @@ -68,7 +68,7 @@ function viewcontacts_content(&$a) { intval($a->pager['start']), intval($a->pager['itemspage']) ); - if(!count($r)) { + if(!dbm::is_result($r)) { info(t('No contacts.').EOL); return $o; } diff --git a/mod/viewsrc.php b/mod/viewsrc.php index 3fa4eaed5..1751b856f 100644 --- a/mod/viewsrc.php +++ b/mod/viewsrc.php @@ -24,7 +24,7 @@ function viewsrc_content(&$a) { dbesc($item_id) ); - if(count($r)) + if(dbm::is_result($r)) if(is_ajax()) { echo str_replace("\n",'
',$r[0]['body']); killme(); diff --git a/mod/wall_attach.php b/mod/wall_attach.php index 15e3d3f75..152efb5f1 100644 --- a/mod/wall_attach.php +++ b/mod/wall_attach.php @@ -12,7 +12,7 @@ function wall_attach_post(&$a) { $r = q("SELECT `user`.*, `contact`.`id` FROM `user` LEFT JOIN `contact` on `user`.`uid` = `contact`.`uid` WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1", dbesc($nick) ); - if(! count($r)){ + if(! dbm::is_result($r)){ if ($r_json) { echo json_encode(array('error'=>t('Invalid request.'))); killme(); @@ -55,7 +55,7 @@ function wall_attach_post(&$a) { intval($contact_id), intval($page_owner_uid) ); - if(count($r)) { + if(dbm::is_result($r)) { $can_post = true; $visitor = $contact_id; } @@ -168,7 +168,7 @@ function wall_attach_post(&$a) { dbesc($hash) ); - if(! count($r)) { + if(! dbm::is_result($r)) { $msg = t('File upload failed.'); if ($r_json) { echo json_encode(array('error'=>$msg)); diff --git a/mod/wall_upload.php b/mod/wall_upload.php index f5996d76f..45b45ae62 100644 --- a/mod/wall_upload.php +++ b/mod/wall_upload.php @@ -15,7 +15,7 @@ function wall_upload_post(&$a, $desktopmode = true) { dbesc($nick) ); - if(! count($r)){ + if(! dbm::is_result($r)){ if ($r_json) { echo json_encode(array('error'=>t('Invalid request.'))); killme(); @@ -63,7 +63,7 @@ function wall_upload_post(&$a, $desktopmode = true) { intval($contact_id), intval($page_owner_uid) ); - if(count($r)) { + if(dbm::is_result($r)) { $can_post = true; $visitor = $contact_id; } diff --git a/mod/wallmessage.php b/mod/wallmessage.php index 8642624a4..03a0b7a16 100644 --- a/mod/wallmessage.php +++ b/mod/wallmessage.php @@ -22,7 +22,7 @@ function wallmessage_post(&$a) { dbesc($recipient) ); - if(! count($r)) { + if(! dbm::is_result($r)) { logger('wallmessage: no recipient'); return; } @@ -91,7 +91,7 @@ function wallmessage_content(&$a) { dbesc($recipient) ); - if(! count($r)) { + if(! dbm::is_result($r)) { notice( t('No recipient.') . EOL); logger('wallmessage: no recipient'); return; diff --git a/mod/xrd.php b/mod/xrd.php index 094211360..1250b0812 100644 --- a/mod/xrd.php +++ b/mod/xrd.php @@ -21,7 +21,7 @@ function xrd_init(&$a) { $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' LIMIT 1", dbesc($name) ); - if(! count($r)) + if(! dbm::is_result($r)) killme(); $salmon_key = salmon_key($r[0]['spubkey']); diff --git a/object/Item.php b/object/Item.php index 9f01ac59b..45d2dba3e 100644 --- a/object/Item.php +++ b/object/Item.php @@ -235,7 +235,7 @@ class Item extends BaseObject { intval($item['uid']), intval($item['id']) ); - if (count($r)) { + if (dbm::is_result($r)) { $ignore = array( 'do' => t("ignore thread"), 'undo' => t("unignore thread"), diff --git a/update.php b/update.php index 76007ad3a..1ff2df1bf 100644 --- a/update.php +++ b/update.php @@ -85,7 +85,7 @@ function update_1006() { // create 's' keys for everybody that does not have one $r = q("SELECT * FROM `user` WHERE `spubkey` = '' "); - if(count($r)) { + if(dbm::is_result($r)) { foreach($r as $rr) { $sres=openssl_pkey_new(array('encrypt_key' => false )); $sprvkey = ''; @@ -122,7 +122,7 @@ function update_1010() { function update_1011() { q("ALTER TABLE `contact` ADD `nick` CHAR( 255 ) NOT NULL AFTER `name` "); $r = q("SELECT * FROM `contact` WHERE 1"); - if(count($r)) { + if(dbm::is_result($r)) { foreach($r as $rr) { q("UPDATE `contact` SET `nick` = '%s' WHERE `id` = %d", dbesc(basename($rr['url'])), @@ -145,7 +145,7 @@ function update_1014() { require_once('include/Photo.php'); q("ALTER TABLE `contact` ADD `micro` TEXT NOT NULL AFTER `thumb` "); $r = q("SELECT * FROM `photo` WHERE `scale` = 4"); - if(count($r)) { + if(dbm::is_result($r)) { foreach($r as $rr) { $ph = new Photo($rr['data']); if($ph->is_valid()) { @@ -155,7 +155,7 @@ function update_1014() { } } $r = q("SELECT * FROM `contact` WHERE 1"); - if(count($r)) { + if(dbm::is_result($r)) { foreach($r as $rr) { if(stristr($rr['thumb'],'avatar')) q("UPDATE `contact` SET `micro` = '%s' WHERE `id` = %d", @@ -308,7 +308,7 @@ function update_1030() { function update_1031() { // Repair any bad links that slipped into the item table $r = q("SELECT `id`, `object` FROM `item` WHERE `object` != '' "); - if($r && count($r)) { + if($r && dbm::is_result($r)) { foreach($r as $rr) { if(strstr($rr['object'],'type="http')) { q("UPDATE `item` SET `object` = '%s' WHERE `id` = %d", @@ -356,7 +356,7 @@ function update_1035() { function update_1036() { $r = dbq("SELECT * FROM `contact` WHERE `network` = 'dfrn' && `photo` LIKE '%include/photo%' "); - if(count($r)) { + if(dbm::is_result($r)) { foreach($r as $rr) { q("UPDATE `contact` SET `photo` = '%s', `thumb` = '%s', `micro` = '%s' WHERE `id` = %d", dbesc(str_replace('include/photo','photo',$rr['photo'])), @@ -594,7 +594,7 @@ function update_1073() { function update_1074() { q("ALTER TABLE `user` ADD `hidewall` TINYINT( 1) NOT NULL DEFAULT '0' AFTER `blockwall` "); $r = q("SELECT `uid` FROM `profile` WHERE `is-default` = 1 AND `hidewall` = 1"); - if(count($r)) { + if(dbm::is_result($r)) { foreach($r as $rr) q("UPDATE `user` SET `hidewall` = 1 WHERE `uid` = %d", intval($rr['uid']) @@ -606,7 +606,7 @@ function update_1074() { function update_1075() { q("ALTER TABLE `user` ADD `guid` CHAR( 16 ) NOT NULL AFTER `uid` "); $r = q("SELECT `uid` FROM `user` WHERE 1"); - if(count($r)) { + if(dbm::is_result($r)) { foreach($r as $rr) { $found = true; do { @@ -685,10 +685,10 @@ function update_1082() { ADD INDEX ( `guid` ) "); // make certain the following code is only executed once $r = q("select `id` from `photo` where `guid` != '' limit 1"); - if($r && count($r)) + if(dbm::is_result($r)) return; $r = q("SELECT distinct(`resource-id`) FROM `photo` WHERE 1 group by `id`"); - if(count($r)) { + if(dbm::is_result($r)) { foreach($r as $rr) { $guid = get_guid(); q("update `photo` set `guid` = '%s' where `resource-id` = '%s'", @@ -731,7 +731,7 @@ function update_1087() { q("ALTER TABLE `item` ADD `commented` datetime NOT NULL DEFAULT '0000-00-00 00:00:00' AFTER `edited` "); $r = q("SELECT `id` FROM `item` WHERE `parent` = `id` "); - if(count($r)) { + if(dbm::is_result($r)) { foreach($r as $rr) { $x = q("SELECT max(`created`) AS `cdate` FROM `item` WHERE `parent` = %d LIMIT 1", intval($rr['id']) @@ -854,7 +854,7 @@ function update_1100() { require_once('include/text.php'); $r = q("select id, url from contact where url != '' and nurl = '' "); - if(count($r)) { + if(dbm::is_result($r)) { foreach($r as $rr) { q("update contact set nurl = '%s' where id = %d", dbesc(normalise_link($rr['url'])), @@ -1030,7 +1030,7 @@ function update_1120() { // might be missing on new installs. We'll check. $r = q("describe item"); - if($r && count($r)) { + if(dbm::is_result($r)) { foreach($r as $rr) if($rr['Field'] == 'spam') return; @@ -1168,7 +1168,7 @@ function update_1136() { // order in reverse so that we save the newest entry $r = q("select * from config where 1 order by id desc"); - if(count($r)) { + if(dbm::is_result($r)) { foreach($r as $rr) { $found = false; foreach($arr as $x) { @@ -1187,7 +1187,7 @@ function update_1136() { $arr = array(); $r = q("select * from pconfig where 1 order by id desc"); - if(count($r)) { + if(dbm::is_result($r)) { foreach($r as $rr) { $found = false; foreach($arr as $x) { @@ -1692,7 +1692,7 @@ function update_1190() { ); // convert old forumlist addon entries in new config entries - if (count($r)) { + if (dbm::is_result($r)) { foreach ($r as $rr) { $uid = $rr['uid']; $family = $rr['cat']; diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php index 085d4d941..3fb889cdc 100644 --- a/view/theme/frio/theme.php +++ b/view/theme/frio/theme.php @@ -221,7 +221,7 @@ function frio_remote_nav($a,&$nav) { // user info $r = q("SELECT `micro` FROM `contact` WHERE `uid` = %d AND `self` = 1", intval($a->user['uid'])); - $r[0]['photo'] = (count($r) ? $a->remove_baseurl($r[0]['micro']) : "images/person-48.jpg"); + $r[0]['photo'] = (dbm::is_result($r) ? $a->remove_baseurl($r[0]['micro']) : "images/person-48.jpg"); $r[0]['name'] = $a->user['username']; } elseif(!local_user() && remote_user()) { @@ -235,9 +235,9 @@ function frio_remote_nav($a,&$nav) { $nav['remote'] = t("Visitor"); } - if(count($r)){ + if(dbm::is_result($r)){ $nav['userinfo'] = array( - 'icon' => (count($r) ? $r[0]['photo'] : "images/person-48.jpg"), + 'icon' => (dbm::is_result($r) ? $r[0]['photo'] : "images/person-48.jpg"), 'name' => $r[0]['name'], ); } @@ -299,7 +299,7 @@ function frio_acl_lookup($a, &$results) { $r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `pending` = 0 $sql_extra $sql_extra2 ", intval($_SESSION['uid'])); - if(count($r)) { + if(dbm::is_result($r)) { $total = $r[0]["total"]; } @@ -311,7 +311,7 @@ function frio_acl_lookup($a, &$results) { $contacts = array(); - if(count($r)) { + if(dbm::is_result($r)) { foreach($r as $rr) { $contacts[] = _contact_detail_for_template($rr); } diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php index 925ac76a1..ef118c696 100644 --- a/view/theme/vier/theme.php +++ b/view/theme/vier/theme.php @@ -147,7 +147,7 @@ function vier_community_info() { $r = suggestion_query(local_user(), 0, 9); $tpl = get_markup_template('ch_directory_item.tpl'); - if(count($r)) { + if(dbm::is_result($r)) { $aside['$comunity_profiles_title'] = t('Community Profiles'); $aside['$comunity_profiles_items'] = array(); @@ -176,7 +176,7 @@ function vier_community_info() { 0, 9); $tpl = get_markup_template('ch_directory_item.tpl'); - if(count($r)) { + if(dbm::is_result($r)) { $aside['$lastusers_title'] = t('Last users'); $aside['$lastusers_items'] = array();