more instrumentation

diff --git a/.htaccess b/.htaccess
index eb30198bb2849a1673b14527db3e7e4b6e039fd9..e17ea00b2acd92df3f5a69a64447f3fc6196d759 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -2,6 +2,10 @@
 Options -Indexes
 AddType application/x-java-archive .jar
 
+<FilesMatch "\.out">
+Deny from all
+</FilesMatch>
+
 <IfModule mod_rewrite.c>
   RewriteEngine on
 

diff --git a/include/dba.php b/include/dba.php
index 9e44db5fbb85188e4bcbf589f34e3c6192b61704..0e790d4c1ca493fd995fa87cf7a1ea3ea0120c2f 100644 (file)
--- a/include/dba.php
+++ b/include/dba.php
@@ -57,6 +57,10 @@ class dba {
                                        break;
                        }
                }
+               else {
+                       if(($result === false) && (file_exists('dbfail.out')))
+                               file_put_contents('dbfail.out', printable($sql) . ' returned false' . "\n", FILE_APPEND);
+               }
 
                if(($result === true) || ($result === false))
                        return $result;

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index d657b1f88e957c6767096355c197893534ffffe9..4a23da505012229deba47a4137ae5562a2596633 100644 (file)
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -117,8 +117,8 @@ function dfrn_notify_post(&$a) {
                                '$username' => $importer['username'],
                                '$email' => $importer['email'],
                                '$from' => $msg['from-name'],
-                               '$title' => $msg['title'],
-                               '$body' => strip_tags(bbcode($msg['body']))
+                               '$title' => stripslashes($msg['title']),
+                               '$body' => strip_tags(bbcode(stripslashes($msg['body'])))
                        ));
 
                        $res = mail($importer['email'], t('New mail received at ') . $a->config['sitename'],