X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdba.php;h=70c27515c4499d268327285c7809183cc65a5890;hb=4ba29089d27912fc0e742fb1e1d1c12b6719c5c5;hp=4e3f11f7befbfbfa15666dafc698a88912ef9c9c;hpb=f4fd67992812c5c356ff51e875077921a2222d90;p=friendica.git diff --git a/include/dba.php b/include/dba.php index 4e3f11f7be..70c27515c4 100644 --- a/include/dba.php +++ b/include/dba.php @@ -1,23 +1,50 @@ connected = false; + $this->db = null; + return; + } + } + } + $this->db = @new mysqli($server,$user,$pass,$db); - if((mysqli_connect_errno()) && (! $install)) - system_unavailable(); + if(! mysqli_connect_errno()) { + $this->connected = true; + } + else { + $this->db = null; + if(! $install) + system_unavailable(); + } } public function getdb() { @@ -25,9 +52,8 @@ class dba { } public function q($sql) { - global $debug_text; - if(! $this->db ) + if((! $this->db) || (! $this->connected)) return false; $result = @$this->db->query($sql); @@ -44,13 +70,20 @@ class dba { elseif($result === true) $mesg = 'true'; else - $mesg = $result->num_rows.' results' . EOL; + $mesg = $result->num_rows . ' results' . EOL; $str = 'SQL = ' . printable($sql) . EOL . 'SQL returned ' . $mesg . EOL; logger('dba: ' . $str ); } else { + + /** + * 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) { logger('dba: ' . printable($sql) . ' returned false.'); if(file_exists('dbfail.out')) @@ -78,7 +111,8 @@ class dba { } public function escape($str) { - return @$this->db->real_escape_string($str); + if($this->db && $this->connected) + return @$this->db->real_escape_string($str); } function __destruct() { @@ -99,13 +133,17 @@ function printable($s) { if(! function_exists('dbg')) { function dbg($state) { global $db; + if($db) $db->dbg($state); }} if(! function_exists('dbesc')) { function dbesc($str) { global $db; - return($db->escape($str)); + if($db && $db->connected) + return($db->escape($str)); + else + return(str_replace("'","\\'",$str)); }} @@ -120,17 +158,38 @@ function q($sql) { global $db; $args = func_get_args(); unset($args[0]); - $ret = $db->q(vsprintf($sql,$args)); - return $ret; + + if($db && $db->connected) { + $ret = $db->q(vsprintf($sql,$args)); + return $ret; + } + + /** + * + * This will happen occasionally trying to store the + * session data after abnormal program termination + * + */ + + logger('dba: no database: ' . print_r($args,true)); + return false; + }} -// raw db query, no arguments +/** + * + * Raw db query, no arguments + * + */ if(! function_exists('dbq')) { function dbq($sql) { global $db; - $ret = $db->q($sql); + if($db && $db->connected) + $ret = $db->q($sql); + else + $ret = false; return $ret; }} @@ -153,4 +212,6 @@ function dbesc_array(&$arr) { if(is_array($arr) && count($arr)) { array_walk($arr,'dbesc_array_cb'); } -}} \ No newline at end of file +}} + +