X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdba_pdo.php;h=9f2774d9b78c2f85230ed61717a7ca8c4ad7003d;hb=1b53b8cae9fe11f17c282fb8ea62f785ca901f68;hp=7cd8c638e7f60955364b93b3ea84a591a5b29adc;hpb=adefb06ff7310fec8ce4bb93010c2568c7857878;p=friendica.git diff --git a/include/dba_pdo.php b/include/dba_pdo.php index 7cd8c638e7..9f2774d9b7 100644 --- a/include/dba_pdo.php +++ b/include/dba_pdo.php @@ -1,8 +1,11 @@ getState()->get('PDOStatement'); - $objQueue->getState()->update(array('result' => $objPDO)); - - # delete handler which closes the PDOStatement-cursor - # this will be done manual if using this handler - $objQueue->deleteHandler(QUEUE_CLOSE_CURSOR_POSITION); +$cloPDOStatementResultHandler = function(Queue $objQueue) { + $objPDO = $objQueue->getState()->get('PDOStatement'); + $objQueue->getState()->update(array('result' => $objPDO)); + /* + * delete handler which closes the PDOStatement-cursor + * this will be done manual if using this handler + */ + $objQueue->deleteHandler(QUEUE_CLOSE_CURSOR_POSITION); }; $objDDDBLResultHandler->add('PDOStatement', array('HANDLER' => $cloPDOStatementResultHandler)); +if (! class_exists('dba')) { /** * * MySQL database class * * For debugging, insert 'dbg(1);' anywhere in the program flow. * dbg(0); will turn it off. Logging is performed at LOGGER_DATA level. - * When logging, all binary info is converted to text and html entities are escaped so that + * When logging, all binary info is converted to text and html entities are escaped so that * the debugging stream is safe to view within both terminals and web pages. * */ - -if(! class_exists('dba')) { class dba { private $debug = 0; @@ -44,14 +46,16 @@ class dba { public $error = false; function __construct($server,$user,$pass,$db,$install = false) { - global $a; - - # work around, to store the database - configuration in DDDBL - $objDataObjectPool = new \DDDBL\DataObjectPool('Database-Definition'); - $objDataObjectPool->add('DEFAULT', array('CONNECTION' => "mysql:host=$server;dbname=$db", - 'USER' => $user, - 'PASS' => $pass, - 'DEFAULT' => true)); + $a = get_app(); + + // work around, to store the database - configuration in DDDBL + $objDataObjectPool = new DataObjectPool('Database-Definition'); + $objDataObjectPool->add('DEFAULT', array( + 'CONNECTION' => "mysql:host=$server;dbname=$db", + 'USER' => $user, + 'PASS' => $pass, + 'DEFAULT' => true + )); $stamp1 = microtime(true); @@ -60,35 +64,34 @@ class dba { $pass = trim($pass); $db = trim($db); - if (!(strlen($server) && strlen($user))){ + if (!(strlen($server) && strlen($user))) { $this->connected = false; $this->db = null; return; } - if($install) { - if(strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) { - if(! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) { - $this->error = sprintf( t('Cannot locate DNS info for database server \'%s\''), $server); - $this->connected = false; - $this->db = null; - return; - } + if ($install && strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) { + if (! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) { + $this->error = sprintf( t('Cannot locate DNS info for database server \'%s\''), $server); + $this->connected = false; + $this->db = null; + return; } } - # etablish connection to database and store PDO object - \DDDBL\connect(); - $this->db = \DDDBL\getDB(); - - if(\DDDBL\isConnected()) { - $this->connected = true; - } - - if(! $this->connected) { + // Establish connection to database and store PDO object + DDDBL\connect(); + $this->db = DDDBL\getDB(); + + if (DDDBL\isConnected()) { + $this->connected = true; + } + + if (! $this->connected) { $this->db = null; - if(! $install) + if (! $install) { system_unavailable(); + } } $a->save_timestamp($stamp1, "network"); @@ -99,73 +102,80 @@ class dba { } public function q($sql, $onlyquery = false) { - global $a; - - $strHandler = (true === $onlyquery) ? 'PDOStatement' : 'MULTI'; - - $strQueryAlias = md5($sql); - $strSQLType = strtoupper(strstr($sql, ' ', true)); - - $objPreparedQueryPool = new \DDDBL\DataObjectPool('Query-Definition'); - - # check if query do not exists till now, if so create its definition - if(!$objPreparedQueryPool->exists($strQueryAlias)) - $objPreparedQueryPool->add($strQueryAlias, array('QUERY' => $sql, - 'HANDLER' => $strHandler)); - - if((! $this->db) || (! $this->connected)) + $a = get_app(); + + $strHandler = (true === $onlyquery) ? 'PDOStatement' : 'MULTI'; + + $strQueryAlias = md5($sql); + $strSQLType = strtoupper(strstr($sql, ' ', true)); + + $objPreparedQueryPool = new DataObjectPool('Query-Definition'); + + // check if query do not exists till now, if so create its definition + if (!$objPreparedQueryPool->exists($strQueryAlias)) { + $objPreparedQueryPool->add($strQueryAlias, array( + 'QUERY' => $sql, + 'HANDLER' => $strHandler + )); + } + + if ((! $this->db) || (! $this->connected)) { return false; + } $this->error = ''; $stamp1 = microtime(true); - try { - $r = \DDDBL\get($strQueryAlias); - - # bad workaround to emulate the bizzare behavior of mysql_query - if(in_array($strSQLType, array('INSERT', 'UPDATE', 'DELETE', 'CREATE', 'DROP', 'SET'))) - $result = true; - - } catch (\Exception $objException) { - $result = false; - $intErrorCode = $objPreparedQueryPool->get($strQueryAlias)->get('PDOStatement')->errorCode(); - } + try { + $r = DDDBL\get($strQueryAlias); + + // bad workaround to emulate the bizzare behavior of mysql_query + if (in_array($strSQLType, array('INSERT', 'UPDATE', 'DELETE', 'CREATE', 'DROP', 'SET'))) { + $result = true; + } + $intErrorCode = false; + } catch (Exception $objException) { + $result = false; + $intErrorCode = $objPreparedQueryPool->get($strQueryAlias)->get('PDOStatement')->errorCode(); + } $stamp2 = microtime(true); $duration = (float)($stamp2-$stamp1); $a->save_timestamp($stamp1, "database"); - if(x($a->config,'system') && x($a->config['system'],'db_log')) { - if (($duration > $a->config["system"]["db_loglimit"])) { - $duration = round($duration, 3); - $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); - @file_put_contents($a->config["system"]["db_log"], datetime_convert()."\t".$duration."\t". - basename($backtrace[1]["file"])."\t". - $backtrace[1]["line"]."\t".$backtrace[2]["function"]."\t". - substr($sql, 0, 2000)."\n", FILE_APPEND); - } + /* + * Check if the configuration group 'system' and db_log is there. The + * extra first check needs to be done to avoid endless loop. + */ + if (x($a->config, 'system') && x($a->config['system'], 'db_log') && ($duration > $a->config["system"]["db_loglimit"])) { + $duration = round($duration, 3); + $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); + @file_put_contents($a->config["system"]["db_log"], datetime_convert()."\t".$duration."\t". + basename($backtrace[1]["file"])."\t". + $backtrace[1]["line"]."\t".$backtrace[2]["function"]."\t". + substr($sql, 0, 2000)."\n", FILE_APPEND); } - if($intErrorCode) - $this->error = $intErrorCode; + if ($intErrorCode) { + $this->error = $intErrorCode; + } - if(strlen($this->error)) { + if (strlen($this->error)) { logger('dba: ' . $this->error); } - if($this->debug) { - + if ($this->debug) { $mesg = ''; - if($result === false) + if ($result === false) { $mesg = 'false'; - elseif($result === true) + } elseif ($result === true) { $mesg = 'true'; - else { - # this needs fixing, but is a bug itself - #$mesg = mysql_num_rows($result) . ' results' . EOL; + } else { + /// @TODO this needs fixing, but is a bug itself + // $mesg = mysql_num_rows($result) . ' results' . EOL; } $str = 'SQL = ' . printable($sql) . EOL . 'SQL returned ' . $mesg @@ -175,46 +185,52 @@ class dba { logger('dba: ' . $str ); } - /** + /* * If dbfail.out exists, we will write any failed calls directly to it, * regardless of any logging that may or may nor be in effect. * These usually indicate SQL syntax errors that need to be resolved. */ - - if($result === false) { + if (isset($result) && ($result === false)) { logger('dba: ' . printable($sql) . ' returned false.' . "\n" . $this->error); - if(file_exists('dbfail.out')) + if (file_exists('dbfail.out')) { file_put_contents('dbfail.out', datetime_convert() . "\n" . printable($sql) . ' returned false' . "\n" . $this->error . "\n", FILE_APPEND); + } } - if(($result === true) || ($result === false)) + if (isset($result) && (($result === true) || ($result === false))) { return $result; - + } + if ($onlyquery) { - $this->result = $r; # this will store an PDOStatement Object in result - $this->result->execute(); # execute the Statement, to get its result + // this will store an PDOStatement Object in result + $this->result = $r; + + // execute the Statement, to get its result + $this->result->execute(); return true; } - + //$a->save_timestamp($stamp1, "database"); - if($this->debug) + if ($this->debug) { logger('dba: ' . printable(print_r($r, true))); - return($r); + } + + return $r; } public function qfetch() { + if (false === $this->result) { + return false; + } - if (false === $this->result) - return false; - - return $this->result->fetch(); - + return $this->result->fetch(); } - + public function qclose() { - if ($this->result) - return $this->result->closeCursor(); + if ($this->result) { + return $this->result->closeCursor(); + } } public function dbg($dbg) { @@ -222,119 +238,119 @@ class dba { } public function escape($str) { - if($this->db && $this->connected) { - $strQuoted = $this->db->quote($str); - # this workaround is needed, because quote creates "'" and the beginning and the end - # of the string, which is correct. but until now the queries set this delimiter manually, - # so we must remove them from here and wait until everything uses prepared statements - return mb_substr($strQuoted, 1, mb_strlen($strQuoted) - 2); + if ($this->db && $this->connected) { + $strQuoted = $this->db->quote($str); + /* + * this workaround is needed, because quote creates "'" and the beginning and the end + * of the string, which is correct. but until now the queries set this delimiter manually, + * so we must remove them from here and wait until everything uses prepared statements + */ + return mb_substr($strQuoted, 1, mb_strlen($strQuoted) - 2); } } - function __destruct() { - if ($this->db) - \DDDBL\disconnect(); + public function __destruct() { + if ($this->db) { + DDDBL\disconnect(); + } } }} -if(! function_exists('printable')) { +if (! function_exists('printable')) { function printable($s) { $s = preg_replace("~([\x01-\x08\x0E-\x0F\x10-\x1F\x7F-\xFF])~",".", $s); $s = str_replace("\x00",'.',$s); - if(x($_SERVER,'SERVER_NAME')) + if (x($_SERVER,'SERVER_NAME')) $s = escape_tags($s); return $s; }} -// Procedural functions -if(! function_exists('dbg')) { +// --- Procedural functions --- + +if (! function_exists('dbg')) { function dbg($state) { global $db; - if($db) + if ($db) $db->dbg($state); }} -if(! function_exists('dbesc')) { +if (! function_exists('dbesc')) { function dbesc($str) { global $db; - if($db && $db->connected) - return($db->escape($str)); - else - return(str_replace("'","\\'",$str)); -}} - + if ($db && $db->connected) { + return $db->escape($str); + } else { + return str_replace("'","\\'",$str); + } +}} -// Function: q($sql,$args); -// Description: execute SQL query with printf style args. -// Example: $r = q("SELECT * FROM `%s` WHERE `uid` = %d", -// 'user', 1); - -if(! function_exists('q')) { +if (! function_exists('q')) { +/* + * Function: q($sql,$args); + * Description: execute SQL query with printf style args. + * Example: $r = q("SELECT * FROM `%s` WHERE `uid` = %d", + * 'user', 1); + */ function q($sql) { global $db; $args = func_get_args(); unset($args[0]); - if($db && $db->connected) { + if ($db && $db->connected) { $stmt = @vsprintf($sql,$args); // Disabled warnings //logger("dba: q: $stmt", LOGGER_ALL); - if($stmt === false) + if ($stmt === false) { logger('dba: vsprintf error: ' . print_r(debug_backtrace(),true), LOGGER_DEBUG); + } return $db->q($stmt); } - /** - * - * This will happen occasionally trying to store the - * session data after abnormal program termination - * + /* + * This will happen occasionally trying to store the + * session data after abnormal program termination */ logger('dba: no database: ' . print_r($args,true)); - return false; - + return false; }} -/** - * +if (! function_exists('dbq')) { +/* * Raw db query, no arguments - * */ - -if(! function_exists('dbq')) { function dbq($sql) { - global $db; - if($db && $db->connected) + if ($db && $db->connected) { $ret = $db->q($sql); - else + } else { $ret = false; + } return $ret; }} - -// Caller is responsible for ensuring that any integer arguments to -// dbesc_array are actually integers and not malformed strings containing -// SQL injection vectors. All integer array elements should be specifically -// cast to int to avoid trouble. - - -if(! function_exists('dbesc_array_cb')) { +if (! function_exists('dbesc_array_cb')) { function dbesc_array_cb(&$item, $key) { - if(is_string($item)) + /* + * Caller is responsible for ensuring that any integer arguments to + * dbesc_array are actually integers and not malformed strings containing + * SQL injection vectors. All integer array elements should be specifically + * cast to int to avoid trouble. + */ + if (is_string($item)) { $item = dbesc($item); + } }} -if(! function_exists('dbesc_array')) { +if (! function_exists('dbesc_array')) { function dbesc_array(&$arr) { - if(is_array($arr) && count($arr)) { + if (is_array($arr) && count($arr)) { array_walk($arr,'dbesc_array_cb'); } }} -if(! function_exists('dba_timer')) { +if (! function_exists('dba_timer')) { function dba_timer() { - return microtime(true); + return microtime(true); }}