ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

initial convert to PDO with no testing

pull/236/head
Isaac Connor 2013-10-16 16:07:58 -04:00
parent 1ac731a058
commit 9e2d7cfd24
3 changed files with 35 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
distros/ubuntu1204/changelog
View File

@ -1,3 +1,9 @@
zoneminder (1.26.4-3) precise; urgency=low
* Convert from php mysql ext to PDO
-- Isaac Connor <iconnor@connortechnology.com> Wed, 16 Oct 2013 15:51:39 -0400
zoneminder (1.26.4-2) precise; urgency=high
* improvements to zmupdate.pl, cleanups

42
web/includes/database.php
View File

@ -29,8 +29,14 @@ $GLOBALS['dbConn'] = false;
function dbConnect()
{
global $dbConn;
$dbConn = mysql_pconnect( ZM_DB_HOST, ZM_DB_USER, ZM_DB_PASS ) or die( "Could not connect to database: ".mysql_error() );
mysql_select_db( ZM_DB_NAME, $dbConn ) or die( "Could not select database: ".mysql_error() );
try {
#$dbConn = mysql_pconnect( ZM_DB_HOST, ZM_DB_USER, ZM_DB_PASS ) or die( "Could not connect to database: ".mysql_error() );
$dbConn = new PDO( ZM_DB_TYPE + ':host=' + ZM_DB_HOST + ';dbname='+ZM_DB_NAME, ZM_DB_USER, ZM_DB_PASS ) or die( "Could not connect to database: ".mysql_error() );
#mysql_select_db( ZM_DB_NAME, $dbConn ) or die( "Could not select database: ".mysql_error() );
} catch(PDOException $ex ) {
echo "Unable to connect to ZM db.";
}
}
dbConnect();
@ -94,44 +100,39 @@ function dbEscape( $string )
function dbQuery( $sql )
{
global $dbConn;
if ( dbLog( $sql, true ) )
return;
if (!($result = mysql_query( $sql )))
if (!($result = $dbCon->query( $sql )))
dbError( $sql );
return( $result );
}
function dbFetchOne( $sql, $col=false )
{
dbLog( $sql );
if (!($result = mysql_query( $sql )))
dbError( $sql );
$result = dbQuery( $sql );
if ( $dbRow = mysql_fetch_assoc( $result ) )
if ( $dbRow = $result->fetch( PDO::FETCH_ASSOC ) )
return( $col?$dbRow[$col]:$dbRow );
return( false );
}
function dbFetchAll( $sql, $col=false )
{
dbLog( $sql );
if (!($result = mysql_query( $sql )))
dbError( $sql );
$result = dbQuery( $sql );
$dbRows = array();
while( $dbRow = mysql_fetch_assoc( $result ) )
while( $dbRow = $result->fetch( PDO::FETCH_ASSOC ) )
$dbRows[] = $col?$dbRow[$col]:$dbRow;
return( $dbRows );
}
function dbFetchAssoc( $sql, $indexCol, $dataCol=false )
{
dbLog( $sql );
if (!($result = mysql_query( $sql )))
dbError( $sql );
$result = dbQuery( $sql );
$dbRows = array();
while( $dbRow = mysql_fetch_assoc( $result ) )
while( $dbRow = $result->fetch( PDO::FETCH_ASSOC ) )
$dbRows[$dbRow[$indexCol]] = $dataCol?$dbRow[$dataCol]:$dbRow;
return( $dbRows );
}
@ -143,22 +144,21 @@ function dbFetch( $sql, $col=false )
function dbFetchNext( $result, $col=false )
{
if ( $dbRow = mysql_fetch_assoc( $result ) )
if ( $dbRow = $result->fetch( PDO::FETCH_ASSOC ) )
return( $col?$dbRow[$col]:$dbRow );
return( false );
}
function dbNumRows( $sql )
{
dbLog( $sql );
if (!($result = mysql_query( $sql )))
dbError( $sql );
return( mysql_num_rows( $result ) );
$result = dbQuery( $sql );
return( $result->rowCount() );
}
function dbInsertId()
{
return( mysql_insert_id() );
global $dbCon;
return( $dbCon->lastInsertId() );
}
function getEnumValues( $table, $column )

12
web/includes/logger.php
View File

@ -460,11 +460,15 @@ class Logger
{
$dbFile = is_null($file)?'NULL':"'".dbEscape($file)."'";
$dbLine = is_null($line)?'NULL':dbEscape($line);
$sql = "insert into Logs ( TimeKey, Component, Pid, Level, Code, Message, File, Line ) values ( ".sprintf( "%d.%06d", $time['sec'], $time['usec'] ).", '".dbEscape($this->id)."', ".getmypid().", ".dbEscape($level).", '".dbEscape($code)."', '".dbEscape($string)."', ".$dbFile.", ".$dbLine." )";
if (!($result = mysql_query( $sql )))
{
try {
global $dbCon;
$sql = "INSERT INTO Logs ( TimeKey, Component, Pid, Level, Code, Message, File, Line ) values ( ?, ?, ?, ?, ?, ?, ?, ? )";
$stmt = $dbCon->prepare( $sql );
$result = $dbCon->execute( array( sprintf( "%d.%06d", $time['sec'], $time['usec'] ), .dbEscape($this->id), getmypid(), dbEscape($level), dbEscape($code), dbEscape($string), $dbFile, $dbLine ) );
} catch(PDOException $ex) {
$this->databaseLevel = self::NOLOG;
Fatal( "Can't write log entry '$sql': ".mysql_error() );
Fatal( "Can't write log entry '$sql': ". $ex->getMessage() );
}
}
// This has to be last as trigger_error can be fatal