Some Horde_Log conversion fixes/omissions

diff --git a/ansel/lib/Image.php b/ansel/lib/Image.php
index a56e531..b6735c5 100644 (file)
--- a/ansel/lib/Image.php
+++ b/ansel/lib/Image.php
@@ -897,7 +897,7 @@ class Ansel_Image Implements Iterator
             $this->load($view);
             return $this->_image->getDimensions();
         } catch (Horde_Exception $e) {
-            Horde::logMessage($e->getMessage(), __FILE__, __LINE__);
+            Horde::logMessage($e, 'INFO');
             throw new Ansel_Exception($e);
         }
     }

diff --git a/framework/Alarm/lib/Horde/Alarm/Sql.php b/framework/Alarm/lib/Horde/Alarm/Sql.php
index b84735b..14871ef 100644 (file)
--- a/framework/Alarm/lib/Horde/Alarm/Sql.php
+++ b/framework/Alarm/lib/Horde/Alarm/Sql.php
@@ -89,10 +89,16 @@ class Horde_Alarm_Sql extends Horde_Alarm
         $query = sprintf('SELECT alarm_id, alarm_uid, alarm_start, alarm_end, alarm_methods, alarm_params, alarm_title, alarm_text, alarm_snooze, alarm_internal FROM %s WHERE alarm_id = ? AND %s',
                          $this->_params['table'],
                          !empty($user) ? 'alarm_uid = ?' : '(alarm_uid = ? OR alarm_uid IS NULL)');
-        Horde::logMessage('SQL query by Horde_Alarm_sql::_get(): ' . $query, 'DEBUG');
+
+        if ($this->_logger) {
+            $this->_logger->log('SQL query by Horde_Alarm_sql::_get(): ' . $query, 'DEBUG');
+        }
+
         $alarm = $this->_db->getRow($query, array($id, $user), DB_FETCHMODE_ASSOC);
         if ($alarm instanceof PEAR_Error) {
-            Horde::logMessage($alarm, __FILE__, __LINE__);
+            if ($this->_logger) {
+                $this->_logger->log($alarm, 'INFO');
+            }
             throw new Horde_Alarm_Exception($alarm);
         }
 
@@ -123,18 +129,25 @@ class Horde_Alarm_Sql extends Horde_Alarm
             $values[] = '';
             $values[] = (string)$user;
         }
-        Horde::logMessage('SQL query by Horde_Alarm_sql::_list(): ' . $query, 'DEBUG');
+
+        if ($this->_logger) {
+            $this->_logger->log('SQL query by Horde_Alarm_sql::_list(): ' . $query, 'DEBUG');
+        }
 
         $alarms = array();
         $result = $this->_db->query($query, $values);
         if ($result instanceof PEAR_Error) {
-            Horde::logMessage($result, __FILE__, __LINE__);
+            if ($this->_logger) {
+                $this->_logger->log($result, 'INFO');
+            }
             throw new Horde_Alarm_Exception($result);
         }
 
         while ($alarm = $result->fetchRow(DB_FETCHMODE_ASSOC)) {
             if ($alarm instanceof PEAR_Error) {
-                Horde::logMessage($alarm, __FILE__, __LINE__);
+                if ($this->_logger) {
+                    $this->_logger->log($alarm, 'INFO');
+                }
                 throw new Horde_Alarm_Exception($alarm);
             }
 
@@ -181,11 +194,15 @@ class Horde_Alarm_Sql extends Horde_Alarm
             empty($alarm['text']) ? null : $this->_toDriver($alarm['text']),
             null
         );
-        Horde::logMessage('SQL query by Horde_Alarm_sql::_add(): ' . $query, 'DEBUG');
+        if ($this->_logger) {
+            $this->_logger->log('SQL query by Horde_Alarm_sql::_add(): ' . $query, 'DEBUG');
+        }
 
         $result = $this->_write_db->query($query, $values);
         if ($result instanceof PEAR_Error) {
-            Horde::logMessage($result, __FILE__, __LINE__);
+            if ($this->_logger) {
+                $this->_logger->log($result, 'INFO');
+            }
             throw new Horde_Alarm_Exception($result);
         }
 
@@ -212,11 +229,16 @@ class Horde_Alarm_Sql extends Horde_Alarm
                               : $this->_toDriver($alarm['text']),
                         $alarm['id'],
                         isset($alarm['user']) ? $alarm['user'] : '');
