Change $db->query_first to $db->queryFirst

diff --git a/admin/global.php b/admin/global.php
index 5e6abf39b755993eeb82c515eb7469f3553e25f0..a71a06a6d95923a03c98478fb23c1304b701d922 100755 (executable)
--- a/admin/global.php
+++ b/admin/global.php
@@ -72,7 +72,7 @@ function admin_login()
 
 if (can_perform('canadminpanel'))
 {
-       $session = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "adminsession WHERE sessionid = '" . $bugsys->input_escape(COOKIE_PREFIX . 'adminsession') . "'");
+       $session = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "adminsession WHERE sessionid = '" . $bugsys->input_escape(COOKIE_PREFIX . 'adminsession') . "'");
        if ($session AND $session['userid'] == bugdar::$userinfo['userid'] AND $session['dateline'] >= (TIMENOW - 3600))
        {
                // renew the cookie

diff --git a/admin/index.php b/admin/index.php
index 9ef06659cfd18d0c4974c90b6ef3f07755648ac9..816df901dcce85a69549a3d80307c190c309bb88 100755 (executable)
--- a/admin/index.php
+++ b/admin/index.php
@@ -56,7 +56,7 @@ $admin->row_span(T('Version Information'), 'thead');
 $admin->row_text(T('Bugdar Version'), bugdar::$options['trackerversion']);
 $admin->row_text(T('PHP Version'), phpversion());
 
-$mysql = $db->query_first("SELECT VERSION() AS version");
+$mysql = $db->queryFirst("SELECT VERSION() AS version");
 $admin->row_text(T('MySQL Version'), $mysql['version']);
 
 $admin->row_text(T('Web Server'), ($_SERVER['SERVER_SOFTWARE'] ? $_SERVER['SERVER_SOFTWARE'] : $SERVER['SERVER_SOFTWARE']));
@@ -64,12 +64,12 @@ $admin->row_text(T('Web Server'), ($_SERVER['SERVER_SOFTWARE'] ? $_SERVER['SERVE
 // -------------------------------------------------------------------
 $admin->row_span(T('Server Options'), 'thead');
 
-$mysql = $db->query_first("SHOW VARIABLES LIKE 'max_allowed_packet'");
+$mysql = $db->queryFirst("SHOW VARIABLES LIKE 'max_allowed_packet'");
 $admin->row_text(T('MySQL: Maximum Packet Size'), $mysql['Value']);
 
 $admin->row_text(T('MySQL: Maximum Upload Size'), BSFunctions::fetch_max_php_file_size());
 
-$mysql = $db->query_first("SHOW VARIABLES LIKE 'ft_min_word_len'");
+$mysql = $db->queryFirst("SHOW VARIABLES LIKE 'ft_min_word_len'");
 $admin->row_text(T('MySQL: Full-Text Search Minimum Word Length'), $mysql['Value']);
 
 $admin->row_text(T('PHP: Safe Mode'), ((ini_get('safe_mode') == 1 OR strtolower(ini_get('safe_mode')) == 'on') ? T('Yes') : T('No')));

diff --git a/admin/permission.php b/admin/permission.php
index 7075a3b656a56efa36f0721d07d9660e313b4f49..512edb62159ee0bdd7278f70b9ccc0d7377bdc18 100755 (executable)
--- a/admin/permission.php
+++ b/admin/permission.php
@@ -98,9 +98,9 @@ if ($_REQUEST['do'] == 'edit')
                'usergroupid'   => TYPE_UINT,
                'productid'             => TYPE_UINT
        ));
-       $perm = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "permission WHERE usergroupid = " . $bugsys->in['usergroupid'] . " AND productid = " . $bugsys->in['productid']);
-       $usergroup = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "usergroup WHERE usergroupid = " . $bugsys->in['usergroupid']);
-       $product = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "product WHERE productid = " . $bugsys->in['productid']);
+       $perm = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "permission WHERE usergroupid = " . $bugsys->in['usergroupid'] . " AND productid = " . $bugsys->in['productid']);
+       $usergroup = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "usergroup WHERE usergroupid = " . $bugsys->in['usergroupid']);
+       $product = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "product WHERE productid = " . $bugsys->in['productid']);
        
        if (!$usergroup OR !$product)
        {

diff --git a/admin/product.php b/admin/product.php
index 34c965871cd8963be01b7f3b1ac275e86e7ab184..7efc13e62f0bd05bd2405ae01193ea2b5d98e61e 100755 (executable)
--- a/admin/product.php
+++ b/admin/product.php
@@ -113,7 +113,7 @@ if ($_REQUEST['do'] == 'addversion')
        
        if ($bugsys->in['productid'] != -1)
        {
-               $product = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "product WHERE productid = " . $bugsys->in['productid']);
+               $product = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "product WHERE productid = " . $bugsys->in['productid']);
                if (!is_array($product))
                {
                        $admin->error(L_INVALID_ID);
@@ -161,7 +161,7 @@ if ($_REQUEST['do'] == 'editversion')
 {
        $admin->page_start(T('Edit Version'));
        
-       $version = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "version WHERE versionid = " . $input->inputClean('versionid', TYPE_UINT));
+       $version = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "version WHERE versionid = " . $input->inputClean('versionid', TYPE_UINT));
        if (!is_array($version))
        {
                $admin->error(L_INVALID_ID);
@@ -289,7 +289,7 @@ if ($_REQUEST['do'] == 'editproduct')
        
        $admin->page_start(T('Edit Product'));
        
-       $product = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "product WHERE productid = " . $bugsys->in['productid']);
+       $product = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "product WHERE productid = " . $bugsys->in['productid']);
        if (!is_array($product))
        {
                $admin->error(L_INVALID_ID);

diff --git a/admin/user.php b/admin/user.php
index 0f790a1e05e8213eb7346be0beb56191155b70f8..26ba54124196dcd8cf828d9cc152da9a9f1030cf 100644 (file)
--- a/admin/user.php
+++ b/admin/user.php
@@ -331,7 +331,7 @@ if ($_REQUEST['do'] == 'search')
        if (is_numeric($bugsys->in['userdata']))
        {
                $input->inputClean('userdata', TYPE_UINT);
-               if ($db->query_first("SELECT * FROM " . TABLE_PREFIX . "user WHERE userid = " . $bugsys->in['userdata']))
+               if ($db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "user WHERE userid = " . $bugsys->in['userdata']))
                {
                        header('Location: user.php?do=edit&userid=' . $bugsys->in['userdata']);
                }
@@ -395,7 +395,7 @@ if ($_REQUEST['do'] == 'showall')
        $admin->table_head(T('Show All Users'), 4);
        $admin->table_column_head(array(T('Display Name'), T('Email'), T('User ID'), T('Actions')));
        
-       $count = $db->query_first("SELECT COUNT(*) AS count FROM " . TABLE_PREFIX . "user");
+       $count = $db->queryFirst("SELECT COUNT(*) AS count FROM " . TABLE_PREFIX . "user");
        $pagination->setTotal($count['count']);
        $pagination->splitPages();
        

diff --git a/attachment.php b/attachment.php
index 8bda1b6f910f18495c15359a27014dc59c07f839..77126c1a4415d3eba349c1e88db5511e2d04e756 100755 (executable)
--- a/attachment.php
+++ b/attachment.php
@@ -38,14 +38,14 @@ APIError(array(new API_Error_Handler($message), 'user_cumulative'));
 
 if (isset($bugsys->in['attachmentid']))
 {
-       $attachment = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "attachment WHERE attachmentid = " . $input->inputClean('attachmentid', TYPE_UINT));
+       $attachment = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "attachment WHERE attachmentid = " . $input->inputClean('attachmentid', TYPE_UINT));
        if (!$attachment)
        {
                $message->error(L_INVALID_ID);
        }
 }
 
