diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/dba.php | 31 | ||||
| -rw-r--r-- | include/poller.php | 2 |
2 files changed, 28 insertions, 5 deletions
diff --git a/include/dba.php b/include/dba.php index ae3a4957b..e58abb1a1 100644 --- a/include/dba.php +++ b/include/dba.php @@ -46,7 +46,7 @@ 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; @@ -114,7 +114,10 @@ function dbg($state) { if(! function_exists('dbesc')) { function dbesc($str) { global $db; - return($db->escape($str)); + if($db) + return($db->escape($str)); + else + return(str_replace("'","\\'",$str)); }} @@ -129,11 +132,29 @@ function q($sql) { global $db; $args = func_get_args(); unset($args[0]); - $ret = $db->q(vsprintf($sql,$args)); - return $ret; + + if($db) { + $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) { diff --git a/include/poller.php b/include/poller.php index 3d13a5480..28e421f5f 100644 --- a/include/poller.php +++ b/include/poller.php @@ -26,7 +26,9 @@ proc_close(proc_open("\"$php_path\" \"include/queue.php\" &", array(), $foo)); + $hub_update = false; $force = false; + if(($argc > 1) && ($argv[1] == 'force')) $force = true; |