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

rework dbQuery, dbFetchOne to take a parameters array, and use it

pull/236/head
Isaac Connor 2013-10-18 14:15:24 -04:00
parent cde89a7144
commit 7fdb933d6b
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
web/includes/database.php
View File

@ -97,21 +97,32 @@ function dbEscape( $string )
return( $dbConn->quote( $string ) );
}
function dbQuery( $sql )
function dbQuery( $sql, $params=NULL )
{
global $dbConn;
if ( dbLog( $sql, true ) )
return;
if (!($result = $dbConn->query( $sql )))
dbError( $sql );
$result = NULL;
try {
if ( isset($params) ) {
$result = $dbConn->prepare( $sql );
$result->execute( $params );
} else {
$result = $dbConn->query( $sql );
}
} catch(PDOException $e) {
dbError( $sql . $e->getMessage() );
}
return( $result );
}
function dbFetchOne( $sql, $col=false )
function dbFetchOne( $sql, $col=false, $params=NULL )
{
$result = dbQuery( $sql );
$result = dbQuery( $sql, $params );
if ( ! $result )
return false;
if ( $dbRow = $result->fetch( PDO::FETCH_ASSOC ) )
if ( $result && $dbRow = $result->fetch( PDO::FETCH_ASSOC ) )
return( $col?$dbRow[$col]:$dbRow );
return( false );
}