<?php
-// MySQL database class
-//
-// For debugging, insert 'dbg(x);' anywhere in the program flow.
-// x = 1: display db success/failure following content
-// x = 2: display full queries following content
-// x = 3: display full queries using echo; which will mess up display
-// really bad but will return output in stubborn cases.
+/**
+ *
+ * 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
+ * the debugging stream is safe to view within both terminals and web pages.
+ *
+ */
if(! class_exists('dba')) {
class dba {
function __construct($server,$user,$pass,$db,$install = false) {
$this->db = @new mysqli($server,$user,$pass,$db);
- if((mysqli_connect_errno()) && (! install))
+ if((mysqli_connect_errno()) && (! $install))
system_unavailable();
}
+ public function getdb() {
+ return $this->db;
+ }
+
public function q($sql) {
- global $debug_text;
if(! $this->db )
return false;
$mesg = '';
- if($this->db->mysqli->errno)
- $debug_text .= $this->db->mysqli->error . EOL;
+ if($this->db->errno)
+ logger('dba: ' . $this->db->error);
if($result === false)
$mesg = 'false';
else
$mesg = $result->num_rows.' results' . EOL;
- $str = 'SQL = ' . $sql . EOL . 'SQL returned ' . $mesg . EOL;
-
- switch($this->debug) {
- case 3:
- echo $str;
- break;
- default:
- $debug_text .= $str;
- break;
+ $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'))
+ file_put_contents('dbfail.out', printable($sql) . ' returned false' . "\n", FILE_APPEND);
}
}
$result->free_result();
}
- if($this->debug == 2)
- $debug_text .= printable(print_r($r, true). EOL);
- elseif($this->debug == 3)
- echo printable(print_r($r, true) . EOL) ;
-
+ if($this->debug)
+ logger('dba: ' . printable(print_r($r, true)), LOGGER_DATA);
return($r);
}
if(! function_exists('printable')) {
function printable($s) {
$s = preg_replace("~([\x01-\x08\x0E-\x0F\x10-\x1F\x7F-\xFF])~",".", $s);
- return(escape_tags(str_replace("\x00",'.',$s)));
+ $s = str_replace("\x00",'.',$s);
+ if(x($_SERVER,'SERVER_NAME'))
+ $s = escape_tags($s);
+ return $s;
}}
// Procedural functions
return $ret;
}}
+// raw db query, no arguments
+
+if(! function_exists('dbq')) {
+function dbq($sql) {
+
+ global $db;
+ $ret = $db->q($sql);
+ return $ret;
+}}
+
// Caller is responsible for ensuring that any integer arguments to
// dbesc_array are actually integers and not malformed strings containing