diff options
| author | Ludovic Arnaud <ludovic_arnaud@users.sourceforge.net> | 2002-10-17 02:50:50 +0000 |
|---|---|---|
| committer | Ludovic Arnaud <ludovic_arnaud@users.sourceforge.net> | 2002-10-17 02:50:50 +0000 |
| commit | 80864fa7ee6e1d7e76a1f490d186fb9a7f5b1162 (patch) | |
| tree | a01b78d812ef3a2931dd3ef8ea76ccddfa0a263b /phpBB/db | |
| parent | fafd167dde6726df46cd3cd9523ec6ad8af22b13 (diff) | |
| download | forums-80864fa7ee6e1d7e76a1f490d186fb9a7f5b1162.tar forums-80864fa7ee6e1d7e76a1f490d186fb9a7f5b1162.tar.gz forums-80864fa7ee6e1d7e76a1f490d186fb9a7f5b1162.tar.bz2 forums-80864fa7ee6e1d7e76a1f490d186fb9a7f5b1162.tar.xz forums-80864fa7ee6e1d7e76a1f490d186fb9a7f5b1162.zip | |
Random bugfixes, (hopefully) improved admin panel security.
git-svn-id: file:///svn/phpbb/trunk@2954 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/db')
| -rw-r--r-- | phpBB/db/mysql.php | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/phpBB/db/mysql.php b/phpBB/db/mysql.php index 12ce33aed7..b7a4dafed8 100644 --- a/phpBB/db/mysql.php +++ b/phpBB/db/mysql.php @@ -196,19 +196,12 @@ class sql_db $query .= ' LIMIT ' . ( ( !empty($offset) ) ? $offset . ', ' . $total : $total ); } - if ( !($this->query_result = @mysql_query($query, $this->db_connect_id)) ) - { - $this->sql_error($query); - } - - $this->open_queries[] = $this->query_result; + return $this->sql_query($query); } else { return false; } - - return ( $this->query_result) ? $this->query_result : ( ( $transaction == END_TRANSACTION ) ? true : false ); } // Idea for this from Ikonboard @@ -296,7 +289,7 @@ class sql_db $query_id = $this->query_result; } - return ( $query_id ) ? @mysql_fetch_array($query_id) : false; + return ( $query_id ) ? @mysql_fetch_assoc($query_id) : false; } function sql_fetchrowset($query_id = 0) @@ -309,7 +302,7 @@ class sql_db { unset($this->rowset[$query_id]); unset($this->row[$query_id]); - while($this->rowset[$query_id] = @mysql_fetch_array($query_id)) + while($this->rowset[$query_id] = @mysql_fetch_assoc($query_id)) { $result[] = $this->rowset[$query_id]; } @@ -389,7 +382,7 @@ class sql_db function sql_error($sql = '') { - global $HTTP_SERVER_VARS, $HTTP_ENV_VARS; + global $_SERVER, $_ENV; if ( !$this->return_on_error ) { @@ -398,8 +391,8 @@ class sql_db $this->sql_transaction(ROLLBACK); } - $this_page = ( !empty($HTTP_SERVER_VARS['PHP_SELF']) ) ? $HTTP_SERVER_VARS['PHP_SELF'] : $HTTP_ENV_VARS['PHP_SELF']; - $this_page .= '&' . ( ( !empty($HTTP_SERVER_VARS['QUERY_STRING']) ) ? $HTTP_SERVER_VARS['QUERY_STRING'] : $HTTP_ENV_VARS['QUERY_STRING'] ); + $this_page = ( !empty($_SERVER['PHP_SELF']) ) ? $_SERVER['PHP_SELF'] : $_ENV['PHP_SELF']; + $this_page .= '&' . ( ( !empty($_SERVER['QUERY_STRING']) ) ? $_SERVER['QUERY_STRING'] : $_ENV['QUERY_STRING'] ); $message = '<u>SQL ERROR</u> [ ' . SQL_LAYER . ' ]<br /><br />' . @mysql_error() . '<br /><br /><u>PAGE</u><br /><br />' . $this_page . ( ( $sql != '' ) ? '<br /><br /><u>SQL</u><br /><br />' . $sql : '' ) . '<br />'; message_die(ERROR, $message); |