From d810b21f8722190754cb5b9a0cb27896b8648dae Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 11 Aug 2017 08:04:01 +0000 Subject: [PATCH] New dba functions --- include/Contact.php | 25 +++--- include/conversation.php | 6 +- include/dba.php | 18 +++++ include/dbstructure.php | 1 + include/identity.php | 5 +- include/network.php | 4 +- include/plugin.php | 2 +- include/security.php | 45 ++++------- include/text.php | 11 ++- mod/community.php | 30 +++---- mod/display.php | 165 +++++++++++++++++++-------------------- mod/profile.php | 12 +-- 12 files changed, 157 insertions(+), 167 deletions(-) diff --git a/include/Contact.php b/include/Contact.php index feeb040acc..1d49d4eeba 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -206,26 +206,27 @@ function get_contact_details_by_url($url, $uid = -1, $default = array()) { } // Fetch contact data from the contact table for the given user - $r = q("SELECT `id`, `id` AS `cid`, 0 AS `gid`, 0 AS `zid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`, + $s = dba::p("SELECT `id`, `id` AS `cid`, 0 AS `gid`, 0 AS `zid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`, `keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, `self` - FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d", - dbesc(normalise_link($url)), intval($uid)); + FROM `contact` WHERE `nurl` = ? AND `uid` = ?", + normalise_link($url), $uid); // Fetch the data from the contact table with "uid=0" (which is filled automatically) - if (!dbm::is_result($r)) - $r = q("SELECT `id`, 0 AS `cid`, `id` AS `zid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`, + if (!dbm::is_result($s)) + $s = dba::p("SELECT `id`, 0 AS `cid`, `id` AS `zid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`, `keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, 0 AS `self` - FROM `contact` WHERE `nurl` = '%s' AND `uid` = 0", - dbesc(normalise_link($url))); + FROM `contact` WHERE `nurl` = ? AND `uid` = 0", + normalise_link($url)); // Fetch the data from the gcontact table - if (!dbm::is_result($r)) - $r = q("SELECT 0 AS `id`, 0 AS `cid`, `id` AS `gid`, 0 AS `zid`, 0 AS `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, '' AS `xmpp`, + if (!dbm::is_result($s)) + $s = dba::p("SELECT 0 AS `id`, 0 AS `cid`, `id` AS `gid`, 0 AS `zid`, 0 AS `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, '' AS `xmpp`, `keywords`, `gender`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, `community` AS `forum`, 0 AS `prv`, `community`, `contact-type`, `birthday`, 0 AS `self` - FROM `gcontact` WHERE `nurl` = '%s'", - dbesc(normalise_link($url))); + FROM `gcontact` WHERE `nurl` = ?", + normalise_link($url)); - if (dbm::is_result($r)) { + if (dbm::is_result($s)) { + $r = dba::inArray($s); // If there is more than one entry we filter out the connector networks if (count($r) > 1) { foreach ($r AS $id => $result) { diff --git a/include/conversation.php b/include/conversation.php index a8ac83c1a2..7c044a672c 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -680,11 +680,10 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $hashtags = array(); $mentions = array(); - $taglist = q("SELECT `type`, `term`, `url` FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` IN (%d, %d) ORDER BY `tid`", + $taglist = dba::p("SELECT `type`, `term`, `url` FROM `term` WHERE `otype` = ? AND `oid` = ? AND `type` IN (?, ?) ORDER BY `tid`", intval(TERM_OBJ_POST), intval($item['id']), intval(TERM_HASHTAG), intval(TERM_MENTION)); - foreach ($taglist as $tag) { - + while ($tag = dba::fetch($taglist)) { if ($tag["url"] == "") { $tag["url"] = $searchpath . strtolower($tag["term"]); } @@ -698,6 +697,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { } $tags[] = $prefix."" . $tag["term"] . ""; } + dba::close($taglist); $sp = false; $profile_link = best_link_url($item,$sp); diff --git a/include/dba.php b/include/dba.php index dd95a74c53..b44aa8fb71 100644 --- a/include/dba.php +++ b/include/dba.php @@ -1290,6 +1290,24 @@ class dba { } } + + /** + * @brief Fills an array with data from a query + * + * @param object $stmt statement object + * @return array Data array + */ + static public function inArray($stmt, $do_close = true) { + $data = array(); + while ($row = self::fetch($stmt)) { + $data[] = $row; + } + if ($do_close) { + self::close($stmt); + } + return $data; + } + /** * @brief Closes the current statement * diff --git a/include/dbstructure.php b/include/dbstructure.php index eaa7d9ce40..fea88c9d38 100644 --- a/include/dbstructure.php +++ b/include/dbstructure.php @@ -1656,6 +1656,7 @@ function db_definition() { "uid_created" => array("uid","created"), "uid_commented" => array("uid","commented"), "uid_wall_created" => array("uid","wall","created"), + "private_wall_received" => array("private","wall","received"), ) ); $database["tokens"] = array( diff --git a/include/identity.php b/include/identity.php index 03a5416452..d5233a91cb 100644 --- a/include/identity.php +++ b/include/identity.php @@ -245,9 +245,8 @@ function profile_sidebar($profile, $block = 0) { $profile_url = normalise_link(App::get_baseurl()."/profile/".$profile["nickname"]); } - $r = q("SELECT * FROM `contact` WHERE NOT `pending` AND `uid` = %d AND `nurl` = '%s'", - local_user(), $profile_url); - + $r = dba::select('contact', array('id'), + array('pending' => false, 'uid' => local_user(), 'nurl' => $profile_url), array('limit' => 1)); if (dbm::is_result($r)) $connect = false; } diff --git a/include/network.php b/include/network.php index 035abc478a..4bf6868822 100644 --- a/include/network.php +++ b/include/network.php @@ -220,8 +220,8 @@ function z_fetch_url($url, $binary = false, &$redirects = 0, $opts = array()) { if (!$ret['success']) { $ret['error'] = curl_error($ch); $ret['debug'] = $curl_info; - logger('z_fetch_url: error: ' . $url . ': ' . $ret['error'], LOGGER_DEBUG); - logger('z_fetch_url: debug: ' . print_r($curl_info, true), LOGGER_DATA); + logger('z_fetch_url: error: '.$url.': '.$ret['return_code'].' - '.$ret['error'], LOGGER_DEBUG); + logger('z_fetch_url: debug: '.print_r($curl_info, true), LOGGER_DATA); } $ret['body'] = substr($s, strlen($header)); diff --git a/include/plugin.php b/include/plugin.php index be06122ea2..1ce13139fb 100644 --- a/include/plugin.php +++ b/include/plugin.php @@ -121,7 +121,7 @@ function reload_plugins() { * @return boolean */ function plugin_enabled($plugin) { - $r = q("SELECT * FROM `addon` WHERE `installed` = 1 AND `name` = '%s'", $plugin); + $r = dba::select('addon', array('id'), array('installed' => true, 'name' => $plugin), array('limit' => 1)); return ((dbm::is_result($r)) && (count($r) > 0)); } diff --git a/include/security.php b/include/security.php index 51fb6f7259..0a4379d952 100644 --- a/include/security.php +++ b/include/security.php @@ -81,32 +81,30 @@ function authenticate_success($user_record, $login_initial = false, $interactive $master_record = $a->user; if ((x($_SESSION,'submanage')) && intval($_SESSION['submanage'])) { - $r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", + $r = dba::fetch_first("SELECT * FROM `user` WHERE `uid` = ? LIMIT 1", intval($_SESSION['submanage']) ); if (dbm::is_result($r)) { - $master_record = $r[0]; + $master_record = $r; } } - $r = q("SELECT `uid`,`username`,`nickname` FROM `user` WHERE `password` = '%s' AND `email` = '%s' AND `account_removed` = 0 ", - dbesc($master_record['password']), - dbesc($master_record['email']) - ); + $r = dba::select('user', array('uid', 'username', 'nickname'), + array('password' => $master_record['password'], 'email' => $master_record['email'], 'account_removed' => false)); if (dbm::is_result($r)) { - $a->identities = $r; + $a->identities = dba::inArray($r); } else { $a->identities = array(); } - $r = q("SELECT `user`.`uid`, `user`.`username`, `user`.`nickname` + $r = dba::p("SELECT `user`.`uid`, `user`.`username`, `user`.`nickname` FROM `manage` INNER JOIN `user` ON `manage`.`mid` = `user`.`uid` - WHERE `user`.`account_removed` = 0 AND `manage`.`uid` = %d", - intval($master_record['uid']) + WHERE `user`.`account_removed` = 0 AND `manage`.`uid` = ?", + $master_record['uid'] ); if (dbm::is_result($r)) { - $a->identities = array_merge($a->identities,$r); + $a->identities = array_merge($a->identities, dba::inArray($r)); } if ($login_initial) { @@ -116,31 +114,21 @@ function authenticate_success($user_record, $login_initial = false, $interactive logger('auth_identities refresh: ' . print_r($a->identities,true), LOGGER_DEBUG); } - $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1", - intval($_SESSION['uid'])); + $r = dba::fetch_first("SELECT * FROM `contact` WHERE `uid` = ? AND `self` LIMIT 1", $_SESSION['uid']); if (dbm::is_result($r)) { - $a->contact = $r[0]; - $a->cid = $r[0]['id']; + $a->contact = $r; + $a->cid = $r['id']; $_SESSION['cid'] = $a->cid; } header('X-Account-Management-Status: active; name="' . $a->user['username'] . '"; id="' . $a->user['nickname'] .'"'); if ($login_initial || $login_refresh) { - - q("UPDATE `user` SET `login_date` = '%s' WHERE `uid` = %d", - dbesc(datetime_convert()), - intval($_SESSION['uid']) - ); + dba::update('user', array('login_date' => datetime_convert()), array('uid' => $_SESSION['uid'])); // Set the login date for all identities of the user - q("UPDATE `user` SET `login_date` = '%s' WHERE `password` = '%s' AND `email` = '%s' AND `account_removed` = 0", - dbesc(datetime_convert()), - dbesc($master_record['password']), - dbesc($master_record['email']) - ); - - + dba::update('user', array('login_date' => datetime_convert()), + array('password' => $master_record['password'], 'email' => $master_record['email'], 'account_removed' => false)); } if ($login_initial) { @@ -155,8 +143,6 @@ function authenticate_success($user_record, $login_initial = false, $interactive } } - - if ($login_initial) { call_hooks('logged_in', $a->user); @@ -164,7 +150,6 @@ function authenticate_success($user_record, $login_initial = false, $interactive goaway(App::get_baseurl() . '/' . $_SESSION['return_url']); } } - } diff --git a/include/text.php b/include/text.php index 71a2564405..59c007830d 100644 --- a/include/text.php +++ b/include/text.php @@ -499,8 +499,7 @@ function item_new_uri($hostname, $uid, $guid = "") { $uri = "urn:X-dfrn:" . $hostname . ':' . $uid . ':' . $hash; - $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' LIMIT 1", - dbesc($uri)); + $r = dba::select('item', array('id'), array('uri' => $uri), array('limit' => 1)); if (dbm::is_result($r)) { $dups = true; } @@ -1324,11 +1323,10 @@ function prepare_body(&$item, $attach = false, $preview = false) { $mentions = array(); if (!get_config('system','suppress_tags')) { - $taglist = q("SELECT `type`, `term`, `url` FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` IN (%d, %d) ORDER BY `tid`", + $taglist = dba::p("SELECT `type`, `term`, `url` FROM `term` WHERE `otype` = ? AND `oid` = ? AND `type` IN (?, ?) ORDER BY `tid`", intval(TERM_OBJ_POST), intval($item['id']), intval(TERM_HASHTAG), intval(TERM_MENTION)); - foreach ($taglist as $tag) { - + while ($tag = dba::fetch($taglist)) { if ($tag["url"] == "") { $tag["url"] = $searchpath.strtolower($tag["term"]); } @@ -1342,6 +1340,7 @@ function prepare_body(&$item, $attach = false, $preview = false) { } $tags[] = $prefix."".$tag["term"].""; } + dba::close($taglist); } $item['tags'] = $tags; @@ -1665,7 +1664,7 @@ function generate_user_guid() { if (! dbm::is_result($x)) { $found = false; } - } while ($found == true ); + } while ($found == true); return $guid; } diff --git a/mod/community.php b/mod/community.php index 89a369d94f..83a2fdebf5 100644 --- a/mod/community.php +++ b/mod/community.php @@ -11,7 +11,6 @@ function community_init(App $a) { } function community_content(App $a, $update = 0) { - $o = ''; if ((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) { @@ -92,34 +91,27 @@ function community_getitems($start, $itemspage) { if (Config::get('system','community_page_style') == CP_GLOBAL_COMMUNITY) { return(community_getpublicitems($start, $itemspage)); } - $r = qu("SELECT %s - FROM `thread` + $r = dba::p("SELECT ".item_fieldlists()." FROM `thread` INNER JOIN `user` ON `user`.`uid` = `thread`.`uid` AND NOT `user`.`hidewall` INNER JOIN `item` ON `item`.`id` = `thread`.`iid` AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' - AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' - %s AND `contact`.`self` + AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''". + item_joins()." AND `contact`.`self` WHERE `thread`.`visible` AND NOT `thread`.`deleted` AND NOT `thread`.`moderated` AND NOT `thread`.`private` AND `thread`.`wall` - ORDER BY `thread`.`received` DESC LIMIT %d, %d", - item_fieldlists(), item_joins(), - intval($start), intval($itemspage) + ORDER BY `thread`.`received` DESC LIMIT ".intval($start).", ".intval($itemspage) ); - return($r); - + return dba::inArray($r); } function community_getpublicitems($start, $itemspage) { - - $r = qu("SELECT %s - FROM `thread` - INNER JOIN `item` ON `item`.`id` = `thread`.`iid` %s - WHERE `thread`.`uid` = 0 AND `verb` = '%s' - ORDER BY `thread`.`created` DESC LIMIT %d, %d", - item_fieldlists(), item_joins(), - dbesc(ACTIVITY_POST), intval($start), intval($itemspage) + $r = dba::p("SELECT ".item_fieldlists()." FROM `thread` + INNER JOIN `item` ON `item`.`id` = `thread`.`iid` ".item_joins(). + "WHERE `thread`.`uid` = 0 AND `verb` = ? + ORDER BY `thread`.`created` DESC LIMIT ".intval($start).", ".intval($itemspage), + ACTIVITY_POST ); - return($r); + return dba::inArray($r); } diff --git a/mod/display.php b/mod/display.php index 08b51bab48..cb0d40cfb6 100644 --- a/mod/display.php +++ b/mod/display.php @@ -33,9 +33,9 @@ function display_init(App $a) { // Does the local user have this item? if (local_user()) { - $r = qu("SELECT `id`, `parent`, `author-name`, `author-link`, `author-avatar`, `network`, `body`, `uid`, `owner-link` FROM `item` + $r = dba::fetch_first("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()); + AND `guid` = ? AND `uid` = ? LIMIT 1", $a->argv[1], local_user()); if (dbm::is_result($r)) { $nick = $a->user["nickname"]; $itemuid = local_user(); @@ -44,44 +44,44 @@ function display_init(App $a) { // Or is it anywhere on the server? if ($nick == "") { - $r = qu("SELECT `user`.`nickname`, `item`.`id`, `item`.`parent`, `item`.`author-name`, + $r = dba::fetch_first("SELECT `user`.`nickname`, `item`.`id`, `item`.`parent`, `item`.`author-name`, `item`.`author-link`, `item`.`author-avatar`, `item`.`network`, `item`.`uid`, `item`.`owner-link`, `item`.`body` FROM `item` STRAIGHT_JOIN `user` ON `user`.`uid` = `item`.`uid` WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated` AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND NOT `item`.`private` AND NOT `user`.`hidewall` - AND `item`.`guid` = '%s'", dbesc($a->argv[1])); + AND `item`.`guid` = ? LIMIT 1", $a->argv[1]); if (dbm::is_result($r)) { - $nick = $r[0]["nickname"]; - $itemuid = $r[0]["uid"]; + $nick = $r["nickname"]; + $itemuid = $r["uid"]; } } // Is it an item with uid=0? if ($nick == "") { - $r = qu("SELECT `item`.`id`, `item`.`parent`, `item`.`author-name`, `item`.`author-link`, + $r = dba::fetch_first("SELECT `item`.`id`, `item`.`parent`, `item`.`author-name`, `item`.`author-link`, `item`.`author-avatar`, `item`.`network`, `item`.`uid`, `item`.`owner-link`, `item`.`body` FROM `item` WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated` AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND NOT `item`.`private` AND `item`.`uid` = 0 - AND `item`.`guid` = '%s'", dbesc($a->argv[1])); + AND `item`.`guid` = ? LIMIT 1", $a->argv[1]); } if (dbm::is_result($r)) { - if ($r[0]["id"] != $r[0]["parent"]) { - $r = qu("SELECT `id`, `author-name`, `author-link`, `author-avatar`, `network`, `body`, `uid`, `owner-link` FROM `item` + if ($r["id"] != $r["parent"]) { + $r = dba::fetch_first("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"]); + AND `id` = %d", $r["parent"]); } if (($itemuid != local_user()) && local_user()) { // Do we know this contact but we haven't got this item? // Copy the wohle thread to our local storage so that we can interact. // We really should change this need for the future since it scales very bad. - $contactid = get_contact($r[0]['owner-link'], local_user()); + $contactid = get_contact($r['owner-link'], local_user()); if ($contactid) { - $items = qu("SELECT * FROM `item` WHERE `parent` = %d ORDER BY `id`", intval($r[0]["id"])); - foreach ($items AS $item) { + $items = dba::p("SELECT * FROM `item` WHERE `parent` = ? ORDER BY `id`", $r["id"]); + while ($item = self::fetch($items)) { $itemcontactid = get_contact($item['owner-link'], local_user()); if (!$itemcontactid) { $itemcontactid = $contactid; @@ -93,22 +93,23 @@ function display_init(App $a) { $local_copy = item_store($item, false, false, true); logger("Stored local copy for post ".$item['guid']." under id ".$local_copy, LOGGER_DEBUG); } + dba::close($items); } } - $profiledata = display_fetchauthor($a, $r[0]); + $profiledata = display_fetchauthor($a, $r); if (strstr(normalise_link($profiledata["url"]), normalise_link(App::get_baseurl()))) { $nickname = str_replace(normalise_link(App::get_baseurl())."/profile/", "", normalise_link($profiledata["url"])); if (($nickname != $a->user["nickname"])) { - $r = qu("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile` + $r = dba::fetch_first("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile` INNER JOIN `contact` on `contact`.`uid` = `profile`.`uid` INNER JOIN `user` ON `profile`.`uid` = `user`.`uid` - WHERE `user`.`nickname` = '%s' AND `profile`.`is-default` AND `contact`.`self` LIMIT 1", - dbesc($nickname) + WHERE `user`.`nickname` = ? AND `profile`.`is-default` AND `contact`.`self` LIMIT 1", + $nickname ); if (dbm::is_result($r)) { - $profiledata = $r[0]; + $profiledata = $r; } $profiledata["network"] = NETWORK_DFRN; } else { @@ -240,48 +241,45 @@ function display_content(App $a, $update = 0) { $nick = ""; if (local_user()) { - $r = qu("SELECT `id` FROM `item` + $r = dba::fetch_first("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()); + AND `guid` = ? AND `uid` = ?", $a->argv[1], local_user()); if (dbm::is_result($r)) { - $item_id = $r[0]["id"]; + $item_id = $r["id"]; $nick = $a->user["nickname"]; } } if ($nick == "") { - $r = qu("SELECT `user`.`nickname`, `item`.`id` FROM `item` STRAIGHT_JOIN `user` ON `user`.`uid` = `item`.`uid` + $r = dba::fetch_first("SELECT `user`.`nickname`, `item`.`id` FROM `item` STRAIGHT_JOIN `user` ON `user`.`uid` = `item`.`uid` WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated` AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND NOT `item`.`private` AND NOT `user`.`hidewall` - AND `item`.`guid` = '%s'", dbesc($a->argv[1])); - // AND NOT `item`.`private` AND `item`.`wall` + AND `item`.`guid` = ?", $a->argv[1]); if (dbm::is_result($r)) { - $item_id = $r[0]["id"]; - $nick = $r[0]["nickname"]; + $item_id = $r["id"]; + $nick = $r["nickname"]; } } if ($nick == "") { - $r = qu("SELECT `item`.`id` FROM `item` + $r = dba::fetch_first("SELECT `item`.`id` FROM `item` WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated` AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND NOT `item`.`private` AND `item`.`uid` = 0 - AND `item`.`guid` = '%s'", dbesc($a->argv[1])); - // AND NOT `item`.`private` AND `item`.`wall` + AND `item`.`guid` = ?", $a->argv[1]); if (dbm::is_result($r)) { - $item_id = $r[0]["id"]; + $item_id = $r["id"]; } } } } if ($item_id && !is_numeric($item_id)) { - $r = qu("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", - dbesc($item_id), intval($a->profile['uid'])); + $r = dba::select('item', array('id'), array('uri' => $item_id, 'uid' => $a->profile['uid']), array('limit' => 1)); if (dbm::is_result($r)) { - $item_id = $r[0]["id"]; + $item_id = $r["id"]; } else { $item_id = false; } @@ -294,7 +292,7 @@ function display_content(App $a, $update = 0) { } // We are displaying an "alternate" link if that post was public. See issue 2864 - $items = q("SELECT `id` FROM `item` WHERE `id` = %d AND NOT `private` AND `wall`", intval($item_id)); + $items = dba::select('item', array('id'), array('id' => $item_id, 'private' => false, 'wall' => true)); if (dbm::is_result($items)) { $alternate = App::get_baseurl().'/display/'.$nick.'/'.$item_id.'.atom'; } else { @@ -322,12 +320,12 @@ function display_content(App $a, $update = 0) { if ($contact_id) { $groups = init_groups_visitor($contact_id); - $r = qu("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", - intval($contact_id), - intval($a->profile['uid']) + $r = dba::fetch_first("SELECT * FROM `contact` WHERE `id` = ? AND `uid` = ? LIMIT 1", + $contact_id, + $a->profile['uid'] ); if (dbm::is_result($r)) { - $contact = $r[0]; + $contact = $r; $remote_contact = true; } } @@ -339,11 +337,9 @@ function display_content(App $a, $update = 0) { } } - $r = qu("SELECT * FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1", - intval($a->profile['uid']) - ); + $r = dba::fetch_first("SELECT * FROM `contact` WHERE `uid` = ? AND `self` LIMIT 1", $a->profile['uid']); if (dbm::is_result($r)) { - $a->page_contact = $r[0]; + $a->page_contact = $r; } $is_owner = ((local_user()) && (local_user() == $a->profile['profile_uid']) ? true : false); @@ -373,12 +369,11 @@ function display_content(App $a, $update = 0) { $sql_extra = item_permissions_sql($a->profile['uid'],$remote_contact,$groups); if ($update) { - - $r = qu("SELECT `id` FROM `item` WHERE `item`.`uid` = %d - AND `item`.`parent` = (SELECT `parent` FROM `item` WHERE `id` = %d) + $r = dba::exists("SELECT `id` FROM `item` WHERE `item`.`uid` = ? + AND `item`.`parent` = (SELECT `parent` FROM `item` WHERE `id` = ?) $sql_extra AND `unseen`", - intval($a->profile['uid']), - intval($item_id) + $a->profile['uid'], + $item_id ); if (!$r) { @@ -386,62 +381,60 @@ function display_content(App $a, $update = 0) { } } - $r = qu(item_query()." AND `item`.`uid` = %d - AND `item`.`parent` = (SELECT `parent` FROM `item` WHERE `id` = %d) + $r = dba::p(item_query()." AND `item`.`uid` = ? + AND `item`.`parent` = (SELECT `parent` FROM `item` WHERE `id` = ?) $sql_extra ORDER BY `parent` DESC, `gravity` ASC, `id` ASC", - intval($a->profile['uid']), - intval($item_id) + $a->profile['uid'], + $item_id ); - - if (!$r && local_user()) { + if (!dbm::is_result($r) && local_user()) { // Check if this is another person's link to a post that we have - $r = qu("SELECT `item`.uri FROM `item` - WHERE (`item`.`id` = %d OR `item`.`uri` = '%s') + $r = dba::fetch_first("SELECT `item`.uri FROM `item` + WHERE (`item`.`id` = ? OR `item`.`uri` = ?) LIMIT 1", - intval($item_id), - dbesc($item_id) + $item_id, + $item_id ); if (dbm::is_result($r)) { - $item_uri = $r[0]['uri']; + $item_uri = $r['uri']; - $r = qu(item_query()." AND `item`.`uid` = %d - AND `item`.`parent` = (SELECT `parent` FROM `item` WHERE `uri` = '%s' AND uid = %d) - ORDER BY `parent` DESC, `gravity` ASC, `id` ASC ", - intval(local_user()), - dbesc($item_uri), - intval(local_user()) + $r = dba::p(item_query()." AND `item`.`uid` = ? + AND `item`.`parent` = (SELECT `parent` FROM `item` WHERE `uri` = ? AND uid = ?) + ORDER BY `parent` DESC, `gravity` ASC, `id` ASC", + local_user(), + $item_uri, + local_user() ); } } - if ($r) { + if (dbm::is_result($r)) { + $s = dba::inArray($r); if ((local_user()) && (local_user() == $a->profile['uid'])) { - $unseen = q("SELECT `id` FROM `item` WHERE `unseen` AND `parent` = %d", - intval($r[0]['parent'])); - - if ($unseen) { - dba::update('item', array('unseen' => false), array('parent' => $r[0]['parent'], 'unseen' => true)); + $unseen = dba::select('item', array('id'), array('parent' => $s[0]['parent'], 'unseen' => true), array('limit' => 1)); + if (dbm::is_result($unseen)) { + dba::update('item', array('unseen' => false), array('parent' => $s[0]['parent'], 'unseen' => true)); } } - $items = conv_sort($r,"`commented`"); + $items = conv_sort($s, "`commented`"); if (!$update) { $o .= ""; } - $o .= conversation($a,$items,'display', $update); + $o .= conversation($a, $items, 'display', $update); // Preparing the meta header require_once('include/bbcode.php'); require_once("include/html2plain.php"); - $description = trim(html2plain(bbcode($r[0]["body"], false, false), 0, true)); - $title = trim(html2plain(bbcode($r[0]["title"], false, false), 0, true)); - $author_name = $r[0]["author-name"]; + $description = trim(html2plain(bbcode($s[0]["body"], false, false), 0, true)); + $title = trim(html2plain(bbcode($s[0]["title"], false, false), 0, true)); + $author_name = $s[0]["author-name"]; - $image = $a->remove_baseurl($r[0]["author-thumb"]); + $image = $a->remove_baseurl($s[0]["author-thumb"]); if ($title == "") { $title = $author_name; @@ -473,7 +466,7 @@ function display_content(App $a, $update = 0) { $a->page['htmlhead'] .= ''."\n"; $a->page['htmlhead'] .= ''."\n"; $a->page['htmlhead'] .= ''."\n"; - $a->page['htmlhead'] .= ''."\n"; + $a->page['htmlhead'] .= ''."\n"; // Dublin Core $a->page['htmlhead'] .= ''."\n"; @@ -483,7 +476,7 @@ function display_content(App $a, $update = 0) { $a->page['htmlhead'] .= ''."\n"; $a->page['htmlhead'] .= ''."\n"; $a->page['htmlhead'] .= ''."\n"; - $a->page['htmlhead'] .= ''."\n"; + $a->page['htmlhead'] .= ''."\n"; $a->page['htmlhead'] .= ''."\n"; $a->page['htmlhead'] .= ''."\n"; // article:tag @@ -491,18 +484,18 @@ function display_content(App $a, $update = 0) { return $o; } - $r = qu("SELECT `id`,`deleted` FROM `item` WHERE `id` = '%s' OR `uri` = '%s' LIMIT 1", - dbesc($item_id), - dbesc($item_id) + $r = dba::fetch_first("SELECT `id`,`deleted` FROM `item` WHERE `id` = ? OR `uri` = ? LIMIT 1", + $item_id, + $item_id ); if ($r) { - if ($r[0]['deleted']) { - notice(t('Item has been removed.') . EOL ); + if ($r['deleted']) { + notice(t('Item has been removed.') . EOL); } else { - notice(t('Permission denied.') . EOL ); + notice(t('Permission denied.') . EOL); } } else { - notice(t('Item not found.') . EOL ); + notice(t('Item not found.') . EOL); } return $o; diff --git a/mod/profile.php b/mod/profile.php index 7a11e9bc6b..2af572b1c7 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -333,11 +333,13 @@ function profile_content(App $a, $update = 0) { } - if($is_owner) { - $r = q("UPDATE `item` SET `unseen` = 0 - WHERE `wall` = 1 AND `unseen` = 1 AND `uid` = %d", - intval(local_user()) - ); + if ($is_owner) { + $unseen = dba::select('item', array('id'), array('wall' => true, 'unseen' => true, 'uid' => local_user()), + array('limit' => 1)); + if (dbm::is_result($unseen)) { + $r = dba::update('item', array('unseen' => false), + array('wall' => true, 'unseen' => true, 'uid' => local_user())); + } } $o .= conversation($a, $items, 'profile', $update);