-        Horde::logMessage('SQL query by Horde_Alarm_sql::_update(): ' . $query, 'DEBUG');
+
+        if ($this->_logger) {
+            $this->_logger->log('SQL query by Horde_Alarm_sql::_update(): ' . $query, 'DEBUG');
+        }
 
         $result = $this->_write_db->query($query, $values);
         if ($result instanceof PEAR_Error) {
-            Horde::logMessage($result, __FILE__, __LINE__);
+            if ($this->_logger) {
+                $this->_logger->log($result, 'INFO');
+            }
             throw new Horde_Alarm_Exception($result);
         }
 
@@ -237,11 +259,16 @@ class Horde_Alarm_Sql extends Horde_Alarm
                          $this->_params['table'],
                          !empty($user) ? 'alarm_uid = ?' : '(alarm_uid = ? OR alarm_uid IS NULL)');
         $values = array(serialize($internal), $id, $user);
-        Horde::logMessage('SQL query by Horde_Alarm_sql::_internal(): ' . $query, 'DEBUG');
+
+        if ($this->_logger) {
+            $this->_logger->log('SQL query by Horde_Alarm_sql::_internal(): ' . $query, 'DEBUG');
+        }
 
         $result = $this->_write_db->query($query, $values);
         if ($result instanceof PEAR_Error) {
-            Horde::logMessage($result, __FILE__, __LINE__);
+            if ($this->_logger) {
+                $this->_logger->log($result, 'INFO');
+            }
             throw new Horde_Alarm_Exception($result);
         }
 
@@ -261,11 +288,16 @@ class Horde_Alarm_Sql extends Horde_Alarm
         $query = sprintf('SELECT 1 FROM %s WHERE alarm_id = ? AND %s',
                          $this->_params['table'],
                          !empty($user) ? 'alarm_uid = ?' : '(alarm_uid = ? OR alarm_uid IS NULL)');
-        Horde::logMessage('SQL query by Horde_Alarm_sql::_exists(): ' . $query, 'DEBUG');
+
+        if ($this->_logger) {
+            $this->_logger->log('SQL query by Horde_Alarm_sql::_exists(): ' . $query, 'DEBUG');
+        }
 
         $result = $this->_db->getOne($query, array($id, $user));
         if ($result instanceof PEAR_Error) {
-            Horde::logMessage($result, __FILE__, __LINE__);
+            if ($this->_logger) {
+                $this->_logger->log($result, 'INFO');
+            }
             throw new Horde_Alarm_Exception($result);
         }
 
@@ -285,11 +317,16 @@ class Horde_Alarm_Sql extends Horde_Alarm
                          $this->_params['table'],
                          !empty($user) ? 'alarm_uid = ?' : '(alarm_uid = ? OR alarm_uid IS NULL)');
         $values = array((string)$snooze->setTimezone('UTC'), $id, $user);
-        Horde::logMessage('SQL query by Horde_Alarm_sql::_snooze(): ' . $query, 'DEBUG');
+
+        if ($this->_logger) {
+            $this->_logger->log('SQL query by Horde_Alarm_sql::_snooze(): ' . $query, 'DEBUG');
+        }
 
         $result = $this->_write_db->query($query, $values);
         if ($result instanceof PEAR_Error) {
-            Horde::logMessage($result, __FILE__, __LINE__);
+            if ($this->_logger) {
+                $this->_logger->log($result, 'INFO');
+            }
             throw new Horde_Alarm_Exception($result);
         }
 
@@ -308,11 +345,16 @@ class Horde_Alarm_Sql extends Horde_Alarm
                          $this->_params['table'],
                          !empty($user) ? 'alarm_uid = ?' : '(alarm_uid = ? OR alarm_uid IS NULL)');
         $values = array($id, $user);
-        Horde::logMessage('SQL query by Horde_Alarm_sql::_dismiss(): ' . $query, 'DEBUG');
+
+        if ($this->_logger) {
+            $this->_logger->log('SQL query by Horde_Alarm_sql::_dismiss(): ' . $query, 'DEBUG');
+        }
 
         $result = $this->_write_db->query($query, $values);
         if ($result instanceof PEAR_Error) {
-            Horde::logMessage($result, __FILE__, __LINE__);
+            if ($this->_logger) {
+                $this->_logger->log($result, 'INFO');
+            }
             throw new Horde_Alarm_Exception($result);
         }
 
