From: Roland Haeder Date: Sun, 18 Sep 2016 21:21:18 +0000 (+0200) Subject: This merge brings back dbm::is_result() where I could find it. X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c825cc8d0d61386cb00b6310fc4ea46c4354460d;p=friendica.git This merge brings back dbm::is_result() where I could find it. Merge branch 'develop' of github.com:friendica/friendica into rhaeder-develop Signed-off-by: Roland Haeder --- c825cc8d0d61386cb00b6310fc4ea46c4354460d diff --cc include/Contact.php index a5930e1cfc,1dbf21c737..6e8f93c9b1 --- a/include/Contact.php +++ b/include/Contact.php @@@ -368,7 -393,7 +393,7 @@@ function random_profile() ORDER BY rand() LIMIT 1", dbesc(NETWORK_DFRN)); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) return dirname($r[0]['url']); return ''; } diff --cc include/Photo.php index 23148f69cc,d87bce4787..1bd1b3a26a --- a/include/Photo.php +++ b/include/Photo.php @@@ -589,7 -589,7 +589,7 @@@ class Photo $r = q("select `guid` from photo where `resource-id` = '%s' and `guid` != '' limit 1", dbesc($rid) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $guid = $r[0]['guid']; else $guid = get_guid(); diff --cc include/acl_selectors.php index 93dcdea742,71a42478ba..6b0a822cc2 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@@ -33,7 -33,7 +33,7 @@@ function group_select($selname,$selclas call_hooks($a->module . '_pre_' . $selname, $arr); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { foreach($r as $rr) { if((is_array($preselected)) && in_array($rr['id'], $preselected)) $selected = " selected=\"selected\" "; @@@ -144,7 -144,7 +144,7 @@@ function contact_selector($selname, $se call_hooks($a->module . '_pre_' . $selname, $arr); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { foreach($r as $rr) { if((is_array($preselected)) && in_array($rr['id'], $preselected)) $selected = " selected=\"selected\" "; @@@ -220,7 -220,7 +220,7 @@@ function contact_select($selname, $selc $receiverlist = array(); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { foreach($r as $rr) { if((is_array($preselected)) && in_array($rr['id'], $preselected)) $selected = " selected=\"selected\" "; @@@ -314,7 -314,7 +314,7 @@@ function populate_acl($user = null, $sh $r = q("SELECT `pubmail` FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1", intval(local_user()) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $mail_enabled = true; if(intval($r[0]['pubmail'])) $pubmail_enabled = true; @@@ -577,7 -577,7 +577,7 @@@ function acl_lookup(&$a, $out_type = 'j $r = array(); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { foreach($r as $g){ $contacts[] = array( "type" => "c", @@@ -612,7 -612,7 +612,7 @@@ dbesc($search), implode("','", $known_contacts) ); - if (dba::is_result($r)){ - if (is_array($r) && count($r)){ ++ if (dbm::is_result($r)){ foreach($r as $row) { // nickname.. $up = parse_url($row['author-link']); diff --cc include/api.php index e25c15560e,a9c5e7a468..d6f6dec7d9 --- a/include/api.php +++ b/include/api.php @@@ -207,7 -208,7 +208,7 @@@ dbesc(trim($user)), dbesc($encrypted) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $record = $r[0]; } @@@ -1246,15 -1336,18 +1336,18 @@@ if (isset($_GET["q"])) { $r = q("SELECT id FROM `gcontact` WHERE `name`='%s'", dbesc($_GET["q"])); -- if (!count($r)) ++ if (!dbm::is_result($r)) $r = q("SELECT `id` FROM `gcontact` WHERE `nick`='%s'", dbesc($_GET["q"])); - if (dba::is_result($r)) { - if (count($r)) { ++ if (dbm::is_result($r)) { + $k = 0; foreach ($r AS $user) { - $user_info = api_get_user($a, $user["id"]); - //echo print_r($user_info, true)."\n"; - $userdata = api_apply_template("user", $type, array('user' => $user_info)); - $userlist[] = $userdata["user"]; + $user_info = api_get_user($a, $user["id"], "json"); + + if ($type == "xml") + $userlist[$k++.":user"] = $user_info; + else + $userlist[] = $user_info; } $userlist = array("users" => $userlist); } else { @@@ -2612,36 -2747,24 +2747,23 @@@ intval(api_user()) ); - if(dba::is_result($r)) { - if(!dbm::is_result($r)) - return; ++ if(dbm::is_result($r)) { - if($type === 'xml') { - header("Content-type: application/xml"); - echo '' . "\r\n" . '' . "\r\n"; - foreach($r as $rr) - echo '' . $rr['id'] . '' . "\r\n"; - echo '' . "\r\n"; - killme(); - } - elseif($type === 'json') { - $ret = array(); - header("Content-type: application/json"); - foreach($r as $rr) - if ($stringify_ids) - $ret[] = $rr['id']; - else - $ret[] = intval($rr['id']); + $ids = array(); + foreach($r as $rr) + if ($stringify_ids) + $ids[] = $rr['id']; + else + $ids[] = intval($rr['id']); - echo json_encode($ret); - killme(); - } - } + return api_format_data("ids", $type, array('id' => $ids)); } - function api_friends_ids(&$a,$type) { - api_ff_ids($a,$type,'friends'); + function api_friends_ids($type) { + return api_ff_ids($type,'friends'); } - function api_followers_ids(&$a,$type) { - api_ff_ids($a,$type,'followers'); + function api_followers_ids($type) { + return api_ff_ids($type,'followers'); } api_register_func('api/friends/ids','api_friends_ids',true); api_register_func('api/followers/ids','api_followers_ids',true); diff --cc include/auth.php index f3193ee904,d1917b8b30..5dc19d1dfc --- a/include/auth.php +++ b/include/auth.php @@@ -50,7 -50,7 +50,7 @@@ if (isset($_SESSION) && x($_SESSION,'au $r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1", intval($_SESSION['visitor_id']) ); - if (dba::is_result($r)) { - if (count($r)) { ++ if (dbm::is_result($r)) { $a->contact = $r[0]; } } @@@ -169,7 -169,7 +169,7 @@@ dbesc(trim($_POST['username'])), dbesc($encrypted) ); - if (dba::is_result($r)) - if (count($r)) ++ if (dbm::is_result($r)) $record = $r[0]; } diff --cc include/cache.php index 7640f347b1,d0b0dfafda..032d231b24 --- a/include/cache.php +++ b/include/cache.php @@@ -10,7 -10,7 +10,7 @@@ dbesc($key) ); - if (dba::is_result($r)) - if (count($r)) ++ if (dbm::is_result($r)) return $r[0]['v']; return null; @@@ -38,7 -38,7 +38,7 @@@ * $r = q("SELECT * FROM `cache` WHERE `k`='%s' limit 1", * dbesc($key) * ); - * if(dba::is_result($r)) { - * if(count($r)) { ++ * if(dbm::is_result($r)) { * q("UPDATE `cache` SET `v` = '%s', `updated = '%s' WHERE `k` = '%s'", * dbesc($value), * dbesc(datetime_convert()), diff --cc include/contact_selectors.php index 77d38590b5,35c9d983d7..8a7dd56061 --- a/include/contact_selectors.php +++ b/include/contact_selectors.php @@@ -7,12 -7,12 +7,12 @@@ function contact_profile_assign($curren $disabled = (($foreign_net) ? ' disabled="true" ' : ''); - $o .= "\r\n"; $r = q("SELECT `id`, `profile-name` FROM `profile` WHERE `uid` = %d", - intval($_SESSION['uid'])); + intval($_SESSION['uid'])); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { foreach($r as $rr) { $selected = (($rr['id'] == $current) ? " selected=\"selected\" " : ""); $o .= "\r\n"; diff --cc include/contact_widgets.php index 8fabc6ff69,bbbd941b56..e0a33eee08 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@@ -93,7 -93,7 +93,7 @@@ function networks_widget($baseurl,$sele ); $nets = array(); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { require_once('include/contact_selectors.php'); foreach($r as $rr) { if($rr['network']) @@@ -204,13 -204,13 +204,13 @@@ function common_friends_visitor_widget( dbesc(normalise_link(get_my_url())), intval($profile_uid) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $cid = $r[0]['id']; else { $r = q("select id from gcontact where nurl = '%s' limit 1", dbesc(normalise_link(get_my_url())) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $zcid = $r[0]['id']; } } diff --cc include/cron.php index 00dd500704,0669f24a1e..a32f13ab61 --- a/include/cron.php +++ b/include/cron.php @@@ -382,7 -410,7 +410,7 @@@ function cron_repair_diaspora(&$a) $r = q("SELECT `id`, `url` FROM `contact` WHERE `network` = '%s' AND (`batch` = '' OR `notify` = '' OR `poll` = '' OR pubkey = '') ORDER BY RAND() LIMIT 50", dbesc(NETWORK_DIASPORA)); -- if ($r) { ++ if (dbm::is_result($r)) { foreach ($r AS $contact) { if (poco_reachable($contact["url"])) { $data = probe_url($contact["url"]); @@@ -410,6 -438,12 +438,12 @@@ function cron_repair_database() // There was an issue where the nick vanishes from the contact table q("UPDATE `contact` INNER JOIN `user` ON `contact`.`uid` = `user`.`uid` SET `nick` = `nickname` WHERE `self` AND `nick`=''"); + // Update the global contacts for local users + $r = q("SELECT `uid` FROM `user` WHERE `verified` AND NOT `blocked` AND NOT `account_removed` AND NOT `account_expired`"); - if ($r) ++ if (dbm::is_result($r)) + foreach ($r AS $user) + update_gcontact_for_user($user["uid"]); + /// @todo /// - remove thread entries without item /// - remove sign entries without item diff --cc include/datetime.php index da9e84d90f,ea98f01fe0..3ac476b008 --- a/include/datetime.php +++ b/include/datetime.php @@@ -544,7 -558,7 +558,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(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { foreach($r as $rr) { logger('update_contact_birthday: ' . $rr['bd']); diff --cc include/delivery.php index 7375beb232,fe33774382..66f5e931ba --- a/include/delivery.php +++ b/include/delivery.php @@@ -254,7 -254,7 +254,7 @@@ function delivery_run(&$argv, &$argc) intval($contact_id) ); - if (dba::is_result($r)) - if (count($r)) ++ if (dbm::is_result($r)) $contact = $r[0]; if ($contact['self']) @@@ -416,7 -416,7 +416,7 @@@ intval($argv[2]), intval($uid) ); - if (dba::is_result($r)) - if (count($r)) ++ if (dbm::is_result($r)) $it = $r[0]; } if (!$it) diff --cc include/dfrn.php index 4d116153bf,27fc644c6b..1615031ae0 --- a/include/dfrn.php +++ b/include/dfrn.php @@@ -1430,7 -1458,7 +1458,7 @@@ class dfrn dbesc(normalise_link($suggest["url"])), intval($suggest["uid"]) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) return false; // Do we already have an fcontact record for this person? @@@ -1441,7 -1469,7 +1469,7 @@@ dbesc($suggest["name"]), dbesc($suggest["request"]) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $fid = $r[0]["id"]; // OK, we do. Do we already have an introduction for this person ? @@@ -1449,7 -1477,7 +1477,7 @@@ intval($suggest["uid"]), intval($fid) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) return false; } if(!$fid) @@@ -1464,7 -1492,7 +1492,7 @@@ dbesc($suggest["name"]), dbesc($suggest["request"]) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $fid = $r[0]["id"]; else // database record did not get created. Quietly give up. @@@ -2120,7 -2188,7 +2188,7 @@@ dbesc($item["uri"]), intval($importer["uid"]) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $ev["id"] = $r[0]["id"]; $event_id = event_store($ev); @@@ -2141,7 -2209,7 +2209,7 @@@ } // Update content if 'updated' changes - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { if (self::update_content($r[0], $item, $importer, $entrytype)) logger("Item ".$item["uri"]." was updated.", LOGGER_DEBUG); else @@@ -2163,7 -2231,7 +2231,7 @@@ intval($posted_id), intval($importer["importer_uid"]) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $parent = $r[0]["parent"]; $parent_uri = $r[0]["parent-uri"]; } @@@ -2345,7 -2413,7 +2413,7 @@@ dbesc($item["parent-uri"]), intval($importer["uid"]) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d", intval($r[0]["id"]) ); diff --cc include/diaspora.php index 0556511857,db6844f44d..ae8522d003 --- a/include/diaspora.php +++ b/include/diaspora.php @@@ -1188,7 -1274,7 +1274,7 @@@ class diaspora $r = q("SELECT `id` FROM `mail` WHERE `uri` = '%s' LIMIT 1", dbesc($message_uri) ); -- if($r) { ++ if(dbm::is_result($r)) { logger("duplicate message already delivered.", LOGGER_DEBUG); return false; } @@@ -2736,7 -2913,7 +2913,7 @@@ $p = q("SELECT `guid`, `uri`, `parent-uri` FROM `item` WHERE `uri` = '%s' LIMIT 1", dbesc($item["thr-parent"])); -- if(!$p) ++ if(!dbm::is_result($p)) return false; $parent = $p[0]; @@@ -2767,7 -2944,7 +2944,7 @@@ intval($item["parent"]) ); -- if (!$p) ++ if (!dbm::is_result($p)) return false; $parent = $p[0]; @@@ -2981,7 -3158,7 +3158,7 @@@ intval($item["uid"]) ); -- if (!$r) { ++ if (!dbm::is_result($r)) { logger("conversation not found."); return; } diff --cc include/enotify.php index 55fec1f318,bed00c5eaf..3d72684498 --- a/include/enotify.php +++ b/include/enotify.php @@@ -401,7 -411,7 +411,7 @@@ function notification($params) $hash = random_string(); $r = q("SELECT `id` FROM `notify` WHERE `hash` = '%s' LIMIT 1", dbesc($hash)); - if(dba::is_result($r)) - if (count($r)) ++ if(dbm::is_result($r)) $dups = true; } while($dups == true); @@@ -703,26 -723,26 +723,26 @@@ function check_item_notification($itemi $params["source_photo"] = $item[0]["author-avatar"]; if ($item[0]["parent-uri"] === $item[0]["uri"]) { - // Send a notification for every new post? - $r = q("SELECT `notify_new_posts` FROM `contact` WHERE `id` = %d AND `uid` = %d AND `notify_new_posts` LIMIT 1", - intval($item[0]['contact-id']), - intval($uid) - ); - $send_notification = count($r); - - if (!$send_notification) { - $tags = q("SELECT `url` FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` = %d AND `uid` = %d", - intval(TERM_OBJ_POST), intval($itemid), intval(TERM_MENTION), intval($uid)); - - if (count($tags)) { - 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 (dba::is_result($r)) - $send_notification = true; - } - } - } + // Send a notification for every new post? + $r = q("SELECT `notify_new_posts` FROM `contact` WHERE `id` = %d AND `uid` = %d AND `notify_new_posts` LIMIT 1", + intval($item[0]['contact-id']), + intval($uid) + ); - $send_notification = count($r); ++ $send_notification = dbm::is_result($r); + + if (!$send_notification) { + $tags = q("SELECT `url` FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` = %d AND `uid` = %d", + intval(TERM_OBJ_POST), intval($itemid), intval(TERM_MENTION), intval($uid)); + - if (count($tags)) { ++ if (dbm::is_result($tags)) { + foreach ($tags AS $tag) { + $r = q("SELECT `id` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `notify_new_posts`", + normalise_link($tag["url"]), intval($uid)); - if (count($r)) ++ if (dbm::is_result($r)) + $send_notification = true; + } + } + } if ($send_notification) { $params["type"] = NOTIFY_SHARE; diff --cc include/event.php index 4d5f3b8a1b,a68e1c4626..88166fc9e7 --- a/include/event.php +++ b/include/event.php @@@ -276,7 -279,7 +279,7 @@@ function event_store($arr) intval($arr['id']), intval($arr['uid']) ); - return((dba::is_result($r)) ? $r[0]['id'] : 0); - return((count($r)) ? $r[0]['id'] : 0); ++ return((dbm::is_result($r)) ? $r[0]['id'] : 0); } // The event changed. Update it. @@@ -317,7 -312,7 +312,7 @@@ intval($arr['id']), intval($arr['uid']) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $object = '' . xmlify(ACTIVITY_OBJ_EVENT) . '' . xmlify($arr['uri']) . ''; $object .= '' . xmlify(format_event_bbcode($arr)) . ''; $object .= '' . "\n"; @@@ -376,7 -365,7 +365,7 @@@ dbesc($arr['uri']), intval($arr['uid']) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $event = $r[0]; $item_arr = array(); @@@ -418,7 -407,7 +407,7 @@@ $r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($arr['uid']) ); - //if(dba::is_result($r)) - //if(count($r)) ++ //if(dbm::is_result($r)) // $plink = $a->get_baseurl() . '/display/' . $r[0]['nickname'] . '/' . $item_id; diff --cc include/expire.php index 5cc22d6830,873c594e84..5110713cdb --- a/include/expire.php +++ b/include/expire.php @@@ -39,7 -39,7 +39,7 @@@ function expire_run(&$argv, &$argc) logger('expire: start'); $r = q("SELECT `uid`,`username`,`expire` FROM `user` WHERE `expire` != 0"); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { foreach($r as $rr) { logger('Expire: ' . $rr['username'] . ' interval: ' . $rr['expire'], LOGGER_DEBUG); item_expire($rr['uid'],$rr['expire']); diff --cc include/fcontact.php index b268f2a037,8821a985f2..45145ddf99 --- a/include/fcontact.php +++ b/include/fcontact.php @@@ -10,7 -10,7 +10,7 @@@ function fcontact_store($url,$name,$pho dbesc($nurl) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) return $r[0]['id']; $r = q("INSERT INTO `fcontact` ( `url`, `name`, `photo` ) VALUES ( '%s', '%s', '%s' ) ", @@@ -23,7 -23,7 +23,7 @@@ $r = q("SELECT `id` FROM `fcontact` WHERE `url` = '%s' LIMIT 1", dbesc($nurl) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) return $r[0]['id']; } diff --cc include/follow.php index d5870e05de,08e74e02f3..1f188bf178 --- a/include/follow.php +++ b/include/follow.php @@@ -178,7 -178,7 +178,7 @@@ function new_contact($uid,$url,$interac intval($uid), dbesc(normalise_link($url)), dbesc($ret['network']) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { // update contact if($r[0]['rel'] == CONTACT_IS_FOLLOWER || ($network === NETWORK_DIASPORA && $r[0]['rel'] == CONTACT_IS_SHARING)) { q("UPDATE `contact` SET `rel` = %d , `subhub` = %d, `readonly` = 0 WHERE `id` = %d AND `uid` = %d", @@@ -196,7 -196,7 +196,7 @@@ $r = q("select count(*) as total from contact where uid = %d and pending = 0 and self = 0", intval($uid) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $total_contacts = $r[0]['total']; if(! service_class_allows($uid,'total_contacts',$total_contacts)) { @@@ -208,7 -208,7 +208,7 @@@ intval($uid), dbesc($network) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $total_network = $r[0]['total']; if(! service_class_allows($uid,'total_contacts_' . $network,$total_network)) { @@@ -295,7 -295,7 +295,7 @@@ intval($uid) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { if(($contact['network'] == NETWORK_OSTATUS) && (strlen($contact['notify']))) { require_once('include/salmon.php'); slapper($r[0],$contact['notify'],$slap); diff --cc include/gprobe.php index 70c45547eb,91b9b16e33..d6c1e91250 --- a/include/gprobe.php +++ b/include/gprobe.php @@@ -65,7 -65,7 +65,7 @@@ function gprobe_run(&$argv, &$argc) dbesc(normalise_link($url)) ); } - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::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'])); diff --cc include/group.php index 1c1fa631a1,53c0b78d84..21f1943993 --- a/include/group.php +++ b/include/group.php @@@ -44,7 -44,7 +44,7 @@@ function group_rmv($uid,$name) intval($uid), dbesc($name) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $group_id = $r[0]['id']; if(! $group_id) return false; @@@ -106,7 -106,7 +106,7 @@@ function group_byname($uid,$name) intval($uid), dbesc($name) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) return $r[0]['id']; return false; } @@@ -139,7 -139,7 +139,7 @@@ function group_add_member($uid,$name,$m intval($gid), intval($member) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) return true; // You might question this, but // we indicate success because the group member was in fact created // -- It was just created at another time @@@ -164,7 -164,7 +164,7 @@@ function group_get_members($gid) intval($gid), intval(local_user()) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $ret = $r; } return $ret; @@@ -181,7 -181,7 +181,7 @@@ function group_public_members($gid) intval(local_user()), dbesc(NETWORK_OSTATUS) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $ret = count($r); } return $ret; @@@ -197,7 -197,7 +197,7 @@@ function mini_group_select($uid,$gid = intval($uid) ); $grps[] = array('name' => '', 'id' => '0', 'selected' => ''); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { foreach($r as $rr) { $grps[] = array('name' => $rr['name'], 'id' => $rr['id'], 'selected' => (($gid == $rr['id']) ? 'true' : '')); } @@@ -255,7 -255,7 +255,7 @@@ function group_side($every="contacts",$ $member_of = groups_containing(local_user(),$cid); } - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { foreach($r as $rr) { $selected = (($group_id == $rr['id']) ? ' group-selected' : ''); @@@ -316,7 -316,7 +316,7 @@@ function expand_groups($a,$check_dead $ret = array(); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) foreach($r as $rr) $ret[] = $rr['contact-id']; if($check_dead AND !$use_gcontact) { @@@ -345,7 -345,7 +345,7 @@@ function groups_containing($uid,$c) ); $ret = array(); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { foreach($r as $rr) $ret[] = $rr['gid']; } diff --cc include/identity.php index 18154a0fb8,91b31c0784..c0c7936717 --- a/include/identity.php +++ b/include/identity.php @@@ -138,7 -138,7 +138,7 @@@ function get_profiledata_by_nick($nickn $r = q("SELECT `profile-id` FROM `contact` WHERE `id` = %d LIMIT 1", intval($visitor['cid']) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $profile = $r[0]['profile-id']; break; } @@@ -230,7 -230,7 +230,7 @@@ function profile_sidebar($profile, $blo $r = q("SELECT * FROM `contact` WHERE NOT `pending` AND `uid` = %d AND `nurl` = '%s'", local_user(), $profile_url); - if (dba::is_result($r)) - if (count($r)) ++ if (dbm::is_result($r)) $connect = false; } @@@ -263,7 -283,7 +283,7 @@@ 'entries' => array(), ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { foreach($r as $rr) { $profile['menu']['entries'][] = array( @@@ -344,7 -367,7 +367,7 @@@ 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(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $updated = date("c", strtotime($r[0]['updated'])); $r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 AND `archive` = 0 @@@ -354,7 -377,7 +377,7 @@@ dbesc(NETWORK_DIASPORA), dbesc(NETWORK_OSTATUS) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $contacts = intval($r[0]['total']); } } diff --cc include/items.php index cc416d8d98,6d2c830f96..8f07099615 --- a/include/items.php +++ b/include/items.php @@@ -413,7 -413,7 +413,7 @@@ function item_store($arr,$force_parent /* check for create date and expire time */ $uid = intval($arr['uid']); $r = q("SELECT expire FROM user WHERE uid = %d", intval($uid)); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $expire_interval = $r[0]['expire']; if ($expire_interval>0) { $expire_date = new DateTime( '- '.$expire_interval.' days', new DateTimeZone('UTC')); @@@ -535,7 -542,7 +542,7 @@@ intval($arr['uid']) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $arr['network'] = $r[0]["network"]; // Fallback to friendica (why is it empty in some cases?) @@@ -583,7 -596,7 +596,7 @@@ $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(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { logger('found item with guid '.$arr['guid'].' for user '.$arr['uid'].' on network '.$arr['network'], LOGGER_DEBUG); return 0; } @@@ -612,7 -625,7 +625,7 @@@ intval($arr['uid']) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { // is the new message multi-level threaded? // even though we don't support it now, preserve the info @@@ -768,7 -781,7 +781,7 @@@ intval($r[0]["id"]) ); return 0; - } elseif(dba::is_result($r)) { - } elseif(count($r)) { ++ } elseif(dbm::is_result($r)) { $current_post = $r[0]['id']; logger('item_store: created item ' . $current_post); @@@ -979,7 -992,7 +992,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 (dba::is_result($r)) - if (count($r)) ++ if (dbm::is_result($r)) return($r[0]["guid"]); else return(""); @@@ -998,7 -1011,7 +1011,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 (dba::is_result($r)) { - if (count($r)) { ++ if (dbm::is_result($r)) { $id = $r[0]["id"]; $nick = $r[0]["nickname"]; } @@@ -1012,7 -1025,7 +1025,7 @@@ AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `item`.`guid` = '%s'", dbesc($guid)); - if (dba::is_result($r)) { - if (count($r)) { ++ if (dbm::is_result($r)) { $id = $r[0]["id"]; $nick = $r[0]["nickname"]; } @@@ -1313,7 -1326,7 +1326,7 @@@ function item_is_remote_self($contact, if ($contact['remote_self'] == 2) { $r = q("SELECT `id`,`url`,`name`,`thumb` FROM `contact` WHERE `uid` = %d AND `self`", intval($contact['uid'])); - if (dba::is_result($r)) { - if (count($r)) { ++ if (dbm::is_result($r)) { $datarray['contact-id'] = $r[0]["id"]; $datarray['owner-name'] = $r[0]["name"]; @@@ -1390,17 -1403,9 +1403,9 @@@ function new_follower($importer,$contac intval($importer['uid']), dbesc($url) ); - if(dba::is_result($r)) { - $contact_record = $r[0]; - - $photos = import_profile_photo($photo,$importer["uid"],$contact_record["id"]); - - q("UPDATE `contact` SET `photo` = '%s', `thumb` = '%s', `micro` = '%s' WHERE `id` = %d", - dbesc($photos[0]), - dbesc($photos[1]), - dbesc($photos[2]), - intval($contact_record["id"]) - ); - if(count($r)) { ++ if(dbm::is_result($r)) { + $contact_record = $r[0]; + update_contact_avatar($photo, $importer["uid"], $contact_record["id"], true); } @@@ -1408,7 -1413,7 +1413,8 @@@ intval($importer['uid']) ); $a = get_app(); -- if(count($r) AND !in_array($r[0]['page-flags'], array(PAGE_SOAPBOX, PAGE_FREELOVE))) { ++ ++ if(dbm::is_result($r) AND !in_array($r[0]['page-flags'], array(PAGE_SOAPBOX, PAGE_FREELOVE))) { // create notification $hash = random_string(); @@@ -1982,7 -1987,7 +1988,7 @@@ function drop_item($id,$interactive = t dbesc($item['parent-uri']), intval($item['uid']) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d", intval($r[0]['id']) ); @@@ -2019,7 -2024,7 +2025,7 @@@ function first_post_date($uid,$wall = f intval($uid), intval($wall ? 1 : 0) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { // logger('first_post_date: ' . $r[0]['id'] . ' ' . $r[0]['created'], LOGGER_DATA); return substr(datetime_convert('',date_default_timezone_get(),$r[0]['created']),0,10); } diff --cc include/like.php index 3ca005f28b,118ec81ca1..36d7a922e7 --- a/include/like.php +++ b/include/like.php @@@ -90,7 -90,7 +90,7 @@@ function do_like($item_id, $verb) WHERE `contact`.`self` = 1 AND `contact`.`uid` = %d LIMIT 1", intval($owner_uid) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $owner = $r[0]; if(! $owner) { @@@ -112,7 -112,7 +112,7 @@@ intval($_SESSION['visitor_id']), intval($owner_uid) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $contact = $r[0]; } if(! $contact) { @@@ -135,7 -135,7 +135,7 @@@ dbesc($item_id), dbesc($item_id), dbesc($item['uri']) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $like_item = $r[0]; // Already voted, undo it diff --cc include/lock.php index 35d2b02aa8,70cf4b787b..31b18191a9 --- a/include/lock.php +++ b/include/lock.php @@@ -16,7 -16,7 +16,7 @@@ function lock_function($fn_name, $bloc dbesc($fn_name) ); - if((dba::is_result($r)) AND (!$r[0]['locked'] OR (strtotime($r[0]['created']) < time() - 3600))) { - if((count($r)) AND (!$r[0]['locked'] OR (strtotime($r[0]['created']) < time() - 3600))) { ++ if((dbm::is_result($r)) AND (!$r[0]['locked'] OR (strtotime($r[0]['created']) < time() - 3600))) { q("UPDATE `locks` SET `locked` = 1, `created` = '%s' WHERE `name` = '%s'", dbesc(datetime_convert()), dbesc($fn_name) diff --cc include/message.php index fcbd53e4e7,51f3ad805a..0411104404 --- a/include/message.php +++ b/include/message.php @@@ -41,7 -41,7 +41,7 @@@ function send_message($recipient=0, $bo dbesc($replyto), dbesc($replyto) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $convid = $r[0]['convid']; } @@@ -74,7 -74,7 +74,7 @@@ dbesc($conv_guid), intval(local_user()) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $convid = $r[0]['id']; } @@@ -113,7 -113,7 +113,7 @@@ dbesc($uri), intval(local_user()) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $post_id = $r[0]['id']; /** @@@ -210,7 -210,7 +210,7 @@@ function send_wallmessage($recipient='' dbesc($conv_guid), intval($recipient['uid']) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $convid = $r[0]['id']; if(! $convid) { diff --cc include/network.php index b238dbff65,f20445d27e..09a6239193 --- a/include/network.php +++ b/include/network.php @@@ -338,7 -338,7 +338,6 @@@ function xml_status($st, $message = '' killme(); } -- /** * @brief Send HTTP status header and exit. * @@@ -348,6 -348,6 +347,14 @@@ * 'description' => optional message */ ++/** ++ * @brief Send HTTP status header and exit. ++ * ++ * @param integer $val HTTP status result value ++ * @param array $description optional message ++ * 'title' => header title ++ * 'description' => optional message ++ */ function http_status_exit($val, $description = array()) { $err = ''; if($val >= 400) { diff --cc include/notifier.php index 0e5f162843,0610a4e398..825e4aac15 --- a/include/notifier.php +++ b/include/notifier.php @@@ -314,7 -321,7 +321,7 @@@ function notifier_run(&$argv, &$argc) intval($uid), dbesc(NETWORK_DFRN) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) foreach($r as $rr) $recipients_followup[] = $rr['id']; } @@@ -388,22 -395,35 +395,49 @@@ // We have not only to look at the parent, since it could be a Friendica thread. if (($thr_parent AND ($thr_parent[0]['network'] == NETWORK_OSTATUS)) OR ($parent['network'] == NETWORK_OSTATUS)) { - logger('Some parent is OStatus for '.$target_item["guid"], LOGGER_DEBUG); + logger('Some parent is OStatus for '.$target_item["guid"]." - Author: ".$thr_parent[0]['author-link']." - Owner: ".$thr_parent[0]['owner-link'], LOGGER_DEBUG); + + // Send a salmon to the parent author + $r = q("SELECT `notify` FROM `contact` WHERE `nurl`='%s' AND `uid` IN (0, %d) AND `notify` != ''", + dbesc(normalise_link($thr_parent[0]['author-link'])), + intval($uid)); + if ($r) + $probed_contact = $r[0]; + else + $probed_contact = probe_url($thr_parent[0]['author-link']); + + if ($probed_contact["notify"] != "") { + logger('Notify parent author '.$probed_contact["url"].': '.$probed_contact["notify"]); + $url_recipients[$probed_contact["notify"]] = $probed_contact["notify"]; + } + + // Send a salmon to the parent owner + $r = q("SELECT `notify` FROM `contact` WHERE `nurl`='%s' AND `uid` IN (0, %d) AND `notify` != ''", + dbesc(normalise_link($thr_parent[0]['owner-link'])), + intval($uid)); + if ($r) + $probed_contact = $r[0]; + else + $probed_contact = probe_url($thr_parent[0]['owner-link']); + if ($probed_contact["notify"] != "") { + logger('Notify parent owner '.$probed_contact["url"].': '.$probed_contact["notify"]); + $url_recipients[$probed_contact["notify"]] = $probed_contact["notify"]; + } + // Send a salmon to the parent author + $probed_contact = probe_url($thr_parent[0]['author-link']); + if ($probed_contact["notify"] != "") { + logger('Notify parent author '.$probed_contact["url"].': '.$probed_contact["notify"]); + $url_recipients[$probed_contact["notify"]] = $probed_contact["notify"]; + } + + // Send a salmon to the parent owner + $probed_contact = probe_url($thr_parent[0]['owner-link']); + if ($probed_contact["notify"] != "") { + logger('Notify parent owner '.$probed_contact["url"].': '.$probed_contact["notify"]); + $url_recipients[$probed_contact["notify"]] = $probed_contact["notify"]; + } + // Send a salmon notification to every person we mentioned in the post $arr = explode(',',$target_item['tag']); foreach($arr as $x) { @@@ -425,7 -445,7 +459,7 @@@ $r = q("SELECT * FROM `contact` WHERE `id` IN ($conversant_str) AND NOT `blocked` AND NOT `pending` AND NOT `archive`".$sql_extra); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $contacts = $r; } else @@@ -443,7 -463,7 +477,7 @@@ intval($uid), dbesc(NETWORK_MAIL) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { foreach($r as $rr) $recipients[] = $rr['id']; } @@@ -471,7 -491,7 +505,7 @@@ // delivery loop - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { foreach($r as $contact) { if(!$contact['self']) { @@@ -572,7 -592,7 +606,7 @@@ $r = array_merge($r2,$r1,$r0); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { logger('pubdeliver '.$target_item["guid"].': '.print_r($r,true), LOGGER_DEBUG); // throw everything into the queue in case we get killed diff --cc include/oauth.php index bcfd79469b,6a1d72d178..761a7a42c8 --- a/include/oauth.php +++ b/include/oauth.php @@@ -23,7 -23,7 +23,7 @@@ class FKOAuthDataStore extends OAuthDat $r = q("SELECT client_id, pw, redirect_uri FROM clients WHERE client_id='%s'", dbesc($consumer_key) ); - if (dba::is_result($r)) - if (count($r)) ++ if (dbm::is_result($r)) return new OAuthConsumer($r[0]['client_id'],$r[0]['pw'],$r[0]['redirect_uri']); return null; } @@@ -35,7 -35,7 +35,7 @@@ dbesc($token_type), dbesc($token) ); - if (dba::is_result($r)){ - if (count($r)){ ++ if (dbm::is_result($r)){ $ot=new OAuthToken($r[0]['id'],$r[0]['secret']); $ot->scope=$r[0]['scope']; $ot->expires = $r[0]['expires']; @@@ -52,7 -52,7 +52,7 @@@ dbesc($nonce), intval($timestamp) ); - if (dba::is_result($r)) - if (count($r)) ++ if (dbm::is_result($r)) return new OAuthToken($r[0]['id'],$r[0]['secret']); return null; } @@@ -136,7 -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(dba::is_result($r)){ - if(count($r)){ ++ if(dbm::is_result($r)){ $record = $r[0]; } else { logger('FKOAuth1::loginUser failure: ' . print_r($_SERVER,true), LOGGER_DEBUG); @@@ -162,7 -162,7 +162,7 @@@ $r = q("SELECT * FROM `contact` WHERE `uid` = %s AND `self` = 1 LIMIT 1", intval($_SESSION['uid'])); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $a->contact = $r[0]; $a->cid = $r[0]['id']; $_SESSION['cid'] = $a->cid; @@@ -219,7 -219,7 +219,7 @@@ class FKOAuth2 extends OAuth2 $r = q("SELECT client_id, expires, scope FROM tokens WHERE id = '%s'", dbesc($oauth_token)); - if (dba::is_result($r)) - if (count($r)) ++ if (dbm::is_result($r)) return $r[0]; return null; } @@@ -247,7 -247,7 +247,7 @@@ $r = q("SELECT id, client_id, redirect_uri, expires, scope FROM auth_codes WHERE id = '%s'", dbesc($code)); - if (dba::is_result($r)) - if (count($r)) ++ if (dbm::is_result($r)) return $r[0]; return null; } diff --cc include/onepoll.php index 19fa58ce02,e779372720..9ea1287ae1 --- a/include/onepoll.php +++ b/include/onepoll.php @@@ -94,7 -93,7 +93,7 @@@ function onepoll_run(&$argv, &$argc) where `cid` = %d and updated > UTC_TIMESTAMP() - INTERVAL 1 DAY", intval($contact['id']) ); - if (dba::is_result($r)) - if (count($r)) ++ if (dbm::is_result($r)) if (!$r[0]['total']) poco_load($contact['id'],$importer_uid,0,$contact['poco']); } @@@ -394,7 -393,7 +393,7 @@@ dbesc($datarray['uri']) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { logger("Mail: Seen before ".$msg_uid." for ".$mailconf[0]['user']." UID: ".$importer_uid." URI: ".$datarray['uri'],LOGGER_DEBUG); // Only delete when mails aren't automatically moved or deleted @@@ -447,7 -446,7 +446,7 @@@ $r = q("SELECT `uri` , `parent-uri` FROM `item` WHERE `uri` IN ( $qstr ) AND `uid` = %d LIMIT 1", intval($importer_uid) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $datarray['parent-uri'] = $r[0]['parent-uri']; // Set the parent as the top-level item // $datarray['parent-uri'] = $r[0]['uri']; } @@@ -479,7 -478,7 +478,7 @@@ $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(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $datarray['parent-uri'] = $r[0]['parent-uri']; } diff --cc include/plugin.php index 912591a5d0,f6e4a7a882..28b02f9954 --- a/include/plugin.php +++ b/include/plugin.php @@@ -79,7 -79,7 +79,7 @@@ function reload_plugins() if(strlen($plugins)) { $r = q("SELECT * FROM `addon` WHERE `installed` = 1"); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $installed = $r; else $installed = array(); @@@ -150,7 -150,7 +150,7 @@@ function register_hook($hook,$file,$fun dbesc($file), dbesc($function) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) return true; $r = q("INSERT INTO `hook` (`hook`, `file`, `function`, `priority`) VALUES ( '%s', '%s', '%s', '%s' ) ", @@@ -187,7 -187,7 +187,7 @@@ function load_hooks() $a = get_app(); $a->hooks = array(); $r = q("SELECT * FROM `hook` WHERE 1 ORDER BY `priority` DESC, `file`"); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { foreach($r as $rr) { if(! array_key_exists($rr['hook'],$a->hooks)) $a->hooks[$rr['hook']] = array(); diff --cc include/queue_fn.php index 4c02417ea3,5214131b2b..a253aa2fb2 --- a/include/queue_fn.php +++ b/include/queue_fn.php @@@ -21,14 -21,16 +21,14 @@@ function was_recently_delayed($cid) and last > UTC_TIMESTAMP() - interval 15 minute limit 1", intval($cid) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::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 (dba::is_result($r)); - return false; ++ return (dbm::is_result($r)); } diff --cc include/security.php index 3d64ae6677,2d6db95f4f..000451dbe5 --- a/include/security.php +++ b/include/security.php @@@ -42,7 -42,7 +42,7 @@@ function authenticate_success($user_rec $r = q("select * from user where uid = %d limit 1", intval($_SESSION['submanage']) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $master_record = $r[0]; } @@@ -70,7 -70,7 +70,7 @@@ $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1", intval($_SESSION['uid'])); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $a->contact = $r[0]; $a->cid = $r[0]['id']; $_SESSION['cid'] = $a->cid; @@@ -158,7 -158,7 +158,7 @@@ function can_write_wall(&$a,$owner) intval(PAGE_COMMUNITY) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $verified = 2; return true; } @@@ -212,7 -212,7 +212,7 @@@ function permissions_sql($owner_id,$rem intval($remote_user), intval($owner_id) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $remote_verified = true; $groups = init_groups_visitor($remote_user); } @@@ -294,7 -294,7 +294,7 @@@ function item_permissions_sql($owner_id intval($remote_user), intval($owner_id) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $remote_verified = true; $groups = init_groups_visitor($remote_user); } @@@ -405,7 -405,7 +405,7 @@@ function init_groups_visitor($contact_i WHERE `contact-id` = %d ", intval($contact_id) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { foreach($r as $rr) $groups[] = $rr['gid']; } diff --cc include/session.php index 8c76eba41a,8f9d64606c..fe8e0848ef --- a/include/session.php +++ b/include/session.php @@@ -17,7 -17,7 +17,7 @@@ function ref_session_read ($id) if(x($id)) $r = q("SELECT `data` FROM `session` WHERE `sid`= '%s'", dbesc($id)); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $session_exists = true; return $r[0]['data']; } else { diff --cc include/socgraph.php index 00f8fb11f3,89897aaa7c..1e7362b8bd --- a/include/socgraph.php +++ b/include/socgraph.php @@@ -39,7 -40,7 +40,7 @@@ function poco_load($cid,$uid = 0,$zcid $r = q("select `poco`, `uid` from `contact` where `id` = %d limit 1", intval($cid) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $url = $r[0]['poco']; $uid = $r[0]['uid']; } @@@ -205,14 -206,14 +206,14 @@@ function poco_check($profile_url, $name $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(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $network = $r[0]["network"]; if (($network == "") OR ($network == NETWORK_OSTATUS)) { $r = q("SELECT `network`, `url` FROM `contact` WHERE `alias` IN ('%s', '%s') AND `network` != '' AND `network` != '%s' LIMIT 1", dbesc($profile_url), dbesc(normalise_link($profile_url)), dbesc(NETWORK_STATUSNET) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $network = $r[0]["network"]; //$profile_url = $r[0]["url"]; } @@@ -948,7 -953,7 +953,7 @@@ function count_common_friends($uid,$cid ); // logger("count_common_friends: $uid $cid {$r[0]['total']}"); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) return $r[0]['total']; return 0; @@@ -994,7 -999,7 +999,7 @@@ function count_common_friends_zcid($uid intval($uid) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) return $r[0]['total']; return 0; @@@ -1033,7 -1038,7 +1038,7 @@@ function count_all_friends($uid,$cid) intval($uid) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) return $r[0]['total']; return 0; @@@ -1162,7 -1167,7 +1167,7 @@@ function update_suggestions() dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { foreach($r as $rr) { $base = substr($rr['poco'],0,strrpos($rr['poco'],'/')); if(! in_array($base,$done)) diff --cc include/text.php index ed905d3fff,3aec42b323..71b9a716c8 --- a/include/text.php +++ b/include/text.php @@@ -491,7 -491,7 +491,7 @@@ function item_new_uri($hostname,$uid, $ $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' LIMIT 1", dbesc($uri)); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $dups = true; } while($dups == true); return $uri; @@@ -515,7 -515,7 +515,7 @@@ function photo_new_resource() $r = q("SELECT `id` FROM `photo` WHERE `resource-id` = '%s' LIMIT 1", dbesc($resource) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $found = true; } while($found == true); return $resource; @@@ -859,7 -864,7 +864,7 @@@ function contact_block() dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DIASPORA) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $total = intval($r[0]['total']); } if(! $total) { @@@ -877,11 -883,19 +883,20 @@@ dbesc(NETWORK_DIASPORA), intval($shown) ); - if(dba::is_result($r)) { - $contacts = sprintf( tt('%d Contact','%d Contacts', $total),$total); - $micropro = Array(); - foreach($r as $rr) { - $micropro[] = micropro($rr,true,'mpfriend'); - if ($r) { ++ if(dbm::is_result($r)) { + $contacts = ""; + foreach ($r AS $contact) + $contacts[] = $contact["id"]; + + $r = q("SELECT `id`, `uid`, `addr`, `url`, `name`, `thumb`, `network` FROM `contact` WHERE `id` IN (%s)", + dbesc(implode(",", $contacts))); - if(count($r)) { ++ ++ if(dbm::is_result($r)) { + $contacts = sprintf( tt('%d Contact','%d Contacts', $total),$total); + $micropro = Array(); + foreach($r as $rr) { + $micropro[] = micropro($rr,true,'mpfriend'); + } } } } @@@ -2050,7 -1917,7 +1918,7 @@@ function file_tag_update_pconfig($uid,$ // intval($uid) //); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { unset($deleted_tags[$key]); } else { @@@ -2080,7 -1947,7 +1948,7 @@@ function file_tag_save_file($uid,$item, intval($item), intval($uid) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { if(! stristr($r[0]['file'],'[' . file_tag_encode($file) . ']')) q("UPDATE `item` SET `file` = '%s' WHERE `id` = %d AND `uid` = %d", dbesc($r[0]['file'] . '[' . file_tag_encode($file) . ']'), diff --cc include/threads.php index 33d6d3fc82,2e02e7ada3..2b1b27679b --- a/include/threads.php +++ b/include/threads.php @@@ -83,12 -85,12 +85,12 @@@ function add_shadow_entry($item) // Is there a shadow parent? $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = 0 LIMIT 1", dbesc($item['parent-uri'])); -- if (!count($r)) ++ if (!dbm::is_result($r)) return; // Is there already a shadow entry? $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = 0 LIMIT 1", dbesc($item['uri'])); - if (dba::is_result($r)) - if (count($r)) ++ if (dbm::is_result($r)) return; // Preparing public shadow (removing user specific data) @@@ -106,7 -108,7 +108,7 @@@ function update_thread_uri($itemuri, $uid) { $messages = q("SELECT `id` FROM `item` WHERE uri ='%s' AND uid=%d", dbesc($itemuri), intval($uid)); -- if(count($messages)) ++ if(dbm::is_result($messages)) foreach ($messages as $message) update_thread($message["id"]); } @@@ -115,7 -117,7 +117,7 @@@ function update_thread($itemid, $setmen $items = q("SELECT `uid`, `guid`, `title`, `body`, `created`, `edited`, `commented`, `received`, `changed`, `wall`, `private`, `pubmail`, `moderated`, `visible`, `spam`, `starred`, `bookmark`, `contact-id`, `gcontact-id`, `deleted`, `origin`, `forum_mode`, `network`, `rendered-html`, `rendered-hash` FROM `item` WHERE `id` = %d AND (`parent` = %d OR `parent` = 0) LIMIT 1", intval($itemid), intval($itemid)); -- if (!$items) ++ if (!dbm::is_result($items)) return; $item = $items[0]; diff --cc include/user.php index a61da7b303,3997a8a61f..3a45837687 --- a/include/user.php +++ b/include/user.php @@@ -130,7 -130,7 +130,7 @@@ function create_user($arr) $r = q("SELECT * FROM `user` WHERE `email` = '%s' LIMIT 1", dbesc($email) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $result['message'] .= t('Cannot use that email.') . EOL; } @@@ -143,7 -143,7 +143,7 @@@ WHERE `nickname` = '%s' LIMIT 1", dbesc($nickname) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $result['message'] .= t('Nickname is already registered. Please choose another.') . EOL; // Check deleted accounts that had this nickname. Doesn't matter to us, @@@ -153,7 -153,7 +153,7 @@@ WHERE `username` = '%s' LIMIT 1", dbesc($nickname) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $result['message'] .= t('Nickname was once registered here and may not be re-used. Please choose another.') . EOL; if(strlen($result['message'])) { diff --cc mod/admin.php index 3e19935cb5,0749fd1861..90fe059752 --- a/mod/admin.php +++ b/mod/admin.php @@@ -1077,8 -1090,8 +1090,8 @@@ function admin_page_dbsync(&$a) } $failed = array(); - $r = q("select k, v from config where `cat` = 'database' "); - if(dba::is_result($r)) { + $r = q("SELECT `k`, `v` FROM `config` WHERE `cat` = 'database' "); - if(count($r)) { ++ if(dbm::is_result($r)) { foreach($r as $rr) { $upd = intval(substr($rr['k'],7)); if($upd < 1139 || $rr['v'] === 'success') diff --cc mod/common.php index bc65336249,9b2c69f6d7..b465612c3c --- a/mod/common.php +++ b/mod/common.php @@@ -57,13 -57,13 +57,13 @@@ function common_content(&$a) dbesc(normalise_link(get_my_url())), intval($profile_uid) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $cid = $r[0]['id']; else { $r = q("SELECT `id` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1", dbesc(normalise_link(get_my_url())) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $zcid = $r[0]['id']; } } diff --cc mod/community.php index fb50ad4bd2,06a96c7403..dc270514a2 --- a/mod/community.php +++ b/mod/community.php @@@ -59,7 -59,7 +59,7 @@@ function community_content(&$a, $updat AND `item`.`private` = 0 AND `item`.`wall` = 1" ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $a->set_pager_total($r[0]['total']); if(! $r[0]['total']) { diff --cc mod/contactgroup.php index be69832512,bf81afe079..d19e1b2ebf --- a/mod/contactgroup.php +++ b/mod/contactgroup.php @@@ -14,7 -14,7 +14,7 @@@ function contactgroup_content(&$a) intval($a->argv[2]), intval(local_user()) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $change = intval($a->argv[2]); } diff --cc mod/contacts.php index 19cbf4e6fb,ba8ad45c39..3721937d4d --- a/mod/contacts.php +++ b/mod/contacts.php @@@ -758,7 -763,7 +763,7 @@@ function contacts_content(&$a) $r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `pending` = 0 $sql_extra $sql_extra2 ", intval($_SESSION['uid'])); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $a->set_pager_total($r[0]['total']); $total = $r[0]['total']; } @@@ -773,7 -776,9 +778,7 @@@ intval($a->pager['itemspage']) ); - if(dba::is_result($r)) { - $contacts = array(); - - if(count($r)) { ++ if(dbm::is_result($r)) { foreach($r as $rr) { $contacts[] = _contact_detail_for_template($rr); } diff --cc mod/content.php index 718dc77d29,c4b1f2f68f..76c59d19c0 --- a/mod/content.php +++ b/mod/content.php @@@ -93,7 -93,7 +93,7 @@@ function content_content(&$a, $update ); $str = ''; - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) foreach($r as $rr) $str .= '<' . $rr['id'] . '>'; if(strlen($str)) @@@ -141,7 -141,7 +141,7 @@@ AND `blocked` = 0 AND `pending` = 0 LIMIT 1", intval($cid) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $sql_extra = " AND `item`.`parent` IN ( SELECT DISTINCT(`parent`) FROM `item` WHERE 1 $sql_options AND `contact-id` = " . intval($cid) . " and deleted = 0 ) "; } @@@ -259,7 -259,7 +259,7 @@@ $parents_arr = array(); $parents_str = ''; - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { foreach($r as $rr) if(! in_array($rr['item_id'],$parents_arr)) $parents_arr[] = $rr['item_id']; diff --cc mod/delegate.php index 55951cd51b,20d2e605e0..6ffe785878 --- a/mod/delegate.php +++ b/mod/delegate.php @@@ -26,12 -26,12 +26,12 @@@ function delegate_content(&$a) $r = q("select `nickname` from user where uid = %d limit 1", intval($id) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $r = q("select id from contact where uid = %d and nurl = '%s' limit 1", intval(local_user()), dbesc(normalise_link($a->get_baseurl() . '/profile/' . $r[0]['nickname'])) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { q("insert into manage ( uid, mid ) values ( %d , %d ) ", intval($a->argv[2]), intval(local_user()) @@@ -64,7 -64,7 +64,7 @@@ dbesc($a->user['email']), dbesc($a->user['password']) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $full_managers = $r; $delegates = array(); @@@ -75,7 -75,7 +75,7 @@@ intval(local_user()) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $delegates = $r; $uids = array(); @@@ -104,7 -104,7 +104,7 @@@ $nicknames = array(); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { foreach($r as $rr) { $nicknames[] = "'" . dbesc(basename($rr['nurl'])) . "'"; } @@@ -118,7 -118,7 +118,7 @@@ $r = q("select `uid`, `username`, `nickname` from user where nickname in ( $nicks )"); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) foreach($r as $rr) if(! in_array($rr['uid'],$uids)) $potentials[] = $rr; diff --cc mod/dfrn_confirm.php index 29d3630aca,51cd59c62f..1dab713065 --- a/mod/dfrn_confirm.php +++ b/mod/dfrn_confirm.php @@@ -418,7 -419,7 +419,7 @@@ function dfrn_confirm_post(&$a,$handsfr $r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1", intval($contact_id) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $contact = $r[0]; else $contact = null; @@@ -438,7 -439,7 +439,7 @@@ intval($uid) ); - if((dba::is_result($r)) && ($r[0]['hide-friends'] == 0) && ($activity) && (! $hidden)) { - if((count($r)) && ($r[0]['hide-friends'] == 0) && ($activity) && (! $hidden)) { ++ if((dbm::is_result($r)) && ($r[0]['hide-friends'] == 0) && ($activity) && (! $hidden)) { require_once('include/items.php'); @@@ -624,7 -625,7 +625,7 @@@ $r = q("SELECT * FROM `contact` WHERE `dfrn-id` = '%s' LIMIT 1", dbesc($decrypted_dfrn_id) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $message = t('The ID provided by your system is a duplicate on our system. It should work if you try again.'); xml_status(1,$message); // Birthday paradox - duplicate dfrn-id // NOTREACHED @@@ -656,7 -657,7 +657,7 @@@ $r = q("SELECT `photo` FROM `contact` WHERE `id` = %d LIMIT 1", intval($dfrn_record)); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $photo = $r[0]['photo']; else $photo = $a->get_baseurl() . '/images/person-175.jpg'; @@@ -709,10 -710,10 +710,10 @@@ intval($dfrn_record) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $combined = $r[0]; - if((dba::is_result($r)) && ($r[0]['notify-flags'] & NOTIFY_CONFIRM)) { - if((count($r)) && ($r[0]['notify-flags'] & NOTIFY_CONFIRM)) { ++ if((dbm::is_result($r)) && ($r[0]['notify-flags'] & NOTIFY_CONFIRM)) { $mutual = ($new_relation == CONTACT_IS_FRIEND); notification(array( 'type' => NOTIFY_CONFIRM, @@@ -737,7 -738,7 +738,7 @@@ intval($local_uid) ); - if((dba::is_result($r)) && ($r[0]['hide-friends'] == 0)) { - if((count($r)) && ($r[0]['hide-friends'] == 0)) { ++ if((dbm::is_result($r)) && ($r[0]['hide-friends'] == 0)) { require_once('include/items.php'); diff --cc mod/dfrn_poll.php index a75fbc40b8,9613229dab..083e4d3488 --- a/mod/dfrn_poll.php +++ b/mod/dfrn_poll.php @@@ -76,7 -79,7 +79,7 @@@ function dfrn_poll_init(&$a) dbesc($a->argv[1]) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $s = fetch_url($r[0]['poll'] . '?dfrn_id=' . $my_id . '&type=profile-check'); @@@ -187,7 -190,7 +190,7 @@@ 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(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { xml_status(1); return; // NOTREACHED } @@@ -332,7 -335,7 +335,7 @@@ function dfrn_poll_post(&$a) $reputation = 0; $text = ''; - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $reputation = $r[0]['rating']; $text = $r[0]['reason']; @@@ -445,7 -448,7 +448,7 @@@ function dfrn_poll_content(&$a) dbesc($nickname) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $challenge = ''; $encrypted_id = ''; @@@ -492,7 -495,7 +495,7 @@@ )); } - $profile = ((dba::is_result($r) && $r[0]['nickname']) ? $r[0]['nickname'] : $nickname); - $profile = ((count($r) && $r[0]['nickname']) ? $r[0]['nickname'] : $nickname); ++ $profile = ((dbm::is_result($r) && $r[0]['nickname']) ? $r[0]['nickname'] : $nickname); switch($destination_url) { case 'profile': diff --cc mod/dfrn_request.php index dc9d32adf4,7fe2527f3d..0162ecf193 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@@ -89,7 -90,7 +90,7 @@@ function dfrn_request_post(&$a) dbesc(normalise_link($dfrn_url)) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { if(strlen($r[0]['dfrn-id'])) { /** @@@ -180,7 -183,7 +183,7 @@@ dbesc($dfrn_url), $parms['key'] // this was already escaped ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $def_gid = get_default_group(local_user(), $r[0]["network"]); if(intval($def_gid)) group_add_member(local_user(), '', $r[0]['id'], $def_gid); @@@ -285,7 -291,7 +291,7 @@@ AND `intro`.`datetime` < UTC_TIMESTAMP() - INTERVAL 30 MINUTE ", dbesc(NETWORK_MAIL2) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { foreach($r as $rr) { if(! $rr['rel']) { q("DELETE FROM `contact` WHERE `id` = %d", @@@ -310,7 -316,7 +316,7 @@@ AND `intro`.`datetime` < UTC_TIMESTAMP() - INTERVAL 3 DAY ", dbesc(NETWORK_MAIL2) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { foreach($r as $rr) { if(! $rr['rel']) { q("DELETE FROM `contact` WHERE `id` = %d", @@@ -390,7 -396,7 +396,7 @@@ dbesc($poll), intval($uid) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $contact_id = $r[0]['id']; $def_gid = get_default_group($uid, $r[0]["network"]); @@@ -441,13 -447,9 +447,13 @@@ $data = probe_url($url); $network = $data["network"]; + logger('dfrn_request: url=' . $url . ',network=' . $network . ',hcard=' . $hcard . ' - BEFORE!', LOGGER_DEBUG); + // Canonicalise email-style profile locator - $url = webfinger_dfrn($url,$hcard); + $url = Probe::webfinger_dfrn($url,$hcard); + logger('dfrn_request: url=' . $url . ',network=' . $network . ',hcard=' . $hcard . ' - AFTER!', LOGGER_DEBUG); + if (substr($url,0,5) === 'stat:') { // Every time we detect the remote subscription we define this as OStatus. @@@ -566,8 -568,10 +572,10 @@@ $parms['url'], $parms['issued-id'] ); - if(dba::is_result($r)) - if(count($r)) { ++ if(dbm::is_result($r)) $contact_record = $r[0]; + update_contact_avatar($photo, $uid, $contact_record["id"], true); + } } } @@@ -715,16 -719,16 +723,16 @@@ function dfrn_request_content(&$a) dbesc($_GET['confirm_key']) ); - if(dba::is_result($intro)) { - if(count($intro)) { ++ if(dbm::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']) ); - if(dba::is_result($r)) { - $auto_confirm = false; - - if(count($r)) { ++ if(dbm::is_result($r)) { if(($r[0]['page-flags'] != PAGE_NORMAL) && ($r[0]['page-flags'] != PAGE_PRVGROUP)) $auto_confirm = true; diff --cc mod/directory.php index 531283936c,a6a9cb8ab2..92a3f3d05b --- a/mod/directory.php +++ b/mod/directory.php @@@ -78,7 -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(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $a->set_pager_total($r[0]['total']); $order = " ORDER BY `name` ASC "; @@@ -90,7 -90,7 +90,7 @@@ 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(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { if(in_array('small', $a->argv)) $photo = 'thumb'; diff --cc mod/display.php index 849fef3f24,f879a91aec..cf7700a145 --- a/mod/display.php +++ b/mod/display.php @@@ -16,10 -16,10 +16,10 @@@ function display_init(&$a) // Does the local user have this item? if (local_user()) { - $r = q("SELECT `id`, `parent`, `author-name`, `author-link`, `author-avatar`, `network`, `body`, `uid` FROM `item` + $r = q("SELECT `id`, `parent`, `author-name`, `author-link`, `author-avatar`, `network`, `body`, `uid`, `owner-link` 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 (dba::is_result($r)) { - if (count($r)) { ++ if (dbm::is_result($r)) { $nick = $a->user["nickname"]; $itemuid = local_user(); } @@@ -36,7 -36,7 +36,7 @@@ AND NOT `item`.`private` AND NOT `user`.`hidewall` AND `item`.`guid` = '%s'", dbesc($a->argv[1])); // AND NOT `item`.`private` AND `item`.`wall` - if (dba::is_result($r)) { - if (count($r)) { ++ if (dbm::is_result($r)) { $nick = $r[0]["nickname"]; $itemuid = $r[0]["uid"]; } @@@ -53,9 -53,9 +53,9 @@@ AND `item`.`guid` = '%s'", dbesc($a->argv[1])); // AND NOT `item`.`private` AND `item`.`wall` } - if (dba::is_result($r)) { - if (count($r)) { ++ if (dbm::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` + $r = q("SELECT `id`, `author-name`, `author-link`, `author-avatar`, `network`, `body`, `uid`, `owner-link` FROM `item` WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated` AND `id` = %d", $r[0]["parent"]); @@@ -70,7 -92,7 +92,7 @@@ WHERE `user`.`nickname` = '%s' AND `profile`.`is-default` AND `contact`.`self` LIMIT 1", dbesc($nickname) ); - if (dba::is_result($r)) - if (count($r)) ++ if (dbm::is_result($r)) $profiledata = $r[0]; $profiledata["network"] = NETWORK_DFRN; @@@ -259,7 -231,7 +231,7 @@@ function display_content(&$a, $update $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 (dba::is_result($r)) { - if (count($r)) { ++ if (dbm::is_result($r)) { $item_id = $r[0]["id"]; $nick = $a->user["nickname"]; } @@@ -273,7 -245,7 +245,7 @@@ AND NOT `item`.`private` AND NOT `user`.`hidewall` AND `item`.`guid` = '%s'", dbesc($a->argv[1])); // AND NOT `item`.`private` AND `item`.`wall` - if (dba::is_result($r)) { - if (count($r)) { ++ if (dbm::is_result($r)) { $item_id = $r[0]["id"]; $nick = $r[0]["nickname"]; } @@@ -286,7 -258,7 +258,7 @@@ AND NOT `item`.`private` AND `item`.`uid` = 0 AND `item`.`guid` = '%s'", dbesc($a->argv[1])); // AND NOT `item`.`private` AND `item`.`wall` - if (dba::is_result($r)) { - if (count($r)) { ++ if (dbm::is_result($r)) { $item_id = $r[0]["id"]; } } @@@ -331,7 -303,7 +303,7 @@@ intval($contact_id), intval($a->profile['uid']) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $contact = $r[0]; $remote_contact = true; } @@@ -347,7 -319,7 +319,7 @@@ $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1", intval($a->profile['uid']) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $a->page_contact = $r[0]; $is_owner = ((local_user()) && (local_user() == $a->profile['profile_uid']) ? true : false); diff --cc mod/editpost.php index bbd21a064d,46a530dce0..5322a271c1 --- a/mod/editpost.php +++ b/mod/editpost.php @@@ -78,7 -78,7 +78,7 @@@ function editpost_content(&$a) $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1", intval(local_user()) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $mail_enabled = true; if(intval($r[0]['pubmail'])) $pubmail_enabled = true; diff --cc mod/events.php index 1b2d8f9cef,1b5dfdf31c..e579d3530d --- a/mod/events.php +++ b/mod/events.php @@@ -361,7 -332,7 +332,7 @@@ function events_content(&$a) $links = array(); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $r = sort_by_date($r); foreach($r as $rr) { $j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['start'], 'j') : datetime_convert('UTC','UTC',$rr['start'],'j')); @@@ -370,60 -341,12 +341,12 @@@ } } - $events=array(); - $last_date = ''; - $fmt = t('l, F j'); - - if(dba::is_result($r)) { + // transform the event in a usable array - if(count($r)) ++ if(dbm::is_result($r)) { $r = sort_by_date($r); - foreach($r as $rr) { - - - $j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['start'], 'j') : datetime_convert('UTC','UTC',$rr['start'],'j')); - $d = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['start'], $fmt) : datetime_convert('UTC','UTC',$rr['start'],$fmt)); - $d = day_translate($d); - - $start = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['start'], 'c') : datetime_convert('UTC','UTC',$rr['start'],'c')); - if ($rr['nofinish']){ - $end = null; - } else { - $end = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['finish'], 'c') : datetime_convert('UTC','UTC',$rr['finish'],'c')); - } - - - $is_first = ($d !== $last_date); - - $last_date = $d; - $edit = ((! $rr['cid']) ? array($a->get_baseurl().'/events/event/'.$rr['id'],t('Edit event'),'','') : null); - $title = strip_tags(html_entity_decode(bbcode($rr['summary']),ENT_QUOTES,'UTF-8')); - if(! $title) { - list($title, $_trash) = explode("$rr['id'], - 'start'=> $start, - 'end' => $end, - 'allDay' => false, - 'title' => $title, - - 'j' => $j, - 'd' => $d, - 'edit' => $edit, - 'is_first'=>$is_first, - 'item'=>$rr, - 'html'=>$html, - 'plink' => array($rr['plink'],t('link to source'),'',''), - ); - - - } - } + $events = process_events($r); if ($a->argv[1] === 'json'){ echo json_encode($events); killme(); @@@ -475,7 -404,7 +404,7 @@@ intval($event_id), intval(local_user()) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $orig_event = $r[0]; } diff --cc mod/friendica.php index 2ec8ab95a3,aad5964baf..8c9e9d7ad4 --- a/mod/friendica.php +++ b/mod/friendica.php @@@ -24,7 -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(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) foreach($r as $rr) $visible_plugins[] = $rr['name']; } @@@ -80,7 -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(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) foreach($r as $rr) $visible_plugins[] = $rr['name']; } diff --cc mod/fsuggest.php index 986f92e34b,ad407d5f32..a905cb44af --- a/mod/fsuggest.php +++ b/mod/fsuggest.php @@@ -33,7 -33,7 +33,7 @@@ function fsuggest_post(&$a) intval($new_contact), intval(local_user()) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $x = q("INSERT INTO `fsuggest` ( `uid`,`cid`,`name`,`url`,`request`,`photo`,`note`,`created`) VALUES ( %d, %d, '%s','%s','%s','%s','%s','%s')", @@@ -50,7 -50,7 +50,7 @@@ dbesc($hash), intval(local_user()) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $fsuggest_id = $r[0]['id']; q("UPDATE `fsuggest` SET `note` = '%s' WHERE `id` = %d AND `uid` = %d", dbesc($note), diff --cc mod/group.php index 94947c1890,5b28784f56..9f3551e1f5 --- a/mod/group.php +++ b/mod/group.php @@@ -107,7 -107,7 +107,7 @@@ function group_content(&$a) intval($a->argv[2]), intval(local_user()) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $result = group_rmv(local_user(),$r[0]['name']); if($result) info( t('Group removed.') . EOL); @@@ -125,7 -125,7 +125,7 @@@ intval($a->argv[2]), intval(local_user()) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $change = intval($a->argv[2]); } @@@ -209,7 -209,7 +209,7 @@@ intval(local_user()) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $textmode = (($switchtotext && (count($r) > $switchtotext)) ? true : false); foreach($r as $member) { if(! in_array($member['id'],$preselected)) { diff --cc mod/item.php index 935d66e6d8,9a9b5895bd..02fda2c270 --- a/mod/item.php +++ b/mod/item.php @@@ -129,7 -130,7 +130,7 @@@ function item_post(&$a) intval($parent_item['contact-id']), intval($uid) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::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 -141,7 +141,7 @@@ $r = q("SELECT * FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1", dbesc(normalise_link($thrparent[0]["author-link"]))); - if (dba::is_result($r)) { - if (count($r)) { ++ if (dbm::is_result($r)) { $parent_contact = $r[0]; $parent_contact["thumb"] = $parent_contact["photo"]; $parent_contact["micro"] = $parent_contact["photo"]; @@@ -219,7 -220,7 +220,7 @@@ $r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($profile_uid) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $user = $r[0]; if($orig_post) { @@@ -322,7 -323,7 +323,7 @@@ $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1", intval(local_user()) ); - if(dba::is_result($r) && intval($r[0]['pubmail'])) - if(count($r) && intval($r[0]['pubmail'])) ++ if(dbm::is_result($r) && intval($r[0]['pubmail'])) $pubmail_enabled = true; } } @@@ -391,7 -392,7 +392,7 @@@ } } - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $author = $r[0]; $contact_id = $author['id']; } @@@ -405,7 -406,7 +406,7 @@@ $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1", intval($profile_uid) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $contact_record = $r[0]; } @@@ -490,7 -491,7 +491,7 @@@ intval($profile_uid), intval($attach) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::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 -632,7 +632,7 @@@ intval($profile_uid), intval($mtch) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::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]'; diff --cc mod/lockview.php index df11a7f6fb,0ae54c8c12..1543507695 --- a/mod/lockview.php +++ b/mod/lockview.php @@@ -52,7 -52,7 +52,7 @@@ function lockview_content(&$a) $r = q("SELECT `name` FROM `group` WHERE `id` IN ( %s )", dbesc(implode(', ', $allowed_groups)) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) foreach($r as $rr) $l[] = '' . $rr['name'] . ''; } @@@ -60,7 -60,7 +60,7 @@@ $r = q("SELECT `name` FROM `contact` WHERE `id` IN ( %s )", dbesc(implode(', ',$allowed_users)) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) foreach($r as $rr) $l[] = $rr['name']; @@@ -70,7 -70,7 +70,7 @@@ $r = q("SELECT `name` FROM `group` WHERE `id` IN ( %s )", dbesc(implode(', ', $deny_groups)) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) foreach($r as $rr) $l[] = '' . $rr['name'] . ''; } @@@ -78,7 -78,7 +78,7 @@@ $r = q("SELECT `name` FROM `contact` WHERE `id` IN ( %s )", dbesc(implode(', ',$deny_users)) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) foreach($r as $rr) $l[] = '' . $rr['name'] . ''; diff --cc mod/manage.php index c56e4d8bc9,adcc3d787a..f131e609c1 --- a/mod/manage.php +++ b/mod/manage.php @@@ -15,7 -15,7 +15,7 @@@ function manage_post(&$a) $r = q("select * from user where uid = %d limit 1", intval($_SESSION['submanage']) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $uid = intval($r[0]['uid']); $orig_record = $r[0]; } diff --cc mod/message.php index 2a1152b8c0,4bd73d0cee..4a65b744a6 --- a/mod/message.php +++ b/mod/message.php @@@ -242,7 -242,7 +242,7 @@@ function message_content(&$a) intval($a->argv[2]), intval(local_user()) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $parent = $r[0]['parent-uri']; $convid = $r[0]['convid']; @@@ -309,7 -309,19 +309,21 @@@ intval(local_user()), intval($a->argv[2]) ); - if(dba::is_result($r)) { - if(!$r) { ++ if(!dbm::is_result($r)) { + $r = q("SELECT `name`, `url`, `id` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' LIMIT 1", + intval(local_user()), + dbesc(normalise_link(base64_decode($a->argv[2]))) + ); + } - if(!$r) { ++ ++ if(!dbm::is_result($r)) { + $r = q("SELECT `name`, `url`, `id` FROM `contact` WHERE `uid` = %d AND `addr` = '%s' LIMIT 1", + intval(local_user()), + dbesc(base64_decode($a->argv[2])) + ); + } - if(count($r)) { ++ ++ if(dbm::is_result($r)) { $prename = $r[0]['name']; $preurl = $r[0]['url']; $preid = $r[0]['id']; @@@ -393,7 -405,7 +407,7 @@@ intval(local_user()), intval($a->argv[1]) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $contact_id = $r[0]['contact-id']; $convid = $r[0]['convid']; diff --cc mod/mood.php index 9be60de1d8,f804af0c00..4ddf16e34c --- a/mod/mood.php +++ b/mod/mood.php @@@ -36,7 -36,7 +36,7 @@@ function mood_init(&$a) intval($parent), intval($uid) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $parent_uri = $r[0]['uri']; $private = $r[0]['private']; $allow_cid = $r[0]['allow_cid']; diff --cc mod/msearch.php index 8393a97ae8,89de5b7057..fd46cc1e1b --- a/mod/msearch.php +++ b/mod/msearch.php @@@ -13,19 -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)) ++ if(dbm::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) ); - if(dba::is_result($r)) { - $results = array(); - if(count($r)) { ++ if(dbm::is_result($r)) { foreach($r as $rr) $results[] = array( 'name' => $rr['name'], diff --cc mod/network.php index 28ce8fdbfe,6ebedbcae8..0222e33401 --- a/mod/network.php +++ b/mod/network.php @@@ -182,7 -182,7 +182,7 @@@ function saved_searches($search) $saved = array(); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { foreach($r as $rr) { $saved[] = array( 'id' => $rr['id'], @@@ -465,7 -381,7 +381,7 @@@ function network_content(&$a, $update ); $str = ''; - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) foreach($r as $rr) $str .= '<' . $rr['id'] . '>'; if(strlen($str)) @@@ -587,7 -506,7 +506,7 @@@ AND `blocked` = 0 AND `pending` = 0 LIMIT 1", intval($cid) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $sql_extra = " AND ".$sql_table.".`contact-id` = ".intval($cid); $entries[0] = array( @@@ -689,7 -608,7 +608,7 @@@ intval($_SESSION['uid']) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $a->set_pager_total($r[0]['total']); } } diff --cc mod/nogroup.php index a29cb9c86e,2f0985c9db..c34120f0ff --- a/mod/nogroup.php +++ b/mod/nogroup.php @@@ -28,17 -28,17 +28,17 @@@ function nogroup_content(&$a) require_once('include/Contact.php'); $r = contacts_not_grouped(local_user()); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $a->set_pager_total($r[0]['total']); } $r = contacts_not_grouped(local_user(),$a->pager['start'],$a->pager['itemspage']); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { foreach($r as $rr) { - $contact_details = get_contact_details_by_url($rr['url'], local_user()); + $contact_details = get_contact_details_by_url($rr['url'], local_user(), $rr); $contacts[] = array( - 'img_hover' => sprintf( t('Visit %s\'s profile [%s]'),$rr['name'],$rr['url']), + 'img_hover' => sprintf(t('Visit %s\'s profile [%s]'), $contact_details['name'], $rr['url']), 'edit_hover' => t('Edit contact'), 'photo_menu' => contact_photo_menu($rr), 'id' => $rr['id'], diff --cc mod/noscrape.php index 7b759d15d8,2a04605469..a2a71a8e2b --- a/mod/noscrape.php +++ b/mod/noscrape.php @@@ -39,7 -43,7 +43,7 @@@ function noscrape_init(&$a) if(is_array($a->profile) AND !$a->profile['hide-friends']) { $r = q("SELECT `gcontact`.`updated` FROM `contact` INNER JOIN `gcontact` WHERE `gcontact`.`nurl` = `contact`.`nurl` AND `self` AND `uid` = %d LIMIT 1", intval($a->profile['uid'])); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $json_info["updated"] = date("c", strtotime($r[0]['updated'])); $r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 and `pending` = 0 AND `hidden` = 0 AND `archive` = 0 @@@ -49,7 -53,7 +53,7 @@@ dbesc(NETWORK_DIASPORA), dbesc(NETWORK_OSTATUS) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $json_info["contacts"] = intval($r[0]['total']); } diff --cc mod/notes.php index ba5ef1b6d4,a25d090ed7..f1b49ebee4 --- a/mod/notes.php +++ b/mod/notes.php @@@ -83,7 -82,7 +82,7 @@@ function notes_content(&$a,$update = fa ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $a->set_pager_total($r[0]['total']); $a->set_pager_itemspage(40); } @@@ -105,7 -102,7 +102,7 @@@ $parents_arr = array(); $parents_str = ''; - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { foreach($r as $rr) $parents_arr[] = $rr['item_id']; $parents_str = implode(', ', $parents_arr); @@@ -124,7 -116,7 +116,7 @@@ dbesc($parents_str) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $items = conv_sort($r,"`commented`"); $o .= conversation($a,$items,'notes',$update); diff --cc mod/notice.php index 161273b0ac,19cf53189a..7fdf4493a4 --- a/mod/notice.php +++ b/mod/notice.php @@@ -6,7 -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 (dba::is_result($r)){ - if (count($r)){ ++ if (dbm::is_result($r)){ $nick = $r[0]['nickname']; $url = $a->get_baseurl()."/display/$nick/$id"; goaway($url); diff --cc mod/notifications.php index 6d8c68eb35,af44097c1c..e6dbdf2640 --- a/mod/notifications.php +++ b/mod/notifications.php @@@ -21,7 -27,7 +27,7 @@@ function notifications_post(&$a) intval(local_user()) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $intro_id = $r[0]['id']; $contact_id = $r[0]['contact-id']; } @@@ -206,376 -207,113 +207,112 @@@ function notifications_content(&$a) '$fan_selected' => $fan_selected, '$approve_as' => $helptext, '$as_friend' => t('Friend'), - '$as_fan' => (($rr['network'] == NETWORK_DIASPORA) ? t('Sharer') : t('Fan/Admirer')) + '$as_fan' => (($it['network'] == NETWORK_DIASPORA) ? t('Sharer') : t('Fan/Admirer')) )); - } - - $header = $rr["name"]; - - $ret = probe_url($rr["url"]); - - if ($rr['gnetwork'] == "") - $rr['gnetwork'] = $ret["network"]; - - if ($ret["addr"] != "") - $header .= " <".$ret["addr"].">"; - - $header .= " (".network_to_name($rr['gnetwork'], $rr['url']).")"; - - // Don't show these data until you are connected. Diaspora is doing the same. - if($rr['gnetwork'] === NETWORK_DIASPORA) { - $rr['glocation'] = ""; - $rr['gabout'] = ""; - $rr['ggender'] = ""; - } - - $notif_content .= replace_macros($tpl, array( - '$header' => htmlentities($header), - '$str_notifytype' => t('Notification type: '), - '$notify_type' => (($rr['network'] !== NETWORK_OSTATUS) ? t('Friend/Connect Request') : t('New Follower')), - '$dfrn_text' => $dfrn_text, - '$dfrn_id' => $rr['issued-id'], - '$uid' => $_SESSION['uid'], - '$intro_id' => $rr['intro_id'], - '$contact_id' => $rr['contact-id'], - '$photo' => ((x($rr,'photo')) ? proxy_url($rr['photo'], false, PROXY_SIZE_SMALL) : "images/person-175.jpg"), - '$fullname' => $rr['name'], - '$location' => bbcode($rr['glocation'], false, false), - '$location_label' => t('Location:'), - '$about' => bbcode($rr['gabout'], false, false), - '$about_label' => t('About:'), - '$keywords' => $rr['gkeywords'], - '$keywords_label' => t('Tags:'), - '$gender' => $rr['ggender'], - '$gender_label' => t('Gender:'), - '$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''), - '$activity' => array('activity', t('Post a new friend activity'), (intval(get_pconfig(local_user(),'system','post_newfriend')) ? '1' : 0), t('if applicable')), - '$url' => $rr['url'], - '$zrl' => zrl($rr['url']), - '$url_label' => t('Profile URL'), - '$knowyou' => $knowyou, - '$approve' => t('Approve'), - '$note' => $rr['note'], - '$ignore' => t('Ignore'), - '$discard' => t('Discard'), - - )); - } - } - else - info( t('No introductions.') . EOL); - - $o .= replace_macros($notif_tpl, array( - '$notif_header' => t('Notifications'), - '$tabs' => $tabs, - '$notif_content' => $notif_content, - )); - - $o .= paginate($a); - return $o; - - } else if (($a->argc > 1) && ($a->argv[1] == 'network')) { - - $notif_tpl = get_markup_template('notifications.tpl'); - - $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, - `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` as `object`, - `pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink`, `pitem`.`guid` as `pguid` - FROM `item` INNER JOIN `item` as `pitem` ON `pitem`.`id`=`item`.`parent` - WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND `pitem`.`parent` != 0 AND - `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0 ORDER BY `item`.`created` DESC" , - intval(local_user()) - ); - - $tpl_item_likes = get_markup_template('notifications_likes_item.tpl'); - $tpl_item_dislikes = get_markup_template('notifications_dislikes_item.tpl'); - $tpl_item_friends = get_markup_template('notifications_friends_item.tpl'); - $tpl_item_comments = get_markup_template('notifications_comments_item.tpl'); - $tpl_item_posts = get_markup_template('notifications_posts_item.tpl'); - - $notif_content = ''; - - if ($r) { - - foreach ($r as $it) { - switch($it['verb']){ - case ACTIVITY_LIKE: - $notif_content .= replace_macros($tpl_item_likes,array( - //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], - '$item_image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), - '$item_text' => sprintf( t("%s liked %s's post"), $it['author-name'], $it['pname']), - '$item_when' => relative_date($it['created']) - )); - break; - - case ACTIVITY_DISLIKE: - $notif_content .= replace_macros($tpl_item_dislikes,array( - //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], - '$item_image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), - '$item_text' => sprintf( t("%s disliked %s's post"), $it['author-name'], $it['pname']), - '$item_when' => relative_date($it['created']) - )); - break; - - case ACTIVITY_FRIEND: - - $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; - $obj = parse_xml_string($xmlhead.$it['object']); - $it['fname'] = $obj->title; - - $notif_content .= replace_macros($tpl_item_friends,array( - //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], - '$item_image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), - '$item_text' => sprintf( t("%s is now friends with %s"), $it['author-name'], $it['fname']), - '$item_when' => relative_date($it['created']) - )); - break; - - default: - $item_text = (($it['id'] == $it['parent']) - ? sprintf( t("%s created a new post"), $it['author-name']) - : sprintf( t("%s commented on %s's post"), $it['author-name'], $it['pname'])); - $tpl = (($it['id'] == $it['parent']) ? $tpl_item_posts : $tpl_item_comments); - - $notif_content .= replace_macros($tpl,array( - //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], - '$item_image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), - '$item_text' => $item_text, - '$item_when' => relative_date($it['created']) - )); - } - } - - } else { - - $notif_content = t('No more network notifications.'); - } - - $o .= replace_macros($notif_tpl, array( - '$notif_header' => t('Network Notifications'), - '$tabs' => $tabs, - '$notif_content' => $notif_content, - )); - } else if (($a->argc > 1) && ($a->argv[1] == 'system')) { + $header = $it["name"]; - $notif_tpl = get_markup_template('notifications.tpl'); + if ($it["addr"] != "") + $header .= " <".$it["addr"].">"; - $not_tpl = get_markup_template('notify.tpl'); - require_once('include/bbcode.php'); + $header .= " (".network_to_name($it['network'], $it['url']).")"; - $r = q("SELECT * from notify where uid = %d and seen = 0 order by date desc", - intval(local_user()) - ); + $notif_content[] = replace_macros($tpl, array( + '$header' => htmlentities($header), + '$str_notifytype' => t('Notification type: '), + '$notify_type' => $it['notify_type'], + '$dfrn_text' => $dfrn_text, + '$dfrn_id' => $it['dfrn_id'], + '$uid' => $it['uid'], + '$intro_id' => $it['intro_id'], + '$contact_id' => $it['contact_id'], + '$photo' => $it['photo'], + '$fullname' => $it['name'], + '$location' => $it['location'], + '$lbl_location' => t('Location:'), + '$about' => $it['about'], + '$lbl_about' => t('About:'), + '$keywords' => $it['keywords'], + '$lbl_keywords' => t('Tags:'), + '$gender' => $it['gender'], + '$lbl_gender' => t('Gender:'), + '$hidden' => array('hidden', t('Hide this contact from others'), ($it['hidden'] == 1), ''), + '$activity' => array('activity', t('Post a new friend activity'), $it['post_newfriend'], t('if applicable')), + '$url' => $it['url'], + '$zrl' => $it['zrl'], + '$lbl_url' => t('Profile URL'), + '$addr' => $it['addr'], + '$lbl_knowyou' => $lbl_knowyou, + '$lbl_network' => t('Network:'), + '$network' => network_to_name($it['network'], $it['url']), + '$knowyou' => $knowyou, + '$approve' => t('Approve'), + '$note' => $it['note'], + '$ignore' => t('Ignore'), + '$discard' => t('Discard'), - 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'], - '$item_image' => proxy_url($it['photo'], false, PROXY_SIZE_MICRO), - '$item_text' => strip_tags(bbcode($it['msg'])), - '$item_when' => relative_date($it['date']) - )); + )); + break; } - } else { - $notif_content .= t('No more system notifications.'); } - $o .= replace_macros($notif_tpl, array( - '$notif_header' => t('System Notifications'), - '$tabs' => $tabs, - '$notif_content' => $notif_content, - )); - - } else if (($a->argc > 1) && ($a->argv[1] == 'personal')) { - - $notif_tpl = get_markup_template('notifications.tpl'); - - $myurl = $a->get_baseurl(true) . '/profile/'. $a->user['nickname']; - $myurl = substr($myurl,strpos($myurl,'://')+3); - $myurl = str_replace(array('www.','.'),array('','\\.'),$myurl); - $diasp_url = str_replace('/profile/','/u/',$myurl); - $sql_extra .= sprintf(" AND ( `item`.`author-link` regexp '%s' or `item`.`tag` regexp '%s' or `item`.`tag` regexp '%s' ) ", - dbesc($myurl . '$'), - dbesc($myurl . '\\]'), - dbesc($diasp_url . '\\]') - ); - - - $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, - `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` as `object`, - `pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink`, `pitem`.`guid` as `pguid` - FROM `item` INNER JOIN `item` as `pitem` ON `pitem`.`id`=`item`.`parent` - WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 - $sql_extra - AND `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0 ORDER BY `item`.`created` DESC" , - intval(local_user()) - ); - - $tpl_item_likes = get_markup_template('notifications_likes_item.tpl'); - $tpl_item_dislikes = get_markup_template('notifications_dislikes_item.tpl'); - $tpl_item_friends = get_markup_template('notifications_friends_item.tpl'); - $tpl_item_comments = get_markup_template('notifications_comments_item.tpl'); - $tpl_item_posts = get_markup_template('notifications_posts_item.tpl'); - - $notif_content = ''; - - if (dba::is_result($r)) { - - foreach ($r as $it) { - switch($it['verb']){ - case ACTIVITY_LIKE: - $notif_content .= replace_macros($tpl_item_likes,array( - //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], - '$item_image' => $it['author-avatar'], - '$item_text' => sprintf( t("%s liked %s's post"), $it['author-name'], $it['pname']), - '$item_when' => relative_date($it['created']) - )); - break; - - case ACTIVITY_DISLIKE: - $notif_content .= replace_macros($tpl_item_dislikes,array( - //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], - '$item_image' => $it['author-avatar'], - '$item_text' => sprintf( t("%s disliked %s's post"), $it['author-name'], $it['pname']), - '$item_when' => relative_date($it['created']) - )); - break; - - case ACTIVITY_FRIEND: - - $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; - $obj = parse_xml_string($xmlhead.$it['object']); - $it['fname'] = $obj->title; - - $notif_content .= replace_macros($tpl_item_friends,array( - //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], - '$item_image' => $it['author-avatar'], - '$item_text' => sprintf( t("%s is now friends with %s"), $it['author-name'], $it['fname']), - '$item_when' => relative_date($it['created']) - )); - break; - - default: - $item_text = (($it['id'] == $it['parent']) - ? sprintf( t("%s created a new post"), $it['author-name']) - : sprintf( t("%s commented on %s's post"), $it['author-name'], $it['pname'])); - $tpl = (($it['id'] == $it['parent']) ? $tpl_item_posts : $tpl_item_comments); - - $notif_content .= replace_macros($tpl,array( - //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], - '$item_image' => $it['author-avatar'], - '$item_text' => $item_text, - '$item_when' => relative_date($it['created']) - )); - } - } - - } else { + if($notifs['total'] == 0) + info( t('No introductions.') . EOL); - $notif_content = t('No more personal notifications.'); + // Normal notifications (no introductions) + } else { + + // The template files we need in different cases for formatting the content + $tpl_item_like = 'notifications_likes_item.tpl'; + $tpl_item_dislike = 'notifications_dislikes_item.tpl'; + $tpl_item_attend = 'notifications_attend_item.tpl'; + $tpl_item_attendno = 'notifications_attend_item.tpl'; + $tpl_item_attendmaybe = 'notifications_attend_item.tpl'; + $tpl_item_friend = 'notifications_friends_item.tpl'; + $tpl_item_comment = 'notifications_comments_item.tpl'; + $tpl_item_post = 'notifications_posts_item.tpl'; + $tpl_item_notify = 'notify.tpl'; + + // Loop trough ever notification This creates an array with the output html for each + // notification and apply the correct template according to the notificationtype (label). + foreach ($notifs['notifications'] as $it) { + + // We use the notification label to get the correct template file + $tpl_var_name = 'tpl_item_'.$it['label']; + $tpl_notif = get_markup_template($$tpl_var_name); + + $notif_content[] = replace_macros($tpl_notif,array( + '$item_label' => $it['label'], + '$item_link' => $it['link'], + '$item_image' => $it['image'], + '$item_text' => htmlentities($it['text']), + '$item_when' => $it['when'], + '$item_seen' => $it['seen'], + )); } - $o .= replace_macros($notif_tpl, array( - '$notif_header' => t('Personal Notifications'), - '$tabs' => $tabs, - '$notif_content' => $notif_content, - )); - - - - - - - } else if (($a->argc > 1) && ($a->argv[1] == 'home')) { - - $notif_tpl = get_markup_template('notifications.tpl'); - - $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, - `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` as `object`, - `pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink`, `pitem`.`guid` as `pguid` - FROM `item` INNER JOIN `item` as `pitem` ON `pitem`.`id`=`item`.`parent` - WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND - `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 1 ORDER BY `item`.`created` DESC", - intval(local_user()) - ); - - $tpl_item_likes = get_markup_template('notifications_likes_item.tpl'); - $tpl_item_dislikes = get_markup_template('notifications_dislikes_item.tpl'); - $tpl_item_friends = get_markup_template('notifications_friends_item.tpl'); - $tpl_item_comments = get_markup_template('notifications_comments_item.tpl'); - - $notif_content = ''; - - if (dba::is_result($r)) { - - foreach ($r as $it) { - switch($it['verb']){ - case ACTIVITY_LIKE: - $notif_content .= replace_macros($tpl_item_likes,array( - //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], - '$item_image' => $it['author-avatar'], - '$item_text' => sprintf( t("%s liked %s's post"), $it['author-name'], $it['pname']), - '$item_when' => relative_date($it['created']) - )); - - break; - case ACTIVITY_DISLIKE: - $notif_content .= replace_macros($tpl_item_dislikes,array( - //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], - '$item_image' => $it['author-avatar'], - '$item_text' => sprintf( t("%s disliked %s's post"), $it['author-name'], $it['pname']), - '$item_when' => relative_date($it['created']) - )); - - break; - case ACTIVITY_FRIEND: - - $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; - $obj = parse_xml_string($xmlhead.$it['object']); - $it['fname'] = $obj->title; - - $notif_content .= replace_macros($tpl_item_friends,array( - //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], - '$item_image' => $it['author-avatar'], - '$item_text' => sprintf( t("%s is now friends with %s"), $it['author-name'], $it['fname']), - '$item_when' => relative_date($it['created']) - )); - - break; - default: - $notif_content .= replace_macros($tpl_item_comments,array( - //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], - '$item_image' => $it['author-avatar'], - '$item_text' => sprintf( t("%s commented on %s's post"), $it['author-name'], $it['pname']), - '$item_when' => relative_date($it['created']) - )); - } - } - - } else { - $notif_content = t('No more home notifications.'); + // It doesn't make sense to show the Show unread / Show all link visible if the user is on the + // "Show all" page and there are no notifications. So we will hide it. + if($show == 0 || intval($show) && $notifs['total'] > 0) { + $notif_show_lnk = array( + 'href' => ($show ? 'notifications/'.$notifs['ident'] : 'notifications/'.$notifs['ident'].'?show=all' ), + 'text' => ($show ? t('Show unread') : t('Show all')), + ); } - $o .= replace_macros($notif_tpl, array( - '$notif_header' => t('Home Notifications'), - '$tabs' => $tabs, - '$notif_content' => $notif_content, - )); + // Output if there aren't any notifications available + if($notifs['total'] == 0) + $notif_nocontent = sprintf( t('No more %s notifications.'), $notifs['ident']); } - $o .= paginate($a); - + $o .= replace_macros($notif_tpl, array( + '$notif_header' => $notif_header, + '$tabs' => $tabs, + '$notif_content' => $notif_content, + '$notif_nocontent' => $notif_nocontent, + '$notif_show_lnk' => $notif_show_lnk, + '$notif_paginate' => paginate($a) + )); + return $o; } diff --cc mod/p.php index 20d6cfdbaf,8da044e932..4db8f55296 --- a/mod/p.php +++ b/mod/p.php @@@ -26,55 -44,20 +44,20 @@@ function p_init($a) killme(); } - $post = array(); - - $reshared = diaspora::is_reshare($item[0]["body"]); - - if ($reshared) { - $nodename = "reshare"; - $post["root_diaspora_id"] = $reshared["root_handle"]; - $post["root_guid"] = $reshared["root_guid"]; - $post["guid"] = $item[0]["guid"]; - $post["diaspora_handle"] = diaspora::handle_from_contact($item[0]["contact-id"]); - $post["public"] = (!$item[0]["private"] ? 'true':'false'); - $post["created_at"] = datetime_convert('UTC','UTC',$item[0]["created"]); - } else { - - $body = bb2diaspora($item[0]["body"]); - - if(strlen($item[0]["title"])) - $body = "## ".html_entity_decode($item[0]["title"])."\n\n".$body; - - $nodename = "status_message"; - $post["raw_message"] = str_replace("&", "&", $body); - $post["guid"] = $item[0]["guid"]; - $post["diaspora_handle"] = diaspora::handle_from_contact($item[0]["contact-id"]); - $post["public"] = (!$item[0]["private"] ? 'true':'false'); - $post["created_at"] = datetime_convert('UTC','UTC',$item[0]["created"]); - $post["provider_display_name"] = $item[0]["app"]; + // Fetch some data from the author (We could combine both queries - but I think this is more readable) + $r = q("SELECT `user`.`prvkey`, `contact`.`addr`, `user`.`nickname`, `contact`.`nick` FROM `user` + INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid` + WHERE `user`.`uid` = %d", intval($item[0]["uid"])); - if (!$r) { ++ if (!dbm::is_result($r)) { + header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found')); + killme(); } + $user = $r[0]; - $dom = new DOMDocument("1.0"); - $root = $dom->createElement("XML"); - $dom->appendChild($root); - $postelement = $dom->createElement("post"); - $root->appendChild($postelement); - $statuselement = $dom->createElement($nodename); - $postelement->appendChild($statuselement); - - foreach($post AS $index => $value) { - $postnode = $dom->createElement($index, $value); - $statuselement->appendChild($postnode); - } + $status = diaspora::build_status($item[0], $user); + $xml = diaspora::build_post_xml($status["type"], $status["message"]); header("Content-Type: application/xml; charset=utf-8"); - $xml = $dom->saveXML(); - - // Diaspora doesn't send the XML header, so we remove them as well. - // So we avoid possible compatibility problems. - if (substr($xml, 0, 21) == '') - $xml = trim(substr($xml, 21)); - echo $xml; killme(); diff --cc mod/photo.php index 33a0242352,4166b4d539..9141a98676 --- a/mod/photo.php +++ b/mod/photo.php @@@ -76,7 -76,7 +76,7 @@@ function photo_init(&$a) intval($resolution), intval($uid) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $data = $r[0]['data']; $mimetype = $r[0]['type']; } @@@ -106,7 -106,7 +106,7 @@@ dbesc($photo), intval($resolution) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $sql_extra = permissions_sql($r[0]['uid']); @@@ -117,9 -117,9 +117,9 @@@ intval($resolution) ); - $public = (dba::is_result($r)) && ($r[0]['allow_cid'] == '') AND ($r[0]['allow_gid'] == '') AND ($r[0]['deny_cid'] == '') AND ($r[0]['deny_gid'] == ''); - $public = ($r[0]['allow_cid'] == '') AND ($r[0]['allow_gid'] == '') AND ($r[0]['deny_cid'] == '') AND ($r[0]['deny_gid'] == ''); ++ $public = (dbm::is_result($r)) && ($r[0]['allow_cid'] == '') AND ($r[0]['allow_gid'] == '') AND ($r[0]['deny_cid'] == '') AND ($r[0]['deny_gid'] == ''); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $resolution = $r[0]['scale']; $data = $r[0]['data']; $mimetype = $r[0]['type']; diff --cc mod/photos.php index b05bc12b1a,a191dcf071..328be50b27 --- a/mod/photos.php +++ b/mod/photos.php @@@ -159,7 -160,7 +160,7 @@@ function photos_post(&$a) intval($cid), intval($page_owner_uid) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $can_post = true; $visitor = $cid; } @@@ -267,7 -268,7 +268,7 @@@ dbesc($album) ); } - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { foreach($r as $rr) { $res[] = "'" . dbesc($rr['rid']) . "'" ; } @@@ -290,7 -291,7 +291,7 @@@ $r = q("SELECT `parent-uri` FROM `item` WHERE `resource-id` IN ( $str_res ) AND `uid` = %d", intval($page_owner_uid) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::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 -353,7 +353,7 @@@ dbesc($a->argv[2]) ); } - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::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 -409,7 +409,7 @@@ dbesc($resource_id), intval($page_owner_uid) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::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 -526,7 +526,7 @@@ intval($page_owner_uid) ); } - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $old_tag = $r[0]['tag']; $old_inform = $r[0]['inform']; } @@@ -612,7 -613,7 +613,7 @@@ intval($page_owner_uid) ); }*/ - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $newname = $r[0]['name']; $profile = $r[0]['url']; $notify = 'cid:' . $r[0]['id']; @@@ -1028,7 -1029,7 +1029,7 @@@ function photos_content(&$a) intval($contact_id), intval($owner_uid) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $can_post = true; $contact = $r[0]; $remote_contact = true; @@@ -1056,7 -1057,7 +1057,7 @@@ intval($contact_id), intval($owner_uid) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $contact = $r[0]; $remote_contact = true; } @@@ -1209,8 -1210,8 +1210,8 @@@ intval($owner_uid), dbesc($album) ); - if(dba::is_result($r)) { - $a->set_pager_total(dba::is_result($r)); - if(count($r)) { - $a->set_pager_total(count($r)); ++ if(dbm::is_result($r)) { ++ $a->set_pager_total(dbm::is_result($r)); $a->set_pager_itemspage(20); } @@@ -1266,7 -1267,7 +1267,7 @@@ $photos = array(); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $twist = 'rotright'; foreach($r as $rr) { if($twist == 'rotright') @@@ -1461,7 -1461,7 +1461,7 @@@ ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $a->set_pager_total($r[0]['total']); @@@ -1638,7 -1638,7 +1638,7 @@@ // display comments - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { foreach($r as $item) { builtin_activity_puller($item, $conv_responses); @@@ -1824,8 -1824,8 +1824,8 @@@ dbesc('Contact Photos'), dbesc( t('Contact Photos')) ); - if(dba::is_result($r)) { - $a->set_pager_total(dba::is_result($r)); - if(count($r)) { - $a->set_pager_total(count($r)); ++ if(dbm::is_result($r)) { ++ $a->set_pager_total(dbm::is_result($r)); $a->set_pager_itemspage(20); } @@@ -1842,7 -1842,7 +1842,7 @@@ $photos = array(); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $twist = 'rotright'; foreach($r as $rr) { //hide profile photos to others diff --cc mod/poco.php index 372f5b45b6,0a1b392169..d492d7e933 --- a/mod/poco.php +++ b/mod/poco.php @@@ -81,7 -81,7 +81,7 @@@ function poco_init(&$a) dbesc(NETWORK_STATUSNET) ); } - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $totalResults = intval($r[0]['total']); else $totalResults = 0; @@@ -168,7 -168,7 +168,7 @@@ } if(is_array($r)) { - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { foreach($r as $rr) { if (!isset($rr['generation'])) { if ($global) diff --cc mod/poke.php index f59ec18697,435da4dcd4..daa3c0a89c --- a/mod/poke.php +++ b/mod/poke.php @@@ -66,7 -66,7 +66,7 @@@ function poke_init(&$a) intval($parent), intval($uid) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $parent_uri = $r[0]['uri']; $private = $r[0]['private']; $allow_cid = $r[0]['allow_cid']; @@@ -159,7 -159,7 +159,7 @@@ function poke_content(&$a) intval($_GET['c']), intval(local_user()) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $name = $r[0]['name']; $id = $r[0]['id']; } diff --cc mod/profile.php index 66d7ce3999,681b1dbd1c..04f6fa247f --- a/mod/profile.php +++ b/mod/profile.php @@@ -13,7 -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(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { goaway($a->get_baseurl() . '/profile/' . $r[0]['nickname']); } else { @@@ -136,7 -136,7 +136,7 @@@ function profile_content(&$a, $update intval($contact_id), intval($a->profile['profile_uid']) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $contact = $r[0]; $remote_contact = true; } @@@ -257,10 -256,10 +256,10 @@@ AND `thread`.`wall` = 1 $sql_extra $sql_extra2 ", intval($a->profile['profile_uid']) - ); + ); - if(dba::is_result($r)) { - if(count($r)) { - $a->set_pager_total($r[0]['total']); ++ if(dbm::is_result($r)) { + $a->set_pager_total($r[0]['total']); } } diff --cc mod/profile_photo.php index 75b364d2b9,11e671afc5..635fe7c55a --- a/mod/profile_photo.php +++ b/mod/profile_photo.php @@@ -32,7 -32,7 +32,7 @@@ function profile_photo_post(&$a) intval($_REQUEST['profile']), intval(local_user()) ); - if(dba::is_result($r) && (! intval($r[0]['is-default']))) - if(count($r) && (! intval($r[0]['is-default']))) ++ if(dbm::is_result($r) && (! intval($r[0]['is-default']))) $is_default_profile = 0; } @@@ -63,7 -63,7 +63,7 @@@ dbesc(local_user()), intval($scale)); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $base_image = $r[0]; diff --cc mod/profiles.php index dfab29894e,d770e75c3a..44cdaa70ff --- a/mod/profiles.php +++ b/mod/profiles.php @@@ -285,7 -286,7 +286,7 @@@ function profiles_post(&$a) intval(local_user()) ); } - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $prf = $r[0]['url']; $newname = $r[0]['name']; } @@@ -778,7 -759,7 +759,7 @@@ function profiles_content(&$a) "SELECT * FROM `profile` WHERE `uid` = %d AND `is-default`=1", local_user() ); - if(dba::is_result($r)){ - if(count($r)){ ++ if(dbm::is_result($r)){ //Go to the default profile. goaway('profiles/'.$r[0]['id']); } @@@ -786,21 -767,11 +767,11 @@@ $r = q("SELECT * FROM `profile` WHERE `uid` = %d", local_user()); - if(dba::is_result($r)) { - - $tpl_header = get_markup_template('profile_listing_header.tpl'); - $o .= replace_macros($tpl_header,array( - '$header' => t('Edit/Manage Profiles'), - '$chg_photo' => t('Change profile photo'), - '$cr_new' => t('Create New Profile'), - '$cr_new_link' => 'profiles/new?t=' . get_form_security_token("profile_new") - )); - - if(count($r)) { ++ if(dbm::is_result($r)) { $tpl = get_markup_template('profile_entry.tpl'); - foreach($r as $rr) { - $o .= replace_macros($tpl, array( + $profiles .= replace_macros($tpl, array( '$photo' => $a->remove_baseurl($rr['thumb']), '$id' => $rr['id'], '$alt' => t('Profile Image'), diff --cc mod/profperm.php index 91b84e2b94,077f695bea..c3c189cd8a --- a/mod/profperm.php +++ b/mod/profperm.php @@@ -42,7 -42,7 +42,7 @@@ function profperm_content(&$a) intval($a->argv[2]), intval(local_user()) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $change = intval($a->argv[2]); } @@@ -64,7 -64,7 +64,7 @@@ ); $ingroup = array(); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) foreach($r as $member) $ingroup[] = $member['id']; @@@ -94,7 -94,7 +94,7 @@@ $members = $r; $ingroup = array(); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) foreach($r as $member) $ingroup[] = $member['id']; } @@@ -138,7 -138,7 +138,7 @@@ dbesc(NETWORK_DFRN) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $textmode = (($switchtotext && (count($r) > $switchtotext)) ? true : false); foreach($r as $member) { if(! in_array($member['id'],$ingroup)) { diff --cc mod/proxy.php index 02def84ca1,abcaf49127..75f485bc71 --- a/mod/proxy.php +++ b/mod/proxy.php @@@ -136,7 -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 (dba::is_result($r)) { - if (count($r)) { ++ if (dbm::is_result($r)) { $img_str = $r[0]['data']; $mime = $r[0]["desc"]; if ($mime == "") $mime = "image/jpeg"; @@@ -144,7 -144,7 +144,7 @@@ } else $r = array(); -- if (!count($r)) { ++ if (!dbm::is_result($r)) { // It shouldn't happen but it does - spaces in URL $_REQUEST['url'] = str_replace(" ", "+", $_REQUEST['url']); $redirects = 0; diff --cc mod/pubsubhubbub.php index a50efc9229,5d7621cc74..5a66ccbc7c --- a/mod/pubsubhubbub.php +++ b/mod/pubsubhubbub.php @@@ -132,7 -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 (dba::is_result($r)) { - if (count($r)) { ++ if (dbm::is_result($r)) { $last_update = $r[0]['last_update']; $push_flag = $r[0]['push']; } diff --cc mod/qsearch.php index 0eabf6b7c6,c35e253b67..49868f4851 --- a/mod/qsearch.php +++ b/mod/qsearch.php @@@ -23,7 -23,7 +23,7 @@@ function qsearch_init(&$a) intval($limit) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { foreach($r as $rr) $results[] = array( 0, (int) $rr['id'], $rr['name'], '', ''); @@@ -38,7 -38,7 +38,7 @@@ ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { foreach($r as $rr) $results[] = array( (int) $rr['id'], 0, $rr['name'],$rr['url'],$rr['photo']); diff --cc mod/regmod.php index 47258e0914,bbe733003a..f37953ac50 --- a/mod/regmod.php +++ b/mod/regmod.php @@@ -34,10 -34,10 +34,10 @@@ function user_allow($hash) $r = q("SELECT * FROM `profile` WHERE `uid` = %d AND `is-default` = 1", intval($user[0]['uid']) ); - if(dba::is_result($r) && $r[0]['net-publish']) { - if(count($r) && $r[0]['net-publish']) { ++ if(dbm::is_result($r) && $r[0]['net-publish']) { $url = $a->get_baseurl() . '/profile/' . $user[0]['nickname']; if($url && strlen(get_config('system','directory'))) - proc_run('php',"include/directory.php","$url"); + proc_run(PRIORITY_LOW, "include/directory.php", $url); } push_lang($register[0]['language']); diff --cc mod/salmon.php index ec0693b941,37230a5573..e655da411b --- a/mod/salmon.php +++ b/mod/salmon.php @@@ -169,8 -169,8 +169,8 @@@ function salmon_post(&$a) // Have we ignored the person? // If so we can not accept this post. - //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']) { - //if((count($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == CONTACT_IS_FOLLOWER) || ($r[0]['blocked']))) { - if(count($r) && $r[0]['blocked']) { ++ //if((dbm::is_result($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == CONTACT_IS_FOLLOWER) || ($r[0]['blocked']))) { ++ if(dbm::is_result($r) && $r[0]['blocked']) { logger('mod-salmon: Ignoring this author.'); http_status_exit(202); // NOTREACHED @@@ -179,7 -179,7 +179,7 @@@ // Placeholder for hub discovery. $hub = ''; - $contact_rec = ((dba::is_result($r)) ? $r[0] : null); - $contact_rec = ((count($r)) ? $r[0] : null); ++ $contact_rec = ((dbm::is_result($r)) ? $r[0] : null); ostatus::import($data,$importer,$contact_rec, $hub); diff --cc mod/search.php index 9ad1fe5077,a837259991..587b89209d --- a/mod/search.php +++ b/mod/search.php @@@ -15,7 -15,7 +15,7 @@@ function search_saved_searches() intval(local_user()) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $saved = array(); foreach($r as $rr) { $saved[] = array( @@@ -210,20 -209,18 +209,17 @@@ function search_content(&$a) $sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search)))); } - $r = q("SELECT STRAIGHT_JOIN `item`.`uri`, `item`.*, `item`.`id` AS `item_id`, - `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`rel`, - `contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`, - `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid` - FROM `item` - INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND NOT `contact`.`blocked` AND NOT `contact`.`pending` - WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated` - AND (`item`.`uid` = 0 OR (`item`.`uid` = %s AND NOT `item`.`global`)) - + $r = q("SELECT %s + FROM `item` %s + WHERE %s AND (`item`.`uid` = 0 OR (`item`.`uid` = %s AND NOT `item`.`global`)) $sql_extra - GROUP BY `item`.`uri` ORDER BY `item`.`id` DESC LIMIT %d , %d ", - intval(local_user()), intval($a->pager['start']), intval($a->pager['itemspage'])); + GROUP BY `item`.`uri` ORDER BY `item`.`id` DESC LIMIT %d , %d", + item_fieldlists(), item_joins(), item_condition(), + intval(local_user()), + intval($a->pager['start']), intval($a->pager['itemspage'])); } -- if(! count($r)) { ++ if(! dbm::is_result($r)) { info( t('No results.') . EOL); return $o; } diff --cc mod/settings.php index 8417423639,e2d3f4d367..932dfe26d9 --- a/mod/settings.php +++ b/mod/settings.php @@@ -254,7 -255,7 +255,7 @@@ function settings_post(&$a) $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1", intval(local_user()) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $eacct = $r[0]; require_once('include/email.php'); $mb = construct_mailbox_name($eacct); @@@ -842,15 -844,15 +844,15 @@@ function settings_content(&$a) $r = null; } - $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'); - $mail_server = ((count($r)) ? $r[0]['server'] : ''); - $mail_port = ((count($r) && intval($r[0]['port'])) ? intval($r[0]['port']) : ''); - $mail_ssl = ((count($r)) ? $r[0]['ssltype'] : ''); - $mail_user = ((count($r)) ? $r[0]['user'] : ''); - $mail_replyto = ((count($r)) ? $r[0]['reply_to'] : ''); - $mail_pubmail = ((count($r)) ? $r[0]['pubmail'] : 0); - $mail_action = ((count($r)) ? $r[0]['action'] : 0); - $mail_movetofolder = ((count($r)) ? $r[0]['movetofolder'] : ''); - $mail_chk = ((count($r)) ? $r[0]['last_check'] : '0000-00-00 00:00:00'); ++ $mail_server = ((dbm::is_result($r)) ? $r[0]['server'] : ''); ++ $mail_port = ((dbm::is_result($r) && intval($r[0]['port'])) ? intval($r[0]['port']) : ''); ++ $mail_ssl = ((dbm::is_result($r)) ? $r[0]['ssltype'] : ''); ++ $mail_user = ((dbm::is_result($r)) ? $r[0]['user'] : ''); ++ $mail_replyto = ((dbm::is_result($r)) ? $r[0]['reply_to'] : ''); ++ $mail_pubmail = ((dbm::is_result($r)) ? $r[0]['pubmail'] : 0); ++ $mail_action = ((dbm::is_result($r)) ? $r[0]['action'] : 0); ++ $mail_movetofolder = ((dbm::is_result($r)) ? $r[0]['movetofolder'] : ''); ++ $mail_chk = ((dbm::is_result($r)) ? $r[0]['last_check'] : '0000-00-00 00:00:00'); $tpl = get_markup_template("settings_connectors.tpl"); diff --cc mod/subthread.php index 4b417b75b9,33cf7489c1..f86cf02d9d --- a/mod/subthread.php +++ b/mod/subthread.php @@@ -53,7 -53,7 +53,7 @@@ function subthread_content(&$a) WHERE `contact`.`self` = 1 AND `contact`.`uid` = %d LIMIT 1", intval($owner_uid) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $owner = $r[0]; if(! $owner) { @@@ -75,7 -75,7 +75,7 @@@ intval($_SESSION['visitor_id']), intval($owner_uid) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $contact = $r[0]; } if(! $contact) { diff --cc mod/tagger.php index 78bf11cc4c,e0ef1ceb02..50415e709f --- a/mod/tagger.php +++ b/mod/tagger.php @@@ -39,7 -39,7 +39,7 @@@ function tagger_content(&$a) $r = q("select `nickname`,`blocktags` from user where uid = %d limit 1", intval($owner_uid) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $owner_nick = $r[0]['nickname']; $blocktags = $r[0]['blocktags']; } @@@ -50,7 -50,7 +50,7 @@@ $r = q("select * from contact where self = 1 and uid = %d limit 1", intval(local_user()) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $contact = $r[0]; else { logger('tagger: no contact_id'); @@@ -178,7 -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(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $x = q("SELECT `blocktags` FROM `user` WHERE `uid` = %d limit 1", intval($r[0]['uid']) ); diff --cc mod/uexport.php index dde5fe090d,3114add7e4..0aa9f68b26 --- a/mod/uexport.php +++ b/mod/uexport.php @@@ -44,7 -44,7 +44,7 @@@ function uexport_content(&$a) function _uexport_multirow($query) { $result = array(); $r = q($query); - // if(dba::is_result($r)) { -// if(count($r)) { ++// if(dbm::is_result($r)) { if ($r){ foreach($r as $rr){ $p = array(); @@@ -130,7 -130,7 +130,7 @@@ function uexport_all(&$a) $r = q("SELECT count(*) as `total` FROM `item` WHERE `uid` = %d ", intval(local_user()) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $total = $r[0]['total']; // chunk the output to avoid exhausting memory @@@ -142,7 -142,7 +142,7 @@@ intval($x), intval(500) ); - /*if(dba::is_result($r)) { - /*if(count($r)) { ++ /*if(dbm::is_result($r)) { foreach($r as $rr) foreach($rr as $k => $v) $item[][$k] = $v; diff --cc mod/videos.php index 2cd013b008,e5a0887bb9..75518472a3 --- a/mod/videos.php +++ b/mod/videos.php @@@ -143,7 -143,7 +143,7 @@@ function videos_post(&$a) dbesc($video_id) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { q("DELETE FROM `attach` WHERE `uid` = %d AND `id` = '%s'", intval(local_user()), dbesc($video_id) @@@ -262,7 -262,7 +262,7 @@@ function videos_content(&$a) intval($contact_id), intval($owner_uid) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $can_post = true; $contact = $r[0]; $remote_contact = true; @@@ -290,7 -290,7 +290,7 @@@ intval($contact_id), intval($owner_uid) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $contact = $r[0]; $remote_contact = true; } @@@ -350,8 -350,8 +350,8 @@@ $sql_extra GROUP BY hash", intval($a->data['user']['uid']) ); - if(dba::is_result($r)) { - $a->set_pager_total(dba::is_result($r)); - if(count($r)) { - $a->set_pager_total(count($r)); ++ if(dbm::is_result($r)) { ++ $a->set_pager_total(dbm::is_result($r)); $a->set_pager_itemspage(20); } @@@ -366,7 -366,7 +366,7 @@@ $videos = array(); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { foreach($r as $rr) { if($a->theme['template_engine'] === 'internal') { $alt_e = template_escape($rr['filename']); diff --cc mod/viewcontacts.php index 43e3151308,2eae8fec8e..3449643afd --- a/mod/viewcontacts.php +++ b/mod/viewcontacts.php @@@ -54,7 -54,7 +54,7 @@@ function viewcontacts_content(&$a) dbesc(NETWORK_DIASPORA), dbesc(NETWORK_OSTATUS) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) $a->set_pager_total($r[0]['total']); $r = q("SELECT * FROM `contact` diff --cc mod/viewsrc.php index 0c10cbf7c8,3fa4eaed53..1751b856f2 --- a/mod/viewsrc.php +++ b/mod/viewsrc.php @@@ -24,7 -24,7 +24,7 @@@ function viewsrc_content(&$a) dbesc($item_id) ); - if(dba::is_result($r)) - if(count($r)) ++ if(dbm::is_result($r)) if(is_ajax()) { echo str_replace("\n",'
',$r[0]['body']); killme(); diff --cc mod/wall_attach.php index 9a041d9448,68752a0e1f..11ef81aca3 --- a/mod/wall_attach.php +++ b/mod/wall_attach.php @@@ -55,7 -55,7 +55,7 @@@ function wall_attach_post(&$a) intval($cid), intval($page_owner_uid) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $can_post = true; $visitor = $cid; } diff --cc mod/wall_upload.php index ac7dd77649,b815348c70..d2915d4de3 --- a/mod/wall_upload.php +++ b/mod/wall_upload.php @@@ -63,7 -63,7 +63,7 @@@ function wall_upload_post(&$a, $desktop intval($cid), intval($page_owner_uid) ); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { $can_post = true; $visitor = $cid; } diff --cc object/Item.php index e1a46532a1,9f01ac59b0..45d2dba3ed --- a/object/Item.php +++ b/object/Item.php @@@ -225,7 -235,7 +235,7 @@@ class Item extends BaseObject intval($item['uid']), intval($item['id']) ); - if (dba::is_result($r)) { - if (count($r)) { ++ if (dbm::is_result($r)) { $ignore = array( 'do' => t("ignore thread"), 'undo' => t("unignore thread"), diff --cc update.php index 5ab3e69f3b,f1981f730f..0592c928c7 --- a/update.php +++ b/update.php @@@ -85,7 -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(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { foreach($r as $rr) { $sres=openssl_pkey_new(array('encrypt_key' => false )); $sprvkey = ''; @@@ -122,7 -122,7 +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(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { foreach($r as $rr) { q("UPDATE `contact` SET `nick` = '%s' WHERE `id` = %d", dbesc(basename($rr['url'])), @@@ -145,7 -145,7 +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(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { foreach($r as $rr) { $ph = new Photo($rr['data']); if($ph->is_valid()) { @@@ -155,7 -155,7 +155,7 @@@ } } $r = q("SELECT * FROM `contact` WHERE 1"); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { foreach($r as $rr) { if(stristr($rr['thumb'],'avatar')) q("UPDATE `contact` SET `micro` = '%s' WHERE `id` = %d", @@@ -356,7 -356,7 +356,7 @@@ function update_1035() function update_1036() { $r = dbq("SELECT * FROM `contact` WHERE `network` = 'dfrn' && `photo` LIKE '%include/photo%' "); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { foreach($r as $rr) { q("UPDATE `contact` SET `photo` = '%s', `thumb` = '%s', `micro` = '%s' WHERE `id` = %d", dbesc(str_replace('include/photo','photo',$rr['photo'])), @@@ -594,7 -594,7 +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(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { foreach($r as $rr) q("UPDATE `user` SET `hidewall` = 1 WHERE `uid` = %d", intval($rr['uid']) @@@ -606,7 -606,7 +606,7 @@@ function update_1075() { q("ALTER TABLE `user` ADD `guid` CHAR( 16 ) NOT NULL AFTER `uid` "); $r = q("SELECT `uid` FROM `user` WHERE 1"); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { foreach($r as $rr) { $found = true; do { @@@ -688,7 -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(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { foreach($r as $rr) { $guid = get_guid(); q("update `photo` set `guid` = '%s' where `resource-id` = '%s'", @@@ -731,7 -731,7 +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(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { foreach($r as $rr) { $x = q("SELECT max(`created`) AS `cdate` FROM `item` WHERE `parent` = %d LIMIT 1", intval($rr['id']) @@@ -854,7 -854,7 +854,7 @@@ function update_1100() require_once('include/text.php'); $r = q("select id, url from contact where url != '' and nurl = '' "); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { foreach($r as $rr) { q("update contact set nurl = '%s' where id = %d", dbesc(normalise_link($rr['url'])), @@@ -1168,7 -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(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { foreach($r as $rr) { $found = false; foreach($arr as $x) { @@@ -1187,7 -1187,7 +1187,7 @@@ $arr = array(); $r = q("select * from pconfig where 1 order by id desc"); - if(dba::is_result($r)) { - if(count($r)) { ++ if(dbm::is_result($r)) { foreach($r as $rr) { $found = false; foreach($arr as $x) { @@@ -1692,7 -1692,7 +1692,7 @@@ function update_1190() ); // convert old forumlist addon entries in new config entries - if (dba::is_result($r)) { - if (count($r)) { ++ if (dbm::is_result($r)) { foreach ($r as $rr) { $uid = $rr['uid']; $family = $rr['cat']; diff --cc view/templates/head.tpl index 733f8917a6,70add44c2f..8a5ff65cb6 --- a/view/templates/head.tpl +++ b/view/templates/head.tpl @@@ -28,21 -29,21 +29,21 @@@ - - - - - - - - - - - - - - - + + + + + - ++ + + + + + + + + +