X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdba.php;h=76cc0bc7b91ff74f77f743eb720ee96f66d81c8a;hb=aace55df0ad279d74c5e612078c3f29d114389dc;hp=ae3a4957b6b08ec95b69b93459c9cde6f0f88709;hpb=03c1e5a5ad764d5cfaa03fffdc9e80222f70088e;p=friendica.git diff --git a/include/dba.php b/include/dba.php old mode 100644 new mode 100755 index ae3a4957b6..76cc0bc7b9 --- a/include/dba.php +++ b/include/dba.php @@ -1,5 +1,7 @@ db = @new mysqli($server,$user,$pass,$db); - if((mysqli_connect_errno()) && (! $install)) - system_unavailable(); + + $server = trim($server); + $user = trim($user); + $pass = trim($pass); + $db = trim($db); + + 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(class_exists('mysqli')) { + $this->db = @new mysqli($server,$user,$pass,$db); + if(! mysqli_connect_errno()) { + $this->connected = true; + } + } + else { + $this->mysqli = false; + $this->db = mysql_connect($server,$user,$pass); + if($this->db && mysql_select_db($db,$this->db)) { + $this->connected = true; + } + } + if(! $this->connected) { + $this->db = null; + if(! $install) + system_unavailable(); + } } public function getdb() { @@ -29,56 +72,75 @@ class dba { public function q($sql) { - if(! $this->db ) + if((! $this->db) || (! $this->connected)) return false; - $result = @$this->db->query($sql); + if($this->mysqli) + $result = @$this->db->query($sql); + else + $result = @mysql_query($sql,$this->db); if($this->debug) { $mesg = ''; - if($this->db->errno) - logger('dba: ' . $this->db->error); + if($this->mysqli) { + if($this->db->errno) + logger('dba: ' . $this->db->error); + } + elseif(mysql_errno($this->db)) + logger('dba: ' . mysql_error($this->db)); if($result === false) $mesg = 'false'; elseif($result === true) $mesg = 'true'; - else - $mesg = $result->num_rows.' results' . EOL; - + else { + if($this->mysqli) + $mesg = $result->num_rows . ' results' . EOL; + else + $mesg = mysql_num_rows($result) . ' 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 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')) - file_put_contents('dbfail.out', printable($sql) . ' returned false' . "\n", FILE_APPEND); - } + if($result === false) { + logger('dba: ' . printable($sql) . ' returned false.'); + if(file_exists('dbfail.out')) + file_put_contents('dbfail.out', datetime_convert() . "\n" . printable($sql) . ' returned false' . "\n", FILE_APPEND); } if(($result === true) || ($result === false)) return $result; $r = array(); - if($result->num_rows) { - while($x = $result->fetch_array(MYSQL_ASSOC)) - $r[] = $x; - $result->free_result(); + if($this->mysqli) { + if($result->num_rows) { + while($x = $result->fetch_array(MYSQLI_ASSOC)) + $r[] = $x; + $result->free_result(); + } } + else { + if(mysql_num_rows($result)) { + while($x = mysql_fetch_array($result, MYSQL_ASSOC)) + $r[] = $x; + mysql_free_result($result); + } + } + if($this->debug) - logger('dba: ' . printable(print_r($r, true)), LOGGER_DATA); + logger('dba: ' . printable(print_r($r, true))); return($r); } @@ -87,11 +149,20 @@ class dba { } public function escape($str) { - return @$this->db->real_escape_string($str); + if($this->db && $this->connected) { + if($this->mysqli) + return @$this->db->real_escape_string($str); + else + return @mysql_real_escape_string($str,$this->db); + } } function __destruct() { - @$this->db->close(); + if ($this->db) + if($this->mysqli) + $this->db->close(); + else + mysql_close($this->db); } }} @@ -108,16 +179,21 @@ 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)); }} + // Function: q($sql,$args); // Description: execute SQL query with printf style args. // Example: $r = q("SELECT * FROM `%s` WHERE `uid` = %d", @@ -129,17 +205,39 @@ function q($sql) { global $db; $args = func_get_args(); unset($args[0]); - $ret = $db->q(vsprintf($sql,$args)); - return $ret; + + if($db && $db->connected) { + $stmt = vsprintf($sql,$args); + if($stmt === false) + logger('dba: vsprintf error: ' . print_r(debug_backtrace(),true)); + return $db->q($stmt); + } + + /** + * + * 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; }} @@ -162,4 +260,6 @@ function dbesc_array(&$arr) { if(is_array($arr) && count($arr)) { array_walk($arr,'dbesc_array_cb'); } -}} \ No newline at end of file +}} + +