-$bug = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "bug WHERE bugid = " . (($attachment['attachmentid']) ? $attachment['bugid'] : $input->inputClean('bugid', TYPE_UINT)));
+$bug = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "bug WHERE bugid = " . (($attachment['attachmentid']) ? $attachment['bugid'] : $input->inputClean('bugid', TYPE_UINT)));
 if (!$bug)
 {
        $message->error(L_INVALID_ID);
@@ -74,7 +74,7 @@ if ($_POST['do'] == 'insert')
        }
        
        // max packet size
-       $var = $db->query_first("SHOW VARIABLES LIKE 'max_allowed_packet'");
+       $var = $db->queryFirst("SHOW VARIABLES LIKE 'max_allowed_packet'");
        $bugsys->debug("max_allowed_packet = $var[Value]");
        
        // create alias

diff --git a/editcomment.php b/editcomment.php
index dd7c0e33399653d27fce38ecfc3e94a2186a3daf..4ebaa2570bc66dfde9e8a87cea9eeec4afe47ad8 100644 (file)
--- a/editcomment.php
+++ b/editcomment.php
@@ -40,7 +40,7 @@ $commentapi->fetch();
 
 $comment =& $commentapi->objdata;
 
-$bug = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "bug WHERE bugid = $comment[bugid]");
+$bug = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "bug WHERE bugid = $comment[bugid]");
 
 if (!check_bug_permissions($bug))
 {
@@ -64,14 +64,14 @@ if ($_POST['do'] == 'kill')
        }
        
        // get the last post (as in prior to deletion)
