]> git.mxchange.org Git - friendica.git/commitdiff
Continued rewriting:
authorRoland Haeder <roland@mxchange.org>
Sun, 1 May 2016 12:24:44 +0000 (14:24 +0200)
committerRoland Haeder <roland@mxchange.org>
Sun, 1 May 2016 12:24:44 +0000 (14:24 +0200)
- use dba::is_result() everywhere (where I found the old, bad way)
- converted some spaces -> tabs for code
- converted some CRLF -> LF as mixures of both is not good

Signed-off-by: Roland Haeder <roland@mxchange.org>
93 files changed:
include/Contact.php
include/Photo.php
include/acl_selectors.php
include/api.php
include/auth.php
include/cache.php
include/config.php
include/contact_selectors.php
include/contact_widgets.php
include/datetime.php
include/dba.php
include/delivery.php
include/dfrn.php
include/enotify.php
include/event.php
include/expire.php
include/fcontact.php
include/follow.php
include/gprobe.php
include/group.php
include/identity.php
include/items.php
include/like.php
include/lock.php
include/message.php
include/notifier.php
include/oauth.php
include/onepoll.php
include/plugin.php
include/queue_fn.php
include/security.php
include/session.php
include/socgraph.php
include/text.php
include/threads.php
include/user.php
mod/admin.php
mod/common.php
mod/community.php
mod/contactgroup.php
mod/contacts.php
mod/content.php
mod/delegate.php
mod/dfrn_confirm.php
mod/dfrn_poll.php
mod/dfrn_request.php
mod/directory.php
mod/display.php
mod/editpost.php
mod/events.php
mod/friendica.php
mod/fsuggest.php
mod/group.php
mod/item.php
mod/lockview.php
mod/manage.php
mod/message.php
mod/mood.php
mod/msearch.php
mod/network.php
mod/nogroup.php
mod/noscrape.php
mod/notes.php
mod/notice.php
mod/notifications.php
mod/photo.php
mod/photos.php
mod/poco.php
mod/poke.php
mod/profile.php
mod/profile_photo.php
mod/profiles.php
mod/profperm.php
mod/proxy.php
mod/pubsubhubbub.php
mod/qsearch.php
mod/regmod.php
mod/salmon.php
mod/search.php
mod/settings.php
mod/subthread.php
mod/tagger.php
mod/uexport.php
mod/videos.php
mod/viewcontacts.php
mod/viewsrc.php
mod/wall_attach.php
mod/wall_upload.php
object/Item.php
tests/get_tags_test.php
update.php
view/theme/diabook/theme.php
view/theme/vier/theme.php

index 79a14ab581c84dd3de3ab61d9e3efe8174bf27c1..a5930e1cfc1ce5ad294d95f2d96c71de79b238ca 100644 (file)
@@ -368,7 +368,7 @@ function random_profile() {
                        ORDER BY rand() LIMIT 1",
                dbesc(NETWORK_DFRN));
 
-       if(count($r))
+       if(dba::is_result($r))
                return dirname($r[0]['url']);
        return '';
 }
