aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMike Macgirvin <mike@macgirvin.com>2010-08-17 18:44:13 -0700
committerMike Macgirvin <mike@macgirvin.com>2010-08-17 18:44:13 -0700
commit1a1f9b296c163af850d68babfb844e617f154875 (patch)
tree3ded181e34a21908831021369680b5177bbab8a0 /include
parent478f84d9f2ccdad429aadb0d47b196db11c02945 (diff)
downloadvolse-hubzilla-1a1f9b296c163af850d68babfb844e617f154875.tar.gz
volse-hubzilla-1a1f9b296c163af850d68babfb844e617f154875.tar.bz2
volse-hubzilla-1a1f9b296c163af850d68babfb844e617f154875.zip
contact search + sync to personal edition, installer db check + curl proxy
Diffstat (limited to 'include')
-rw-r--r--include/dba.php2
-rw-r--r--include/notifier.php22
2 files changed, 12 insertions, 12 deletions
diff --git a/include/dba.php b/include/dba.php
index 050068230..9e44db5fb 100644
--- a/include/dba.php
+++ b/include/dba.php
@@ -46,7 +46,7 @@ class dba {
else
$mesg = $result->num_rows.' results' . EOL;
- $str = 'SQL = ' . $sql . EOL . 'SQL returned ' . $mesg . EOL;
+ $str = 'SQL = ' . printable($sql) . EOL . 'SQL returned ' . $mesg . EOL;
switch($this->debug) {
case 3:
diff --git a/include/notifier.php b/include/notifier.php
index dcc772454..149ce765c 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -1,21 +1,21 @@
<?php
-$debugging = false;
+ $debugging = false;
-require_once("boot.php");
+ require_once("boot.php");
-$a = new App;
+ $a = new App;
-@include(".htconfig.php");
-require_once("dba.php");
-$db = new dba($db_host, $db_user, $db_pass, $db_data, $install);
- unset($db_host, $db_user, $db_pass, $db_data);
+ @include(".htconfig.php");
+ require_once("dba.php");
+ $db = new dba($db_host, $db_user, $db_pass, $db_data, $install);
+ unset($db_host, $db_user, $db_pass, $db_data);
-require_once("session.php");
-require_once("datetime.php");
+ require_once("session.php");
+ require_once("datetime.php");
-if($argc < 2)
- exit;
+ if($argc < 3)
+ exit;
$a->set_baseurl(get_config('system',url'));