-       $lastpost = $db->query_first("SELECT commentid FROM " . TABLE_PREFIX . "comment WHERE bugid = $bug[bugid] ORDER BY dateline DESC");
+       $lastpost = $db->queryFirst("SELECT commentid FROM " . TABLE_PREFIX . "comment WHERE bugid = $bug[bugid] ORDER BY dateline DESC");
        
        $commentapi->delete();
        
        // check to see if we need to rebuild the lastpost information
        if ($lastpost['commentid'] == $comment['commentid'])
        {
-               $lastgoodpublic = $db->query_first("
+               $lastgoodpublic = $db->queryFirst("
                        SELECT comment.* AS comment, user.displayname AS username
                        FROM " . TABLE_PREFIX . "comment AS comment
                        LEFT JOIN " . TABLE_PREFIX . "user AS user
@@ -79,7 +79,7 @@ if ($_POST['do'] == 'kill')
                        WHERE bugid = $bug[bugid]
                                AND !hidden ORDER BY dateline DESC
                ");
-               $lastgoodprivate = $db->query_first("
+               $lastgoodprivate = $db->queryFirst("
                        SELECT comment.* AS comment, user.displayname AS username
                        FROM " . TABLE_PREFIX . "comment AS comment
                        LEFT JOIN " . TABLE_PREFIX . "user AS user
@@ -150,7 +150,7 @@ if ($_POST['do'] == 'update')
                $log->add_data(true, $commentapi->objdata, array('comment', 'hidden'), false, 'comment');
                $log->add_data(false, $commentapi->values, array('comment', 'hidden'), false, 'comment');
                
-               $lastgood = $db->query_first("
+               $lastgood = $db->queryFirst("
                        SELECT comment.* AS comment, user.displayname AS username
                        FROM " . TABLE_PREFIX . "comment AS comment
                        LEFT JOIN " . TABLE_PREFIX . "user AS user

diff --git a/editreport.php b/editreport.php
index 637b7537644b00b2cb88161973cfc9ff6fa71006..432723be8675f01e3e5597946b6db0503f020e42 100644 (file)
--- a/editreport.php
+++ b/editreport.php
@@ -32,7 +32,7 @@ require_once('./includes/api_comment.php');
 require_once('./includes/class_api_error.php');
 APIError(array(new API_Error_Handler($message), 'user_cumulative'));
 
-$bug = $db->query_first("
+$bug = $db->queryFirst("
        SELECT bug.*, user.email, user.displayname, user.showemail
        FROM " . TABLE_PREFIX . "bug AS bug
        LEFT JOIN " . TABLE_PREFIX . "user AS user
@@ -104,7 +104,7 @@ if ($_POST['do'] == 'update')
        // handle automations
        if ($bugsys->in['automation'])
        {
-               $automation = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "automation WHERE actionid = " . $input->inputClean('automation', TYPE_UINT));
+               $automation = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "automation WHERE actionid = " . $input->inputClean('automation', TYPE_UINT));
                if ($automation)
                {
                        $automation['fields'] = unserialize($automation['fieldchanges']);

diff --git a/favorite.php b/favorite.php
index bec6abe9ec85440d8e884900fa622287b256c36a..a4943d46fe30b05708b8d2e60ceeec5f04b6b920 100644 (file)
--- a/favorite.php
+++ b/favorite.php
@@ -42,7 +42,7 @@ require_once('./includes/class_sort.php');
 if ($_REQUEST['do'] == 'handle')
 {
        $input->inputClean('bugid', TYPE_UINT);
-       $bug = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "bug WHERE bugid = " . $bugsys->in['bugid']);
+       $bug = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "bug WHERE bugid = " . $bugsys->in['bugid']);
        if (!check_bug_permissions($bug))
        {
                $message->errorPermission();
@@ -53,7 +53,7 @@ if ($_REQUEST['do'] == 'handle')
                $message->errorPermission();
        }
        
-       if ($db->query_first("SELECT * FROM " . TABLE_PREFIX . "favorite WHERE userid = " . bugdar::$userinfo['userid'] . " AND bugid = " . $bugsys->in['bugid']))
+       if ($db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "favorite WHERE userid = " . bugdar::$userinfo['userid'] . " AND bugid = " . $bugsys->in['bugid']))
        {
                $db->query("DELETE FROM " . TABLE_PREFIX . "favorite WHERE userid = " . bugdar::$userinfo['userid'] . " AND bugid = " . $bugsys->in['bugid']);
                $message->redirect(T('This bug has been removed from your favorites list.'), "showreport.php?bugid=" . $bugsys->in['bugid']);

diff --git a/install/convert_database_charset.php b/install/convert_database_charset.php
index cc8d6eec056793014d67dcdf8ec22bc69bab9eaf..99683f41fb5d10bc64494050a9adc1a4097602db 100644 (file)
--- a/install/convert_database_charset.php
+++ b/install/convert_database_charset.php
@@ -58,7 +58,7 @@ $admin->page_start('Convert Database Character Set');
 
 if ($bugsys->in['step'] == 0)
 {
-       $collation = $db->query_first("SHOW VARIABLES LIKE 'collation_database'");
+       $collation = $db->queryFirst("SHOW VARIABLES LIKE 'collation_database'");
        
        echo '<h1>Convert Database Character Set</h1>';
        echo '<p>Earlier versions of Bugdar did not check or enforce the MySQL database character set or collation. It is recommended that the database be set at <strong>' . TARGET . '</strong>. This script can migrate all of data from your current character set/collation of <strong>' . $collation['Value'] . '</strong>. If you would like to convert your database to utf8, please click the link below.</p>';

diff --git a/install/upgrade.php b/install/upgrade.php
index 6dca12e10ab2445cd4b9a52c129aff28ec668e25..567af00404fdb6cb62c50bd8a884b3e3998c443c 100644 (file)
--- a/install/upgrade.php
+++ b/install/upgrade.php
@@ -27,7 +27,7 @@ if (!isset($bugsys->in['next']))
 {
        $db->showerrors = false;
        
-       $version = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "setting WHERE varname = 'trackerversion'");
+       $version = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "setting WHERE varname = 'trackerversion'");
        $version = $version['value'];
        
        if ($version == '[#]version[#]')

diff --git a/install/upgrade5.php b/install/upgrade5.php
index 4b7be8e99e0729219beec0117025d50777ea32d6..5fa40216e0dc6017cd1d2b20ca5efea7a1650522 100644 (file)
--- a/install/upgrade5.php
+++ b/install/upgrade5.php
@@ -61,7 +61,7 @@ if ($bugsys->in['mark'] == 1)
        build_automations();
        echo "Rebuilding the automations cahce<br />\n";
        
-       $topic = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "fieldhelp WHERE keystring = 'newreply'");
+       $topic = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "fieldhelp WHERE keystring = 'newreply'");
        if (md5($topic['body']) == '7e1154340454ca6d8f8ba47aab057c23')
        {
                $topic = $db->query("UPDATE " . TABLE_PREFIX . "fieldhelp SET body = 'Here you can specify additional comments. If you do not change any fields, this will merely attach a comment.

diff --git a/login.php b/login.php
index 4e8a0fa6830233d11a50cff25a5b2d3c9d921f17..75f1be87597fd2334268d5595592640591ec17f5 100755 (executable)
--- a/login.php
+++ b/login.php
@@ -148,7 +148,7 @@ if ($_POST['do'] == 'resetpw')
        $db->query("DELETE FROM " . TABLE_PREFIX . "passwordreset WHERE dateline < " . (TIMENOW - 86400));
        
        // now look for ours
-       $activation = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "passwordreset WHERE activatorid = '" . $bugsys->input_escape('activator') . "'");
+       $activation = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "passwordreset WHERE activatorid = '" . $bugsys->input_escape('activator') . "'");
        if (!$activation)
        {
                $message->error(L_INVALID_ID);
@@ -192,7 +192,7 @@ if ($_REQUEST['do'] == 'recoverpw')
        $db->query("DELETE FROM " . TABLE_PREFIX . "passwordreset WHERE dateline < " . (TIMENOW - 86400));
        
        // now look for ours
-       $activation = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "passwordreset WHERE activatorid = '" . $bugsys->input_escape('activator') . "'");
+       $activation = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "passwordreset WHERE activatorid = '" . $bugsys->input_escape('activator') . "'");
        if (!$activation)
        {
                $message->error(T('Invalid activation reset key. Please make sure you copied the URL exactly as it appeared in the email.'));

diff --git a/register.php b/register.php
index a27a0e8c1797259561e9b8b4bfba4491396b93d9..05c3a586b2083256e499bfe50c182648b382d6ff 100755 (executable)
--- a/register.php
+++ b/register.php
@@ -163,9 +163,9 @@ if (empty($_REQUEST['do']))
 if ($_REQUEST['do'] == 'activate')
 {
        $input->inputClean('userid', TYPE_UINT);
-       if ($useractivation = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "useractivation WHERE userid = " . $bugsys->in['userid'] . " AND activator = '" . $bugsys->input_escape('activator') . "'"))
+       if ($useractivation = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "useractivation WHERE userid = " . $bugsys->in['userid'] . " AND activator = '" . $bugsys->input_escape('activator') . "'"))
        {
-               $user = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "user WHERE userid = " . $bugsys->in['userid']);
+               $user = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "user WHERE userid = " . $bugsys->in['userid']);
                $db->query("UPDATE " . TABLE_PREFIX . "user SET usergroupid = $useractivation[usergroupid] WHERE userid = " . $bugsys->in['userid']);
                $db->query("DELETE FROM " . TABLE_PREFIX . "useractivation WHERE userid = " . $bugsys->in['userid']);
                

diff --git a/search.php b/search.php
index 610725657c6c972fc94bfa40d6e724c6c64c7da4..a7f5c41e29b96d072febe7d9ed9b24299c96b91c 100644 (file)
--- a/search.php
+++ b/search.php
@@ -52,7 +52,7 @@ define('MODE_ANY', 1);
 define('MODE_ALL', 2);
 define('MODE_RAW', 3);
 
-$var = $db->query_first("SHOW VARIABLES LIKE 'ft_min_word_len'");
+$var = $db->queryFirst("SHOW VARIABLES LIKE 'ft_min_word_len'");
 define('SEARCH_WORD_MIN', $var['Value']);
 
 $db->query("DELETE FROM " . TABLE_PREFIX . "search WHERE userid = 0 AND dateline < " . (TIMENOW - 3600));
@@ -76,11 +76,11 @@ if ($_REQUEST['do'] == 'search')
        }
        else if ($bugsys->in['searchid'])
        {
-               $cachedsearch = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "search WHERE searchid = " . $input->inputClean('searchid', TYPE_UINT) . " AND userid = " . bugdar::$userinfo['userid']);
+               $cachedsearch = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "search WHERE searchid = " . $input->inputClean('searchid', TYPE_UINT) . " AND userid = " . bugdar::$userinfo['userid']);
        }
        else if (bugdar::$userinfo['userid'])
        {
-               $cachedsearch = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "search WHERE name IS NULL AND userid = " . bugdar::$userinfo['userid']);
+               $cachedsearch = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "search WHERE name IS NULL AND userid = " . bugdar::$userinfo['userid']);
        }
        else
        {
@@ -223,7 +223,7 @@ if ($_REQUEST['do'] == 'process')
        {
                // force email or name?? make a distinction?
                // more elegant way to do this? probably
-               $user = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "user WHERE email LIKE '%" . str_replace('%', '\%', $bugsys->input_escape('reporter')) . "' OR displayname LIKE '%" . str_replace('%', '\%', $bugsys->input_escape('reporter')) . "%'");
+               $user = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "user WHERE email LIKE '%" . str_replace('%', '\%', $bugsys->input_escape('reporter')) . "' OR displayname LIKE '%" . str_replace('%', '\%', $bugsys->input_escape('reporter')) . "%'");
                if ($user['userid'])
                {
                        $querybuild['reporter'] = "AND bug.userid = $user[userid] OR comment.userid = $user[userid]";
@@ -440,7 +440,7 @@ if ($_REQUEST['do'] == 'process')
 
 if ($_REQUEST['do'] == 'update')
 {
-       $search = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "search WHERE searchid = " . $input->inputClean('searchid', TYPE_UINT) . " AND userid = " . bugdar::$userinfo['userid']);
+       $search = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "search WHERE searchid = " . $input->inputClean('searchid', TYPE_UINT) . " AND userid = " . bugdar::$userinfo['userid']);
        if (!$search OR !can_perform('caneditother'))
        {
                $message->errorPermission();
@@ -494,7 +494,7 @@ if ($_REQUEST['do'] == 'update')
 
 if ($_POST['do'] == 'doupdate')
 {
-       $search = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "search WHERE searchid = " . $input->inputClean('searchid', TYPE_UINT) . " AND userid = " . bugdar::$userinfo['userid']);
+       $search = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "search WHERE searchid = " . $input->inputClean('searchid', TYPE_UINT) . " AND userid = " . bugdar::$userinfo['userid']);
        if (!$search OR !can_perform('caneditother'))
        {
                $message->errorPermission();
@@ -573,11 +573,11 @@ if ($_REQUEST['do'] == 'export')
 {
        if (!$bugsys->in['searchid'] AND bugdar::$userinfo['userid'])
        {
-               $search = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "search WHERE name IS NULL AND userid = " . bugdar::$userinfo['userid']);
+               $search = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "search WHERE name IS NULL AND userid = " . bugdar::$userinfo['userid']);
        }
        else if ($bugsys->in['searchid'])
        {
-               $search = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "search WHERE searchid = " . $input->inputClean('searchid', TYPE_UINT) . " AND userid = " . bugdar::$userinfo['userid']);
+               $search = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "search WHERE searchid = " . $input->inputClean('searchid', TYPE_UINT) . " AND userid = " . bugdar::$userinfo['userid']);
        }
        else
        {
@@ -605,7 +605,7 @@ if ($_REQUEST['do'] == 'export')
                $xml .= "\n\t\t<dateReported>" . $datef->format('r', $bug['dateline']) . "</dateReported>";
                if ($bug['userid'])
                {
-                       $xml .= "\n\t\t<reporter>" . construct_user_display($db->query_first("SELECT * FROM " . TABLE_PREFIX . "user WHERE userid = $bug[userid]"), false) . "</reporter>";
+                       $xml .= "\n\t\t<reporter>" . construct_user_display($db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "user WHERE userid = $bug[userid]"), false) . "</reporter>";
                }
                $xml .= "\n\t\t<summary>" . $bug['summary'] . "</summary>";
                $xml .= "\n\t\t<product>" . $bug['product'] . "</product>";