@@ -333,11 +375,16 @@ class Horde_Alarm_Sql extends Horde_Alarm
         $query = sprintf('SELECT 1 FROM %s WHERE alarm_id = ? AND %s AND (alarm_dismissed = 1 OR (alarm_snooze IS NOT NULL AND alarm_snooze >= ?))',
                          $this->_params['table'],
                          !empty($user) ? 'alarm_uid = ?' : '(alarm_uid = ? OR alarm_uid IS NULL)');
-        Horde::logMessage('SQL query by Horde_Alarm_sql::_isSnoozed(): ' . $query, 'DEBUG');
+
+        if ($this->_logger) {
+            $this->_logger->log('SQL query by Horde_Alarm_sql::_isSnoozed(): ' . $query, 'DEBUG');
+        }
 
         $result = $this->_db->getOne($query, array($id, $user, (string)$time->setTimezone('UTC')));
         if ($result instanceof PEAR_Error) {
-            Horde::logMessage($result, __FILE__, __LINE__);
+            if ($this->_logger) {
+                $this->_logger->log($result, 'INFO');
+            }
             throw new Horde_Alarm_Exception($result);
         }
 
@@ -360,11 +407,16 @@ class Horde_Alarm_Sql extends Horde_Alarm
                 : ' AND alarm_uid = ?';
             $values[] = $user;
         }
-        Horde::logMessage('SQL query by Horde_Alarm_sql::_delete(): ' . $query, 'DEBUG');
+
+        if ($this->_logger) {
+            $this->_logger->log('SQL query by Horde_Alarm_sql::_delete(): ' . $query, 'DEBUG');
+        }
 
         $result = $this->_write_db->query($query, $values);
         if ($result instanceof PEAR_Error) {
-            Horde::logMessage($result, __FILE__, __LINE__);
+            if ($this->_logger) {
+                $this->_logger->log($result, 'INFO');
+            }
             throw new Horde_Alarm_Exception($result);
         }
 
@@ -377,12 +429,18 @@ class Horde_Alarm_Sql extends Horde_Alarm
     protected function _gc()
     {
         $query = sprintf('DELETE FROM %s WHERE alarm_end IS NOT NULL AND alarm_end < ?', $this->_params['table']);
-        Horde::logMessage('SQL query by Horde_Alarm_sql::_gc(): ' . $query, 'DEBUG');
+
+        if ($this->_logger) {
+            $this->_logger->log('SQL query by Horde_Alarm_sql::_gc(): ' . $query, 'DEBUG');
+        }
+
         $end = new Horde_Date(time());
 
         $result = $this->_write_db->query($query, (string)$end->setTimezone('UTC'));
         if ($result instanceof PEAR_Error) {
-            Horde::logMessage($result, __FILE__, __LINE__);
+            if ($this->_logger) {
+                $this->_logger->log($result, 'INFO');
+            }
             throw new Horde_Alarm_Exception($result);
         }
 
@@ -409,7 +467,9 @@ class Horde_Alarm_Sql extends Horde_Alarm
                                        array('persistent' => !empty($this->_params['persistent']),
                                              'ssl' => !empty($this->_params['ssl'])));
         if ($this->_write_db instanceof PEAR_Error) {
-            Horde::logMessage($this->_write_db, __FILE__, __LINE__);
+            if ($this->_logger) {
+                $this->_logger->log($this->_write_db, 'INFO');
+            }
             throw new Horde_Alarm_Exception($this->_write_db);
         }
         $this->_initConn($this->_write_db);
@@ -421,7 +481,9 @@ class Horde_Alarm_Sql extends Horde_Alarm
                                      array('persistent' => !empty($params['persistent']),
                                            'ssl' => !empty($params['ssl'])));
             if ($this->_db instanceof PEAR_Error) {
-                Horde::logMessage($this->_db, __FILE__, __LINE__);
+                if ($this->_logger) {
+                    $this->_logger->log($this->_db, 'INFO');
+                }
                 throw new Horde_Alarm_Exception($this->_db);
             }
             $this->_initConn($this->_db);
@@ -451,8 +513,9 @@ class Horde_Alarm_Sql extends Horde_Alarm
         case 'oci8':
             $query = "ALTER SESSION SET NLS_DATE_FORMAT = 'YYYY-MM-DD HH24:MI:SS'";
 
