mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Mostly changes to turn userdata into user->data, lang into user->lang + bitstring 2nd format + inheritance for permission admin and various other updates/fixes/changes ... note that user->lang & user->theme isn't final

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@2958 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen
2002-10-20 19:19:07 +00:00
parent 4887cf1e49
commit 0e9f0ac4ec
52 changed files with 2146 additions and 2127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
phpBB/db/mysql.php
View File

@@ -44,7 +44,7 @@ class sql_db
$this->persistency = $persistency;
$this->user = $sqluser;
$this->password = $sqlpassword;
$this->server = $sqlserver . ( ( $port ) ? ':' . $port : '' );
$this->server = $sqlserver . ( ( $port ) ? ':' . $port : '' );
$this->dbname = $database;
$this->db_connect_id = ( $this->persistency ) ? @mysql_pconnect($this->server, $this->user, $this->password) : @mysql_connect($this->server, $this->user, $this->password);
@@ -117,7 +117,7 @@ class sql_db
//
// Base query method
//
function sql_query($query = '', $transaction = false)
function sql_query($query = '')
{
if ($query != '')
{
@@ -181,10 +181,10 @@ class sql_db
return false;
}
return ( $this->query_result) ? $this->query_result : ( ( $transaction == END_TRANSACTION ) ? true : false );
return ( $this->query_result) ? $this->query_result : fals;
}
function sql_query_limit($query = '', $total, $offset = 0, $transaction = false)
function sql_query_limit($query = '', $total, $offset = 0)
{
if ( $query != '' )
{
@@ -205,7 +205,7 @@ class sql_db
}
// Idea for this from Ikonboard
function sql_query_array($query = '', $assoc_ary = false, $transaction = false)
function sql_query_array($query = '', $assoc_ary = false)
{
if (!is_array($assoc_ary))
{
@@ -392,8 +392,8 @@ class sql_db
$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);
$message = '<u>SQL ERROR</u> [ ' . SQL_LAYER . ' ]<br /><br />' . @mysql_error() . '<br /><br /><u>CALLING PAGE</u><br /><br />' . $this_page . ( ( $sql != '' ) ? '<br /><br /><u>SQL</u><br /><br />' . $sql : '' ) . '<br />';
trigger_error($message, E_USER_ERROR);
}
$result['message'] = @mysql_error();