Restructured "dba::exists" function

diff --git a/boot.php b/boot.php
index 9c0ef1d08033327c421e247a906cb15f8e0edfdc..d5dc72ffb96bd92c5ca52daeab21bc8b2382d21c 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -1090,9 +1090,9 @@ function proc_run($cmd) {
        array_shift($argv);
 
        $parameters = json_encode($argv);
-       $found = dba::select('workerqueue', array('id'), array('parameter' => $parameters, 'done' => false), array('limit' => 1));
+       $found = dba::exists('workerqueue', array('parameter' => $parameters, 'done' => false));
 
-       if (!dbm::is_result($found)) {
+       if (!$found) {
                dba::insert('workerqueue', array('parameter' => $parameters, 'created' => $created, 'priority' => $priority));
        }
 

diff --git a/include/dba.php b/include/dba.php
index b44aa8fb710de2471d76f0d025ba60c087693d0a..7926fa10d86da258ff381bd754dbced9f37b1fdd 100644 (file)
--- a/include/dba.php
+++ b/include/dba.php
@@ -767,13 +767,19 @@ class dba {
        /**
         * @brief Check if data exists
         *
-        * @param string $sql SQL statement
-        * @return boolean Are there rows for that query?
+        * @param string $table Table name
+        * @param array $condition array of fields for condition
+        *
+        * @return boolean Are there rows for that condition?
         */
-       static public function exists($sql) {
-               $params = self::getParam(func_get_args());
+       static public function exists($table, $condition) {
+               if (empty($table)) {
+                       return false;
+               }
 
-               $stmt = self::p($sql, $params);
+               $fields = array_keys($condition);
+
+               $stmt = self::select($table, array($fields[0]), $condition, array('limit' => 1, 'only_query' => true));
 
                if (is_bool($stmt)) {
                        $retval = $stmt;
@@ -1270,11 +1276,13 @@ class dba {
                        $param_string = substr($param_string, 0, -2);
                }
 
-               if (isset($params['limit'])) {
-                       if (is_int($params['limit'])) {
-                               $param_string .= " LIMIT ".$params['limit'];
-                               $single_row =($params['limit'] == 1);
-                       }
+               if (isset($params['limit']) && is_int($params['limit'])) {
+                       $param_string .= " LIMIT ".$params['limit'];
+                       $single_row = ($params['limit'] == 1);
+               }
+
+               if (isset($params['only_query']) && $params['only_query']) {
+                       $single_row = !$params['only_query'];
                }
 
                $sql = "SELECT ".$select_fields." FROM `".$table."`".$condition_string.$param_string;

diff --git a/include/identity.php b/include/identity.php
index a50cb1c4a6ce4564adc61e8e14de8d14abb2c6e4..44194c2faeb44be6dc869e2a4e56a0a0add7e335 100644 (file)
--- a/include/identity.php
+++ b/include/identity.php
@@ -245,10 +245,7 @@ function profile_sidebar($profile, $block = 0) {
                        $profile_url = normalise_link(App::get_baseurl()."/profile/".$profile["nickname"]);
                }
 
-               $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;
+               $connect = !dba::exists('contact', array('pending' => false, 'uid' => local_user(), 'nurl' => $profile_url));
        }
 
        if ($connect && ($profile['network'] != NETWORK_DFRN) && !isset($profile['remoteconnect']))

diff --git a/include/plugin.php b/include/plugin.php
index 1ce13139fbeac4bf935ba481016995af771f43a8..1ea3ed73d19c00873987039c994b4cef0ef9f4b7 100644 (file)
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -121,8 +121,7 @@ function reload_plugins() {
  * @return boolean
  */
 function plugin_enabled($plugin) {
-       $r = dba::select('addon', array('id'), array('installed' => true, 'name' => $plugin), array('limit' => 1));
-       return ((dbm::is_result($r)) && (count($r) > 0));
+       return dba::exists('addon', array('installed' => true, 'name' => $plugin));
 }
 
 

diff --git a/include/remove_contact.php b/include/remove_contact.php
index 92f712255771bb05537801b2451b3533448ca89b..9d4b1e4c3709214f56bf74d77c85c35aeaa9a8dc 100644 (file)
--- a/include/remove_contact.php
+++ b/include/remove_contact.php
@@ -14,8 +14,8 @@ function remove_contact_run($argv, $argc) {
        $id = intval($argv[1]);
 
        // Only delete if the contact doesn't exist (anymore)
-       $r = dba::select('contact', array('id'), array('id' => $id), array('limit' => 1));
-       if (dbm::is_result($r)) {
+       $r = dba::exists('contact', array('id' => $id));
+       if ($r) {
                return;
        }
 

diff --git a/include/text.php b/include/text.php
index 0a36a7b736cc2078d45b7f2fe0fb62ea1ea79e9a..1d1515c17777b88e6b83b5d07008637f62da1783 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -488,8 +488,6 @@ if (! function_exists('item_new_uri')) {
 function item_new_uri($hostname, $uid, $guid = "") {
 
        do {
-               $dups = false;
-
                if ($guid == "") {
                        $hash = get_guid(32);
                } else {
@@ -499,10 +497,7 @@ function item_new_uri($hostname, $uid, $guid = "") {
 
                $uri = "urn:X-dfrn:" . $hostname . ':' . $uid . ':' . $hash;
 
-               $r = dba::select('item', array('id'), array('uri' => $uri), array('limit' => 1));
-               if (dbm::is_result($r)) {
-                       $dups = true;
-               }
+               $dups = dba::exists('item', array('uri' => $uri));
        } while ($dups == true);
 
        return $uri;

diff --git a/mod/display.php b/mod/display.php
index c3938117af71bf7ed93c88bcebe2d2e79a5c3834..2bae9cf487e1227fe2a7acd5f05a5150a0a0f6d1 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -292,8 +292,8 @@ function display_content(App $a, $update = 0) {
        }
 
        // We are displaying an "alternate" link if that post was public. See issue 2864
-       $items = dba::select('item', array('id'), array('id' => $item_id, 'private' => false, 'wall' => true));
-       if (dbm::is_result($items)) {
+       $is_public = dba::exists('item', array('id' => $item_id, 'private' => false, 'wall' => true));
+       if ($is_public) {
                $alternate = App::get_baseurl().'/display/'.$nick.'/'.$item_id.'.atom';
        } else {
                $alternate = '';
@@ -369,14 +369,14 @@ function display_content(App $a, $update = 0) {
        $sql_extra = item_permissions_sql($a->profile['uid'],$remote_contact,$groups);
 
        if ($update) {
-               $r = dba::exists("SELECT `id` FROM `item` WHERE `item`.`uid` = ?
+               $r = dba::p("SELECT `id` FROM `item` WHERE `item`.`uid` = ?
                        AND `item`.`parent` = (SELECT `parent` FROM `item` WHERE `id` = ?)
                        $sql_extra AND `unseen`",
                        $a->profile['uid'],
                        $item_id
                );
 
-               if (!$r) {
+               if (dba::num_rows($r) == 0) {
                        return '';
                }
        }

diff --git a/mod/network.php b/mod/network.php
index f498d17a49d65828d62aaaba4f6ac99d496a37c7..395d1347b55b83d2b44e90754d77413700037285 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -793,9 +793,9 @@ function network_content(App $a, $update = 0) {
 
 
        if (!$group && !$cid && !$star) {
-               $unseen = dba::select('item', array('id'), array('unseen' => true, 'uid' => local_user()), array('limit' => 1));
+               $unseen = dba::exists('item', array('unseen' => true, 'uid' => local_user()));
 
-               if (dbm::is_result($unseen)) {
+               if ($unseen) {
                        $r = dba::update('item', array('unseen' => false), array('uid' => local_user(), 'unseen' => true));
                }
        } elseif ($update_unseen) {

diff --git a/mod/profile.php b/mod/profile.php
index 2af572b1c73b21f62f556fe061bd7a1e31eff142..c7bd13a3e9384145dcdcccb665be7f5e9d8e51b1 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -334,9 +334,8 @@ function profile_content(App $a, $update = 0) {
 
 
        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)) {
+               $unseen = dba::exists('item', array('wall' => true, 'unseen' => true, 'uid' => local_user()));
+               if ($unseen) {
                        $r = dba::update('item', array('unseen' => false),
                                        array('wall' => true, 'unseen' => true, 'uid' => local_user()));
                }