-            /* Log the query at a DEBUG log level. */
-            Horde::logMessage(sprintf('SQL connection setup for Alarms, query = "%s"', $query), 'DEBUG');
+            if ($this->_logger) {
+                $this->_logger->log(sprintf('SQL connection setup for Alarms, query = "%s"', $query), 'DEBUG');
+            }
 
             $db->query($query);
             break;
@@ -460,8 +523,9 @@ class Horde_Alarm_Sql extends Horde_Alarm
         case 'pgsql':
             $query = "SET datestyle TO 'iso'";
 
-            /* Log the query at a DEBUG log level. */
-            Horde::logMessage(sprintf('SQL connection setup for Alarms, query = "%s"', $query), 'DEBUG');
+            if ($this->_logger) {
+                $this->_logger->log(sprintf('SQL connection setup for Alarms, query = "%s"', $query), 'DEBUG');
+            }
 
             $db->query($query);
             break;

diff --git a/framework/Auth/lib/Horde/Auth/Customsql.php b/framework/Auth/lib/Horde/Auth/Customsql.php
index cb3a208..abd66e3 100644 (file)
--- a/framework/Auth/lib/Horde/Auth/Customsql.php
+++ b/framework/Auth/lib/Horde/Auth/Customsql.php
@@ -288,7 +288,7 @@ class Horde_Auth_Customsql extends Horde_Auth_Sql
         $query = str_replace('\L', $this->_db->quote($userId), $query);
         $pw = $this->_db->getOne($query);
         if ($pw instanceof PEAR_Error) {
-            Horde::logMessage($pw, __FILE__, __LINE__, 'ERR');
+            Horde::logMessage($pw, 'ERR');
             return '';
         }
 

