MFB: Cleanup logging.

diff --git a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Configuration.php b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Configuration.php
index 1b812e8..0e9485f 100644 (file)
--- a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Configuration.php
+++ b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Configuration.php
@@ -131,7 +131,7 @@ class Horde_Kolab_Filter_Configuration
         }
 
         /* Always display all possible problems */
-        ini_set('error_reporting', E_ALL);
+        ini_set('error_reporting', E_ERROR);
         ini_set('track_errors', '1');
 
         /* Setup error logging */

diff --git a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Response.php b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Response.php
index 3962fb0..bb1b41c 100644 (file)
--- a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Response.php
+++ b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Response.php
@@ -99,7 +99,7 @@ class Horde_Kolab_Filter_Response
         /* Ignore strict errors for now since even PEAR will raise
          * strict notices
          */
-        if ($errno == E_STRICT) {
+        if ($errno == E_STRICT || $errno == E_DEPRECATED) {
             return false;
         }
 
@@ -117,7 +117,7 @@ class Horde_Kolab_Filter_Response
             $msg = 'PHP Error: ' . $errmsg;
         }
 
-        $error = new PEAR_Error($msg, $code);
+        $error = new PEAR_Error($msg, $code, null, null, 'FILE: ' . $filename . ', LINE: ' . $linenum);
         $this->handle($error);
 
         return false;
@@ -134,21 +134,37 @@ class Horde_Kolab_Filter_Response
 
         $msg = $result->getMessage() . '; Code: ' . $result->getCode();
 
-        /* Log all errors */
-        $file = __FILE__;
-        $line = __LINE__;
+        $file = false;
+        $line = false;
 
-        $frames = $result->getBacktrace();
-        if (count($frames) > 1) {
-            $frame = $frames[1];
-        } else if (count($frames) == 1) {
-            $frame = $frames[0];
+        $user_info = $result->getUserInfo();
+
+        if (!empty($user_info)) {
+            if (preg_match('/FILE: (.*), LINE: (.*)/', $user_info, $matches)) {
+                $file = $matches[1];
+                $line = $matches[2];
+            }
         }
-        if (isset($frame['file'])) {
-            $file = $frame['file'];
+
+        if (!$file) {
+            $frames = $result->getBacktrace();
+            if (count($frames) > 1) {
+                $frame = $frames[1];
+            } else if (count($frames) == 1) {
+                $frame = $frames[0];
+            }
+            if (isset($frame['file'])) {
+                $file = $frame['file'];
+            }
+            if (isset($frame['line'])) {
+                $line = $frame['line'];
+            }
         }
-        if (isset($frame['line'])) {
-            $line = $frame['line'];
+
+        if (!$file) {
+            /* Log all errors */
+            $file = __FILE__;
+            $line = __LINE__;
         }
 
         /* In debugging mode the errors get delivered to the screen

diff --git a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/drop.php b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/drop.php
index 045f146..28977b4 100644 (file)
--- a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/drop.php
+++ b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/drop.php
@@ -21,7 +21,7 @@ class Horde_Kolab_Filter_Transport_drop extends Horde_Kolab_Filter_Transport
      *
      * @return DropWrapper Provides a null class as transport.
      */
-    function &_createTransport()
+    function _createTransport()
     {
         $transport = new DropWrapper();
         return $transport;

diff --git a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/echo.php b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/echo.php
index 0b7181d..07ffd24 100644 (file)
--- a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/echo.php
+++ b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/echo.php
@@ -21,7 +21,7 @@ class Horde_Kolab_Filter_Transport_echo extends Horde_Kolab_Filter_Transport
      *
      * @return StdOutWrapper Wraps STDOUT as transport
      */
-    function &_createTransport()
+    function _createTransport()
     {
         $transport = new EchoWrapper();
         return $transport;

diff --git a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/lda.php b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/lda.php
index f10b7b4..b2d8b72 100644 (file)
--- a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/lda.php
+++ b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/lda.php
@@ -21,7 +21,7 @@ class Horde_Kolab_Filter_Transport_lda extends Horde_Kolab_Filter_Transport
      *
      * @return DovecotLDA The LDA handler.
      */
-    function &_createTransport()
+    function _createTransport()
     {
         require_once dirname(__FILE__) . '/DovecotLDA.php';
 

diff --git a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/lmtp.php b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/lmtp.php
index 6d502d8..e32dafc 100644 (file)
--- a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/lmtp.php
+++ b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/lmtp.php
@@ -22,7 +22,7 @@ class Horde_Kolab_Filter_Transport_lmtp extends Horde_Kolab_Filter_Transport
      *
      * @return Net_LMTP The LMTP handler.
      */
-    function &_createTransport()
+    function _createTransport()
     {
         require_once dirname(__FILE__) . '/LMTPTLS.php';
 

diff --git a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/smtp.php b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/smtp.php
index 2ffb286..bbf2272 100644 (file)
--- a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/smtp.php
+++ b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/smtp.php
@@ -22,7 +22,7 @@ class Horde_Kolab_Filter_Transport_smtp extends Horde_Kolab_Filter_Transport
      *
      * @return Net_SMTP The SMTP handler.
      */
-    function &_createTransport()
+    function _createTransport()
     {
         require_once 'Net/SMTP.php';
 

diff --git a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/stdout.php b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/stdout.php
index f7fe4c8..7dedf26 100644 (file)
--- a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/stdout.php
+++ b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/stdout.php
@@ -21,7 +21,7 @@ class Horde_Kolab_Filter_Transport_stdout extends Horde_Kolab_Filter_Transport
      *
      * @return StdOutWrapper Wraps STDOUT as transport
      */
-    function &_createTransport()
+    function _createTransport()
     {
         $transport = new StdOutWrapper();
         return $transport;