@@ -635,7 +635,7 @@ if ($_REQUEST['do'] == 'export')
 
 if ($_POST['do'] == 'dosave')
 {
-       $search = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "search WHERE searchid = " . $input->inputClean('searchid', TYPE_UINT) . " AND userid = " . bugdar::$userinfo['userid']);
+       $search = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "search WHERE searchid = " . $input->inputClean('searchid', TYPE_UINT) . " AND userid = " . bugdar::$userinfo['userid']);
        if (!$search)
        {
                $message->addError(T('The search does not exist.'));

diff --git a/showhistory.php b/showhistory.php
index 4cf44aab0d4c2b56982f0c2b5c1e5f360110f7f5..cc5129d69fa0636dd08d8c23407a35e490f0f702 100644 (file)
--- a/showhistory.php
+++ b/showhistory.php
@@ -31,7 +31,7 @@ $focus['showreport'] = 'focus';
 require_once('./global.php');
 require_once('./includes/api_user.php');
 
-$bug = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "bug WHERE bugid = " . $input->inputClean('bugid', TYPE_UINT));
+$bug = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "bug WHERE bugid = " . $input->inputClean('bugid', TYPE_UINT));
 if (!$bug)
 {
        $message->error(L_INVALID_ID);

diff --git a/showreport.php b/showreport.php
index 27e2c646343bb068d2565c0c1e50726633cb6f0d..f12e90b6e475b6a9441ac9248fcb0017632639ab 100644 (file)
--- a/showreport.php
+++ b/showreport.php
@@ -42,7 +42,7 @@ if (empty($bugid) OR $_REQUEST['do'] == 'quicksearch')
 {
        if (!empty($bugid))
        {
-               if ($db->query_first("SELECT bugid FROM " . TABLE_PREFIX . "bug WHERE bugid = $bugid"))
+               if ($db->queryFirst("SELECT bugid FROM " . TABLE_PREFIX . "bug WHERE bugid = $bugid"))
                {
                        header("Location: showreport.php?bugid=$bugid");
                        exit;
@@ -61,7 +61,7 @@ if (empty($bugid) OR $_REQUEST['do'] == 'quicksearch')
 
 // -------------------------------------------------------------------
 // get the report
-$bug = $db->query_first("
+$bug = $db->queryFirst("
        SELECT bug.*, user.email, user.displayname, user.showemail
        FROM " . TABLE_PREFIX . "bug AS bug
        LEFT JOIN " . TABLE_PREFIX . "user AS user
@@ -119,7 +119,7 @@ if ($show['edit'])
        
        if ($bug['duplicateof'])
        {
-               $duplicate = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "bug WHERE bugid = $bug[duplicateof]");
+               $duplicate = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "bug WHERE bugid = $bug[duplicateof]");
        }
        
        if ($bug['dependency'])
@@ -169,7 +169,7 @@ else
        $assigninfo = bugdar::$datastore['assignto']["$bug[assignedto]"];
        $bug['assigninfo'] = ((is_array($assigninfo)) ? construct_user_display($assigninfo) : '');
                
-       $duplicateof = $db->query_first("SELECT bugid, summary FROM " . TABLE_PREFIX . "bug WHERE bugid = $bug[duplicateof]");
+       $duplicateof = $db->queryFirst("SELECT bugid, summary FROM " . TABLE_PREFIX . "bug WHERE bugid = $bug[duplicateof]");
        
        $dupelist = array();
        $duplicates = $db->query("SELECT bugid, summary FROM " . TABLE_PREFIX . "bug WHERE duplicateof = $bug[bugid]");
@@ -196,7 +196,7 @@ else
 
 $show['subscribe'] = can_perform('cansubscribe', $bug['product']);
 
-$favorite = (bool)$db->query_first("SELECT * FROM " . TABLE_PREFIX . "favorite WHERE bugid = $bug[bugid] AND userid = " . bugdar::$userinfo['userid']);
+$favorite = (bool)$db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "favorite WHERE bugid = $bug[bugid] AND userid = " . bugdar::$userinfo['userid']);
 $favoritetext = ($favorite ? T('Remove from Favorites') : T('Add to Favorites'));
 
 $bug['userinfo'] = construct_user_display($bug);
@@ -277,7 +277,7 @@ if ($show['getattachments'] OR $show['putattachments'])
 // -------------------------------------------------------------------
 // votes
 
-$vote = $db->query_first("SELECT *, FIND_IN_SET(" . bugdar::$userinfo['userid'] . ", userids) AS uservote FROM " . TABLE_PREFIX . "vote WHERE bugid = $bug[bugid]");
+$vote = $db->queryFirst("SELECT *, FIND_IN_SET(" . bugdar::$userinfo['userid'] . ", userids) AS uservote FROM " . TABLE_PREFIX . "vote WHERE bugid = $bug[bugid]");
 
 $vote['total'] = $vote['votefor'] + $vote['voteagainst'];
 if ($vote['total'] != 0)

diff --git a/userctrl.php b/userctrl.php
index a7f01a1a291709715f1a8698f97bdbb1ce5b2ef7..1e48574d98ac5da1ba5bbe309eeebfb987406e55 100644 (file)
--- a/userctrl.php
+++ b/userctrl.php
@@ -57,7 +57,7 @@ if (empty($_REQUEST['do']))
 
 if ($_POST['do'] == 'killsearch')
 {
-       $search = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "search WHERE searchid = " . $input->inputClean('searchid', TYPE_UINT) . " AND userid = " . bugdar::$userinfo['userid']);
+       $search = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "search WHERE searchid = " . $input->inputClean('searchid', TYPE_UINT) . " AND userid = " . bugdar::$userinfo['userid']);
        if (!$search)
        {
                $message->errorPermission();
@@ -72,7 +72,7 @@ if ($_POST['do'] == 'killsearch')
 
 if ($_REQUEST['do'] == 'deletesearch')
 {
-       $search = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "search WHERE searchid = " . $input->inputClean('searchid', TYPE_UINT) . " AND userid = " . bugdar::$userinfo['userid']);
+       $search = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "search WHERE searchid = " . $input->inputClean('searchid', TYPE_UINT) . " AND userid = " . bugdar::$userinfo['userid']);
        if (!$search)
        {
                $message->errorPermission();

diff --git a/viewattachment.php b/viewattachment.php
index 4ce3fe5fee89f03be6ad0565cb5af70794d995ea..542d72015af20cd12d1e6b20a2e65ea582e1b9e2 100755 (executable)
--- a/viewattachment.php
+++ b/viewattachment.php
@@ -27,13 +27,13 @@ $focus['showreport'] = 'focus';
 
 require_once('./global.php');
 
-$attachment = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "attachment WHERE attachmentid = " . $input->inputClean('attachmentid', TYPE_UINT));
+$attachment = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "attachment WHERE attachmentid = " . $input->inputClean('attachmentid', TYPE_UINT));
 if (!$attachment)
 {
        $message->error(L_INVALID_ID);
 }
 
-$bug = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "bug WHERE bugid = $attachment[bugid]");
+$bug = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "bug WHERE bugid = $attachment[bugid]");
 if (!check_bug_permissions($bug))
 {
        $message->errorPermission();

diff --git a/vote.php b/vote.php
index d0e29a66a3fb9e45bec444e135db0deae4af2fc1..aae83eb2e7c469fac4dd43ef9b962126714cb89b 100644 (file)
--- a/vote.php
+++ b/vote.php
@@ -36,8 +36,8 @@ if (empty($_REQUEST['do']))
 
 if ($_REQUEST['do'] == 'vote')
 {
-       $bug = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "bug WHERE bugid = " . $input->inputClean('bugid', TYPE_UINT));
-       $vote =  $db->query_first("SELECT *, FIND_IN_SET(" . bugdar::$userinfo['userid'] . ", userids) AS uservote FROM " . TABLE_PREFIX . "vote WHERE bugid = $bug[bugid]");
+       $bug = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "bug WHERE bugid = " . $input->inputClean('bugid', TYPE_UINT));
+       $vote =  $db->queryFirst("SELECT *, FIND_IN_SET(" . bugdar::$userinfo['userid'] . ", userids) AS uservote FROM " . TABLE_PREFIX . "vote WHERE bugid = $bug[bugid]");
        
        if (!check_bug_permissions($bug))
        {