diff --git a/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Cache.php b/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Cache.php
index 1115b57..8d135da 100644 (file)
--- a/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Cache.php
+++ b/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Cache.php
@@ -73,9 +73,7 @@ class Horde_Kolab_FreeBusy_Cache {
                 }
             }
         } catch (Horde_Kolab_Server_Exception $e) {
-            Horde::logMessage(sprintf("Failed fetching the k=kolab configuration object. Error was: %s",
-                                      $e->getMessage()),
-                              __FILE__, __LINE__, PEAR_LOG_ERR);
+            Horde::logMessage(sprintf("Failed fetching the k=kolab configuration object. Error was: %s", $e->getMessage()), 'ERR');
             if (isset($conf['kolab']['freebusy']['past'])) {
                 $fbpast = $conf['kolab']['freebusy']['past'];
             } else {
@@ -110,9 +108,7 @@ class Horde_Kolab_FreeBusy_Cache {
 
         /* missing data means delete the cache files */
         if (empty($vCal)) {
-            Horde::logMessage(sprintf("No events. Purging cache %s.",
-                                      $fbfilename),
-                              __FILE__, __LINE__, PEAR_LOG_DEBUG);
+            Horde::logMessage(sprintf("No events. Purging cache %s.", $fbfilename), 'DEBUG');
 
             $result = $c_pvcal->purge();
             if (is_a($result, 'PEAR_Error')) {
@@ -181,9 +177,7 @@ class Horde_Kolab_FreeBusy_Cache {
                 $acl = null;
             }
 
-            Horde::logMessage(sprintf("Horde_Kolab_FreeBusy_Cache::store(file=%s, relevance=%s, acl=%s, xacl=%s)",
-                                      $fbfilename, $relevance, $acl, $xacl),
-                              __FILE__, __LINE__, PEAR_LOG_DEBUG);
+            Horde::logMessage(sprintf("Horde_Kolab_FreeBusy_Cache::store(file=%s, relevance=%s, acl=%s, xacl=%s)", $fbfilename, $relevance, $acl, $xacl), 'DEBUG');
         }
         return true;
     }
@@ -235,8 +229,7 @@ class Horde_Kolab_FreeBusy_Cache {
     function _allowExtended($file, &$access)
     {
         if (!isset($access->user_object)) {
-            Horde::logMessage(sprintf("Extended attributes on folder %s disallowed for unknown user.",
-                                      $access->folder, $access->user), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+            Horde::logMessage(sprintf("Extended attributes on folder %s disallowed for unknown user.", $access->folder, $access->user), 'DEBUG');
             return false;
         }
 
@@ -256,8 +249,7 @@ class Horde_Kolab_FreeBusy_Cache {
                 return true;
             }
         }
-        Horde::logMessage(sprintf("Extended attributes on folder %s disallowed for user %s.",
-                                  $access->folder, $access->user), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+        Horde::logMessage(sprintf("Extended attributes on folder %s disallowed for user %s.", $access->folder, $access->user), 'DEBUG');
         return false;
     }
 
@@ -302,7 +294,7 @@ class Horde_Kolab_FreeBusy_Cache {
                 $message = sprintf("Unable to read free/busy information from %s",
                                    'https://' . urlencode($access->user) . ':XXX'
                                    . '@' . $server . $_SERVER['REQUEST_URI']);
-                Horde::logMessage($message, __FILE__, __LINE__, PEAR_LOG_INFO);
+                Horde::logMessage($message, 'INFO');
             }
 
             $rvCal = new Horde_iCalendar();
@@ -313,7 +305,7 @@ class Horde_Kolab_FreeBusy_Cache {
                                    'https://' . urlencode($access->user) . ':XXX'
                                    . '@' . $server . $_SERVER['REQUEST_URI'],
                                    $result->getMessage());
-                Horde::logMessage($message, __FILE__, __LINE__, PEAR_LOG_INFO);
+                Horde::logMessage($message, 'INFO');
             }
 
             $rvFb = &$rvCal->findComponent('vfreebusy');
@@ -321,7 +313,7 @@ class Horde_Kolab_FreeBusy_Cache {
                 $message = sprintf("Unable to find free/busy information in data from %s.",
                                    'https://' . urlencode($access->user) . ':XXX'
                                    . '@' . $server . $_SERVER['REQUEST_URI']);
-                Horde::logMessage($message, __FILE__, __LINE__, PEAR_LOG_INFO);
+                Horde::logMessage($message, 'INFO');
             }
             if ($ets = $rvFb->getAttributeDefault('DTEND', false) !== false) {
                 // PENDING(steffen): Make value configurable
@@ -329,7 +321,7 @@ class Horde_Kolab_FreeBusy_Cache {
                     $message = sprintf("free/busy information from %s is too old.",
                                        'https://' . urlencode($access->user) . ':XXX'
                                        . '@' . $server . $_SERVER['REQUEST_URI']);
-                    Horde::logMessage($message, __FILE__, __LINE__, PEAR_LOG_INFO);
+                    Horde::logMessage($message, 'INFO');
                 }
             }
             if (!empty($vFb)) {

diff --git a/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/View.php b/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/View.php
index 3d1838e..85cc25c 100644 (file)
--- a/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/View.php
+++ b/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/View.php
@@ -273,7 +273,7 @@ class Horde_Kolab_FreeBusy_View_error extends Horde_Kolab_FreeBusy_View {
         echo "<p>" . $body . "</p>\n";
         if (!empty($error)) {
             echo "<hr><pre>" . $error->getMessage() . "</pre>\n";
-            Horde::logMessage($error, __FILE__, __LINE__, PEAR_LOG_ERR);
+            Horde::logMessage($error, 'ERR');
         }
         echo "<hr>\n";
         echo isset($_SERVER['SERVER_SIGNATURE'])?$_SERVER['SERVER_SIGNATURE']:'' . "\n";

diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Permission.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Permission.php
index 200543a..2fc3b75 100644 (file)
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Permission.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Permission.php
@@ -74,8 +74,7 @@ class Horde_Kolab_Storage_Permission extends Horde_Perms_Permission
         if (!isset($perms)) {
             $result = $this->getPerm();
             if ($result instanceOf PEAR_Error) {
-                Horde::logMessage(sprintf("Failed parsing permission information. Error was: %s",
-                                          $result->getMessage()), __FILE__, __LINE__);
+                Horde::logMessage(sprintf("Failed parsing permission information. Error was: %s", $result->getMessage()), 'INFO');
             } else {
                 $perms = $result;
             }
@@ -139,7 +138,7 @@ class Horde_Kolab_Storage_Permission extends Horde_Perms_Permission
         try {
             $acl = $this->_folder->getACL();
         } catch (Horde_Kolab_Storage_Exception $e) {
-            Horde::logMessage($acl, __FILE__, __LINE__);
+            Horde::logMessage($acl, 'INFO');
             return array();
         }
         if (empty($acl)) {

diff --git a/horde/lib/LoginTasks/SystemTask/GarbageCollection.php b/horde/lib/LoginTasks/SystemTask/GarbageCollection.php
index a58bdb0..f90af08 100644 (file)
--- a/horde/lib/LoginTasks/SystemTask/GarbageCollection.php
+++ b/horde/lib/LoginTasks/SystemTask/GarbageCollection.php
@@ -73,7 +73,7 @@ class Horde_LoginTasks_SystemTask_GarbageCollection extends Horde_LoginTasks_Sys
             }
         }
 
-        Horde::logMessage('Cleaned out static files for ' . $type, __FILE__, __LINE__, 'DEBUG');
+        Horde::logMessage('Cleaned out static files for ' . $type, 'DEBUG');
     }
 
 }

diff --git a/imp/lib/Crypt/Pgp.php b/imp/lib/Crypt/Pgp.php
index 83a207a..7879364 100644 (file)
--- a/imp/lib/Crypt/Pgp.php
+++ b/imp/lib/Crypt/Pgp.php
@@ -603,7 +603,7 @@ class IMP_Crypt_Pgp extends Horde_Crypt_Pgp
         try {
             $key_info = $this->pgpPrettyKey($key);
         } catch (Horde_Exception $e) {
-            Horde::logMessage($e, __FILE__, __LINE__);
+            Horde::logMessage($e, 'INFO');
             $key_info = $e->getMessage();
         }
 

diff --git a/imp/lib/Mime/Viewer/Pgp.php b/imp/lib/Mime/Viewer/Pgp.php
index 81e360a..28edf68 100644 (file)
--- a/imp/lib/Mime/Viewer/Pgp.php
+++ b/imp/lib/Mime/Viewer/Pgp.php
@@ -229,7 +229,7 @@ class IMP_Horde_Mime_Viewer_Pgp extends Horde_Mime_Viewer_Driver
                 }
             }
         } catch (Horde_Exception $e) {
-            Horde::logMessage($e, __FILE__, __LINE__);
+            Horde::logMessage($e, 'INFO');
             return null;
         }
 
@@ -237,7 +237,7 @@ class IMP_Horde_Mime_Viewer_Pgp extends Horde_Mime_Viewer_Driver
         try {
             $info = $this->_imppgp->pgpPacketInformation($encrypted_data);
         } catch (Horde_Exception $e) {
-            Horde::logMessage($e, __FILE__, __LINE__);
+            Horde::logMessage($e, 'INFO');
             return null;
         }
 

diff --git a/ingo/lib/Storage/Sql.php b/ingo/lib/Storage/Sql.php
index 8a1ffc5..4ef3e4b 100644 (file)
--- a/ingo/lib/Storage/Sql.php
+++ b/ingo/lib/Storage/Sql.php
@@ -376,7 +376,7 @@ class Ingo_Storage_Sql extends Ingo_Storage
         }
 
         if (is_a($ret, 'PEAR_Error')) {
-            Horde::logMessage($ret, __FILE__, __LINE__);
+            Horde::logMessage($ret, 'INFO');
         }
 
         return $ret;

diff --git a/shout/lib/Ajax/Application.php b/shout/lib/Ajax/Application.php
index 9fe31af..5151d1b 100644 (file)
--- a/shout/lib/Ajax/Application.php
+++ b/shout/lib/Ajax/Application.php
@@ -207,7 +207,7 @@ class Shout_Ajax_Application extends Horde_Ajax_Application_Base
             return Shout::getRecordings($_SESSION['shout']['curaccount']);
         } catch (Exception $e) {
             //FIXME: Create a way to notify the user of the failure.
-            Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR);
+            Horde::logMessage($e->getMessage(), 'ERR');
             return false;
         }
     }

diff --git a/whups/lib/Api.php b/whups/lib/Api.php
index b57867e..1bb90f6 100644 (file)
--- a/whups/lib/Api.php
+++ b/whups/lib/Api.php
@@ -35,7 +35,7 @@ class Whups_Api extends Horde_Registry_Api
                                                  'queue', Horde_Perms::READ))));
         } else {
             $path = explode('/', $path);
-            Horde::logMessage(var_export($path, true), __FILE__, __LINE__);
+            Horde::logMessage(var_export($path, true), 'INFO');
             $results = array();
 
             switch ($path[0]) {