index 91fce55a86f868c4959291618fa4b8af77c4bba6..23148f69cc9ed2cace671df92a9db9bdd5916673 100644 (file)
@@ -589,7 +589,7 @@ class Photo {
        $r = q("select `guid` from photo where `resource-id` = '%s' and `guid` != '' limit 1",
            dbesc($rid)
        );
-       if(count($r))
+       if(dba::is_result($r))
            $guid = $r[0]['guid'];
        else
            $guid = get_guid();
index fc3df52327103d6fa56ce18936af685eceb6b4a9..ea0a7aeb0888488bd7fea6d11ed19d56771624f0 100644 (file)
@@ -33,7 +33,7 @@ function group_select($selname,$selclass,$preselected = false,$size = 4) {
 
        call_hooks($a->module . '_pre_' . $selname, $arr);
 
-       if(count($r)) {
+       if(dba::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(dba::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(dba::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(dba::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(dba::is_result($r)) {
                foreach($r as $g){
                        $contacts[] = array(
                                "type"  => "c",
index 488e858445648baedf6eb8a0f2a7aa99b936451a..3342655ac9be669aee154c76527553b63e02120a 100644 (file)
                                dbesc(trim($user)),
                                dbesc($encrypted)
                        );
-                       if(count($r))
+                       if(dba::is_result($r))
                                $record = $r[0];
                }
 
                        if (!count($r))
                                $r = q("SELECT `id` FROM `gcontact` WHERE `nick`='%s'", dbesc($_GET["q"]));
 
-                       if (count($r)) {
+                       if (dba::is_result($r)) {
                                foreach ($r AS $user) {
                                        $user_info = api_get_user($a, $user["id"]);
                                        //echo print_r($user_info, true)."\n";
index d1917b8b30903138f18a8cd17203588c8c8f1361..f3193ee9048ebf6d36000d1882d1552a78596467 100644 (file)
@@ -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 (dba::is_result($r)) {
                        $a->contact = $r[0];
                }
        }
@@ -169,7 +169,7 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params'
                                dbesc(trim($_POST['username'])),
                                dbesc($encrypted)
                        );
-                       if (count($r))
+                       if (dba::is_result($r))
                                $record = $r[0];
                }
 
index d0b0dfafda9c4fc011102bf6a2fa0cd3cbc00d1b..7640f347b195b852f32a9c1f1aa037c54bc7ea12 100644 (file)
@@ -10,7 +10,7 @@
                                dbesc($key)
                        );
 
-                       if (count($r))
+                       if (dba::is_result($r))
                                return $r[0]['v'];
 
                        return null;
@@ -38,7 +38,7 @@
  *                     $r = q("SELECT * FROM `cache` WHERE `k`='%s' limit 1",
  *                             dbesc($key)
  *                     );
- *                     if(count($r)) {
+ *                     if(dba::is_result($r)) {
  *                             q("UPDATE `cache` SET `v` = '%s', `updated = '%s' WHERE `k` = '%s'",
  *                                     dbesc($value),
  *                                     dbesc(datetime_convert()),
index b27274e9a946671f321062bf0d78827b6f8ac784..513578ef99e1e1b8e890f12dbc15257a771de60d 100644 (file)
@@ -20,7 +20,7 @@ function load_config($family) {
        global $a;
 
        $r = q("SELECT `v`, `k` FROM `config` WHERE `cat` = '%s'", dbesc($family));
-       if(count($r)) {
+       if(dba::is_result($r)) {
                foreach($r as $rr) {
                        $k = $rr['k'];
                        if ($family === 'config') {
@@ -174,7 +174,7 @@ function load_pconfig($uid,$family) {
                dbesc($family),
                intval($uid)
        );
-       if(count($r)) {
+       if(dba::is_result($r)) {
                foreach($r as $rr) {
                        $k = $rr['k'];
                        $a->config[$uid][$family][$k] = $rr['v'];
index 3bf68f764e5597abdfd72fac05c91d1e371fd178..77d38590b5e2a1b246a1c7442938e9f87736b2bc 100644 (file)
@@ -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(dba::is_result($r)) {
                foreach($r as $rr) {
                        $selected = (($rr['id'] == $current) ? " selected=\"selected\" " : "");
                        $o .= "<option value=\"{$rr['id']}\" $selected >{$rr['profile-name']}</option>\r\n";
index bbbd941b5609df3ae7321bc708599e17c6de4ccc..8fabc6ff6959e956d5792b8a8c9bcb31a6152fe8 100644 (file)
@@ -93,7 +93,7 @@ function networks_widget($baseurl,$selected = '') {
        );
 
        $nets = array();
-       if(count($r)) {
+       if(dba::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(dba::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(dba::is_result($r))
                                        $zcid = $r[0]['id'];
                        }
                }
index 89305a2406f1238375944c436ec2e0f21522f126..da9e84d90f2146d524e6c707d55a85e2d3821386 100644 (file)
@@ -544,7 +544,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(dba::is_result($r)) {
                foreach($r as $rr) {
 
                        logger('update_contact_birthday: ' . $rr['bd']);
index 3a16c187c7ec81b47085d894d169c047e18b7cd6..f11df6f17ed634a0a3d159f83b1eb245af1c51a2 100644 (file)
@@ -236,7 +236,7 @@ class dba {
         * @param       $array  mixed   A filled array with at least one entry
         * @return      Whether $array is a filled array
         */
-       public function is_result ($array) {
+       public static function is_result ($array) {
                return (is_array($array) && count($array) > 0);
        }
 
index fe337743820dcb85940262fefdb4abe099c4d530..7375beb232845de4d2e4ae67c6ab9d90a355898e 100644 (file)
@@ -254,7 +254,7 @@ function delivery_run(&$argv, &$argc){
                        intval($contact_id)
                );
 
-               if (count($r))
+               if (dba::is_result($r))
                        $contact = $r[0];
 
                if ($contact['self'])
@@ -416,7 +416,7 @@ function delivery_run(&$argv, &$argc){
                                                        intval($argv[2]),
                                                        intval($uid)
                                                );
-                                               if (count($r))
+                                               if (dba::is_result($r))
                                                        $it = $r[0];
                                        }
                                        if (!$it)
index f6f43660296c39a555cfee7a7150fa37ea013eda..4d116153bfc6a1f07e91696f32597599e13fcb8b 100644 (file)
@@ -1430,7 +1430,7 @@ class dfrn {
                        dbesc(normalise_link($suggest["url"])),
                        intval($suggest["uid"])
                );
-               if(count($r))
+               if(dba::is_result($r))
                        return false;
 
                // Do we already have an fcontact record for this person?
@@ -1441,7 +1441,7 @@ class dfrn {
                        dbesc($suggest["name"]),
                        dbesc($suggest["request"])
                );
-               if(count($r)) {
+               if(dba::is_result($r)) {
                        $fid = $r[0]["id"];
 
                        // OK, we do. Do we already have an introduction for this person ?
@@ -1449,7 +1449,7 @@ class dfrn {
                                intval($suggest["uid"]),
                                intval($fid)
                        );
-                       if(count($r))
+                       if(dba::is_result($r))
                                return false;
                }
                if(!$fid)
@@ -1464,7 +1464,7 @@ class dfrn {
                        dbesc($suggest["name"]),
                        dbesc($suggest["request"])
                );
-               if(count($r))
+               if(dba::is_result($r))
                        $fid = $r[0]["id"];
                else
                        // database record did not get created. Quietly give up.
@@ -2120,7 +2120,7 @@ class dfrn {
                                                dbesc($item["uri"]),
                                                intval($importer["uid"])
                                        );
-                                       if(count($r))
+                                       if(dba::is_result($r))
                                                $ev["id"] = $r[0]["id"];
 
                                        $event_id = event_store($ev);
@@ -2141,7 +2141,7 @@ class dfrn {
                }
 
                // Update content if 'updated' changes
-               if(count($r)) {
+               if(dba::is_result($r)) {
                        if (self::update_content($r[0], $item, $importer, $entrytype))
                                logger("Item ".$item["uri"]." was updated.", LOGGER_DEBUG);
                        else
@@ -2163,7 +2163,7 @@ class dfrn {
                                        intval($posted_id),
                                        intval($importer["importer_uid"])
                                );
-                               if(count($r)) {
+                               if(dba::is_result($r)) {
                                        $parent = $r[0]["parent"];
                                        $parent_uri = $r[0]["parent-uri"];
                                }
@@ -2345,7 +2345,7 @@ class dfrn {
                                                        dbesc($item["parent-uri"]),
                                                        intval($importer["uid"])
                                        );
-                                       if(count($r)) {
+                                       if(dba::is_result($r)) {
                                                q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d",
                                                        intval($r[0]["id"])
                                                );
index 54b59857c2cdb5f72872c7644cb082962a51ddbe..55fec1f3187aa9189161925c8d33f1bb62a48123 100644 (file)
@@ -401,7 +401,7 @@ function notification($params) {
                        $hash = random_string();
                        $r = q("SELECT `id` FROM `notify` WHERE `hash` = '%s' LIMIT 1",
                                dbesc($hash));
-                       if(count($r))
+                       if(dba::is_result($r))
                                $dups = true;
                } while($dups == true);
 
@@ -718,7 +718,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 (dba::is_result($r))
                                                 $send_notification = true;
                                 }
                         }
index a9f054fc2ed2bf530e9c6c0d9fbadf7570313c6d..4d5f3b8a1b2e77e9b77cc08683c0b3c9628e958b 100644 (file)
@@ -276,7 +276,7 @@ function event_store($arr) {
                                intval($arr['id']),
                                intval($arr['uid'])
                        );
-                       return((count($r)) ? $r[0]['id'] : 0);
+                       return((dba::is_result($r)) ? $r[0]['id'] : 0);
                }
 
                // The event changed. Update it.
@@ -317,7 +317,7 @@ function event_store($arr) {
                        intval($arr['id']),
                        intval($arr['uid'])
                );
-               if(count($r)) {
+               if(dba::is_result($r)) {
                        $object = '<object><type>' . xmlify(ACTIVITY_OBJ_EVENT) . '</type><title></title><id>' . xmlify($arr['uri']) . '</id>';
                        $object .= '<content>' . xmlify(format_event_bbcode($arr)) . '</content>';
                        $object .= '</object>' . "\n";
@@ -376,7 +376,7 @@ function event_store($arr) {
                        dbesc($arr['uri']),
                        intval($arr['uid'])
                );
-               if(count($r))
+               if(dba::is_result($r))
                        $event = $r[0];
 
                $item_arr = array();
@@ -418,7 +418,7 @@ function event_store($arr) {
                $r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
                        intval($arr['uid'])
                );
-               //if(count($r))
+               //if(dba::is_result($r))
                //      $plink = $a->get_baseurl() . '/display/' . $r[0]['nickname'] . '/' . $item_id;
 
 
index 873c594e8499ea93aeaa55727abeb09f34e81e28..5cc22d68304973d86b93d57aac7582dedff32639 100644 (file)
@@ -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(dba::is_result($r)) {
                foreach($r as $rr) {
                        logger('Expire: ' . $rr['username'] . ' interval: ' . $rr['expire'], LOGGER_DEBUG);
                        item_expire($rr['uid'],$rr['expire']);
index 8821a985f2dc06e77619ce6bf7719c422358b031..b268f2a03789183a1873673b7ac27cc74b52ea67 100644 (file)
@@ -10,7 +10,7 @@ function fcontact_store($url,$name,$photo) {
                dbesc($nurl)
        );
 
-       if(count($r))
+       if(dba::is_result($r))
                return $r[0]['id'];
 
        $r = q("INSERT INTO `fcontact` ( `url`, `name`, `photo` ) VALUES ( '%s', '%s', '%s' ) ",
@@ -23,7 +23,7 @@ function fcontact_store($url,$name,$photo) {
                $r = q("SELECT `id` FROM `fcontact` WHERE `url` = '%s' LIMIT 1",
                        dbesc($nurl)
                );
-               if(count($r))
+               if(dba::is_result($r))
                        return $r[0]['id'];
        }
 
index 2461bf0356b63ae9fd0ffd2d31f3dbbb89fa2fd3..d5870e05de2612d39b52407d8f314be37b1e847f 100644 (file)
@@ -178,7 +178,7 @@ function new_contact($uid,$url,$interactive = false) {
                        intval($uid), dbesc(normalise_link($url)), dbesc($ret['network'])
        );
 
-       if(count($r)) {
+       if(dba::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(dba::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(dba::is_result($r))
                        $total_network = $r[0]['total'];
 
                if(! service_class_allows($uid,'total_contacts_' . $network,$total_network)) {
@@ -295,7 +295,7 @@ function new_contact($uid,$url,$interactive = false) {
                        intval($uid)
        );
 
-       if(count($r)) {
+       if(dba::is_result($r)) {
                if(($contact['network'] == NETWORK_OSTATUS) && (strlen($contact['notify']))) {
                        require_once('include/salmon.php');
                        slapper($r[0],$contact['notify'],$slap);
index 91b9b16e3306077ba2f0c574e6c46e0ce5fe066a..70c45547eb39a149a2d969bc878702634577aae1 100644 (file)
@@ -65,7 +65,7 @@ function gprobe_run(&$argv, &$argc){
                        dbesc(normalise_link($url))
                );
        }
-       if(count($r)) {
+       if(dba::is_result($r)) {
                // Check for accessibility and do a poco discovery
                if (poco_last_updated($r[0]['url'], true) AND ($r[0]["network"] == NETWORK_DFRN))
                        poco_load(0,0,$r[0]['id'], str_replace('/profile/','/poco/',$r[0]['url']));
index 00b66ad58628f0db729447ed57987440b4a19e2f..1c1fa631a13f59437573285706ed9a28fd86c8b2 100644 (file)
@@ -44,7 +44,7 @@ function group_rmv($uid,$name) {
                        intval($uid),
                        dbesc($name)
                );
-               if(count($r))
+               if(dba::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(dba::is_result($r))
                return $r[0]['id'];
        return false;
 }
@@ -139,7 +139,7 @@ function group_add_member($uid,$name,$member,$gid = 0) {
                intval($gid),
                intval($member)
        );
-       if(count($r))
+       if(dba::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
@@ -164,7 +164,7 @@ function group_get_members($gid) {
                        intval($gid),
                        intval(local_user())
                );
-               if(count($r))
+               if(dba::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(dba::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(dba::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(dba::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(dba::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(dba::is_result($r)) {
                foreach($r as $rr)
                        $ret[] = $rr['gid'];
        }
index 888a09ee6ff88c945384a278a1a0c2b4af3f6dc8..18154a0fb89e650707f57e3a7df36d722a8950b1 100644 (file)
@@ -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(dba::is_result($r))
                                                $profile = $r[0]['profile-id'];
                                        break;
                                }
@@ -230,7 +230,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 (dba::is_result($r))
                        $connect = false;
        }
 
@@ -263,7 +263,7 @@ function profile_sidebar($profile, $block = 0) {
                        'entries' => array(),
                );
 
-               if(count($r)) {
+               if(dba::is_result($r)) {
 
                        foreach($r as $rr) {
                                $profile['menu']['entries'][] = array(
@@ -344,7 +344,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(dba::is_result($r))
                                $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
@@ -354,7 +354,7 @@ function profile_sidebar($profile, $block = 0) {
                                dbesc(NETWORK_DIASPORA),
                                dbesc(NETWORK_OSTATUS)
                        );
-                       if(count($r))
+                       if(dba::is_result($r))
                                $contacts = intval($r[0]['total']);
                }
        }
index 5c0bb047ae63cf60d1d09b44d3ff6a4ec5798a9f..cc416d8d982c06e3dfa1c94e5e87c197d4b5e94b 100644 (file)
@@ -413,7 +413,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(dba::is_result($r)) {
                $expire_interval = $r[0]['expire'];
                if ($expire_interval>0) {
                        $expire_date =  new DateTime( '- '.$expire_interval.' days', new DateTimeZone('UTC'));
@@ -535,7 +535,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
                                intval($arr['uid'])
                        );
 
-               if(count($r))
+               if(dba::is_result($r))
                        $arr['network'] = $r[0]["network"];
 
                // Fallback to friendica (why is it empty in some cases?)
@@ -583,7 +583,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(dba::is_result($r)) {
                        logger('found item with guid '.$arr['guid'].' for user '.$arr['uid'].' on network '.$arr['network'], LOGGER_DEBUG);
                        return 0;
                }
@@ -612,7 +612,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
                        intval($arr['uid'])
                );
 
-               if(count($r)) {
+               if(dba::is_result($r)) {
 
                        // is the new message multi-level threaded?
                        // even though we don't support it now, preserve the info
@@ -768,7 +768,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
                        intval($r[0]["id"])
                );
                return 0;
-       } elseif(count($r)) {
+       } elseif(dba::is_result($r)) {
 
                $current_post = $r[0]['id'];
                logger('item_store: created item ' . $current_post);
@@ -979,7 +979,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 (dba::is_result($r))
                return($r[0]["guid"]);
        else
                return("");
@@ -998,7 +998,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 (dba::is_result($r)) {
                        $id = $r[0]["id"];
                        $nick = $r[0]["nickname"];
                }
@@ -1012,7 +1012,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 (dba::is_result($r)) {
                        $id = $r[0]["id"];
                        $nick = $r[0]["nickname"];
                }
@@ -1313,7 +1313,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 (dba::is_result($r)) {
                        $datarray['contact-id'] = $r[0]["id"];
 
                        $datarray['owner-name'] = $r[0]["name"];
@@ -1390,7 +1390,7 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
                                intval($importer['uid']),
                                dbesc($url)
                );
-               if(count($r)) {
+               if(dba::is_result($r)) {
                                $contact_record = $r[0];
 
                                $photos = import_profile_photo($photo,$importer["uid"],$contact_record["id"]);
@@ -1982,7 +1982,7 @@ function drop_item($id,$interactive = true) {
                                dbesc($item['parent-uri']),
                                intval($item['uid'])
                        );
-                       if(count($r)) {
+                       if(dba::is_result($r)) {
                                q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d",
                                        intval($r[0]['id'])
                                );
@@ -2019,7 +2019,7 @@ function first_post_date($uid,$wall = false) {
                intval($uid),
                intval($wall ? 1 : 0)
        );
-       if(count($r)) {
+       if(dba::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);
        }
index 15633fc7671de1112414d54086c4f327b45855bb..3ca005f28b72bafd6714b9bf4c9cea36be8eef46 100644 (file)
@@ -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(dba::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(dba::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(dba::is_result($r)) {
                $like_item = $r[0];
 
                // Already voted, undo it
index 70cf4b787b439dbf25c5c135965cd0b3b4bfad24..35d2b02aa88b09772a08ae48d54444b18484d5ff 100644 (file)
@@ -16,7 +16,7 @@ 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((dba::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)
index 0f4b53c626964a8122b1494032a000326f94990b..fcbd53e4e76c749658cb1bf9861dae6691ce363a 100644 (file)
@@ -41,7 +41,7 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
                        dbesc($replyto),
                        dbesc($replyto)
                );
-               if(count($r))
+               if(dba::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(dba::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(dba::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(dba::is_result($r))
                $convid = $r[0]['id'];
 
        if(! $convid) {
index ffbb22e7bf10697a3baaf5d82c49011e9264a442..0e5f162843b85606217234f6c13734908ada0f3e 100644 (file)
@@ -314,7 +314,7 @@ function notifier_run(&$argv, &$argc){
                                                intval($uid),
                                                dbesc(NETWORK_DFRN)
                                        );
-                                       if(count($r))
+                                       if(dba::is_result($r))
                                                foreach($r as $rr)
                                                        $recipients_followup[] = $rr['id'];
                                }
@@ -425,7 +425,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(dba::is_result($r))
                        $contacts = $r;
 
        } else
@@ -443,7 +443,7 @@ function notifier_run(&$argv, &$argc){
                                intval($uid),
                                dbesc(NETWORK_MAIL)
                        );
-                       if(count($r)) {
+                       if(dba::is_result($r)) {
                                foreach($r as $rr)
                                        $recipients[] = $rr['id'];
                        }
@@ -471,7 +471,7 @@ function notifier_run(&$argv, &$argc){
 
        // delivery loop
 
-       if(count($r)) {
+       if(dba::is_result($r)) {
 
                foreach($r as $contact) {
                        if(!$contact['self']) {
@@ -572,7 +572,7 @@ function notifier_run(&$argv, &$argc){
 
                $r = array_merge($r2,$r1,$r0);
 
-               if(count($r)) {
+               if(dba::is_result($r)) {
                        logger('pubdeliver '.$target_item["guid"].': '.print_r($r,true), LOGGER_DEBUG);
 
                        // throw everything into the queue in case we get killed
index 6a1d72d178f413fb68a94b8f7a64c7c35cb4d045..bcfd79469b6439832b6d3c93b27fea2435705154 100644 (file)
@@ -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 (dba::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 (dba::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 (dba::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(dba::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(dba::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 (dba::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 (dba::is_result($r))
                        return $r[0];
                return null;
        }
index eb1045de142957dcab4e08d8b66ff8aa3ecb4750..19fa58ce023c29a8a0e6976b0e3863edff0fc8a1 100644 (file)
@@ -94,7 +94,7 @@ function onepoll_run(&$argv, &$argc){
                        where `cid` = %d and updated > UTC_TIMESTAMP() - INTERVAL 1 DAY",
                        intval($contact['id'])
                );
-               if (count($r))
+               if (dba::is_result($r))
                        if (!$r[0]['total'])
                                poco_load($contact['id'],$importer_uid,0,$contact['poco']);
        }
@@ -394,7 +394,7 @@ function onepoll_run(&$argv, &$argc){
                                                        dbesc($datarray['uri'])
                                                );
 
-                                               if(count($r)) {
+                                               if(dba::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
@@ -447,7 +447,7 @@ function onepoll_run(&$argv, &$argc){
                                                        $r = q("SELECT `uri` , `parent-uri` FROM `item` WHERE `uri` IN ( $qstr ) AND `uid` = %d LIMIT 1",
                                                                intval($importer_uid)
                                                        );
-                                                       if(count($r))
+                                                       if(dba::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){
                                                        $r = q("SELECT `uri` , `parent-uri` FROM `item` WHERE `title` = \"%s\" AND `uid` = %d ORDER BY `created` DESC LIMIT 1",
                                                                dbesc(protect_sprintf($datarray['title'])),
                                                                intval($importer_uid));
-                                                       if(count($r))
+                                                       if(dba::is_result($r))
                                                                $datarray['parent-uri'] = $r[0]['parent-uri'];
                                                }
 
index 2cb94b3504b3989377f1bbbd30aa9f3ef9b50de5..912591a5d01f561c9e5c5234a5b89d1f96c2dc67 100644 (file)
@@ -79,7 +79,7 @@ function reload_plugins() {
        if(strlen($plugins)) {
 
                $r = q("SELECT * FROM `addon` WHERE `installed` = 1");
-               if(count($r))
+               if(dba::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(dba::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(dba::is_result($r)) {
                foreach($r as $rr) {
                        if(! array_key_exists($rr['hook'],$a->hooks))
                                $a->hooks[$rr['hook']] = array();
index 5214131b2bf0ed1e119b98379857838d6cf8ea20..4c02417ea367861d1c8cbf28e98f8afd91d2e852 100644 (file)
@@ -21,16 +21,14 @@ function was_recently_delayed($cid) {
                and last > UTC_TIMESTAMP() - interval 15 minute limit 1",
                intval($cid)
        );
-       if(count($r))
+       if(dba::is_result($r))
                return true;
 
        $r = q("select `term-date` from contact where id = %d and `term-date` != '' and `term-date` != '0000-00-00 00:00:00' limit 1",
                intval($cid)
        );
-       if(count($r))
-               return true;
 
-       return false;
+       return (dba::is_result($r));
 }
 
 
index 2d6db95f4f899cd6a877198217980c27b54b7d69..3d64ae66770a83f541ad4202ae97e6f918a76eb6 100644 (file)
@@ -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(dba::is_result($r))
                        $master_record = $r[0];
        }
 
@@ -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(dba::is_result($r)) {
                $a->contact = $r[0];
                $a->cid = $r[0]['id'];
                $_SESSION['cid'] = $a->cid;
@@ -158,7 +158,7 @@ function can_write_wall(&$a,$owner) {
                                intval(PAGE_COMMUNITY)
                        );
 
-                       if(count($r)) {
+                       if(dba::is_result($r)) {
                                $verified = 2;
                                return true;
                        }
@@ -212,7 +212,7 @@ function permissions_sql($owner_id,$remote_verified = false,$groups = null) {
                                intval($remote_user),
                                intval($owner_id)
                        );
-                       if(count($r)) {
+                       if(dba::is_result($r)) {
                                $remote_verified = true;
                                $groups = init_groups_visitor($remote_user);
                        }
@@ -294,7 +294,7 @@ function item_permissions_sql($owner_id,$remote_verified = false,$groups = null)
                                intval($remote_user),
                                intval($owner_id)
                        );
-                       if(count($r)) {
+                       if(dba::is_result($r)) {
                                $remote_verified = true;
                                $groups = init_groups_visitor($remote_user);
                        }
@@ -405,7 +405,7 @@ function init_groups_visitor($contact_id) {
                WHERE `contact-id` = %d ",
                intval($contact_id)
        );
-       if(count($r)) {
+       if(dba::is_result($r)) {
                foreach($r as $rr)
                        $groups[] = $rr['gid'];
        }
index 8f9d64606c00b3dda205e4e85badcca6316f8571..8c76eba41aa2b8534ff6fffd96b2950ae12339de 100644 (file)
@@ -17,7 +17,7 @@ function ref_session_read ($id) {
        if(x($id))
                $r = q("SELECT `data` FROM `session` WHERE `sid`= '%s'", dbesc($id));
 
-       if(count($r)) {
+       if(dba::is_result($r)) {
                $session_exists = true;
                return $r[0]['data'];
        } else {
index 0acd2793aa21e3351d8ceb365142d03da917d760..00f8fb11f3f8cfae43f993234fd2046928264e1d 100644 (file)
@@ -39,7 +39,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(dba::is_result($r)) {
                                $url = $r[0]['poco'];
                                $uid = $r[0]['uid'];
                        }
@@ -205,14 +205,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(dba::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(dba::is_result($r)) {
                        $network = $r[0]["network"];
                        //$profile_url = $r[0]["url"];
                }
@@ -948,7 +948,7 @@ function count_common_friends($uid,$cid) {
        );
 
 //     logger("count_common_friends: $uid $cid {$r[0]['total']}");
-       if(count($r))
+       if(dba::is_result($r))
                return $r[0]['total'];
        return 0;
 
@@ -994,7 +994,7 @@ function count_common_friends_zcid($uid,$zcid) {
                intval($uid)
        );
 
-       if(count($r))
+       if(dba::is_result($r))
                return $r[0]['total'];
        return 0;
 
@@ -1033,7 +1033,7 @@ function count_all_friends($uid,$cid) {
                intval($uid)
        );
 
-       if(count($r))
+       if(dba::is_result($r))
                return $r[0]['total'];
        return 0;
 
@@ -1162,7 +1162,7 @@ function update_suggestions() {
                dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA)
        );
 
-       if(count($r)) {
+       if(dba::is_result($r)) {
                foreach($r as $rr) {
                        $base = substr($rr['poco'],0,strrpos($rr['poco'],'/'));
                        if(! in_array($base,$done))
index e2d2e05d37b27dce1da34010bcc9f02fffd16976..ed905d3fff9e133684399952dc420b7ec0c5566f 100644 (file)
@@ -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(dba::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(dba::is_result($r))
                        $found = true;
        } while($found == true);
        return $resource;
@@ -859,7 +859,7 @@ function contact_block() {
                        dbesc(NETWORK_OSTATUS),
                        dbesc(NETWORK_DIASPORA)
        );
-       if(count($r)) {
+       if(dba::is_result($r)) {
                $total = intval($r[0]['total']);
        }
        if(! $total) {
@@ -877,7 +877,7 @@ function contact_block() {
                                dbesc(NETWORK_DIASPORA),
                                intval($shown)
                );
-               if(count($r)) {
+               if(dba::is_result($r)) {
                        $contacts = sprintf( tt('%d Contact','%d Contacts', $total),$total);
                        $micropro = Array();
                        foreach($r as $rr) {
@@ -2050,7 +2050,7 @@ function file_tag_update_pconfig($uid,$file_old,$file_new,$type = 'file') {
                        //      intval($uid)
                        //);
 
-                       if(count($r)) {
+                       if(dba::is_result($r)) {
                                unset($deleted_tags[$key]);
                        }
                        else {
@@ -2080,7 +2080,7 @@ function file_tag_save_file($uid,$item,$file) {
                intval($item),
                intval($uid)
        );
-       if(count($r)) {
+       if(dba::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) . ']'),
index 0320eaa018e98b28a04179f79aae2b020bbd68da..33d6d3fc820fe81faef507f4b4b42553d70c6107 100644 (file)
@@ -88,7 +88,7 @@ function add_shadow_entry($item) {
 
        // 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 (dba::is_result($r))
                return;
 
        // Preparing public shadow (removing user specific data)
index 3997a8a61f12584da6469808d767fb93c53c2db6..a61da7b3032abe5f1cebf22e5c74d8e98619eab6 100644 (file)
@@ -130,7 +130,7 @@ function create_user($arr) {
                $r = q("SELECT * FROM `user` WHERE `email` = '%s' LIMIT 1",
                        dbesc($email)
                );
-               if(count($r))
+               if(dba::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(dba::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(dba::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'])) {
index 2fc9c48a78c599e82bd3b426e7e0961018d47bda..3e19935cb528b5a38fdd539cbe315c423bc2d478 100644 (file)
@@ -1078,7 +1078,7 @@ function admin_page_dbsync(&$a) {
 
        $failed = array();
        $r = q("select k, v from config where `cat` = 'database' ");
-       if(count($r)) {
+       if(dba::is_result($r)) {
                foreach($r as $rr) {
                        $upd = intval(substr($rr['k'],7));
                        if($upd < 1139 || $rr['v'] === 'success')
index 62a5185fed84c4a00256bab9447fc56c64b530b2..bc6533624993af0e08d88818c04d2a9d6e93330e 100644 (file)
@@ -57,13 +57,13 @@ function common_content(&$a) {
                                dbesc(normalise_link(get_my_url())),
                                intval($profile_uid)
                        );
-                       if(count($r))
+                       if(dba::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(dba::is_result($r))
                                        $zcid = $r[0]['id'];
                        }
                }
index b6d72a35555a64f375b1402fc3188c93357c3579..fb50ad4bd219660d614310fc7cd36363a65d8fbe 100644 (file)
@@ -59,7 +59,7 @@ function community_content(&$a, $update = 0) {
                        AND `item`.`private` = 0 AND `item`.`wall` = 1"
                );
 
-               if(count($r))
+               if(dba::is_result($r))
                        $a->set_pager_total($r[0]['total']);
 
                if(! $r[0]['total']) {
index bf81afe079118767cd83e3917871e6cf34e510ff..be698325121600c6f35f96f39f8cb2c5505e8375 100644 (file)
@@ -14,7 +14,7 @@ function contactgroup_content(&$a) {
                        intval($a->argv[2]),
                        intval(local_user())
                );
-               if(count($r))
+               if(dba::is_result($r))
                        $change = intval($a->argv[2]);
        }
 
@@ -47,4 +47,4 @@ function contactgroup_content(&$a) {
        }
 
        killme();
-}
\ No newline at end of file
+}
index 4897663a051d92b2c3e208507de588ced76adfdd..19cbf4e6fb7db8f0a237ea82aacbe695fb7d2f81 100644 (file)
@@ -758,22 +758,22 @@ 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(dba::is_result($r)) {
                $a->set_pager_total($r[0]['total']);
                $total = $r[0]['total'];
        }
 
        $sql_extra3 = unavailable_networks();
 
+       $contacts = array();
+
        $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `pending` = 0 $sql_extra $sql_extra2 $sql_extra3 ORDER BY `name` ASC LIMIT %d , %d ",
                intval($_SESSION['uid']),
                intval($a->pager['start']),
                intval($a->pager['itemspage'])
        );
 
-       $contacts = array();
-
-       if(count($r)) {
+       if(dba::is_result($r)) {
                foreach($r as $rr) {
                        $contacts[] = _contact_detail_for_template($rr);
                }
index 49cff74d2d9f4e4eac2ffcce3529f87fafcabc55..718dc77d29138e623defa14363fefb2e773c7cc4 100644 (file)
@@ -93,7 +93,7 @@ function content_content(&$a, $update = 0) {
                );
 
                $str = '';
-               if(count($r))
+               if(dba::is_result($r))
                        foreach($r as $rr)
                                $str .= '<' . $rr['id'] . '>';
                if(strlen($str))
@@ -141,7 +141,7 @@ function content_content(&$a, $update = 0) {
                                AND `blocked` = 0 AND `pending` = 0 LIMIT 1",
                        intval($cid)
                );
-               if(count($r)) {
+               if(dba::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(dba::is_result($r)) {
                        foreach($r as $rr)
                                if(! in_array($rr['item_id'],$parents_arr))
                                        $parents_arr[] = $rr['item_id'];
index 20d2e605e0a2d91c90e1d664567037d6baf1902d..55951cd51bb822b80da588816c8007f79f82a2ea 100644 (file)
@@ -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(dba::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(dba::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(dba::is_result($r))
                $full_managers = $r;
 
        $delegates = array();
@@ -75,7 +75,7 @@ function delegate_content(&$a) {
                intval(local_user())
        );
 
-       if(count($r))
+       if(dba::is_result($r))
                $delegates = $r;
 
        $uids = array();
@@ -104,7 +104,7 @@ function delegate_content(&$a) {
 
        $nicknames = array();
 
-       if(count($r)) {
+       if(dba::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(dba::is_result($r))
                foreach($r as $rr)
                        if(! in_array($rr['uid'],$uids))
                                $potentials[] = $rr;
index 9c70ba21ab4c19c4721d7b8d345d489af4eb350f..29d3630aca5f5e2983fa01fb87618df8679b30c1 100644 (file)
@@ -418,7 +418,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(dba::is_result($r))
                        $contact = $r[0];
                else
                        $contact = null;
@@ -438,7 +438,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                                intval($uid)
                        );
 
-                       if((count($r)) && ($r[0]['hide-friends'] == 0) && ($activity) && (! $hidden)) {
+                       if((dba::is_result($r)) && ($r[0]['hide-friends'] == 0) && ($activity) && (! $hidden)) {
 
                                require_once('include/items.php');
 
@@ -624,7 +624,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(dba::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
@@ -656,7 +656,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(dba::is_result($r))
                        $photo = $r[0]['photo'];
                else
                        $photo = $a->get_baseurl() . '/images/person-175.jpg';
@@ -709,10 +709,10 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                        intval($dfrn_record)
                );
 
-               if(count($r))
+               if(dba::is_result($r))
                        $combined = $r[0];
 
-               if((count($r)) && ($r[0]['notify-flags'] & NOTIFY_CONFIRM)) {
+               if((dba::is_result($r)) && ($r[0]['notify-flags'] & NOTIFY_CONFIRM)) {
                        $mutual = ($new_relation == CONTACT_IS_FRIEND);
                        notification(array(
                                'type'         => NOTIFY_CONFIRM,
@@ -737,7 +737,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                                intval($local_uid)
                        );
 
-                       if((count($r)) && ($r[0]['hide-friends'] == 0)) {
+                       if((dba::is_result($r)) && ($r[0]['hide-friends'] == 0)) {
 
                                require_once('include/items.php');
 
index ab6637607e564b2d71eb2ba1353b6944a6216c65..a75fbc40b8dad92a39516dab3c7ac85740e7c8c9 100644 (file)
@@ -76,7 +76,7 @@ function dfrn_poll_init(&$a) {
                        dbesc($a->argv[1])
                );
 
-               if(count($r)) {
+               if(dba::is_result($r)) {
 
                        $s = fetch_url($r[0]['poll'] . '?dfrn_id=' . $my_id . '&type=profile-check');
 
@@ -187,7 +187,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(dba::is_result($r)) {
                                xml_status(1);
                                return; // NOTREACHED
                        }
@@ -332,7 +332,7 @@ function dfrn_poll_post(&$a) {
                $reputation = 0;
                $text = '';
 
-               if(count($r)) {
+               if(dba::is_result($r)) {
                        $reputation = $r[0]['rating'];
                        $text = $r[0]['reason'];
 
@@ -445,7 +445,7 @@ function dfrn_poll_content(&$a) {
                        dbesc($nickname)
                );
 
-               if(count($r)) {
+               if(dba::is_result($r)) {
 
                        $challenge = '';
                        $encrypted_id = '';
@@ -492,7 +492,7 @@ function dfrn_poll_content(&$a) {
                                ));
                        }
 
-                       $profile = ((count($r) && $r[0]['nickname']) ? $r[0]['nickname'] : $nickname);
+                       $profile = ((dba::is_result($r) && $r[0]['nickname']) ? $r[0]['nickname'] : $nickname);
 
                        switch($destination_url) {
                                case 'profile':
index 32e835b71557450863c161e5eed197dd02e09bb9..5932b9b669b87e0795b89c3120e6281c8c3ff481 100644 (file)
@@ -89,7 +89,7 @@ function dfrn_request_post(&$a) {
                                        dbesc(normalise_link($dfrn_url))
                                );
 
-                               if(count($r)) {
+                               if(dba::is_result($r)) {
                                        if(strlen($r[0]['dfrn-id'])) {
 
                                                /**
@@ -180,7 +180,7 @@ function dfrn_request_post(&$a) {
                                        dbesc($dfrn_url),
                                        $parms['key'] // this was already escaped
                                );
-                               if(count($r)) {
+                               if(dba::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);
@@ -285,7 +285,7 @@ function dfrn_request_post(&$a) {
                        AND `intro`.`datetime` < UTC_TIMESTAMP() - INTERVAL 30 MINUTE ",
                        dbesc(NETWORK_MAIL2)
                );
-               if(count($r)) {
+               if(dba::is_result($r)) {
                        foreach($r as $rr) {
                                if(! $rr['rel']) {
                                        q("DELETE FROM `contact` WHERE `id` = %d",
@@ -310,7 +310,7 @@ function dfrn_request_post(&$a) {
                        AND `intro`.`datetime` < UTC_TIMESTAMP() - INTERVAL 3 DAY ",
                        dbesc(NETWORK_MAIL2)
                );
-               if(count($r)) {
+               if(dba::is_result($r)) {
                        foreach($r as $rr) {
                                if(! $rr['rel']) {
                                        q("DELETE FROM `contact` WHERE `id` = %d",
@@ -390,7 +390,7 @@ function dfrn_request_post(&$a) {
                                dbesc($poll),
                                intval($uid)
                        );
-                       if(count($r)) {
+                       if(dba::is_result($r)) {
                                $contact_id = $r[0]['id'];
 
                                $def_gid = get_default_group($uid, $r[0]["network"]);
@@ -562,7 +562,7 @@ function dfrn_request_post(&$a) {
                                                $parms['url'],
                                                $parms['issued-id']
                                        );
-                                       if(count($r))
+                                       if(dba::is_result($r))
                                                $contact_record = $r[0];
                                }
 
@@ -711,16 +711,16 @@ function dfrn_request_content(&$a) {
                        dbesc($_GET['confirm_key'])
                );
 
-               if(count($intro)) {
+               if(dba::is_result($intro)) {
+
+                       $auto_confirm = false;
 
                        $r = q("SELECT `contact`.*, `user`.* FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
                                WHERE `contact`.`id` = %d LIMIT 1",
                                intval($intro[0]['contact-id'])
                        );
 
-                       $auto_confirm = false;
-
-                       if(count($r)) {
+                       if(dba::is_result($r)) {
                                if(($r[0]['page-flags'] != PAGE_NORMAL) && ($r[0]['page-flags'] != PAGE_PRVGROUP))
                                        $auto_confirm = true;
 
index 625f6c95aca781eee24e1a3f895361f8c455e1b6..531283936c61f567e8a5f9e172c5c5b042c436da 100644 (file)
@@ -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(dba::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(dba::is_result($r)) {
 
                if(in_array('small', $a->argv))
                        $photo = 'thumb';
index fbbd26317281adf1a9f8c76e87bbe2c413bfa02c..849fef3f24ed18586b87600a23a822943434ef0b 100644 (file)
@@ -19,7 +19,7 @@ function display_init(&$a) {
                        $r = q("SELECT `id`, `parent`, `author-name`, `author-link`, `author-avatar`, `network`, `body`, `uid` FROM `item`
                                WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
                                        AND `guid` = '%s' AND `uid` = %d", dbesc($a->argv[1]), local_user());
-                       if (count($r)) {
+                       if (dba::is_result($r)) {
                                $nick = $a->user["nickname"];
                                $itemuid = local_user();
                        }
@@ -36,7 +36,7 @@ function display_init(&$a) {
                                        AND NOT `item`.`private` AND NOT `user`.`hidewall`
                                        AND `item`.`guid` = '%s'", dbesc($a->argv[1]));
                                //      AND NOT `item`.`private` AND `item`.`wall`
-                       if (count($r)) {
+                       if (dba::is_result($r)) {
                                $nick = $r[0]["nickname"];
                                $itemuid = $r[0]["uid"];
                        }
@@ -53,7 +53,7 @@ function display_init(&$a) {
                                        AND `item`.`guid` = '%s'", dbesc($a->argv[1]));
                                //      AND NOT `item`.`private` AND `item`.`wall`
                }
-               if (count($r)) {
+               if (dba::is_result($r)) {
                        if ($r[0]["id"] != $r[0]["parent"])
                                $r = q("SELECT `id`, `author-name`, `author-link`, `author-avatar`, `network`, `body`, `uid` FROM `item`
                                        WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
@@ -70,7 +70,7 @@ function display_init(&$a) {
                                                WHERE `user`.`nickname` = '%s' AND `profile`.`is-default` AND `contact`.`self` LIMIT 1",
                                                dbesc($nickname)
                                        );
-                                       if (count($r))
+                                       if (dba::is_result($r))
                                                $profiledata = $r[0];
 
                                        $profiledata["network"] = NETWORK_DFRN;
@@ -168,7 +168,7 @@ function display_fetchauthor($a, $item) {
                        dbesc(normalise_link($profiledata["url"])), intval(local_user()),
                        intval(CONTACT_IS_SHARING), intval(CONTACT_IS_FRIEND));
 
-       if (count($r)) {
+       if (dba::is_result($r)) {
                $profiledata["name"] = $r[0]["name"];
                $profiledata["photo"] = $r[0]["photo"];
                $profiledata["nickname"] = $r[0]["nick"];
@@ -187,7 +187,7 @@ function display_fetchauthor($a, $item) {
        // Fetching profile data from global contacts
        if ($profiledata["network"] != NETWORK_FEED) {
                $r = q("SELECT `name`, `photo`, `nick`, `addr`, `location`, `about`, `gender`, `keywords`, `network` FROM `gcontact` WHERE `nurl` = '%s'", dbesc(normalise_link($profiledata["url"])));
-               if (count($r)) {
+               if (dba::is_result($r)) {
                        $profiledata["name"] = $r[0]["name"];
                        $profiledata["photo"] = $r[0]["photo"];
                        $profiledata["nickname"] = $r[0]["nick"];
@@ -259,7 +259,7 @@ function display_content(&$a, $update = 0) {
                                $r = q("SELECT `id` FROM `item`
                                        WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
                                                AND `guid` = '%s' AND `uid` = %d", dbesc($a->argv[1]), local_user());
-                               if (count($r)) {
+                               if (dba::is_result($r)) {
                                        $item_id = $r[0]["id"];
                                        $nick = $a->user["nickname"];
                                }
@@ -273,7 +273,7 @@ function display_content(&$a, $update = 0) {
                                                AND NOT `item`.`private` AND NOT `user`.`hidewall`
                                                AND `item`.`guid` = '%s'", dbesc($a->argv[1]));
                                        //      AND NOT `item`.`private` AND `item`.`wall`
-                               if (count($r)) {
+                               if (dba::is_result($r)) {
                                        $item_id = $r[0]["id"];
                                        $nick = $r[0]["nickname"];
                                }
@@ -286,7 +286,7 @@ function display_content(&$a, $update = 0) {
                                                AND NOT `item`.`private` AND `item`.`uid` = 0
                                                AND `item`.`guid` = '%s'", dbesc($a->argv[1]));
                                        //      AND NOT `item`.`private` AND `item`.`wall`
-                               if (count($r)) {
+                               if (dba::is_result($r)) {
                                        $item_id = $r[0]["id"];
                                }
                        }
@@ -331,7 +331,7 @@ function display_content(&$a, $update = 0) {
                        intval($contact_id),
                        intval($a->profile['uid'])
                );
-               if(count($r)) {
+               if(dba::is_result($r)) {
                        $contact = $r[0];
                        $remote_contact = true;
                }
@@ -347,7 +347,7 @@ function display_content(&$a, $update = 0) {
        $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1",
                intval($a->profile['uid'])
        );
-       if(count($r))
+       if(dba::is_result($r))
                $a->page_contact = $r[0];
 
        $is_owner = ((local_user()) && (local_user() == $a->profile['profile_uid']) ? true : false);
index 9a80d0b2f4ba622badbaac42f617e973eeed926a..bbd21a064dc9ac8f5572adaad7767824898d75a6 100644 (file)
@@ -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(dba::is_result($r)) {
                        $mail_enabled = true;
                        if(intval($r[0]['pubmail']))
                                $pubmail_enabled = true;
index 653ae489b8f97c8022fe68fcd6f7513e4b5fe009..1b2d8f9cefec3cf7d5fcdbdb152d5e4fa0fb94ae 100644 (file)
@@ -361,7 +361,7 @@ function events_content(&$a) {
 
                $links = array();
 
-               if(count($r)) {
+               if(dba::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'));
@@ -376,7 +376,7 @@ function events_content(&$a) {
                $last_date = '';
                $fmt = t('l, F j');
 
-               if(count($r)) {
+               if(dba::is_result($r)) {
                        $r = sort_by_date($r);
                        foreach($r as $rr) {
 
@@ -475,7 +475,7 @@ function events_content(&$a) {
                        intval($event_id),
                        intval(local_user())
                );
-               if(count($r))
+               if(dba::is_result($r))
                        $orig_event = $r[0];
        }
 
index aad5964baf6e5d1ddf737e88f46b636cb255d6d7..2ec8ab95a33cc4685a732fde5c599e4728d90b3f 100644 (file)
@@ -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(dba::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(dba::is_result($r))
                        foreach($r as $rr)
                                $visible_plugins[] = $rr['name'];
        }
index 6b1cbd7533be8ca44f6e9ce19c32609cdbf74490..986f92e34bca657aab64e1ee2c1c4935f465cc58 100644 (file)
@@ -33,7 +33,7 @@ function fsuggest_post(&$a) {
                        intval($new_contact),
                        intval(local_user())
                );
-               if(count($r)) {
+               if(dba::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(dba::is_result($r)) {
                                $fsuggest_id = $r[0]['id'];
                                q("UPDATE `fsuggest` SET `note` = '%s' WHERE `id` = %d AND `uid` = %d",
                                        dbesc($note),
index 5b28784f5663cc1b7056125b26619416e9e76b6d..94947c1890bc475308d937fdd80b7070262d41bb 100644 (file)
@@ -107,7 +107,7 @@ function group_content(&$a) {
                                intval($a->argv[2]),
                                intval(local_user())
                        );
-                       if(count($r))
+                       if(dba::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(dba::is_result($r))
                        $change = intval($a->argv[2]);
        }
 
@@ -209,7 +209,7 @@ function group_content(&$a) {
                intval(local_user())
        );
 
-       if(count($r)) {
+       if(dba::is_result($r)) {
                $textmode = (($switchtotext && (count($r) > $switchtotext)) ? true : false);
                foreach($r as $member) {
                        if(! in_array($member['id'],$preselected)) {
index d0e1ffed508cf10cf177acb5ecbdafbbefa45b77..935d66e6d8babc31e7e8abe21283db15bc974d5b 100644 (file)
@@ -129,7 +129,7 @@ function item_post(&$a) {
                                intval($parent_item['contact-id']),
                                intval($uid)
                        );
-                       if(count($r))
+                       if(dba::is_result($r))
                                $parent_contact = $r[0];
 
                        // If the contact id doesn't fit with the contact, then set the contact to null
@@ -140,7 +140,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 (dba::is_result($r)) {
                                        $parent_contact = $r[0];
                                        $parent_contact["thumb"] = $parent_contact["photo"];
                                        $parent_contact["micro"] = $parent_contact["photo"];
@@ -219,7 +219,7 @@ function item_post(&$a) {
        $r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
                intval($profile_uid)
        );
-       if(count($r))
+       if(dba::is_result($r))
                $user = $r[0];
 
        if($orig_post) {
@@ -322,7 +322,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(dba::is_result($r) && intval($r[0]['pubmail']))
                                        $pubmail_enabled = true;
                        }
                }
@@ -391,7 +391,7 @@ function item_post(&$a) {
                }
        }
 
-       if(count($r)) {
+       if(dba::is_result($r)) {
                $author = $r[0];
                $contact_id = $author['id'];
        }
@@ -405,7 +405,7 @@ function item_post(&$a) {
                $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
                        intval($profile_uid)
                );
-               if(count($r))
+               if(dba::is_result($r))
                        $contact_record = $r[0];
        }
 
@@ -490,7 +490,7 @@ function item_post(&$a) {
                                        intval($profile_uid),
                                        intval($attach)
                                );
-                               if(count($r)) {
+                               if(dba::is_result($r)) {
                                        $r = q("UPDATE `attach` SET `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s'
                                                WHERE `uid` = %d AND `id` = %d",
                                                dbesc($str_contact_allow),
@@ -631,7 +631,7 @@ function item_post(&$a) {
                                intval($profile_uid),
                                intval($mtch)
                        );
-                       if(count($r)) {
+                       if(dba::is_result($r)) {
                                if(strlen($attachments))
                                        $attachments .= ',';
                                $attachments .= '[attach]href="' . $a->get_baseurl() . '/attach/' . $r[0]['id'] . '" length="' . $r[0]['filesize'] . '" type="' . $r[0]['filetype'] . '" title="' . (($r[0]['filename']) ? $r[0]['filename'] : '') . '"[/attach]';
index 0ae54c8c125f92d07616113a7b52865e3d61fed1..df11a7f6fbcae1400bc1cbfd28da945f496519d2 100644 (file)
@@ -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(dba::is_result($r))
                        foreach($r as $rr) 
                                $l[] = '<b>' . $rr['name'] . '</b>';
        }
@@ -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(dba::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(dba::is_result($r))
                        foreach($r as $rr) 
                                $l[] = '<b><strike>' . $rr['name'] . '</strike></b>';
        }
@@ -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(dba::is_result($r))
                        foreach($r as $rr) 
                                $l[] = '<strike>' . $rr['name'] . '</strike>';
 
index adcc3d787aac0d58563cbd5d38e82e50384498d2..c56e4d8bc959a7bd30b20423232b2420bcb4f404 100644 (file)
@@ -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(dba::is_result($r)) {
                        $uid = intval($r[0]['uid']);
                        $orig_record = $r[0];
                }
index 433da08a88f61b5ca510687a71c1441fc5ad8983..2a1152b8c0296e0fcf2493bc2d39c3637b877f76 100644 (file)
@@ -242,7 +242,7 @@ function message_content(&$a) {
                                intval($a->argv[2]),
                                intval(local_user())
                        );
-                       if(count($r)) {
+                       if(dba::is_result($r)) {
                                $parent = $r[0]['parent-uri'];
                                $convid = $r[0]['convid'];
 
@@ -309,7 +309,7 @@ function message_content(&$a) {
                                intval(local_user()),
                                intval($a->argv[2])
                        );
-                       if(count($r)) {
+                       if(dba::is_result($r)) {
                                $prename = $r[0]['name'];
                                $preurl = $r[0]['url'];
                                $preid = $r[0]['id'];
@@ -393,7 +393,7 @@ function message_content(&$a) {
                        intval(local_user()),
                        intval($a->argv[1])
                );
-               if(count($r)) {
+               if(dba::is_result($r)) {
                        $contact_id = $r[0]['contact-id'];
                        $convid = $r[0]['convid'];
 
index 5e6ca0fcfc068533751908e8bc2e4d91ba7beed1..9be60de1d852d3d278b8192798510f00f49960b4 100644 (file)
@@ -36,7 +36,7 @@ function mood_init(&$a) {
                        intval($parent),
                        intval($uid)
                );
-               if(count($r)) {
+               if(dba::is_result($r)) {
                        $parent_uri = $r[0]['uri'];
                        $private    = $r[0]['private'];
                        $allow_cid  = $r[0]['allow_cid'];
index 89de5b70576f354653ad4daf8645d5aa5b843876..8393a97ae8aec619a3022bae84c6705749b420a8 100644 (file)
@@ -13,17 +13,19 @@ 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(dba::is_result($r))
                $total = $r[0]['total'];
 
+       $results = array();
+
        $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 ",
                dbesc($search),
                intval($startrec),
                intval($perpage)
        );
 
-       $results = array();
-       if(count($r)) {
+       if(dba::is_result($r)) {
                foreach($r as $rr)
                        $results[] = array(
                                'name' => $rr['name'], 
@@ -39,4 +41,4 @@ function msearch_post(&$a) {
 
        killme();
 
-}
\ No newline at end of file
+}
index c93e2ad9294904a607a413c36394b0816e5323bc..28ce8fdbfe2f518925effd891f5d164df723673f 100644 (file)
@@ -182,7 +182,7 @@ function saved_searches($search) {
 
        $saved = array();
 
-       if(count($r)) {
+       if(dba::is_result($r)) {
                foreach($r as $rr) {
                        $saved[] = array(
                                'id'            => $rr['id'],
@@ -465,7 +465,7 @@ function network_content(&$a, $update = 0) {
                );
 
                $str = '';
-               if(count($r))
+               if(dba::is_result($r))
                        foreach($r as $rr)
                                $str .= '<' . $rr['id'] . '>';
                if(strlen($str))
@@ -587,7 +587,7 @@ function network_content(&$a, $update = 0) {
                                AND `blocked` = 0 AND `pending` = 0 LIMIT 1",
                        intval($cid)
                );
-               if(count($r)) {
+               if(dba::is_result($r)) {
                        $sql_extra = " AND ".$sql_table.".`contact-id` = ".intval($cid);
 
                        $entries[0] = array(
@@ -689,7 +689,7 @@ function network_content(&$a, $update = 0) {
                                intval($_SESSION['uid'])
                        );
 
-                       if(count($r)) {
+                       if(dba::is_result($r)) {
                                $a->set_pager_total($r[0]['total']);
                        }
                }
index 9f6e9784331851b702434245f24256313612d6e4..a29cb9c86ee1985e1706edfcad6cc218142161a0 100644 (file)
@@ -28,11 +28,11 @@ function nogroup_content(&$a) {
 
        require_once('include/Contact.php');
        $r = contacts_not_grouped(local_user());
-       if(count($r)) {
+       if(dba::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(dba::is_result($r)) {
                foreach($r as $rr) {
 
                        $contact_details = get_contact_details_by_url($rr['url'], local_user());
index 4be1a740cd87b6eaaa4d135c256ad6b11d77bb80..7b759d15d8bfbc3026bfbcc40ad1c45249f387b8 100644 (file)
@@ -39,7 +39,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(dba::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
@@ -49,7 +49,7 @@ function noscrape_init(&$a) {
                        dbesc(NETWORK_DIASPORA),
                        dbesc(NETWORK_OSTATUS)
                );
-               if(count($r))
+               if(dba::is_result($r))
                        $json_info["contacts"] = intval($r[0]['total']);
        }
 
index 73c1507e3e044d8ea62538192104eafdc9d1cd0f..ba5ef1b6d46accbca6db4fdc15ee7db1f993ec0e 100644 (file)
@@ -83,7 +83,7 @@ function notes_content(&$a,$update = false) {
 
        );
 
-       if(count($r)) {
+       if(dba::is_result($r)) {
                $a->set_pager_total($r[0]['total']);
                $a->set_pager_itemspage(40);
        }
@@ -105,7 +105,7 @@ function notes_content(&$a,$update = false) {
        $parents_arr = array();
        $parents_str = '';
 
-       if(count($r)) {
+       if(dba::is_result($r)) {
                foreach($r as $rr)
                        $parents_arr[] = $rr['item_id'];
                $parents_str = implode(', ', $parents_arr);
@@ -124,7 +124,7 @@ function notes_content(&$a,$update = false) {
                        dbesc($parents_str)
                );
 
-               if(count($r)) {
+               if(dba::is_result($r)) {
                        $items = conv_sort($r,"`commented`");
 
                        $o .= conversation($a,$items,'notes',$update);
index 19cf53189a1476dfb9795026ab9b23139ad0160f..161273b0acd489e2afe80732458f00d7cfc2a65c 100644 (file)
@@ -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 (dba::is_result($r)){
                        $nick = $r[0]['nickname'];
                        $url = $a->get_baseurl()."/display/$nick/$id";
                        goaway($url);
index f6c4e8f51fb128d7f3c719214e41a5d28d0eb58d..6d8c68eb3505166d2c1b63d80f6dfd0430656966 100644 (file)
@@ -21,7 +21,7 @@ function notifications_post(&$a) {
                        intval(local_user())
                );
 
-               if(count($r)) {
+               if(dba::is_result($r)) {
                        $intro_id = $r[0]['id'];
                        $contact_id = $r[0]['contact-id'];
                }
@@ -149,7 +149,7 @@ function notifications_content(&$a) {
                        WHERE `intro`.`uid` = %d $sql_extra AND `intro`.`blocked` = 0 ",
                                intval($_SESSION['uid']));
 
-               if(($r !== false) && (count($r))) {
+               if(dba::is_result($r)) {
 
                        $sugg = get_markup_template('suggestions.tpl');
                        $tpl = get_markup_template("intros.tpl");
@@ -372,7 +372,7 @@ function notifications_content(&$a) {
                        intval(local_user())
                );
 
-               if (count($r) > 0) {
+               if (dba::is_result($r)) {
                        foreach ($r as $it) {
                                $notif_content .= replace_macros($not_tpl,array(
                                        '$item_link' => $a->get_baseurl(true).'/notify/view/'. $it['id'],
@@ -424,7 +424,7 @@ function notifications_content(&$a) {
 
                $notif_content = '';
 
-               if (count($r) > 0) {
+               if (dba::is_result($r)) {
 
                        foreach ($r as $it) {
                                switch($it['verb']){
@@ -515,7 +515,7 @@ function notifications_content(&$a) {
 
                $notif_content = '';
 
-               if (count($r) > 0) {
+               if (dba::is_result($r)) {
 
                        foreach ($r as $it) {
                                switch($it['verb']){
index 4166b4d53949d4f9cb5b1f9467c045b224ef98e0..33a0242352f27ab9604c544835059007a56259eb 100644 (file)
@@ -76,7 +76,7 @@ function photo_init(&$a) {
                        intval($resolution),
                        intval($uid)
                );
-               if(count($r)) {
+               if(dba::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(dba::is_result($r)) {
 
                        $sql_extra = permissions_sql($r[0]['uid']);
 
@@ -117,9 +117,9 @@ function photo_init(&$a) {
                                intval($resolution)
                        );
 
-                       $public = ($r[0]['allow_cid'] == '') AND ($r[0]['allow_gid'] == '') AND ($r[0]['deny_cid']  == '') AND ($r[0]['deny_gid']  == '');
+                       $public = (dba::is_result($r)) && ($r[0]['allow_cid'] == '') AND ($r[0]['allow_gid'] == '') AND ($r[0]['deny_cid']  == '') AND ($r[0]['deny_gid']  == '');
 
-                       if(count($r)) {
+                       if(dba::is_result($r)) {
                                $resolution = $r[0]['scale'];
                                $data = $r[0]['data'];
                                $mimetype = $r[0]['type'];
index 4761b627d8c51bb228ee071e887b5879ad72f807..b05bc12b1a029f34c193b18e70c61c122aa7e345 100644 (file)
@@ -159,7 +159,7 @@ function photos_post(&$a) {
                                        intval($cid),
                                        intval($page_owner_uid)
                                );
-                               if(count($r)) {
+                               if(dba::is_result($r)) {
                                        $can_post = true;
                                        $visitor = $cid;
                                }
@@ -267,7 +267,7 @@ function photos_post(&$a) {
                                        dbesc($album)
                                );
                        }
-                       if(count($r)) {
+                       if(dba::is_result($r)) {
                                foreach($r as $rr) {
                                        $res[] = "'" . dbesc($rr['rid']) . "'" ;
                                }
@@ -290,7 +290,7 @@ function photos_post(&$a) {
                        $r = q("SELECT `parent-uri` FROM `item` WHERE `resource-id` IN ( $str_res ) AND `uid` = %d",
                                intval($page_owner_uid)
                        );
-                       if(count($r)) {
+                       if(dba::is_result($r)) {
                                foreach($r as $rr) {
                                        q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d",
                                                dbesc(datetime_convert()),
@@ -352,7 +352,7 @@ function photos_post(&$a) {
                                dbesc($a->argv[2])
                        );
                }
-               if(count($r)) {
+               if(dba::is_result($r)) {
                        q("DELETE FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s'",
                                intval($page_owner_uid),
                                dbesc($r[0]['resource-id'])
@@ -408,7 +408,7 @@ function photos_post(&$a) {
                                dbesc($resource_id),
                                intval($page_owner_uid)
                        );
-                       if(count($r)) {
+                       if(dba::is_result($r)) {
                                $ph = new Photo($r[0]['data'], $r[0]['type']);
                                if($ph->is_valid()) {
                                        $rotate_deg = ( (intval($_POST['rotate']) == 1) ? 270 : 90 );
@@ -525,7 +525,7 @@ function photos_post(&$a) {
                                intval($page_owner_uid)
                        );
                }
-               if(count($r)) {
+               if(dba::is_result($r)) {
                        $old_tag    = $r[0]['tag'];
                        $old_inform = $r[0]['inform'];
                }
@@ -612,7 +612,7 @@ function photos_post(&$a) {
                                                                        intval($page_owner_uid)
                                                                );
                                                        }*/
-                                                       if(count($r)) {
+                                                       if(dba::is_result($r)) {
                                                                $newname = $r[0]['name'];
                                                                $profile = $r[0]['url'];
                                                                $notify = 'cid:' . $r[0]['id'];
@@ -1028,7 +1028,7 @@ function photos_content(&$a) {
                                        intval($contact_id),
                                        intval($owner_uid)
                                );
-                               if(count($r)) {
+                               if(dba::is_result($r)) {
                                        $can_post = true;
                                        $contact = $r[0];
                                        $remote_contact = true;
@@ -1056,7 +1056,7 @@ function photos_content(&$a) {
                                intval($contact_id),
                                intval($owner_uid)
                        );
-                       if(count($r)) {
+                       if(dba::is_result($r)) {
                                $contact = $r[0];
                                $remote_contact = true;
                        }
@@ -1209,8 +1209,8 @@ function photos_content(&$a) {
                        intval($owner_uid),
                        dbesc($album)
                );
-               if(count($r)) {
-                       $a->set_pager_total(count($r));
+               if(dba::is_result($r)) {
+                       $a->set_pager_total(dba::is_result($r));
                        $a->set_pager_itemspage(20);
                }
 
@@ -1266,7 +1266,7 @@ function photos_content(&$a) {
 
                $photos = array();
 
-               if(count($r))
+               if(dba::is_result($r))
                        $twist = 'rotright';
                        foreach($r as $rr) {
                                if($twist == 'rotright')
@@ -1461,7 +1461,7 @@ function photos_content(&$a) {
 
                        );
 
-                       if(count($r))
+                       if(dba::is_result($r))
                                $a->set_pager_total($r[0]['total']);
 
 
@@ -1638,7 +1638,7 @@ function photos_content(&$a) {
 
 
                        // display comments
-                       if(count($r)) {
+                       if(dba::is_result($r)) {
 
                                foreach($r as $item) {
                                        builtin_activity_puller($item, $conv_responses);
@@ -1824,8 +1824,8 @@ function photos_content(&$a) {
                dbesc('Contact Photos'),
                dbesc( t('Contact Photos'))
        );
-       if(count($r)) {
-               $a->set_pager_total(count($r));
+       if(dba::is_result($r)) {
+               $a->set_pager_total(dba::is_result($r));
                $a->set_pager_itemspage(20);
        }
 
@@ -1842,7 +1842,7 @@ function photos_content(&$a) {
 
 
        $photos = array();
-       if(count($r)) {
+       if(dba::is_result($r)) {
                $twist = 'rotright';
                foreach($r as $rr) {
                        //hide profile photos to others
index 0a1b392169b22dbf3e5748bb4ebbbebc8aa65a25..372f5b45b60ef40ddcd73c81b07249282ac5aa23 100644 (file)
@@ -81,7 +81,7 @@ function poco_init(&$a) {
                        dbesc(NETWORK_STATUSNET)
                );
        }
-       if(count($r))
+       if(dba::is_result($r))
                $totalResults = intval($r[0]['total']);
        else
                $totalResults = 0;
@@ -168,7 +168,7 @@ function poco_init(&$a) {
        }
 
        if(is_array($r)) {
-               if(count($r)) {
+               if(dba::is_result($r)) {
                        foreach($r as $rr) {
                                if (!isset($rr['generation'])) {
                                        if ($global)
index 4a643435be229acda46beee3fe352af8ed3e830a..f59ec186972f5cc666b04d4ef6f5edc9913f56d8 100644 (file)
@@ -66,7 +66,7 @@ function poke_init(&$a) {
                        intval($parent),
                        intval($uid)
                );
-               if(count($r)) {
+               if(dba::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(dba::is_result($r)) {
                        $name = $r[0]['name'];
                        $id = $r[0]['id'];
                }
index c3f58ab528142fcc850124610eb2883e375cbe62..66d7ce3999438c761532e847c859cc7183ae7b39 100644 (file)
@@ -13,7 +13,7 @@ function profile_init(&$a) {
                $which = $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(dba::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(dba::is_result($r)) {
                        $contact = $r[0];
                        $remote_contact = true;
                }
@@ -257,21 +257,21 @@ function profile_content(&$a, $update = 0) {
                            AND `thread`.`wall` = 1
                            $sql_extra $sql_extra2 ",
                            intval($a->profile['profile_uid'])
-                   );
+                       );
 
-               if(count($r)) {
-                       $a->set_pager_total($r[0]['total']);
+                       if(dba::is_result($r)) {
+                               $a->set_pager_total($r[0]['total']);
                        }
                }
 
                //  check if we serve a mobile device and get the user settings
                //  accordingly
                if ($a->is_mobile) {
-                   $itemspage_network = get_pconfig(local_user(),'system','itemspage_mobile_network');
-                   $itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 10);
+                       $itemspage_network = get_pconfig(local_user(),'system','itemspage_mobile_network');
+                       $itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 10);
                } else {
-                   $itemspage_network = get_pconfig(local_user(),'system','itemspage_network');
-                   $itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 20);
+                       $itemspage_network = get_pconfig(local_user(),'system','itemspage_network');
+                       $itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 20);
                }
                //  now that we have the user settings, see if the theme forces
                //  a maximum item number which is lower then the user choice
index 4e8d279a972b7ce7ec54b03ee12416a8ec627659..75b364d2b9dc310f68a00d3e2286d176a569a417 100644 (file)
@@ -32,7 +32,7 @@ function profile_photo_post(&$a) {
                                intval($_REQUEST['profile']),
                                intval(local_user())
                        );
-                       if(count($r) && (! intval($r[0]['is-default'])))
+                       if(dba::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(dba::is_result($r)) {
 
                        $base_image = $r[0];
 
index 39382fbdd5b6c14b671289b60680151c51531776..dfab29894ed9f9833801fb7c0c4f6a6127ba9d96 100644 (file)
@@ -285,7 +285,7 @@ function profiles_post(&$a) {
                                                        intval(local_user())
                                                );
                                        }
-                                       if(count($r)) {
+                                       if(dba::is_result($r)) {
                                                $prf = $r[0]['url'];
                                                $newname = $r[0]['name'];
                                        }
@@ -778,7 +778,7 @@ function profiles_content(&$a) {
                                "SELECT * FROM `profile` WHERE `uid` = %d AND `is-default`=1",
                                local_user()
                        );
-                       if(count($r)){
+                       if(dba::is_result($r)){
                                //Go to the default profile.
                                goaway('profiles/'.$r[0]['id']);
                        }
@@ -786,7 +786,7 @@ function profiles_content(&$a) {
 
                $r = q("SELECT * FROM `profile` WHERE `uid` = %d",
                        local_user());
-               if(count($r)) {
+               if(dba::is_result($r)) {
 
                        $tpl_header = get_markup_template('profile_listing_header.tpl');
                        $o .= replace_macros($tpl_header,array(
index 077f695bea14c15be10f592258847bcd6e3d1198..91b84e2b9414a64c444b895ac335bc2b87ff8200 100644 (file)
@@ -42,7 +42,7 @@ function profperm_content(&$a) {
                        intval($a->argv[2]),
                        intval(local_user())
                );
-               if(count($r))
+               if(dba::is_result($r))
                        $change = intval($a->argv[2]);
        }
 
@@ -64,7 +64,7 @@ function profperm_content(&$a) {
                );
 
                $ingroup = array();
-               if(count($r))
+               if(dba::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(dba::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(dba::is_result($r)) {
                        $textmode = (($switchtotext && (count($r) > $switchtotext)) ? true : false);
                        foreach($r as $member) {
                                if(! in_array($member['id'],$ingroup)) {
index abcaf4912798830546409ef6d16876bea9f3db96..02def84ca167e94788b70fe0c1c099beeacc1f51 100644 (file)
@@ -136,7 +136,7 @@ function proxy_init() {
 
        if (!$direct_cache AND ($cachefile == "")) {
                $r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' LIMIT 1", $urlhash);
-               if (count($r)) {
+               if (dba::is_result($r)) {
                        $img_str = $r[0]['data'];
                        $mime = $r[0]["desc"];
                        if ($mime == "") $mime = "image/jpeg";
index 5d7621cc745fdf648cd1dc79d83342d09ccbe694..a50efc9229c5bac7c78493322e829ca1f7da4194 100644 (file)
@@ -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 (dba::is_result($r)) {
                                $last_update = $r[0]['last_update'];
                                $push_flag = $r[0]['push'];
                        }
index c35e253b670508c23771013c04187ca482f36a44..0eabf6b7c6965caa89e473b71251950732a846a2 100644 (file)
@@ -23,7 +23,7 @@ function qsearch_init(&$a) {
                intval($limit)
        );
 
-       if(count($r)) {
+       if(dba::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(dba::is_result($r)) {
 
                foreach($r as $rr)
                        $results[] = array( (int) $rr['id'], 0, $rr['name'],$rr['url'],$rr['photo']);
index 5a90db1f902d0b0265d26c1da3104bb1b5ce3e70..47258e0914493a8e1cde401f62fa66eed2a19d95 100644 (file)
@@ -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(dba::is_result($r) && $r[0]['net-publish']) {
                $url = $a->get_baseurl() . '/profile/' . $user[0]['nickname'];
                if($url && strlen(get_config('system','directory')))
                        proc_run('php',"include/directory.php","$url");
index 37230a557351ad70e9b4faada55a17a89f6ef69e..ec0693b9412e7ac4be79c7d56a546346b7803bd4 100644 (file)
@@ -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((dba::is_result($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == CONTACT_IS_FOLLOWER) || ($r[0]['blocked']))) {
+       if(dba::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 = ((dba::is_result($r)) ? $r[0] : null);
 
        ostatus::import($data,$importer,$contact_rec, $hub);
 
index 790f577ba6e17511b6be30b39c3de963da5114a8..9ad1fe5077fe9b1d75491f68663351a042a9850d 100644 (file)
@@ -15,7 +15,7 @@ function search_saved_searches() {
                intval(local_user())
        );
 
-       if(count($r)) {
+       if(dba::is_result($r)) {
                $saved = array();
                foreach($r as $rr) {
                        $saved[] = array(
index c7659212bff242359a337e3e88b4cc4ef699d4a1..841742363911e1ec27f473c1679ed445ac1a5046 100644 (file)
@@ -254,7 +254,7 @@ function settings_post(&$a) {
                                $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
                                        intval(local_user())
                                );
-                               if(count($r)) {
+                               if(dba::is_result($r)) {
                                        $eacct = $r[0];
                                        require_once('include/email.php');
                                        $mb = construct_mailbox_name($eacct);
@@ -842,15 +842,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       = ((dba::is_result($r)) ? $r[0]['server'] : '');
+               $mail_port         = ((dba::is_result($r) && intval($r[0]['port'])) ? intval($r[0]['port']) : '');
+               $mail_ssl          = ((dba::is_result($r)) ? $r[0]['ssltype'] : '');
+               $mail_user         = ((dba::is_result($r)) ? $r[0]['user'] : '');
+               $mail_replyto      = ((dba::is_result($r)) ? $r[0]['reply_to'] : '');
+               $mail_pubmail      = ((dba::is_result($r)) ? $r[0]['pubmail'] : 0);
+               $mail_action       = ((dba::is_result($r)) ? $r[0]['action'] : 0);
+               $mail_movetofolder = ((dba::is_result($r)) ? $r[0]['movetofolder'] : '');
+               $mail_chk          = ((dba::is_result($r)) ? $r[0]['last_check'] : '0000-00-00 00:00:00');
 
 
                $tpl = get_markup_template("settings_connectors.tpl");
index 33cf7489c167764b716f3cee77ca7dae78011667..4b417b75b92402762cb989b84be14f26f4d9ecf2 100644 (file)
@@ -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(dba::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(dba::is_result($r))
                        $contact = $r[0];
        }
        if(! $contact) {
index 26166a3cc0458efb7885f3c8175521aaceb6bc72..78bf11cc4c6e94fc27a8def13bfc48f808f2a309 100644 (file)
@@ -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(dba::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(dba::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(dba::is_result($r)) {
                $x = q("SELECT `blocktags` FROM `user` WHERE `uid` = %d limit 1",
                        intval($r[0]['uid'])
                );
index 3114add7e4a56ae325ce024b379fd232a053f9fe..dde5fe090d9919b501691ace6662aad869c71731 100644 (file)
@@ -44,7 +44,7 @@ function uexport_content(&$a){
 function _uexport_multirow($query) {
        $result = array();
        $r = q($query);
-//     if(count($r)) {
+//     if(dba::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(dba::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(dba::is_result($r)) {
                        foreach($r as $rr)
                                foreach($rr as $k => $v)
                                        $item[][$k] = $v;
index bf8d696b60f90cceef1b14d825ba70151cde932f..2cd013b008c1731ff993f459792185c6156517e1 100644 (file)
@@ -143,7 +143,7 @@ function videos_post(&$a) {
                        dbesc($video_id)
                );
 
-               if(count($r)) {
+               if(dba::is_result($r)) {
                        q("DELETE FROM `attach` WHERE `uid` = %d AND `id` = '%s'",
                                intval(local_user()),
                                dbesc($video_id)
@@ -262,7 +262,7 @@ function videos_content(&$a) {
                                        intval($contact_id),
                                        intval($owner_uid)
                                );
-                               if(count($r)) {
+                               if(dba::is_result($r)) {
                                        $can_post = true;
                                        $contact = $r[0];
                                        $remote_contact = true;
@@ -290,7 +290,7 @@ function videos_content(&$a) {
                                intval($contact_id),
                                intval($owner_uid)
                        );
-                       if(count($r)) {
+                       if(dba::is_result($r)) {
                                $contact = $r[0];
                                $remote_contact = true;
                        }
@@ -350,8 +350,8 @@ function videos_content(&$a) {
                $sql_extra GROUP BY hash",
                intval($a->data['user']['uid'])
        );
-       if(count($r)) {
-               $a->set_pager_total(count($r));
+       if(dba::is_result($r)) {
+               $a->set_pager_total(dba::is_result($r));
                $a->set_pager_itemspage(20);
        }
 
@@ -366,7 +366,7 @@ function videos_content(&$a) {
 
 
        $videos = array();
-       if(count($r)) {
+       if(dba::is_result($r)) {
                foreach($r as $rr) {
                        if($a->theme['template_engine'] === 'internal') {
                                $alt_e = template_escape($rr['filename']);
index 04520e0d9309cc163ffe86c165625ef0e96233cd..43e31513085fdd7e058d9b12887ff36e8f6ac797 100644 (file)
@@ -54,7 +54,7 @@ function viewcontacts_content(&$a) {
                dbesc(NETWORK_DIASPORA),
                dbesc(NETWORK_OSTATUS)
        );
-       if(count($r))
+       if(dba::is_result($r))
                $a->set_pager_total($r[0]['total']);
 
        $r = q("SELECT * FROM `contact`
index 3fa4eaed53bad2b53686a59aef0af30acf1f5645..0c10cbf7c80dea057b6d35ba3f10e64126214ea1 100644 (file)
@@ -24,7 +24,7 @@ function viewsrc_content(&$a) {
                dbesc($item_id)
        );
 
-       if(count($r))
+       if(dba::is_result($r))
                if(is_ajax()) {
                        echo str_replace("\n",'<br />',$r[0]['body']);
                        killme();
index 68752a0e1f659082e51ec6df90add56663d5ba1d..9a041d944873ff77ddf7278af7c3d9e3ebba8922 100644 (file)
@@ -55,7 +55,7 @@ function wall_attach_post(&$a) {
                                        intval($cid),
                                        intval($page_owner_uid)
                                );
-                               if(count($r)) {
+                               if(dba::is_result($r)) {
                                        $can_post = true;
                                        $visitor = $cid;
                                }
index b815348c7010baddd103553dc653f83da416ce86..ac7dd77649c563b962d55447acd7372cc4eda0ee 100644 (file)
@@ -63,7 +63,7 @@ function wall_upload_post(&$a, $desktopmode = true) {
                                        intval($cid),
                                        intval($page_owner_uid)
                                );
-                               if(count($r)) {
+                               if(dba::is_result($r)) {
                                        $can_post = true;
                                        $visitor = $cid;
                                }
index 59659cdaff2e4816df0f42bcdfc4447ef10d51a3..e1a46532a1468dcd5c2bf7a4efb14a16b0054499 100644 (file)
@@ -225,7 +225,7 @@ class Item extends BaseObject {
                                        intval($item['uid']),
                                        intval($item['id'])
                                );
-                               if (count($r)) {
+                               if (dba::is_result($r)) {
                                        $ignore = array(
                                                'do' => t("ignore thread"),
                                                'undo' => t("unignore thread"),
index 40f016747f8a93ea8a971238e958a9904fdd8682..79dcb36a7f4c1800b6e84b89fbe73eb63712795a 100644 (file)
@@ -55,13 +55,13 @@ function q($sql) {
                        return $result; 
                }
                //second call in handle_body, name
-               if($result[0]['name']===$args[1]) {\r
-                       return $result;\r
+               if($result[0]['name']===$args[1]) {
+                       return $result;
                }
        }
        //third call in handle_body, nick or attag
-       if($result[0]['nick']===$args[2] || $result[0]['attag']===$args[1]) {\r
-               return $result;\r
+       if($result[0]['nick']===$args[2] || $result[0]['attag']===$args[1]) {
+               return $result;
        }
 }
 
@@ -88,23 +88,23 @@ function dbesc($str) {
  */
 class GetTagsTest extends PHPUnit_Framework_TestCase {
        /** the mock to use as app */
-       private $a; \r
+       private $a; 
 
        /**
         * initialize the test. That's a phpUnit function, 
         * don't change its name.
-        */\r
-       public function setUp() {\r
+        */
+       public function setUp() {
                $this->a=new MockApp(); 
        }
 
-       /**\r
-        * test with one Person tag\r
-        */\r
-       public function testGetTagsShortPerson() {\r
-               $text="hi @Mike";\r
-\r
-               $tags=get_tags($text);\r
+       /**
+        * test with one Person tag
+        */
+       public function testGetTagsShortPerson() {
+               $text="hi @Mike";
+
+               $tags=get_tags($text);
 
                $inform=''; 
                $str_tags='';
@@ -113,32 +113,32 @@ class GetTagsTest extends PHPUnit_Framework_TestCase {
                }
 
                //correct tags found?
-               $this->assertEquals(1, count($tags)); \r
+               $this->assertEquals(1, count($tags)); 
                $this->assertTrue(in_array("@Mike", $tags));
                
                //correct output from handle_tag?
                $this->assertEquals("cid:15", $inform); 
                $this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url]", $str_tags);
-               $this->assertEquals("hi @[url=http://justatest.de]Mike Lastname[/url]", $text);\r
+               $this->assertEquals("hi @[url=http://justatest.de]Mike Lastname[/url]", $text);
        }
        
-       /**\r
+       /**
         * test with one Person tag. 
-        * There's a minor spelling mistake...\r
-        */\r
-       public function testGetTagsShortPersonSpelling() {\r
-               $text="hi @Mike.because";\r
-       \r
-               $tags=get_tags($text);\r
+        * There's a minor spelling mistake...
+        */
+       public function testGetTagsShortPersonSpelling() {
+               $text="hi @Mike.because";
+       
+               $tags=get_tags($text);
        
-               //correct tags found?\r
-               $this->assertEquals(1, count($tags));\r
+               //correct tags found?
+               $this->assertEquals(1, count($tags));
                $this->assertTrue(in_array("@Mike.because", $tags));
-               \r
-               $inform='';\r
-               $str_tags='';\r
-               handle_tag($this->a, $text, $inform, $str_tags, 11, $tags[0]);\r
-       \r
+               
+               $inform='';
+               $str_tags='';
+               handle_tag($this->a, $text, $inform, $str_tags, 11, $tags[0]);
+       
                // (mike) - This is a tricky case.
                // we support mentions as in @mike@example.com - which contains a period.
                // This shouldn't match anything unless you have a contact named "Mike.because".
@@ -147,91 +147,91 @@ class GetTagsTest extends PHPUnit_Framework_TestCase {
  
 //             $this->assertEquals("cid:15", $inform); 
 //             $this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url]", $str_tags);
-//             $this->assertEquals("hi @[url=http://justatest.de]Mike Lastname[/url].because", $text);\r
+//             $this->assertEquals("hi @[url=http://justatest.de]Mike Lastname[/url].because", $text);
 
                $this->assertEquals("", $inform); 
                $this->assertEquals("", $str_tags);
 
        }
        
-       /**\r
+       /**
         * test with two Person tags. 
-        * There's a minor spelling mistake...\r
-        */\r
+        * There's a minor spelling mistake...
+        */
 
-       public function testGetTagsPerson2Spelling() {\r
-               $text="hi @Mike@campino@friendica.eu";\r
-       \r
-               $tags=get_tags($text);\r
+       public function testGetTagsPerson2Spelling() {
+               $text="hi @Mike@campino@friendica.eu";
+       
+               $tags=get_tags($text);
 
 // This construct is not supported. Results are indeterminate                  
-//             $this->assertEquals(2, count($tags)); \r
+//             $this->assertEquals(2, count($tags)); 
 //             $this->assertTrue(in_array("@Mike", $tags));
-//             $this->assertTrue(in_array("@campino@friendica.eu", $tags));\r
-       }\r
+//             $this->assertTrue(in_array("@campino@friendica.eu", $tags));
+       }
 
        /**
         * Test with one hash tag.
-        */\r
-       public function testGetTagsShortTag() {\r
-               $text="This is a #test_case";\r
-\r
-               $tags=get_tags($text);\r
+        */
+       public function testGetTagsShortTag() {
+               $text="This is a #test_case";
+
+               $tags=get_tags($text);
 
-               $this->assertEquals(1, count($tags));\r
-               $this->assertTrue(in_array("#test_case", $tags));\r
-       }\r
+               $this->assertEquals(1, count($tags));
+               $this->assertTrue(in_array("#test_case", $tags));
+       }
 
        /**
         * test with a person and a hash tag
-        */\r
-       public function testGetTagsShortTagAndPerson() {\r
-               $text="hi @Mike This is a #test_case";\r
-\r
-               $tags=get_tags($text);\r
+        */
+       public function testGetTagsShortTagAndPerson() {
+               $text="hi @Mike This is a #test_case";
+
+               $tags=get_tags($text);
 
                $this->assertEquals(3, count($tags));
                $this->assertTrue(in_array("@Mike", $tags));
-               $this->assertTrue(in_array("@Mike This", $tags));\r
-               $this->assertTrue(in_array("#test_case", $tags));\r
+               $this->assertTrue(in_array("@Mike This", $tags));
+               $this->assertTrue(in_array("#test_case", $tags));
 
                $inform='';
                $str_tags='';
                foreach($tags as $tag) {
                        handle_tag($this->a, $text, $inform, $str_tags, 11, $tag);
                }
-               \r
+               
                $this->assertEquals("cid:15", $inform); 
                $this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url],#[url=baseurl/search?tag=test%20case]test case[/url]", $str_tags);
                $this->assertEquals("hi @[url=http://justatest.de]Mike Lastname[/url] This is a #[url=baseurl/search?tag=test%20case]test case[/url]", $text); 
-               \r
-       }\r
+               
+       }
 
        /**
         * test with a person, a hash tag and some special chars.
-        */\r
-       public function testGetTagsShortTagAndPersonSpecialChars() {\r
-               $text="hi @Mike, This is a #test_case.";\r
-\r
-               $tags=get_tags($text);\r
-\r
+        */
+       public function testGetTagsShortTagAndPersonSpecialChars() {
+               $text="hi @Mike, This is a #test_case.";
+
+               $tags=get_tags($text);
+
                $this->assertEquals(2, count($tags));
                $this->assertTrue(in_array("@Mike", $tags));
-               $this->assertTrue(in_array("#test_case", $tags));\r
-       }\r
+               $this->assertTrue(in_array("#test_case", $tags));
+       }
 
        /**
         * Test with a person tag and text behind it.
-        */\r
-       public function testGetTagsPersonOnly() {\r
-               $text="@Test I saw the Theme Dev group was created.";\r
-\r
-               $tags=get_tags($text);\r
+        */
+       public function testGetTagsPersonOnly() {
+               $text="@Test I saw the Theme Dev group was created.";
+
+               $tags=get_tags($text);
 
-               $this->assertEquals(2, count($tags));\r
+               $this->assertEquals(2, count($tags));
                $this->assertTrue(in_array("@Test I", $tags));
-               $this->assertTrue(in_array("@Test", $tags));\r
-       }\r
+               $this->assertTrue(in_array("@Test", $tags));
+       }
 
        /**
         * this test demonstrates strange behaviour by intval. 
@@ -255,72 +255,72 @@ class GetTagsTest extends PHPUnit_Framework_TestCase {
                //happens right now, but it shouldn't be necessary
                $this->assertTrue(in_array("@mike+15 id", $tags));
                
-               $inform='';\r
+               $inform='';
                $str_tags='';
                foreach($tags as $tag) {
                        handle_tag($this->a, $text, $inform, $str_tags, 11, $tag);
                }
                
-               $this->assertEquals("Test with @[url=http://justatest.de]Mike Lastname[/url] id tag", $text);\r
-               $this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url]", $str_tags);\r
+               $this->assertEquals("Test with @[url=http://justatest.de]Mike Lastname[/url] id tag", $text);
+               $this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url]", $str_tags);
                // this test may produce two cid:15 entries - which is OK because duplicates are pruned before delivery
                $this->assertContains("cid:15",$inform);
        }
        
        /**
         * test with two persons and one special tag.
-        */\r
-       public function testGetTags2Persons1TagSpecialChars() {\r
-               $text="hi @Mike, I'm just writing #test_cases, so"\r
-               ." so @somebody@friendica.com may change #things.";\r
-\r
-               $tags=get_tags($text);\r
-
-               $this->assertEquals(5, count($tags));\r
-               $this->assertTrue(in_array("@Mike", $tags));\r
+        */
+       public function testGetTags2Persons1TagSpecialChars() {
+               $text="hi @Mike, I'm just writing #test_cases, so"
+               ." so @somebody@friendica.com may change #things.";
+
+               $tags=get_tags($text);
+
+               $this->assertEquals(5, count($tags));
+               $this->assertTrue(in_array("@Mike", $tags));
                $this->assertTrue(in_array("#test_cases", $tags));
-               $this->assertTrue(in_array("@somebody@friendica.com", $tags));\r
-               $this->assertTrue(in_array("@somebody@friendica.com may", $tags));\r
-               $this->assertTrue(in_array("#things", $tags));\r
-       }\r
+               $this->assertTrue(in_array("@somebody@friendica.com", $tags));
+               $this->assertTrue(in_array("@somebody@friendica.com may", $tags));
+               $this->assertTrue(in_array("#things", $tags));
+       }
 
        /**
         * test with a long text.
-        */\r
-       public function testGetTags() {\r
-               $text="hi @Mike, I'm just writing #test_cases, "\r
-               ." so @somebody@friendica.com may change #things. Of course I "\r
-               ."look for a lot of #pitfalls, like #tags at the end of a sentence "\r
-               ."@comment. I hope noone forgets about @fullstops.because that might"\r
-               ." break #things. @Mike@campino@friendica.eu is also #nice, isn't it? "\r
-               ."Now, add a @first_last tag. ";\r
-               \r
-               $tags=get_tags($text);\r
-\r
-               $this->assertTrue(in_array("@Mike", $tags));\r
-               $this->assertTrue(in_array("#test_cases", $tags));\r
-               $this->assertTrue(in_array("@somebody@friendica.com", $tags));\r
-               $this->assertTrue(in_array("#things", $tags));\r
-               $this->assertTrue(in_array("#pitfalls", $tags));\r
-               $this->assertTrue(in_array("#tags", $tags));\r
-               $this->assertTrue(in_array("@comment", $tags));\r
-               $this->assertTrue(in_array("@fullstops.because", $tags));\r
-               $this->assertTrue(in_array("#things", $tags));\r
-               $this->assertTrue(in_array("@Mike", $tags));\r
-               $this->assertTrue(in_array("#nice", $tags));\r
+        */
+       public function testGetTags() {
+               $text="hi @Mike, I'm just writing #test_cases, "
+               ." so @somebody@friendica.com may change #things. Of course I "
+               ."look for a lot of #pitfalls, like #tags at the end of a sentence "
+               ."@comment. I hope noone forgets about @fullstops.because that might"
+               ." break #things. @Mike@campino@friendica.eu is also #nice, isn't it? "
+               ."Now, add a @first_last tag. ";
+               
+               $tags=get_tags($text);
+
+               $this->assertTrue(in_array("@Mike", $tags));
+               $this->assertTrue(in_array("#test_cases", $tags));
+               $this->assertTrue(in_array("@somebody@friendica.com", $tags));
+               $this->assertTrue(in_array("#things", $tags));
+               $this->assertTrue(in_array("#pitfalls", $tags));
+               $this->assertTrue(in_array("#tags", $tags));
+               $this->assertTrue(in_array("@comment", $tags));
+               $this->assertTrue(in_array("@fullstops.because", $tags));
+               $this->assertTrue(in_array("#things", $tags));
+               $this->assertTrue(in_array("@Mike", $tags));
+               $this->assertTrue(in_array("#nice", $tags));
                $this->assertTrue(in_array("@first_last", $tags));
                
                //right now, none of the is matched (unsupported)
-//             $this->assertFalse(in_array("@Mike@campino@friendica.eu", $tags));\r
+//             $this->assertFalse(in_array("@Mike@campino@friendica.eu", $tags));
 //             $this->assertTrue(in_array("@campino@friendica.eu", $tags));
-//             $this->assertTrue(in_array("@campino@friendica.eu is", $tags));\r
-       }\r
+//             $this->assertTrue(in_array("@campino@friendica.eu is", $tags));
+       }
 
        /**
         * test with an empty string
-        */\r
-       public function testGetTagsEmpty() {\r
-               $tags=get_tags("");\r
-               $this->assertEquals(0, count($tags));\r
+        */
+       public function testGetTagsEmpty() {
+               $tags=get_tags("");
+               $this->assertEquals(0, count($tags));
        }
-}
\ No newline at end of file
+}
index b74edf7bbd98ce3acfb21df354bc5e64b7e8dab5..5ab3e69f3b794bd6727e9e697e110a58d070630e 100644 (file)
@@ -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(dba::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(dba::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(dba::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(dba::is_result($r)) {
                foreach($r as $rr) {
                        if(stristr($rr['thumb'],'avatar'))
                                q("UPDATE `contact` SET `micro` = '%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(dba::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(dba::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(dba::is_result($r)) {
                foreach($r as $rr) {
                        $found = true;
                        do {
@@ -688,7 +688,7 @@ function update_1082() {
        if($r && count($r))
                return;
        $r = q("SELECT distinct(`resource-id`) FROM `photo` WHERE 1 group by `id`");
-       if(count($r)) {
+       if(dba::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(dba::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(dba::is_result($r)) {
                foreach($r as $rr) {
                        q("update contact set nurl = '%s' where id = %d",
                                dbesc(normalise_link($rr['url'])),
@@ -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(dba::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(dba::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 (dba::is_result($r)) {
                foreach ($r as $rr) {
                        $uid = $rr['uid'];
                        $family = $rr['cat'];
index 972ad2e7cbf224b2ab5250d40bed52033c676bbc..a13923ce4f07beb732c9b2577c2f1b5d014b18b8 100644 (file)
@@ -393,7 +393,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
        $r = q("select gcontact.* from gcontact left join glink on glink.gcid = gcontact.id
                          where glink.cid = 0 and glink.uid = 0 order by rand() limit 9");
        $tpl = get_markup_template('ch_directory_item.tpl');
-       if(count($r)) {
+       if(dba::is_result($r)) {
                $photo = 'photo';
                foreach($r as $rr) {
                        $profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
@@ -422,7 +422,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
                9
        );
        $tpl = get_markup_template('ch_directory_item.tpl');
-       if(count($r)) {
+       if(dba::is_result($r)) {
                $photo = 'thumb';
                foreach($r as $rr) {
                        $profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
@@ -499,7 +499,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
                                dbesc(t('Contact Photos')),
                                dbesc(t('Profile Photos'))
                                );
-               if(count($r)) {
+               if(dba::is_result($r)) {
                $tpl = get_markup_template('ch_directory_item.tpl');
                foreach($r as $rr) {
                        $photo_page = $a->get_baseurl() . '/photos/' . $rr['nickname'] . '/image/' . $rr['resource-id'];
index 925ac76a1fe2284b4798a34268ceb95e7189b314..2d00f231cd3deea0ba736c7a7069cd0152bba36c 100644 (file)
@@ -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(dba::is_result($r)) {
 
                        $aside['$comunity_profiles_title'] = t('Community Profiles');
                        $aside['$comunity_profiles_items'] = array();
@@ -170,13 +170,14 @@ function vier_community_info() {
                $publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 ");
                $order = " ORDER BY `register_date` DESC ";
 
+               $tpl = get_markup_template('ch_directory_item.tpl');
+
                $r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`
                                FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
                                WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $order LIMIT %d , %d ",
                                0, 9);
 
-               $tpl = get_markup_template('ch_directory_item.tpl');
-               if(count($r)) {
+               if(dba::is_result($r)) {
 
                        $aside['$lastusers_title'] = t('Last users');
                        $aside['$lastusers_items'] = array();
@@ -367,7 +368,7 @@ function vier_community_info() {
 
                $tpl = get_markup_template('ch_connectors.tpl');
 
-               if(count($r)) {
+               if(dba::is_result($r)) {
 
                        $con_services = array();
                        $con_services['title'] = Array("", t('Connect Services'), "", "");