From 240ff73e2a3bcfe5e5649e5d9153d87b25471d36 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Fri, 19 Feb 2010 00:58:58 -0700 Subject: [PATCH] Use Horde_Log instead of PEAR's Log. Initiali implementation handles only file, stream, and syslog drivers. (Yes, I know that file is just a subset of stream, but 95% of those installing IMP won't know that, and logging to file is far and away the most popular choice). No support for custom log timestamps/format either. --- agora/lib/Api.php | 6 +- agora/lib/Messages.php | 24 +- agora/lib/Messages/split_sql.php | 4 +- agora/lib/Messages/sql.php | 4 +- agora/scripts/phorum2agora.php | 2 +- ansel/faces/image.php | 2 +- ansel/faces/img.php | 2 +- ansel/gallery.php | 4 +- ansel/image.php | 2 +- ansel/img/mini.php | 2 +- ansel/img/prettythumb.php | 2 +- ansel/img/screen.php | 2 +- ansel/img/thumb.php | 2 +- ansel/lib/Ajax/Imple/LocationAutoCompleter.php | 4 +- ansel/lib/Ansel.php | 2 +- ansel/lib/Api.php | 4 +- ansel/lib/Faces/Base.php | 3 +- ansel/lib/Faces/opencv.php | 3 +- ansel/lib/Gallery.php | 9 +- ansel/lib/GalleryMode/Date.php | 2 +- ansel/lib/GalleryMode/Normal.php | 5 +- ansel/lib/Image.php | 12 +- ansel/lib/ImageView.php | 8 +- ansel/lib/Storage.php | 28 +- ansel/lib/Tags.php | 17 +- ansel/lib/View/EmbeddedRenderer/GalleryLink.php | 2 +- ansel/lib/View/EmbeddedRenderer/Mini.php | 2 +- ansel/lib/View/Image.php | 6 +- ansel/lib/Widget/OtherGalleries.php | 2 +- ansel/perms.php | 2 +- ansel/preview.php | 4 +- ansel/scripts/ansel.php | 38 +- ansel/xppublish.php | 4 +- beatnik/lib/Driver/pdnsgsql.php | 30 +- beatnik/scripts/export_config.php | 26 +- crumb/addclient.php | 2 +- crumb/lib/Driver/sql.php | 2 +- crumb/lib/Forms/AddClient.php | 4 +- fima/lib/Driver/sql.php | 143 +++---- fima/lib/Fima.php | 2 +- folks/perms.php | 4 +- folks/scripts/mail.php | 6 +- .../Ajax/lib/Horde/Ajax/Imple/SpellChecker.php | 4 +- framework/Alarm/lib/Horde/Alarm.php | 6 +- framework/Alarm/lib/Horde/Alarm/Sql.php | 39 +- framework/Alarm/test/Horde/Alarm/setup.inc.dist | 2 +- framework/Auth/lib/Horde/Auth.php | 2 +- framework/Auth/lib/Horde/Auth/Customsql.php | 2 +- framework/Auth/lib/Horde/Auth/Cyrsql.php | 18 +- framework/Auth/lib/Horde/Auth/Kolab.php | 2 +- framework/Auth/lib/Horde/Auth/Ldap.php | 10 +- framework/Auth/lib/Horde/Auth/Passwd.php | 2 +- framework/Auth/lib/Horde/Auth/Signup/Sql.php | 23 +- framework/Auth/lib/Horde/Auth/Sql.php | 20 +- .../Auth/test/Horde/Auth/Kolab/Class/KolabTest.php | 7 +- .../test/Horde/Auth/Kolab/Integration/AuthTest.php | 7 +- framework/Cache/lib/Horde/Cache/Sql.php | 30 +- framework/Core/lib/Horde.php | 143 +------ framework/Core/lib/Horde/Core/Binder/Logger.php | 30 +- framework/Core/lib/Horde/Core/Log/Logger.php | 122 ++++++ framework/Core/lib/Horde/Registry.php | 16 +- framework/Core/package.xml | 9 +- framework/DataTree/DataTree/sql.php | 88 ++--- framework/Form/Form.php | 2 +- framework/Group/Group.php | 4 +- framework/Group/Group/contactlists.php | 6 +- framework/Group/Group/ldap.php | 2 +- framework/Group/Group/sql.php | 2 +- framework/History/lib/Horde/History/Sql.php | 2 +- .../Kolab_Filter/lib/Horde/Kolab/Filter/Base.php | 25 +- .../lib/Horde/Kolab/Filter/Content.php | 29 +- .../lib/Horde/Kolab/Filter/Incoming.php | 18 +- .../lib/Horde/Kolab/Filter/Outlook.php | 9 +- .../lib/Horde/Kolab/Filter/Response.php | 2 +- .../Horde/Kolab/Filter/Transport/DovecotLDA.php | 9 +- .../Kolab_Filter/lib/Horde/Kolab/Resource.php | 138 +++---- .../lib/Horde/Kolab/Resource/Freebusy/Kolab.php | 5 +- .../Kolab_Storage/lib/Horde/Kolab/Storage.php | 2 +- .../Kolab_Storage/lib/Horde/Kolab/Storage/Data.php | 11 +- .../lib/Horde/Kolab/Storage/Folder.php | 39 +- framework/Lock/lib/Horde/Lock/Sql.php | 48 +-- framework/Memcache/lib/Horde/Memcache.php | 2 +- .../Notification/Handler/Decorator/Hordelog.php | 2 +- framework/Perms/lib/Horde/Perms.php | 2 +- framework/Prefs/lib/Horde/Prefs.php | 2 +- framework/Prefs/lib/Horde/Prefs/File.php | 4 +- framework/Prefs/lib/Horde/Prefs/Imsp.php | 6 +- framework/Prefs/lib/Horde/Prefs/KolabImap.php | 10 +- framework/Prefs/lib/Horde/Prefs/Ldap.php | 57 +-- framework/Prefs/lib/Horde/Prefs/Sql.php | 20 +- framework/Rpc/lib/Horde/Rpc/Phpgw.php | 6 +- framework/Rpc/lib/Horde/Rpc/Soap.php | 3 +- framework/Rpc/lib/Horde/Rpc/Syncml.php | 2 +- framework/Rpc/lib/Horde/Rpc/Webdav.php | 36 +- framework/SQL/SQL.php | 6 +- framework/Scheduler/lib/Horde/Scheduler.php | 4 +- framework/Scheduler/lib/Horde/Scheduler/Cron.php | 2 +- .../SessionHandler/lib/Horde/SessionHandler.php | 6 +- .../lib/Horde/SessionHandler/Memcache.php | 12 +- .../lib/Horde/SessionHandler/Mysql.php | 16 +- .../lib/Horde/SessionHandler/None.php | 2 +- .../lib/Horde/SessionHandler/Oci8.php | 16 +- .../lib/Horde/SessionHandler/Pgsql.php | 16 +- .../lib/Horde/SessionHandler/Sql.php | 26 +- framework/Share/Share.php | 14 +- framework/Share/Share/sql.php | 78 ++-- framework/Share/Share/sql_hierarchical.php | 19 +- framework/SyncML/SyncML.php | 32 +- framework/SyncML/SyncML/Backend.php | 82 ++-- framework/SyncML/SyncML/Backend/Horde.php | 132 +++---- framework/SyncML/SyncML/Backend/Sql.php | 27 +- framework/SyncML/SyncML/Command.php | 3 +- framework/SyncML/SyncML/Command/Alert.php | 18 +- framework/SyncML/SyncML/Command/Final.php | 3 +- framework/SyncML/SyncML/Command/Map.php | 3 +- framework/SyncML/SyncML/Command/Sync.php | 3 +- framework/SyncML/SyncML/Command/SyncHdr.php | 6 +- framework/SyncML/SyncML/Device.php | 6 +- framework/SyncML/SyncML/Device/Sync4j.php | 6 +- framework/SyncML/SyncML/Sync.php | 82 ++-- framework/SyncML/tests/sif.phpt | 1 - framework/SyncML/tests/testpacket.php | 6 +- framework/SyncML/tests/testsync.php | 2 +- framework/Template/lib/Horde/Template.php | 2 +- framework/Token/lib/Horde/Token/Sql.php | 6 +- framework/Util/lib/Horde/String.php | 2 +- framework/Util/lib/Horde/Util.php | 2 +- gollem/lib/Auth.php | 9 +- gollem/view.php | 4 +- horde/admin/groups.php | 4 +- horde/admin/signup_confirm.php | 2 +- horde/config/conf.xml | 115 +----- horde/docs/INSTALL | 7 +- horde/lib/Api.php | 12 +- horde/lib/Block/metar.php | 6 +- horde/lib/Block/twitter.php | 12 +- horde/lib/Block/weatherdotcom.php | 6 +- .../LoginTasks/SystemTask/GarbageCollection.php | 2 +- horde/lib/Test.php | 17 - horde/lib/core.php | 3 - horde/login.php | 6 +- horde/services/ajax.php | 2 +- horde/services/images/view.php | 4 +- horde/services/portal/sidebar.php | 4 +- horde/services/prefs.php | 2 +- horde/services/problem.php | 2 +- horde/services/resetpassword.php | 2 +- horde/services/shares/edit.php | 4 +- horde/services/twitterapi.php | 4 +- horde/signup.php | 2 +- hylax/lib/Image.php | 10 +- hylax/lib/SQL/Attributes.php | 10 +- hylax/lib/Storage.php | 6 +- hylax/lib/Storage/sql.php | 42 +- hylax/scripts/fax_create.php | 2 +- hylax/scripts/fax_save_data.php | 2 +- hylax/scripts/fax_save_recv_data.php | 4 +- imp/attachment.php | 6 +- imp/compose.php | 2 +- imp/lib/Auth.php | 19 +- imp/lib/Compose.php | 12 +- imp/lib/Crypt/Pgp.php | 4 +- imp/lib/IMP.php | 2 +- imp/lib/Imap.php | 6 +- imp/lib/Maillog.php | 2 +- imp/lib/Quota/Hook.php | 2 +- imp/lib/Quota/Sql.php | 4 +- imp/lib/Sentmail/Sql.php | 20 +- imp/lib/Spam.php | 6 +- imp/lib/Ui/Compose.php | 2 +- ingo/lib/Application.php | 10 +- ingo/lib/Driver/Timsieved.php | 2 +- ingo/lib/Ingo.php | 2 +- ingo/lib/Storage/Filters/Sql.php | 29 +- ingo/lib/Storage/Sql.php | 35 +- ingo/scripts/ingo-postfix-policyd | 8 +- koward/lib/Koward.php | 2 +- koward/lib/Koward/Controller/Application.php | 3 +- koward/lib/Koward/Controller/IndexController.php | 8 +- koward/www/horde/config/conf.php.dist | 2 +- koward/www/htdocs/koward/koward.php | 2 +- kronolith/fb.php | 2 +- kronolith/feed/index.php | 2 +- kronolith/lib/Ajax/Imple/ContactAutoCompleter.php | 2 +- kronolith/lib/Application.php | 6 +- kronolith/lib/Driver/Holidays.php | 9 +- kronolith/lib/Driver/Ical.php | 8 +- kronolith/lib/Driver/Kolab.php | 2 +- kronolith/lib/Driver/Sql.php | 46 +-- kronolith/lib/Geo/Mysql.php | 8 +- kronolith/lib/Geo/Sql.php | 10 +- kronolith/lib/Kronolith.php | 10 +- kronolith/lib/LoginTasks/Task/PurgeEvents.php | 2 +- kronolith/lib/Storage/sql.php | 8 +- kronolith/perms.php | 4 +- kronolith/scripts/agenda.php | 3 +- nag/lib/Application.php | 8 +- nag/lib/Driver.php | 6 +- nag/lib/Driver/Sql.php | 41 +- nag/lib/Nag.php | 11 +- news/lib/Categories.php | 8 +- news/lib/Driver/sql.php | 4 +- news/pdf.php | 2 +- operator/lib/Driver/asterisksql.php | 32 +- operator/viewgraph.php | 2 +- shout/lib/Ajax/Application.php | 16 +- shout/lib/Driver/Ldap.php | 38 +- shout/lib/Driver/Sql.php | 24 +- skeleton/lib/Driver/Sql.php | 2 +- skoli/lib/Driver/sql.php | 82 ++-- skoli/lib/Skoli.php | 2 +- turba/lib/Application.php | 8 +- turba/lib/Driver/Facebook.php | 4 +- turba/lib/Driver/Imsp.php | 4 +- turba/lib/Driver/Kolab.php | 9 +- turba/lib/Driver/Ldap.php | 3 +- turba/lib/Driver/Sql.php | 33 +- turba/lib/Forms/AddContact.php | 4 +- turba/lib/Forms/EditContact.php | 2 +- turba/lib/Turba.php | 6 +- turba/lib/View/Contact.php | 2 +- turba/view.php | 2 +- vilma/domains/delete.php | 2 +- vilma/domains/edit.php | 2 +- vilma/lib/Driver.php | 10 +- vilma/lib/Driver/qmailldap.php | 164 ++++---- vilma/lib/Driver/sql.php | 32 +- vilma/users/delete.php | 6 +- vilma/users/edit.php | 2 +- vilma/users/editAlias.php | 18 +- vilma/users/editForward.php | 18 +- vilma/virtuals/delete.php | 2 +- vilma/virtuals/edit.php | 2 +- whups/lib/Ajax/Imple/ContactAutoCompleter.php | 2 +- whups/lib/Driver.php | 4 +- whups/lib/Driver/sql.php | 439 ++++++++------------- whups/lib/Forms/EditTicket.php | 2 +- whups/lib/Mail.php | 3 +- whups/lib/Ticket.php | 2 +- whups/lib/Whups.php | 2 +- whups/ticket/create.php | 2 +- wicked/lib/Driver/sql.php | 94 ++--- wicked/lib/Page/AttachedFiles.php | 2 +- wicked/scripts/wicked.php | 6 +- 244 files changed, 1720 insertions(+), 2232 deletions(-) create mode 100644 framework/Core/lib/Horde/Core/Log/Logger.php diff --git a/agora/lib/Api.php b/agora/lib/Api.php index 88070cbef..efafe4e8e 100644 --- a/agora/lib/Api.php +++ b/agora/lib/Api.php @@ -86,14 +86,14 @@ class Agora_Api extends Horde_Registry_Api $forums = &Agora_Messages::singleton($scope); $id = $forums->getForumId($forum_name); if ($id instanceof PEAR_Error) { - Horde::logMessage($id, __LINE__, __FILE__, PEAR_LOG_ERR); + Horde::logMessage($id, 'ERR'); return false; } $forums = &Agora_Messages::singleton($scope, $id); $result = $forums->deleteForum($id); if ($result instanceof PEAR_Error) { - Horde::logMessage($result, __LINE__, __FILE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return false; } return true; @@ -253,7 +253,7 @@ class Agora_Api extends Horde_Registry_Api if (($forum_id = $forums->getForumId($forum)) instanceof PEAR_Error) { // In case of error, just return zero but log the error - so // the calling app always gets an array with all the image ids. - Horde::logMessage($forum_id, __FILE__, __LINE__, 'PEAR_LOG_ERR'); + Horde::logMessage($forum_id, 'ERR'); $results[$forum] = 0; } elseif (empty($forum_id)) { $results[$forum] = 0; diff --git a/agora/lib/Messages.php b/agora/lib/Messages.php index 24baadfe4..33d31a8db 100644 --- a/agora/lib/Messages.php +++ b/agora/lib/Messages.php @@ -200,7 +200,7 @@ class Agora_Messages { $result = $statement->execute($params); $statement->free(); if ($result instanceof PEAR_Error) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -237,7 +237,7 @@ class Agora_Messages { $result = $statement->execute($params); $statement->free(); if ($result instanceof PEAR_Error) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -296,7 +296,7 @@ class Agora_Messages { $result = $statement->execute($file_data); $statement->free(); if ($result instanceof PEAR_Error) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } $attachments = 1; @@ -306,7 +306,7 @@ class Agora_Messages { . ' WHERE message_id = ' . (int)$info['message_id']; $result = $this->_write_db->query($sql); if ($result instanceof PEAR_Error) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } } @@ -511,7 +511,7 @@ class Agora_Messages { . $this->_threads_table . ' WHERE message_id = ?'; $message = $this->_db->getRow($sql, null, array($message_id)); if ($message instanceof PEAR_Error) { - Horde::logMessage($message, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($message, 'ERR'); return $message; } @@ -589,7 +589,7 @@ class Agora_Messages { $thread_id = $this->_db->getOne($sql, null, array($message_id)); if ($thread_id instanceof PEAR_Error) { - Horde::logMessage($thread_id, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($thread_id, 'ERR'); return $thread_id; } @@ -600,7 +600,7 @@ class Agora_Messages { $result = $this->_write_db->query($sql); if ($result instanceof PEAR_Error) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -745,7 +745,7 @@ class Agora_Messages { } $sql .= ', message_modifystamp = ' . $_SERVER['REQUEST_TIME'] . ' WHERE message_id = ' . (int)$thread_id; - Horde::logMessage('Query by Agora_Messages::_sequence(): ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Query by Agora_Messages::_sequence(): ' . $sql, 'DEBUG') return $this->_write_db->query($sql); } @@ -767,7 +767,7 @@ class Agora_Messages { $sql = 'DELETE FROM ' . $this->_threads_table . ' WHERE message_thread = ' . (int)$thread_id; $result = $this->_write_db->query($sql); if ($result instanceof PEAR_Error) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -784,7 +784,7 @@ class Agora_Messages { $sql = 'DELETE FROM ' . $this->_threads_table . ' WHERE forum_id = ' . (int)$this->_forum_id; $result = $this->_write_db->query($sql); if ($result instanceof PEAR_Error) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -1637,7 +1637,7 @@ class Agora_Messages { $sql = 'SELECT file_id, file_name, file_size, file_type FROM agora_files WHERE message_id = ?'; $files = $this->_db->getAssoc($sql, null, array($message_id)); if ($files instanceof PEAR_Error || empty($files)) { - Horde::logMessage($files, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($files, 'ERR'); return $files; } @@ -1988,7 +1988,7 @@ class Agora_Messages { isset($info['forum_distribution_address']) ? $info['forum_distribution_address'] : '', $info['forum_id']); - Horde::logMessage('SQL Query by Agora_Message::saveForum(): ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Agora_Message::saveForum(): ' . $sql, 'DEBUG'); $statement = $this->_write_db->prepare($sql); if ($statement instanceof PEAR_Error) { return $statement; diff --git a/agora/lib/Messages/split_sql.php b/agora/lib/Messages/split_sql.php index f9cf9e827..8a0de45c4 100644 --- a/agora/lib/Messages/split_sql.php +++ b/agora/lib/Messages/split_sql.php @@ -171,7 +171,7 @@ class Agora_Messages_split_sql extends Agora_Messages { $messages = $this->_db->getAssoc($bind[0], null, $bind[1], null, MDB2_FETCHMODE_ASSOC, true); if ($messages instanceof PEAR_Error) { - Horde::logMessage($messages, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($messages, 'ERR'); return $messages; } @@ -215,7 +215,7 @@ class Agora_Messages_split_sql extends Agora_Messages { $messages = $this->_db->getAssoc($bind[0], null, $bind[1], null, MDB2_FETCHMODE_ASSOC, true); if ($messages instanceof PEAR_Error) { - Horde::logMessage($messages, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($messages, 'ERR'); return $messages; } diff --git a/agora/lib/Messages/sql.php b/agora/lib/Messages/sql.php index 7468ef146..38b75f1b1 100644 --- a/agora/lib/Messages/sql.php +++ b/agora/lib/Messages/sql.php @@ -165,7 +165,7 @@ class Agora_Messages_sql extends Agora_Messages { $messages = $this->_db->getAssoc($bind[0], null, $bind[1], null, MDB2_FETCHMODE_ASSOC, true); if ($messages instanceof PEAR_Error) { - Horde::logMessage($messages, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($messages, 'ERR'); return $messages; } @@ -209,7 +209,7 @@ class Agora_Messages_sql extends Agora_Messages { $messages = $this->_db->getAssoc($bind[0], null, $bind[1], null, MDB2_FETCHMODE_ASSOC, true); if ($messages instanceof PEAR_Error) { - Horde::logMessage($messages, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($messages, 'ERR'); return $messages; } diff --git a/agora/scripts/phorum2agora.php b/agora/scripts/phorum2agora.php index 29b408cba..e3fe3668f 100755 --- a/agora/scripts/phorum2agora.php +++ b/agora/scripts/phorum2agora.php @@ -38,7 +38,7 @@ $ret = Console_Getopt::getopt(Console_Getopt::readPHPArgv(), 'h:p:a:t:f:c:', if ($ret instanceof PEAR_Error) { $error = _("Couldn't read command-line options."); - Horde::logMessage($error, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($error, 'DEBUG'); $cli->fatal($error); } diff --git a/ansel/faces/image.php b/ansel/faces/image.php index 72c9680f1..0b104814e 100644 --- a/ansel/faces/image.php +++ b/ansel/faces/image.php @@ -29,7 +29,7 @@ if (($reload || empty($result))) { $image->createView('screen'); $result = $faces->getFromPicture($image_id, $autocreate); } catch (Horde_Exception $e) { - Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); $result = null; } } diff --git a/ansel/faces/img.php b/ansel/faces/img.php index 1cb4df07d..fc49befbc 100644 --- a/ansel/faces/img.php +++ b/ansel/faces/img.php @@ -34,7 +34,7 @@ if ($conf['vfs']['src'] == 'sendfile') { Ansel_Faces::getVFSPath($face['image_id']) . 'faces', $face_id . Ansel_Faces::getExtension()); } catch (VFS_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); exit; } header('Content-type: image/' . $GLOBALS['conf']['image']['type']); diff --git a/ansel/gallery.php b/ansel/gallery.php index fa57ed933..0112e2651 100644 --- a/ansel/gallery.php +++ b/ansel/gallery.php @@ -269,13 +269,13 @@ case 'save': $galleryId = null; $error = sprintf(_("The gallery \"%s\" couldn't be created: %s"), $gallery_name, $gallery->getMessage()); - Horde::logMessage($error, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($error, 'ERR'); $notification->push($error, 'horde.error'); } else { $galleryId = $gallery->getId(); $msg = sprintf(_("The gallery \"%s\" was created successfully."), $gallery_name); - Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($msg, 'DEBUG'); $notification->push($msg, 'horde.success'); } } diff --git a/ansel/image.php b/ansel/image.php index 69dd7405f..bf4547110 100644 --- a/ansel/image.php +++ b/ansel/image.php @@ -427,7 +427,7 @@ case 'resize': list($x1, $y1, $x2, $y2) = explode('.', $params); $result = $image->crop($x1, $y1, $x2, $y2); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); $notification->push($result->getMessage(), 'horde.error'); $error = true; } diff --git a/ansel/img/mini.php b/ansel/img/mini.php index 19aadaab1..254606717 100644 --- a/ansel/img/mini.php +++ b/ansel/img/mini.php @@ -30,7 +30,7 @@ if ($conf['vfs']['src'] == 'sendfile') { try { $image->createView('mini', 'ansel_default'); } catch (Horde_Exception $e) { - Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); exit; } $filename = $ansel_vfs->readFile($image->getVFSPath('mini'), $image->getVFSName('mini')); diff --git a/ansel/img/prettythumb.php b/ansel/img/prettythumb.php index c85e4f000..f053bb4f7 100644 --- a/ansel/img/prettythumb.php +++ b/ansel/img/prettythumb.php @@ -31,7 +31,7 @@ if ($conf['vfs']['src'] == 'sendfile') { try { $image->createView('prettythumb', $style); } catch (Horde_Exception $e) { - Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); exit; } $filename = $ansel_vfs->readFile($image->getVFSPath('prettythumb', $style), $image->getVFSName('prettythumb')); diff --git a/ansel/img/screen.php b/ansel/img/screen.php index 3b5680eaa..b89248708 100644 --- a/ansel/img/screen.php +++ b/ansel/img/screen.php @@ -30,7 +30,7 @@ if ($conf['vfs']['src'] == 'sendfile') { try { $image->createView('screen', 'ansel_default'); } catch (Horde_Exception $e) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); exit; } $filename = $ansel_vfs->readFile($image->getVFSPath('screen'), $image->getVFSName('screen')); diff --git a/ansel/img/thumb.php b/ansel/img/thumb.php index cb6e3d6f6..7b219043b 100644 --- a/ansel/img/thumb.php +++ b/ansel/img/thumb.php @@ -30,7 +30,7 @@ if ($conf['vfs']['src'] == 'sendfile') { try { $image->createView('thumb', 'ansel_default'); } catch (Horde_Exception $e) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); exit; } $filename = $ansel_vfs->readFile($image->getVFSPath('thumb'), $image->getVFSName('thumb')); diff --git a/ansel/lib/Ajax/Imple/LocationAutoCompleter.php b/ansel/lib/Ajax/Imple/LocationAutoCompleter.php index 2046d483d..e7f65766e 100644 --- a/ansel/lib/Ajax/Imple/LocationAutoCompleter.php +++ b/ansel/lib/Ajax/Imple/LocationAutoCompleter.php @@ -29,7 +29,7 @@ class Ansel_Ajax_Imple_LocationAutoCompleter extends Horde_Ajax_Imple_AutoComple if (!isset($_SESSION['ansel']['ajax_locationac'])) { $results = $GLOBALS['ansel_storage']->searchLocations(); if ($results instanceof PEAR_Error) { - Horde::logMessage($results, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($results, 'ERR'); } else { $_SESSION['ansel']['ajax_locationac'] = (count($results) > 50); } @@ -56,7 +56,7 @@ class Ansel_Ajax_Imple_LocationAutoCompleter extends Horde_Ajax_Imple_AutoComple } $locs = $GLOBALS['ansel_storage']->searchLocations($input); if (is_a($locs, 'PEAR_Error')) { - Horde::logMessage($locs->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($locs->getMessage(), 'ERR'); $locs = new StdClass(); } if (!count($locs)) { diff --git a/ansel/lib/Ansel.php b/ansel/lib/Ansel.php index 949d0619c..d1c64be4d 100644 --- a/ansel/lib/Ansel.php +++ b/ansel/lib/Ansel.php @@ -464,7 +464,7 @@ class Ansel try { $image = $ansel_storage->getImage($imageId); } catch (Ansel_Exception $e) { - Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); return Ansel::getErrorImage($view); } try { diff --git a/ansel/lib/Api.php b/ansel/lib/Api.php index 552c1ea5c..8ca9ba69d 100644 --- a/ansel/lib/Api.php +++ b/ansel/lib/Api.php @@ -316,13 +316,13 @@ class Ansel_Api extends Horde_Registry_Api isset($image['description']) && isset($image['data']) && isset($image['type'])) { - Horde::logMessage(sprintf("Receiving image %s in saveImage() with a raw filesize of %i", $image['filename'], strlen($image['data'])), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf("Receiving image %s in saveImage() with a raw filesize of %i", $image['filename'], strlen($image['data'])), 'DEBUG'); $image_data = array('image_filename' => $image['filename'], 'image_caption' => $image['description'], 'image_type' => $image['type'], 'data' => $this->_getImageData($image['data'], $encoding, $compression, true)); } else { - Horde::logMessage(sprintf("Receiving image %s in saveImage() with a raw filesize of %i", $image['file'], filesize($image['file'])), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf("Receiving image %s in saveImage() with a raw filesize of %i", $image['file'], filesize($image['file'])), 'DEBUG'); } if (is_null($image_data) && getimagesize($image['file']) === false) { diff --git a/ansel/lib/Faces/Base.php b/ansel/lib/Faces/Base.php index bc6bf9003..4c06a4c80 100644 --- a/ansel/lib/Faces/Base.php +++ b/ansel/lib/Faces/Base.php @@ -89,8 +89,7 @@ class Ansel_Faces_Base $sql .= ' FROM ansel_faces WHERE image_id = ' . (int)$image_id . ' ORDER BY face_id DESC'; - Horde::logMessage('SQL Query by Ansel_Faces::getImageFacesData: ' . $sql, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Ansel_Faces::getImageFacesData: ' . $sql, 'DEBUG'); $result = $GLOBALS['ansel_db']->query($sql); if ($result instanceof PEAR_Error) { throw new Horde_Exception_Prior($result); diff --git a/ansel/lib/Faces/opencv.php b/ansel/lib/Faces/opencv.php index f3669057d..0622d92c8 100644 --- a/ansel/lib/Faces/opencv.php +++ b/ansel/lib/Faces/opencv.php @@ -40,8 +40,7 @@ class Ansel_Faces_opencv extends Ansel_Faces_Base $haar = cv_object_load($this->_defs); $seq = cv_haar_classifier_cascade_detect_objects($haar, $im); $l = cv_seq_count($seq); - Horde::logMessage(sprintf("opencv extension detected %u faces.", $l), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf("opencv extension detected %u faces.", $l), 'DEBUG'); $rects = array(); for ($i = 0; $i < $l; $i++) { $r = cv_seq_get($seq, $i); diff --git a/ansel/lib/Gallery.php b/ansel/lib/Gallery.php index 9ad0982b9..e8aecaabe 100644 --- a/ansel/lib/Gallery.php +++ b/ansel/lib/Gallery.php @@ -602,7 +602,7 @@ class Ansel_Gallery extends Horde_Share_Object_sql_hierarchical $gal_style = $GLOBALS['ansel_styles']['ansel_default']; } } - Horde::logMessage(sprintf("using gallery style: %s in Ansel::getDefaultImage()", $gal_style['name']), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf("using gallery style: %s in Ansel::getDefaultImage()", $gal_style['name']), 'DEBUG'); if (!empty($gal_style['default_galleryimage_type']) && $gal_style['default_galleryimage_type'] != 'plain') { @@ -644,11 +644,11 @@ class Ansel_Gallery extends Horde_Share_Object_sql_hierarchical } catch (Horde_Exception $e) { // Might not support the requested style...try ansel_default // but protect against infinite recursion. - Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($e->getMessage(), 'DEBUG'); if ($style != 'ansel_default') { return $this->getDefaultImage('ansel_default'); } - Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e->getMessage(), 'ERR'); } } else { @@ -867,8 +867,7 @@ class Ansel_Gallery extends Horde_Share_Object_sql_hierarchical if (!is_null($parent) && !$parent->get('has_subgalleries')) { return $parent->set('has_subgalleries', '1', true); } - Horde::logMessage('Ansel_Gallery parent successfully set', __FILE__, - __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Ansel_Gallery parent successfully set', 'DEBUG'); /* Gallery parent changed, safe to change the parent's attributes */ if ($reset_has_subgalleries) { diff --git a/ansel/lib/GalleryMode/Date.php b/ansel/lib/GalleryMode/Date.php index 6f1281898..2ec55ab6c 100644 --- a/ansel/lib/GalleryMode/Date.php +++ b/ansel/lib/GalleryMode/Date.php @@ -557,7 +557,7 @@ class Ansel_GalleryMode_Date { array('ansel', $image->id)); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __LINE__, __FILE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return false; } } diff --git a/ansel/lib/GalleryMode/Normal.php b/ansel/lib/GalleryMode/Normal.php index 56c298964..4fb9cf0f7 100644 --- a/ansel/lib/GalleryMode/Normal.php +++ b/ansel/lib/GalleryMode/Normal.php @@ -80,8 +80,7 @@ class Ansel_GalleryMode_Normal { $this->_gallery->data['attribute_images']) { $images = $this->getImages(max(0, $from - $num_galleries), $to - count($galleries)); if (is_a($images, 'PEAR_Error')) { - Horde::logMessage($images->message, __FILE__, __LINE__, - PEAR_LOG_ERR); + Horde::logMessage($images, 'ERR'); $images = array(); } } else { @@ -264,7 +263,7 @@ class Ansel_GalleryMode_Normal { array('ansel', $image->id)); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __LINE__, __FILE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return false; } } diff --git a/ansel/lib/Image.php b/ansel/lib/Image.php index 2e57a7d19..a56e5318b 100644 --- a/ansel/lib/Image.php +++ b/ansel/lib/Image.php @@ -309,7 +309,7 @@ class Ansel_Image Implements Iterator try { $data = $GLOBALS['ansel_vfs']->read($vfspath, $this->getVFSName($view)); } catch (VFS_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); throw new Ansel_Exception($e); } @@ -386,7 +386,7 @@ class Ansel_Image Implements Iterator try { $data = $GLOBALS['ansel_vfs']->read($this->getVFSPath('full'), $this->getVFSName('full')); } catch (VFS_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); throw new Ansel_Exception($e); } @@ -552,7 +552,7 @@ class Ansel_Image Implements Iterator if ($result instanceof PEAR_Error) { // Since we got this far, the image has been added, so // just log the tag failure. - Horde::logMessage($result, __LINE__, __FILE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); } } @@ -642,7 +642,7 @@ class Ansel_Image Implements Iterator $exif_fields = $exif->getData($imageFile); } catch (Horde_Image_Exception $e) { // Log the error, but it's not the end of the world, so just ignore - Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); $exif_fields = array(); return false; } @@ -878,7 +878,7 @@ class Ansel_Image Implements Iterator $this->load($view); return $this->_image->toFile($this->_dirty ? false : $this->_data[$view]); } catch (Horde_Exception $e) { - Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); throw new Ansel_Exception($e); } } @@ -1091,7 +1091,7 @@ class Ansel_Image Implements Iterator try { $this->_image->addEffect($type, $params); } catch (Horde_Image_Exception $e) { - Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); throw new Ansel_Exception($e); } } diff --git a/ansel/lib/ImageView.php b/ansel/lib/ImageView.php index c470621da..f77c6bd5f 100644 --- a/ansel/lib/ImageView.php +++ b/ansel/lib/ImageView.php @@ -106,13 +106,13 @@ class Ansel_ImageView // requested effect. foreach ($view->need as $need) { if (!Ansel::isAvailable($need)) { - Horde::logMessage($err, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($err, 'ERR'); throw new Ansel_Exception(_("This install does not support the %s feature. Please contact your administrator."), $need); } } return $view; } else { - Horde::logMessage($err, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($err, 'ERR'); throw new Ansel_Exception(sprintf(_("Unable to load the definition of %s."), $class)); } } @@ -169,7 +169,7 @@ class Ansel_ImageView $images[] = $img->getHordeImage(); $cnt--; } catch (Exception $e) { - Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); } } @@ -181,7 +181,7 @@ class Ansel_ImageView $aimg->load('screen'); $images[] = $aimg->getHordeImage(); } catch (Exception $e) { - Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); } } diff --git a/ansel/lib/Storage.php b/ansel/lib/Storage.php index 21cf63f48..901899fc7 100644 --- a/ansel/lib/Storage.php +++ b/ansel/lib/Storage.php @@ -142,10 +142,10 @@ class Ansel_Storage /* Create the gallery */ $gallery = $this->_shares->newShare(''); if ($gallery instanceof PEAR_Error) { - Horde::logMessage($gallery, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($gallery, 'ERR'); throw new Horde_Exception($gallery->getMessage()); } - Horde::logMessage('New Ansel_Gallery object instantiated', __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('New Ansel_Gallery object instantiated', 'DEBUG'); /* Set the gallery's parent if needed */ if (!is_null($parent)) { @@ -170,7 +170,7 @@ class Ansel_Storage if ($result instanceof PEAR_Error) { $error = sprintf(_("The gallery \"%s\" could not be created: %s"), $attributes['name'], $result->getMessage()); - Horde::logMessage($error, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($error, 'ERR'); throw new Ansel_Exception($error); } @@ -262,13 +262,13 @@ class Ansel_Storage . $this->_shares->_table . ' WHERE attribute_slug = ?'); if ($stmt instanceof PEAR_Error) { - Horde::logMessage($stmt, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($stmt, 'ERR'); return 0; } $result = $stmt->execute($slug); if ($result instanceof PEAR_Error) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return 0; } if (!$result->numRows()) { @@ -482,12 +482,12 @@ class Ansel_Storage $q = $this->_db->prepare('SELECT ' . $this->_getImageFields() . ' FROM ansel_images WHERE image_id = ?'); if ($q instanceof PEAR_Error) { - Horde::logMessage($q, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($q, 'ERR'); throw new Ansel_Exception($q); } $result = $q->execute((int)$id); if ($result instanceof PEAR_Error) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); throw new Ansel_Exception($result); } $image = $result->fetchRow(MDB2_FETCHMODE_ASSOC); @@ -496,7 +496,7 @@ class Ansel_Storage if (is_null($image)) { throw new Horde_Exception_NotFound(_("Photo not found")); } elseif ($image instanceof PEAR_Error) { - Horde::logMessage($image, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($image, 'ERR'); throw new Ansel_Exception($image); } else { $image['image_filename'] = Horde_String::convertCharset($image['image_filename'], $GLOBALS['conf']['sql']['charset']); @@ -522,7 +522,7 @@ class Ansel_Storage if ($image->id) { $update = $this->_db->prepare('UPDATE ansel_images SET image_filename = ?, image_type = ?, image_caption = ?, image_sort = ?, image_original_date = ?, image_latitude = ?, image_longitude = ?, image_location = ?, image_geotag_date = ? WHERE image_id = ?'); if (is_a($update, 'PEAR_Error')) { - Horde::logMessage($update, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($update, 'ERR'); throw new Ansel_Exception($update); } $result = $update->execute(array(Horde_String::convertCharset($image->filename, Horde_Nls::getCharset(), $GLOBALS['conf']['sql']['charset']), @@ -536,7 +536,7 @@ class Ansel_Storage $image->geotag_timestamp, $image->id)); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($update, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($update, 'ERR'); throw new Ansel_Exception($result); } $update->free(); @@ -558,7 +558,7 @@ class Ansel_Storage /* Prepare the SQL statement */ $insert = $this->_db->prepare('INSERT INTO ansel_images (image_id, gallery_id, image_filename, image_type, image_caption, image_uploaded_date, image_sort, image_original_date, image_latitude, image_longitude, image_location, image_geotag_date) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)'); if (is_a($insert, 'PEAR_Error')) { - Horde::logMessage($insert, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($insert, 'ERR'); throw new Ansel_Exception($insert); } @@ -577,7 +577,7 @@ class Ansel_Storage (empty($image->lat) ? 0 : $image->uploaded))); $insert->free(); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); throw new Ansel_Exception($result); } @@ -1069,7 +1069,7 @@ class Ansel_Storage } $this->_db->setLimit($count, $from); $sql = 'SELECT ' . $fields . ' FROM ansel_images ' . $query_where . ' ORDER BY ' . $sort; - Horde::logMessage('Query by Ansel_Storage::listImages: ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Query by Ansel_Storage::listImages: ' . $sql, 'DEBUG'); $results = $this->_db->query($sql); if ($results instanceof PEAR_Error) { throw new Ansel_Exception($results); @@ -1164,7 +1164,7 @@ class Ansel_Storage if (strlen($search)) { $sql .= ' AND image_location LIKE "' . $search . '%"'; } - Horde::logMessage(sprintf("SQL QUERY BY Ansel_Storage::searchLocations: %s", $sql), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf("SQL QUERY BY Ansel_Storage::searchLocations: %s", $sql), 'DEBUG'); $results = $this->_db->query($sql); if ($results instanceof PEAR_Error) { throw new Ansel_Exception($results); diff --git a/ansel/lib/Tags.php b/ansel/lib/Tags.php index f126e823a..cd186b7e7 100644 --- a/ansel/lib/Tags.php +++ b/ansel/lib/Tags.php @@ -65,8 +65,7 @@ class Ansel_Tags { $delete = $GLOBALS['ansel_db']->prepare('DELETE FROM ansel_galleries_tags WHERE gallery_id = ?'); $query = $GLOBALS['ansel_db']->prepare('INSERT INTO ansel_galleries_tags (gallery_id, tag_id) VALUES(?, ?)'); } - Horde::logMessage('SQL query by Ansel_Tags::writeTags: ' . $query->query, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL query by Ansel_Tags::writeTags: ' . $query->query, 'DEBUG'); $delete->execute(array($resource_id)); foreach ($tagkeys as $key) { $query->execute(array($resource_id, $key)); @@ -98,7 +97,7 @@ class Ansel_Tags { if (is_a($stmt, 'PEAR_Error')) { return $stmt; } - Horde::logMessage('SQL query by Ansel_Tags::readTags ' . $stmt->query, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL query by Ansel_Tags::readTags ' . $stmt->query, 'DEBUG'); $result = $stmt->execute((int)$resource_id); $tags = $result->fetchAll(MDB2_FETCHMODE_ASSOC, true); foreach ($tags as $id => $tag) { @@ -198,11 +197,11 @@ class Ansel_Tags { . 'WHERE tag_id IN (' . implode(',', $ids) . ') GROUP BY ' . 'image_id HAVING count(tag_id) = ' . count($ids); - Horde::logMessage('SQL query by Ansel_Tags::searchTags: ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL query by Ansel_Tags::searchTags: ' . $sql, 'DEBUG'); $GLOBALS['ansel_db']->setLimit($max, $from); $images = $GLOBALS['ansel_db']->queryCol($sql); if (is_a($images, 'PEAR_Error')) { - Horde::logMessage($images, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($images, 'ERR'); $results['images'] = array(); } else { /* Check permissions and filter on $user if required */ @@ -220,7 +219,7 @@ class Ansel_Tags { $imgs[] = $id; } } else { - Horde::logMessage($gal, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($gal, 'ERR'); } } $results['images'] = $imgs; @@ -234,18 +233,18 @@ class Ansel_Tags { . 'WHERE tag_id IN (' . implode(',', $ids) . ') GROUP BY ' . 'gallery_id HAVING count(tag_id) = ' . count($ids); - Horde::logMessage('SQL query by Ansel_Tags::searchTags: ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL query by Ansel_Tags::searchTags: ' . $sql, 'DEBUG'); $GLOBALS['ansel_db']->setLimit($max, $from); $galleries = $GLOBALS['ansel_db']->queryCol($sql); if (is_a($galleries, 'PEAR_Error')) { - Horde::logMessage($galleries, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($galleries, 'ERR'); } else { /* Check perms */ foreach ($galleries as $id) { $gallery = $GLOBALS['ansel_storage']->getGallery($id); if (is_a($gallery, 'PEAR_Error')) { - Horde::logMessage($gallery, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($gallery, 'ERR'); continue; } if ($gallery->hasPermission(Horde_Auth::getAuth(), Horde_Perms::SHOW) && (!isset($user) || (isset($user) && $gallery->get('owner') && $gallery->get('owner') == $user))) { diff --git a/ansel/lib/View/EmbeddedRenderer/GalleryLink.php b/ansel/lib/View/EmbeddedRenderer/GalleryLink.php index 35a6ae261..bfba1db27 100644 --- a/ansel/lib/View/EmbeddedRenderer/GalleryLink.php +++ b/ansel/lib/View/EmbeddedRenderer/GalleryLink.php @@ -60,7 +60,7 @@ class Ansel_View_EmbeddedRenderer_GalleryLink extends Ansel_View_Gallery $gallery = $this->_getGallery($identifier); } } catch (Horde_Exception $e) { - Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); exit; } if (!$gallery->hasPermission(Horde_Auth::getAuth(), Horde_Perms::READ)) { diff --git a/ansel/lib/View/EmbeddedRenderer/Mini.php b/ansel/lib/View/EmbeddedRenderer/Mini.php index 4ed350dc1..ce73f338f 100644 --- a/ansel/lib/View/EmbeddedRenderer/Mini.php +++ b/ansel/lib/View/EmbeddedRenderer/Mini.php @@ -51,7 +51,7 @@ class Ansel_View_EmbeddedRenderer_Mini extends Ansel_View_Gallery try { $this->gallery = $this->_getGallery($gallery_id, $gallery_slug); } catch (Horde_Exception $e) { - Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); exit; } diff --git a/ansel/lib/View/Image.php b/ansel/lib/View/Image.php index a93bff0ac..5d0133552 100644 --- a/ansel/lib/View/Image.php +++ b/ansel/lib/View/Image.php @@ -30,7 +30,7 @@ class Ansel_View_Image extends Ansel_View_Base public function __construct($params = array()) { parent::__construct($params); - + /* Get the Ansel_Image */ $image = &$GLOBALS['ansel_storage']->getImage($params['image_id']); @@ -146,7 +146,7 @@ class Ansel_View_Image extends Ansel_View_Base try { $this->_geometry = $this->resource->getDimensions('screen'); } catch (Horde_Exception $e) { - Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); $this->_geometry = $conf['screen']; } @@ -246,7 +246,7 @@ class Ansel_View_Image extends Ansel_View_Base 'commentCallback', true, null, $url)); if (is_a($comments, 'PEAR_Error')) { - Horde::logMessage($comments, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($comments, 'DEBUG'); $comments = array(); } } else { diff --git a/ansel/lib/Widget/OtherGalleries.php b/ansel/lib/Widget/OtherGalleries.php index 8ee5703a3..c3bf0c9f0 100644 --- a/ansel/lib/Widget/OtherGalleries.php +++ b/ansel/lib/Widget/OtherGalleries.php @@ -69,7 +69,7 @@ class Ansel_Widget_OtherGalleries extends Ansel_Widget_Base null, true, 0, 0, 'name', 0); } catch (Ansel_Exception $e) { - Horde::logMessage($gal, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($gal, 'ERR'); return ''; } diff --git a/ansel/perms.php b/ansel/perms.php index 4732bc9e2..d8a8093cf 100644 --- a/ansel/perms.php +++ b/ansel/perms.php @@ -262,7 +262,7 @@ if ($auth->hasCapability('list')) { $groupList = $groups->listGroups(); asort($groupList); if (is_a($groupList, 'PEAR_Error')) { - Horde::logMessage($groupList, __FILE__, __LINE__, PEAR_LOG_NOTICE); + Horde::logMessage($groupList, 'NOTICE'); $groupList = array(); } diff --git a/ansel/preview.php b/ansel/preview.php index 230580942..c63d941e3 100644 --- a/ansel/preview.php +++ b/ansel/preview.php @@ -14,12 +14,12 @@ Horde_Registry::appInit('ansel'); $imageId = Horde_Util::getFormData('image'); $image = &$ansel_storage->getImage($imageId); if (is_a($image, 'PEAR_Error')) { - Horde::logMessage($image, __LINE__, __FILE__, PEAR_LOG_ERR); + Horde::logMessage($image, 'ERR'); exit; } $gal = $ansel_storage->getGallery(abs($image->gallery)); if (is_a($gal, 'PEAR_Error')) { - Horde::logMessage($image, __LINE__, __FILE__, PEAR_LOG_ERR); + Horde::logMessage($image, 'ERR'); exit; } $img = Ansel::getImageUrl($imageId, 'thumb', false); diff --git a/ansel/scripts/ansel.php b/ansel/scripts/ansel.php index 3e20cb6f2..83d585dc9 100755 --- a/ansel/scripts/ansel.php +++ b/ansel/scripts/ansel.php @@ -21,7 +21,7 @@ $ret = Console_Getopt::getopt(Console_Getopt::readPHPArgv(), if (is_a($ret, 'PEAR_Error')) { $error = _("Couldn't read command-line options."); - Horde::logMessage($error, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($error, 'DEBUG'); $cli->fatal($error); } @@ -91,11 +91,11 @@ if (!empty($username) && !empty($password)) { $auth = Horde_Auth::singleton($conf['auth']['driver']); if (!$auth->authenticate($username, array('password' => $password))) { $error = _("Login is incorrect."); - Horde::logMessage($error, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($error, 'ERR'); $cli->fatal($error); } else { $msg = sprintf(_("Logged in successfully as \"%s\"."), $username); - Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($msg, 'DEBUG'); $cli->message($msg, 'cli.success'); } } @@ -104,7 +104,7 @@ if (!empty($username) && !empty($password)) { if (!empty($galleryId)) { if (!$ansel_storage->galleryExists($galleryId)) { $error = sprintf(_("Invalid gallery \"%s\" specified."), $galleryId); - Horde::logMessage($error, __FILE__, __LINE__, PEAR_LOG_WARNING); + Horde::logMessage($error, 'WARN'); $cli->fatal($error); } else { $gallery = $ansel_storage->getGallery($galleryId); @@ -112,7 +112,7 @@ if (!empty($galleryId)) { !$gallery->hasPermission(Horde_Auth::getAuth(), Horde_Perms::EDIT)) { $error = sprintf(_("Access denied adding photos to \"%s\"."), $galleryId); - Horde::logMessage($error, __FILE__, __LINE__, PEAR_LOG_WARNING); + Horde::logMessage($error, 'WARN'); $cli->fatal($error); } } @@ -134,12 +134,12 @@ if (!empty($createGallery)) { $galleryId = null; $error = sprintf(_("The gallery \"%s\" couldn't be created: %s"), $gallery_name, $gallery->getMessage()); - Horde::logMessage($error, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($error, 'ERR'); $cli->fatal($error); } else { $msg = sprintf(_("The gallery \"%s\" was created successfully."), $gallery_name); - Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($msg, 'DEBUG'); $cli->message($msg, 'cli.success'); } } @@ -164,7 +164,7 @@ if (!empty($list)) { $galleries = $GLOBALS['ansel_storage']->listGalleries(); if (is_a($galleries, 'PEAR_Error')) { $error = _("Couldn't list galleries."); - Horde::logMessage($error, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($error, 'DEBUG'); $cli->fatal($error); } @@ -175,7 +175,7 @@ if (!empty($list)) { $name = $gallery->get('name'); $msg = "$id/$name"; $cli->writeln($msg); - Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($msg, 'DEBUG'); } } } @@ -184,7 +184,7 @@ if (!empty($list)) { if (!empty($file) && isset($gallery) && !is_a($gallery, 'PEAR_Error')) { $image = &Ansel::getImageFromFile($file, array('caption' => $caption)); if (is_a($image, 'PEAR_Error')) { - Horde::logMessage($image->getMessage(), __FILE__, __LINE__, PEAR_LOG_WARNING); + Horde::logMessage($image, 'WARN'); $cli->fatal($image->getMessage()); } @@ -193,32 +193,32 @@ if (!empty($file) && isset($gallery) && !is_a($gallery, 'PEAR_Error')) { if (is_a($image_id, 'PEAR_Error')) { $error = sprintf(_("There was a problem adding the photo \"%s\" to gallery \"%s\": %s"), basename($file), $galleryId, $image_id->getMessage()); - Horde::logMessage($error, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($error, 'ERR'); $cli->fatal($error); } $msg = sprintf(_("Successfully added photo \"%s\" to gallery \"%s\"."), basename($file), $galleryId); $cli->message($msg, 'cli.success'); - Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_NOTICE); + Horde::logMessage($msg, 'NOTICE'); } // Add all images from a directory on the filesystem. if (!empty($dir) && isset($gallery) && !is_a($gallery, 'PEAR_Error')) { $msg = addDirToGallery($dir, $gallery); if (is_a($msg, 'PEAR_Error')) { - Horde::logMessage($msg->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($msg, 'ERR'); $cli->fatal($msg->getMessage()); } if ($msg) { $msg = sprintf(ngettext("Successfully added %d photo (%s) to gallery \"%s\" from \"%s\".", "Successfully added %d photos (%s) to gallery \"%s\" from \"%s\".", count($msg)), count($msg), join(', ', $msg), $galleryId, $dir); $cli->message($msg, 'cli.success'); - Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_NOTICE); + Horde::logMessage($msg, 'NOTICE'); } else { $msg = sprintf(_("The directory \"%s\" had no valid photos."), $dir); $cli->message($msg, 'cli.warning'); - Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_WARNING); + Horde::logMessage($msg, 'WARN'); } } @@ -239,7 +239,7 @@ function addDirToGallery($dir = '', &$gallery) if (!file_exists($dir)) { $error = sprintf(_("The directory \"%s\" doesn't exist."), $dir); - Horde::logMessage($error, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($error, 'ERR'); return PEAR::raiseError($error); } @@ -256,7 +256,7 @@ function addDirToGallery($dir = '', &$gallery) if (!$files_array) { $error = sprintf(_("The directory \"%s\" is empty."), $dir); - Horde::logMessage($error, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($error, 'ERR'); return PEAR::raiseError($error); } chdir($dir); @@ -266,7 +266,7 @@ function addDirToGallery($dir = '', &$gallery) foreach ($files_array as $file) { $image = Ansel::getImageFromFile($dir . '/' . $file); if (is_a($image, 'PEAR_Error')) { - Horde::logMessage($image->getMessage(), __FILE__, __LINE__, PEAR_LOG_WARNING); + Horde::logMessage($image, 'WARN'); $cli->message($image->getMessage(), 'cli.error'); continue; } @@ -276,7 +276,7 @@ function addDirToGallery($dir = '', &$gallery) if (is_a($image_id, 'PEAR_Error')) { $error = sprintf(_("There was a problem adding the photo \"%s\" to gallery \"%s\"."), $file, $galleryId); - Horde::logMessage($error, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($error, 'ERR'); $cli->message($image_id->getMessage(), 'cli.error'); continue; } diff --git a/ansel/xppublish.php b/ansel/xppublish.php index 84a323ca9..099420027 100644 --- a/ansel/xppublish.php +++ b/ansel/xppublish.php @@ -117,11 +117,11 @@ if ($cmd == 'new') { 'desc' => $gallery_desc)); if (is_a($gallery, 'PEAR_Error')) { $error = sprintf(_("The gallery \"%s\" couldn't be created: %s"), $gallery_name, $gallery->getMessage()); - Horde::logMessage($error, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($error, 'ERR'); } else { $galleryId = $gallery->id; $msg = sprintf(_("The gallery \"%s\" was created successfully."), $gallery_name); - Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($msg, 'DEBUG'); } } else { if (empty($galleryId) && $prefs->getValue('autoname')) { diff --git a/beatnik/lib/Driver/pdnsgsql.php b/beatnik/lib/Driver/pdnsgsql.php index ae990dfb1..16f59b593 100644 --- a/beatnik/lib/Driver/pdnsgsql.php +++ b/beatnik/lib/Driver/pdnsgsql.php @@ -70,11 +70,11 @@ class Beatnik_Driver_pdnsgsql extends Beatnik_Driver 'r.ttl AS ttl FROM ' . $this->_params['domains_table'] . ' AS d JOIN ' . $this->_params['records_table'] . ' AS r ON ' . 'r.domain_id = d.id WHERE r.type = \'SOA\''; - Horde::logMessage('SQL Query by Beatnik_Driver_pdnsgsql::_getDomains(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Beatnik_Driver_pdnsgsql::_getDomains(): ' . $query, 'DEBUG'); $domainlist = $this->_db->getAll($query, null, DB_FETCHMODE_ASSOC); if (is_a($domainlist, 'PEAR_Error')) { - Horde::logMessage($domainlist, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($domainlist, 'ERR'); throw new Beatnik_Exception(_("Error getting domain list. Details have been logged for the administrator.")); } @@ -82,7 +82,7 @@ class Beatnik_Driver_pdnsgsql extends Beatnik_Driver foreach ($domainlist as $info) { $soa = explode(' ', $info['content']); if (count($soa) != 7) { - Horde::logMessage(sprintf('Invalid SOA found for %s, skipping.', $info['name']), __FILE__, __LINE__, PEAR_LOG_WARNING); + Horde::logMessage(sprintf('Invalid SOA found for %s, skipping.', $info['name']), 'WARN'); continue; } @@ -118,11 +118,11 @@ class Beatnik_Driver_pdnsgsql extends Beatnik_Driver ' AS d JOIN ' . $this->_params['records_table'] . ' AS r ON ' . 'r.domain_id = d.id WHERE r.type = \'SOA\' AND d.name = ?'; $values = array($domainname); - Horde::logMessage('SQL Query by Beatnik_Driver_pdnsgsql::getDomain(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Beatnik_Driver_pdnsgsql::getDomain(): ' . $query, 'DEBUG'); $result = $this->_db->getAll($query, $values, DB_FETCHMODE_ASSOC); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); throw new Beatnik_Exception(_("An error occurred while searching the database. Details have been logged for the administrator."), __FILE__, __LINE__, PEAR_LOG_ERR); } @@ -134,7 +134,7 @@ class Beatnik_Driver_pdnsgsql extends Beatnik_Driver $soa = explode(' ', $info['content']); if (count($soa) != 7) { - Horde::logMessage(sprintf('Invalid SOA found for %s, skipping.', $info['name']), __FILE__, __LINE__, PEAR_LOG_WARN); + Horde::logMessage(sprintf('Invalid SOA found for %s, skipping.', $info['name']), 'WARN'); throw new Beatnik_Exception(_("Corrupt SOA found for zone. Contact your administrator."), __FILE__, __LINE__, PEAR_LOG_ERR); } @@ -173,10 +173,10 @@ class Beatnik_Driver_pdnsgsql extends Beatnik_Driver 'd.id = r.domain_id AND d.name = ?'; $values = array($domain); - Horde::logMessage('SQL Query by Beatnik_Driver_pdnsgsql::getRecords(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Beatnik_Driver_pdnsgsql::getRecords(): ' . $query, 'DEBUG') $result = $this->_db->getAll($query, $values, DB_FETCHMODE_ASSOC); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); throw new Beatnik_Exception(_("An error occurred while searching the database. Details have been logged for the administrator."), __FILE__, __LINE__, PEAR_LOG_ERR); } @@ -193,9 +193,9 @@ class Beatnik_Driver_pdnsgsql extends Beatnik_Driver case 'soa': $soa = explode(' ', $rec['content']); if (count($soa) != 7) { - Horde::logMessage(sprintf('Invalid SOA found for %s, skipping.', $info['name']), __FILE__, __LINE__, PEAR_LOG_WARNING); + Horde::logMessage(sprintf('Invalid SOA found for %s, skipping.', $info['name']), 'WARN'); } - + $tmp['zonename'] = $rec['name']; $tmp['zonens'] = $soa[0]; $tmp['zonecontact'] = $soa[1]; @@ -234,7 +234,7 @@ class Beatnik_Driver_pdnsgsql extends Beatnik_Driver case 'srv': $srv = preg_split('/\s+/', trim($rec['content'])); if (count($srv) != 3) { - Horde::logMessage(sprintf('Invalid SRV data found for %s, skipping.', $rec['name']), __FILE__, __LINE__, PEAR_LOG_WARNING); + Horde::logMessage(sprintf('Invalid SRV data found for %s, skipping.', $rec['name']), 'WARN'); continue; } $tmp['hostname'] = $rec['name']; @@ -360,7 +360,7 @@ class Beatnik_Driver_pdnsgsql extends Beatnik_Driver } if (!empty($info['id'])) { - $query = 'UPDATE ' . $this->_params['records_table'] . ' SET ' . + $query = 'UPDATE ' . $this->_params['records_table'] . ' SET ' . 'name = ?, type = ?, content = ?, ttl = ?, ' . 'prio = ' . (empty($prio) ? 'NULL' : $prio) . ', ' . 'change_date = ? WHERE id = ?'; @@ -372,7 +372,7 @@ class Beatnik_Driver_pdnsgsql extends Beatnik_Driver $values[] = $info['id']; } else { $query = 'INSERT INTO ' . $this->_params['records_table'] . ' ' . - '(domain_id, name, type, content, ttl, prio, ' . + '(domain_id, name, type, content, ttl, prio, ' . 'change_date) VALUES (?, ?, ?, ?, ?, ' . (empty($prio) ? 'NULL' : '?') . ', ?)'; $values = array($domain_id, $name, $type, $content, $ttl); @@ -382,7 +382,7 @@ class Beatnik_Driver_pdnsgsql extends Beatnik_Driver $values[] = $change_date; } - Horde::logMessage('SQL Query by Beatnik_Driver_pdnsgsql::_saveRecord(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Beatnik_Driver_pdnsgsql::_saveRecord(): ' . $query, 'DEBUG'); $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { return $result; @@ -425,7 +425,7 @@ class Beatnik_Driver_pdnsgsql extends Beatnik_Driver 'PowerDNS Generic SQL', array('driver' => 'pdnsgsql')); } catch (Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); throw $e; } diff --git a/beatnik/scripts/export_config.php b/beatnik/scripts/export_config.php index 5a4a01894..34f1ac9e8 100644 --- a/beatnik/scripts/export_config.php +++ b/beatnik/scripts/export_config.php @@ -39,7 +39,7 @@ try { array('help', 'username=', 'password=', 'type=', 'rpc=')); } catch (Exception $e) { $error = _("Couldn't read command-line options."); - Horde::logMessage($error, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($error, 'DEBUG'); $cli->fatal($error); } @@ -62,12 +62,12 @@ foreach ($opts as $opt) { case '--password': $password = $optValue; break; - + case 't': case '--type': $type = $optValue; break; - + case 'r': case '--rpc': $rpc = $optValue; @@ -89,7 +89,7 @@ if (!empty($rpc)) { } catch (Exception $e) { $cli->fatal($e); } - + // Login to horde if username & password are set and load module. } elseif (!empty($username) && !empty($password)) { @@ -97,16 +97,16 @@ if (!empty($rpc)) { $auth = &Horde_Auth::singleton($conf['auth']['driver']); if (!$auth->authenticate($username, array('password' => $password))) { $error = _("Login is incorrect."); - Horde::logMessage($error, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($error, 'ERR'); $cli->fatal($error); } else { $msg = sprintf(_("Logged in successfully as \"%s\"."), $username); - Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($msg, 'DEBUG'); $cli->message($msg, 'cli.success'); } require_once BEATNIK_BASE . '/lib/base.php'; - + } else { $msg = _("Have noting to do."); $cli->fatal($msg); @@ -156,7 +156,7 @@ function _getRecords($domain) $GLOBALS['cli']->fatal($e); } } - + return $result; } @@ -180,7 +180,7 @@ function _hosts() $c .= "$pointer $hostname.$domain.$tld\n"; } } - + return $c; } @@ -206,7 +206,7 @@ function _bash() // use empty hostname as alias for www $c .= "ln -s /var/www/$zonename" . "_$tld/$zonename.$tld " . "/var/www/$zonename" . "_$tld/$hostname.$zonename.$tld" . "\n"; - continue; + continue; } $c .= "mkdir /var/www/$zonename" . "_$tld/$hostname.$zonename.$tld" . "\n"; @@ -214,7 +214,7 @@ function _bash() $c .= "mkdir /var/log/apache2/$hostname.$zonename.$tld" . "\n"; } } - + return $c; } @@ -256,7 +256,7 @@ function _apache() $c .= "\n"; } } - + return $c; } @@ -320,6 +320,6 @@ function _tinydns() $c .= "\n"; } - + return $c; } diff --git a/crumb/addclient.php b/crumb/addclient.php index d918f22b4..1f86def96 100644 --- a/crumb/addclient.php +++ b/crumb/addclient.php @@ -19,7 +19,7 @@ $formname = $vars->get('formname'); $addform = new Horde_Form_AddClient($vars); if (is_a($addform, 'PEAR_Error')) { - Horde::logMessage($addform, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($addform, 'ERR'); $notification->push(_("An internal error has occurred. Details have been logged for the administrator.")); $addform = null; } diff --git a/crumb/lib/Driver/sql.php b/crumb/lib/Driver/sql.php index e802fdc36..9ebd3297b 100644 --- a/crumb/lib/Driver/sql.php +++ b/crumb/lib/Driver/sql.php @@ -83,7 +83,7 @@ class Crumb_Driver_sql extends Crumb_Driver { $query = 'SELECT * FROM ' . $this->_params['table']; /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Crumb_Driver_sql::_listClients(): %s', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Crumb_Driver_sql::_listClients(): %s', $query), 'DEBUG'); /* Execute the query. */ $result = $this->_db->getAll($query, array(), DB_FETCHMODE_ASSOC); diff --git a/crumb/lib/Forms/AddClient.php b/crumb/lib/Forms/AddClient.php index 67ce5f717..9062f0965 100644 --- a/crumb/lib/Forms/AddClient.php +++ b/crumb/lib/Forms/AddClient.php @@ -29,7 +29,7 @@ class Horde_Form_AddClient extends Horde_Form try { $turbaform = $GLOBALS['registry']->call('contacts/getAddClientForm', array(&$vars)); } catch (Horde_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); $notification->push(_("An internal error has occurred. Details have beenlogged for the administrator.")); $addform = null; } @@ -55,7 +55,7 @@ class Horde_Form_AddClient extends Horde_Form try { $whupsform = $GLOBALS['registry']->call('tickets/getAddQueueForm', array(&$vars)); } catch (Horde_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); $notification->push(_("An internal error has occurred. Details have been logged for the administrator.")); $addform = null; } diff --git a/fima/lib/Driver/sql.php b/fima/lib/Driver/sql.php index 9c87fe4d9..eff602afd 100644 --- a/fima/lib/Driver/sql.php +++ b/fima/lib/Driver/sql.php @@ -69,8 +69,7 @@ class Fima_Driver_sql extends Fima_Driver { $query .= ' ORDER BY account_number ASC'; /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Fima_Driver_sql::retrieveAccounts(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Fima_Driver_sql::retrieveAccounts(): %s', $query), 'DEBUG'); /* Execute the query. */ $this->_accounts = array(); @@ -114,8 +113,7 @@ class Fima_Driver_sql extends Fima_Driver { $values = array($this->_ledger, $accountId); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Fima_Driver_sql::getAccount(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Fima_Driver_sql::getAccount(): %s', $query), 'DEBUG'); /* Execute the query. */ $result = $this->_db->query($query, $values); @@ -150,8 +148,7 @@ class Fima_Driver_sql extends Fima_Driver { $values = array($this->_ledger, sprintf('%\'04s', $number)); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Fima_Driver_sql::getAccountByNumber(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Fima_Driver_sql::getAccountByNumber(): %s', $query), 'DEBUG'); /* Execute the query. */ $result = $this->_db->query($query, $values); @@ -194,8 +191,7 @@ class Fima_Driver_sql extends Fima_Driver { $query .= $queryfilter; /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Fima_Driver_sql::retrievePostings(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Fima_Driver_sql::retrievePostings(): %s', $query), 'DEBUG'); /* Execute the query. */ $result = $this->_db->query($query, $values); @@ -211,7 +207,7 @@ class Fima_Driver_sql extends Fima_Driver { // correct result when account is an asset account too if ($this->_postingsCount > 0) { $query = sprintf('SELECT SUM(p.posting_amount) posting_result ' . - 'FROM %s p JOIN %s a ON a.account_id = p.posting_account ' . + 'FROM %s p JOIN %s a ON a.account_id = p.posting_account ' . $queryfilter . ' AND a.account_type = ?', $this->_params['table_postings'], $this->_params['table_accounts']); $values2 = $values; @@ -249,14 +245,14 @@ class Fima_Driver_sql extends Fima_Driver { $sorting = array('posting_date ASC'); } $query .= ' ORDER BY ' . implode(', ', $sorting); - + /* Limit. */ if (count($limit) > 0) { if ($limit[0] < 0) { $limit[0] += ceil($this->_postingsCount / $limit[1]) + 1; } $limit[0] = ($limit[0] - 1) * $limit[1]; - + $query .= ' LIMIT ' . $limit[0]; if (isset($limit[1])) { $query .= ', ' . $limit[1]; @@ -264,8 +260,7 @@ class Fima_Driver_sql extends Fima_Driver { } /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Fima_Driver_sql::retrievePostings(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Fima_Driver_sql::retrievePostings(): %s', $query), 'DEBUG'); /* Execute the query. */ $result = $this->_db->query($query, $values); @@ -287,7 +282,7 @@ class Fima_Driver_sql extends Fima_Driver { } else { return $result; } - + return true; } @@ -306,8 +301,7 @@ class Fima_Driver_sql extends Fima_Driver { $values = array($this->_ledger, $postingId); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Fima_Driver_sql::getPosting(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Fima_Driver_sql::getPosting(): %s', $query), 'DEBUG'); /* Execute the query. */ $result = $this->_db->query($query, $values); @@ -338,7 +332,7 @@ class Fima_Driver_sql extends Fima_Driver { */ function getResults($groups, $filters = array()) { $matrix = array(); - + /* Fix grouping. */ if (!is_array($groups)) { $groups = array($groups); @@ -359,7 +353,7 @@ class Fima_Driver_sql extends Fima_Driver { default: $groups[$groupId] = 'posting_'.$group; break; } } - + /* Build the SQL query filter. */ $query = sprintf('SELECT %s x, %s y, sum(posting_amount) result ' . 'FROM %s p LEFT OUTER JOIN %s asset ON p.posting_asset = asset.account_id AND p.posting_owner = asset.account_owner LEFT OUTER JOIN %s account ON p.posting_account = account.account_id AND p.posting_owner = account.account_owner ' . @@ -382,13 +376,12 @@ class Fima_Driver_sql extends Fima_Driver { } } $this->_addFilters($filters, $query, $values); - + /* Add grouping. */ $query .= ' GROUP BY ' . implode(', ', $groups); - + /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Fima_Driver_sql::getResults(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Fima_Driver_sql::getResults(): %s', $query), 'DEBUG'); /* Execute the query. */ $result = $this->_db->query($query, $values); @@ -411,7 +404,7 @@ class Fima_Driver_sql extends Fima_Driver { } $result->free(); } - + return $matrix; } @@ -426,7 +419,7 @@ class Fima_Driver_sql extends Fima_Driver { function getAssetResults($postingtype, $perdate = null) { $perdate = ($perdate === null) ? mktime() : (int)$perdate; - + /* Build the SQL query. */ $query = sprintf('SELECT account_id, SUM(account_result) account_result FROM ( ' . ' SELECT a1.account_id, SUM(p1.posting_amount) account_result ' . @@ -446,8 +439,7 @@ class Fima_Driver_sql extends Fima_Driver { $this->_ledger, $postingtype, $this->_ledger, FIMA_ACCOUNTTYPE_ASSET, $perdate); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Fima_Driver_sql::getAssetResults(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Fima_Driver_sql::getAssetResults(): %s', $query), 'DEBUG'); /* Execute the query. */ $assetresults = array(); @@ -497,7 +489,7 @@ class Fima_Driver_sql extends Fima_Driver { } } } - + /* Create a new account based on $row's values. */ return array('account_id' => $row['account_id'], 'owner' => $row['account_owner'], @@ -508,13 +500,13 @@ class Fima_Driver_sql extends Fima_Driver { 'desc' => Horde_String::convertCharset($row['account_desc'], $this->_params['charset']), 'closed' => $row['account_closed'], 'label' => trim($row['account_number'] . ' ' . - (($parent === null) ? '' : $parent['name'] . ' - ') . + (($parent === null) ? '' : $parent['name'] . ' - ') . Horde_String::convertCharset($row['account_name'], $this->_params['charset'])), 'parent_id' => ($parent === null) ? null : $parent['account_id'], 'parent_number' => ($parent === null) ? '' : $parent['number'], 'parent_name' => ($parent === null) ? '' : $parent['name']); } - + /** * Adds an account to the backend storage. * @@ -546,13 +538,12 @@ class Fima_Driver_sql extends Fima_Driver { (int)(bool)$closed); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Fima_Driver_sql::_addAccount(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Fima_Driver_sql::_addAccount(): %s', $query), 'DEBUG'); /* Attempt the insertion query. */ $result = $this->_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -593,19 +584,18 @@ class Fima_Driver_sql extends Fima_Driver { $accountId); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Fima_Driver_sql::_modifyAccount(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Fima_Driver_sql::_modifyAccount(): %s', $query), 'DEBUG'); /* Attempt the update query. */ $result = $this->_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } return true; } - + /** * Deletes an account from the backend. * @@ -635,7 +625,7 @@ class Fima_Driver_sql extends Fima_Driver { return $delete; } } - } + } /* Handle postings. */ if ($dsPostings !== false) { @@ -644,15 +634,14 @@ class Fima_Driver_sql extends Fima_Driver { $query = sprintf('DELETE FROM %s WHERE posting_owner = ? AND (posting_asset = ? OR posting_account = ?)', $this->_params['table_postings']); $values = array($this->_ledger, $accountId, $accountId); - + /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Fima_Driver_sql::_deleteAccount(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Fima_Driver_sql::_deleteAccount(): %s', $query), 'DEBUG'); /* Attempt the delete query. */ $result = $this->_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } } else { @@ -670,13 +659,12 @@ class Fima_Driver_sql extends Fima_Driver { $values = array($this->_ledger, $accountId); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Fima_Driver_sql::_deleteAccount(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Fima_Driver_sql::_deleteAccount(): %s', $query), 'DEBUG'); /* Attempt the delete query. */ $result = $this->_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -703,7 +691,7 @@ class Fima_Driver_sql extends Fima_Driver { 'amount' => $row['posting_amount'], 'eo' => (int)(bool)$row['posting_eo']); } - + /** * Adds a posting to the backend storage. * @@ -737,13 +725,12 @@ class Fima_Driver_sql extends Fima_Driver { Horde_String::convertCharset($desc, Horde_Nls::getCharset(), $this->_params['charset'])); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Fima_Driver_sql::_addPosting(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Fima_Driver_sql::_addPosting(): %s', $query), 'DEBUG'); /* Attempt the insertion query. */ $result = $this->_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -787,19 +774,18 @@ class Fima_Driver_sql extends Fima_Driver { $postingId); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Fima_Driver_sql::_modifyPosting(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Fima_Driver_sql::_modifyPosting(): %s', $query), 'DEBUG'); /* Attempt the update query. */ $result = $this->_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } return true; } - + /** * Deletes a posting from the backend. * @@ -817,14 +803,13 @@ class Fima_Driver_sql extends Fima_Driver { $values = array($this->_ledger, $postingId); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Fima_Driver_sql::_deletePosting(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Fima_Driver_sql::_deletePosting(): %s', $query), 'DEBUG'); /* Attempt the delete query. */ $result = $this->_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -862,19 +847,18 @@ class Fima_Driver_sql extends Fima_Driver { $values[] = $postingId; /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Fima_Driver_sql::_shiftPosting(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Fima_Driver_sql::_shiftPosting(): %s', $query), 'DEBUG'); /* Attempt the update query. */ $result = $this->_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } return true; } - + /** * Shift postings in the backend. * @@ -888,7 +872,7 @@ class Fima_Driver_sql extends Fima_Driver { if (!is_array($accountIdFrom)) { $accountIdFrom = array($accountIdFrom); } - + foreach ($accountIdFrom as $key => $value) { $accountIdFrom[$key] = $this->_db->quoteSmart($value); } @@ -902,21 +886,20 @@ class Fima_Driver_sql extends Fima_Driver { $values = array($accountIdTo, $this->_ledger, implode(',', $accountIdFrom)); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Fima_Driver_sql::_shiftPostings(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Fima_Driver_sql::_shiftPostings(): %s', $query), 'DEBUG'); /* Attempt the update query. */ $result = $this->_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } } return true; } - + /** * Deletes all postings and accounts. * @@ -932,7 +915,7 @@ class Fima_Driver_sql extends Fima_Driver { $query = sprintf('DELETE FROM %s WHERE posting_owner = ?', $this->_params['table_postings']); $values = array($this->_ledger); - + /* Filter. */ if ($postings !== true) { $query .= ' AND posting_type = ?'; @@ -940,21 +923,20 @@ class Fima_Driver_sql extends Fima_Driver { } /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Fima_Driver_sql::_deleteAll(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Fima_Driver_sql::_deleteAll(): %s', $query), 'DEBUG'); /* Attempt the delete query. */ $result = $this->_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } } else { /* If postings aren't deleted, don't delete accounts. */ return false; } - + /* Delete Accounts */ if ($accounts) { $query = sprintf('DELETE FROM %s WHERE account_owner = ?', @@ -968,14 +950,13 @@ class Fima_Driver_sql extends Fima_Driver { } /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Fima_Driver_sql::_deleteAll(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Fima_Driver_sql::_deleteAll(): %s', $query), 'DEBUG'); /* Attempt the delete query. */ $result = $this->_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } } @@ -987,7 +968,7 @@ class Fima_Driver_sql extends Fima_Driver { /** * Build the where clause for a query using the passed filters * Attention: does not include the WHERE keyword, add WHERE 1=1 manually in the query - * + * * @param array $filters Array of filters, syntax: array(field, value [, operator = '=' [, andor = 'AND']]) * @param array $prefix optional prefix for fields * @@ -996,7 +977,7 @@ class Fima_Driver_sql extends Fima_Driver { function _addFilters($filters, &$query, &$values, $prefix = '') { $filtercnt = 0; - + foreach ($filters as $filter) { // and/or if (!isset($filter[3])) { @@ -1007,7 +988,7 @@ class Fima_Driver_sql extends Fima_Driver { $filter[3] = 'AND'; } } - + // subfilter if (is_array($filter[0])) { $query .= ' ' . $filter[3] . ' (1=1'; @@ -1015,7 +996,7 @@ class Fima_Driver_sql extends Fima_Driver { $query .= ')'; continue; } - + // fix operator if (!isset($filter[2])) { $filter[2] = '='; @@ -1025,7 +1006,7 @@ class Fima_Driver_sql extends Fima_Driver { $filter[2] = '='; } } - + // fix operator for null values if ($filter[1] === null) { if (!in_array($filter[2], array('IS', 'IS NOT'))) { @@ -1034,7 +1015,7 @@ class Fima_Driver_sql extends Fima_Driver { } elseif (in_array($filter[2], array('IS', 'IS NOT'))) { $filter[2] = ($filter[2] == 'IS') ? '=' : '!='; } - + // fix operator for array value + prepare values if (is_array($filter[1])) { if (!in_array($filter[2], array('IN', 'NOT IN'))) { @@ -1051,17 +1032,17 @@ class Fima_Driver_sql extends Fima_Driver { } $filterph = '?'; } - + // fix != operator if ($filter[2] == '!=') { $filter[2] = '<>'; } - + $query .= sprintf(' ' . $filter[3] . ' ' . $prefix . '%s %s %s', $filter[0], $filter[2], $filterph); $values[] = $filter[1]; $filtercnt++; } - + return $filtercnt; } diff --git a/fima/lib/Fima.php b/fima/lib/Fima.php index 6a6128964..a2af48763 100644 --- a/fima/lib/Fima.php +++ b/fima/lib/Fima.php @@ -191,7 +191,7 @@ class Fima { { $ledgers = $GLOBALS['fima_shares']->listShares(Horde_Auth::getAuth(), $permission, $owneronly ? Horde_Auth::getAuth() : null); if (is_a($ledgers, 'PEAR_Error')) { - Horde::logMessage($ledgers, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($ledgers, 'ERR'); return array(); } diff --git a/folks/perms.php b/folks/perms.php index 8a901b22b..ef0046ecb 100644 --- a/folks/perms.php +++ b/folks/perms.php @@ -226,7 +226,7 @@ if (is_a($share, 'PEAR_Error')) { if ($auth->hasCapability('list')) { $userList = $auth->listUsers(); if (is_a($userList, 'PEAR_Error')) { - Horde::logMessage($userList, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($userList, 'ERR'); $userList = array(); } sort($userList); @@ -240,7 +240,7 @@ if (!empty($conf['share']['any_group'])) { $groupList = $groups->getGroupMemberships(Horde_Auth::getAuth(), true); } if (is_a($groupList, 'PEAR_Error')) { - Horde::logMessage($groupList, __FILE__, __LINE__, PEAR_LOG_NOTICE); + Horde::logMessage($groupList, 'NOTICE'); $groupList = array(); } asort($groupList); diff --git a/folks/scripts/mail.php b/folks/scripts/mail.php index 580eea5f1..681d86d34 100644 --- a/folks/scripts/mail.php +++ b/folks/scripts/mail.php @@ -33,7 +33,7 @@ $ret = Console_Getopt::getopt(Console_Getopt::readPHPArgv(), 'h:u:p:dt:f:c:', if ($ret instanceof PEAR_Error) { $error = _("Couldn't read command-line options."); - Horde::logMessage($error, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($error, 'DEBUG'); $cli->fatal($error); } @@ -78,11 +78,11 @@ if (!empty($username) && !empty($password)) { $auth = Horde_Auth::singleton($conf['auth']['driver']); if (!$auth->authenticate($username, array('password' => $password))) { $error = _("Login is incorrect."); - Horde::logMessage($error, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($error, 'ERR'); $cli->fatal($error); } else { $msg = sprintf(_("Logged in successfully as \"%s\"."), $username); - Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($msg, 'DEBUG'); $cli->message($msg, 'cli.success'); } } diff --git a/framework/Ajax/lib/Horde/Ajax/Imple/SpellChecker.php b/framework/Ajax/lib/Horde/Ajax/Imple/SpellChecker.php index 501645cb0..be51f6de0 100644 --- a/framework/Ajax/lib/Horde/Ajax/Imple/SpellChecker.php +++ b/framework/Ajax/lib/Horde/Ajax/Imple/SpellChecker.php @@ -105,14 +105,14 @@ class Horde_Ajax_Imple_SpellChecker extends Horde_Ajax_Imple_Base try { $speller = Horde_SpellChecker::factory($GLOBALS['conf']['spell']['driver'], $spellArgs); } catch (Horde_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); return array(); } try { return $speller->spellCheck(Horde_Util::getPost($args['input'])); } catch (Horde_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); return array('bad' => array(), 'suggestions' => array()); } } diff --git a/framework/Alarm/lib/Horde/Alarm.php b/framework/Alarm/lib/Horde/Alarm.php index 48ce5731b..ecc14e4ec 100644 --- a/framework/Alarm/lib/Horde/Alarm.php +++ b/framework/Alarm/lib/Horde/Alarm.php @@ -300,7 +300,7 @@ class Horde_Alarm try { $app_alarms = $GLOBALS['registry']->callByPackage($app, 'listAlarms', array(time(), $user), array('noperms' => true)); } catch (Horde_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); $app_alarms = array(); } $alarms = array_merge($alarms, $app_alarms); @@ -374,7 +374,7 @@ class Horde_Alarm try { $alarms = $this->listAlarms($user, null, $load, $preload); } catch (Horde_Alarm_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); throw $e; } @@ -390,7 +390,7 @@ class Horde_Alarm try { $this->{'_' . $alarm_method}($alarm); } catch (Horde_Alarm_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); } } } diff --git a/framework/Alarm/lib/Horde/Alarm/Sql.php b/framework/Alarm/lib/Horde/Alarm/Sql.php index 160045395..b84735bc4 100644 --- a/framework/Alarm/lib/Horde/Alarm/Sql.php +++ b/framework/Alarm/lib/Horde/Alarm/Sql.php @@ -89,8 +89,7 @@ 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, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('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__); @@ -124,8 +123,7 @@ class Horde_Alarm_Sql extends Horde_Alarm $values[] = ''; $values[] = (string)$user; } - Horde::logMessage('SQL query by Horde_Alarm_sql::_list(): ' . $query, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL query by Horde_Alarm_sql::_list(): ' . $query, 'DEBUG'); $alarms = array(); $result = $this->_db->query($query, $values); @@ -183,8 +181,7 @@ 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, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL query by Horde_Alarm_sql::_add(): ' . $query, 'DEBUG'); $result = $this->_write_db->query($query, $values); if ($result instanceof PEAR_Error) { @@ -215,8 +212,7 @@ 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, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL query by Horde_Alarm_sql::_update(): ' . $query, 'DEBUG'); $result = $this->_write_db->query($query, $values); if ($result instanceof PEAR_Error) { @@ -241,8 +237,7 @@ 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, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL query by Horde_Alarm_sql::_internal(): ' . $query, 'DEBUG'); $result = $this->_write_db->query($query, $values); if ($result instanceof PEAR_Error) { @@ -266,8 +261,7 @@ 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, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL query by Horde_Alarm_sql::_exists(): ' . $query, 'DEBUG'); $result = $this->_db->getOne($query, array($id, $user)); if ($result instanceof PEAR_Error) { @@ -291,8 +285,7 @@ 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, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL query by Horde_Alarm_sql::_snooze(): ' . $query, 'DEBUG'); $result = $this->_write_db->query($query, $values); if ($result instanceof PEAR_Error) { @@ -315,8 +308,7 @@ 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, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL query by Horde_Alarm_sql::_dismiss(): ' . $query, 'DEBUG'); $result = $this->_write_db->query($query, $values); if ($result instanceof PEAR_Error) { @@ -341,8 +333,7 @@ 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, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('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) { @@ -369,8 +360,7 @@ class Horde_Alarm_Sql extends Horde_Alarm : ' AND alarm_uid = ?'; $values[] = $user; } - Horde::logMessage('SQL query by Horde_Alarm_sql::_delete(): ' . $query, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL query by Horde_Alarm_sql::_delete(): ' . $query, 'DEBUG'); $result = $this->_write_db->query($query, $values); if ($result instanceof PEAR_Error) { @@ -387,8 +377,7 @@ 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, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL query by Horde_Alarm_sql::_gc(): ' . $query, 'DEBUG'); $end = new Horde_Date(time()); $result = $this->_write_db->query($query, (string)$end->setTimezone('UTC')); @@ -463,8 +452,7 @@ class Horde_Alarm_Sql extends Horde_Alarm $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), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('SQL connection setup for Alarms, query = "%s"', $query), 'DEBUG'); $db->query($query); break; @@ -473,8 +461,7 @@ class Horde_Alarm_Sql extends Horde_Alarm $query = "SET datestyle TO 'iso'"; /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('SQL connection setup for Alarms, query = "%s"', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('SQL connection setup for Alarms, query = "%s"', $query), 'DEBUG'); $db->query($query); break; diff --git a/framework/Alarm/test/Horde/Alarm/setup.inc.dist b/framework/Alarm/test/Horde/Alarm/setup.inc.dist index 761526b1b..726a92b5a 100644 --- a/framework/Alarm/test/Horde/Alarm/setup.inc.dist +++ b/framework/Alarm/test/Horde/Alarm/setup.inc.dist @@ -6,7 +6,7 @@ $params = array('phptype' => 'mysql', 'charset' => 'iso-8859-1'); require_once 'Log.php'; -$conf['log'] = array('priority' => PEAR_LOG_DEBUG, +$conf['log'] = array('priority' => 'DEBUG', 'ident' => 'HORDE', 'params' => array('append' => true), 'name' => '/tmp/horde.log', diff --git a/framework/Auth/lib/Horde/Auth.php b/framework/Auth/lib/Horde/Auth.php index 04b9666bd..da722c850 100644 --- a/framework/Auth/lib/Horde/Auth.php +++ b/framework/Auth/lib/Horde/Auth.php @@ -357,7 +357,7 @@ class Horde_Auth try { $GLOBALS['registry']->callByPackage($app, 'removeUserData', array($userId)); } catch (Horde_Auth_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); $errApps[] = $app; } } diff --git a/framework/Auth/lib/Horde/Auth/Customsql.php b/framework/Auth/lib/Horde/Auth/Customsql.php index 1c558e721..cb3a208b6 100644 --- 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__, PEAR_LOG_ERR); + Horde::logMessage($pw, __FILE__, __LINE__, 'ERR'); return ''; } diff --git a/framework/Auth/lib/Horde/Auth/Cyrsql.php b/framework/Auth/lib/Horde/Auth/Cyrsql.php index c149518a7..2537a1a80 100644 --- a/framework/Auth/lib/Horde/Auth/Cyrsql.php +++ b/framework/Auth/lib/Horde/Auth/Cyrsql.php @@ -167,7 +167,7 @@ class Horde_Auth_Cyrsql extends Horde_Auth_Sql try { $this->_connect(); } catch (Horde_Auth_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); throw new Horde_Auth_Exception('', Horde_Auth::REASON_FAILED); } @@ -187,11 +187,11 @@ class Horde_Auth_Cyrsql extends Horde_Auth_Sql $values = array($userId); } - Horde::logMessage('SQL Query by Horde_Auth_Cyrsql::_authenticate(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Horde_Auth_Cyrsql::_authenticate(): ' . $query, 'DEBUG'); $result = $this->_db->query($query, $values); if ($result instanceof PEAR_Error) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); throw new Horde_Auth_Exception('', Horde_Auth::REASON_FAILED); } @@ -249,13 +249,13 @@ class Horde_Auth_Cyrsql extends Horde_Auth_Sql $this->_params['encryption'], $this->_params['show_encryption'])); - Horde::logMessage('SQL Query by Horde_Auth_Cyrsql::addUser(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Horde_Auth_Cyrsql::addUser(): ' . $query, 'DEBUG'); $dbresult = $this->_db->query($query, $values); $query = 'INSERT INTO virtual (alias, dest, username, status) VALUES (?, ?, ?, 1)'; $values = array($userId, $userId, $name); - Horde::logMessage('SQL Query by Horde_Auth_Cyrsql::addUser(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Horde_Auth_Cyrsql::addUser(): ' . $query, 'DEBUG'); $dbresult2 = $this->_db->query($query, $values); if ($dbresult2 instanceof PEAR_Error) { @@ -325,13 +325,13 @@ Horde_String::convertCharset($userName . $this->_separator . $value . '@' . $dom $this->_params['domain_field']); $values = array($name, $domain); - Horde::logMessage('SQL Query by Horde_Auth_Cyrsql::removeUser(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Horde_Auth_Cyrsql::removeUser(): ' . $query, 'DEBUG'); $dbresult = $this->_db->query($query, $values); $query = 'DELETE FROM virtual WHERE dest = ?'; $values = array($userId); - Horde::logMessage('SQL Query by Horde_Auth_Cyrsql::removeUser(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Horde_Auth_Cyrsql::removeUser(): ' . $query, 'DEBUG'); $dbresult2 = $this->_db->query($query, $values); if ($dbresult2 instanceof PEAR_Error) { @@ -380,7 +380,7 @@ Horde_String::convertCharset($userName . $this->_separator . $value . '@' . $dom $this->_params['username_field']); } - Horde::logMessage('SQL Query by Horde_Auth_Cyrsql::listUsers(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Horde_Auth_Cyrsql::listUsers(): ' . $query, 'DEBUG'); $result = $this->_db->getAll($query, null, DB_FETCHMODE_ORDERED); if ($result instanceof PEAR_Error) { @@ -447,7 +447,7 @@ Horde_String::convertCharset($userName . $this->_separator . $value . '@' . $dom $oldID); } - Horde::logMessage('SQL Query by Horde_Auth_Cyrsql::updateUser(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Horde_Auth_Cyrsql::updateUser(): ' . $query, 'DEBUG'); $res = $this->_db->query($query, $values); if ($res instanceof PEAR_Error) { diff --git a/framework/Auth/lib/Horde/Auth/Kolab.php b/framework/Auth/lib/Horde/Auth/Kolab.php index 617957656..0a66c1e36 100644 --- a/framework/Auth/lib/Horde/Auth/Kolab.php +++ b/framework/Auth/lib/Horde/Auth/Kolab.php @@ -111,7 +111,7 @@ class Horde_Auth_Kolab extends Horde_Auth_Base } catch (Horde_Kolab_Session_Exception_Badlogin $e) { throw new Horde_Auth_Exception('', Horde_Auth::REASON_BADLOGIN); } catch (Horde_Kolab_Session_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); throw new Horde_Auth_Exception('', Horde_Auth::REASON_FAILED); } diff --git a/framework/Auth/lib/Horde/Auth/Ldap.php b/framework/Auth/lib/Horde/Auth/Ldap.php index 05e243d58..355e92f98 100644 --- a/framework/Auth/lib/Horde/Auth/Ldap.php +++ b/framework/Auth/lib/Horde/Auth/Ldap.php @@ -98,7 +98,7 @@ class Horde_Auth_Ldap extends Horde_Auth_Base $this->_params['version'], @ldap_errno($this->_ds), @ldap_error($this->_ds)), - __FILE__, __LINE__, PEAR_LOG_ERR); + 'ERR'); } } @@ -109,7 +109,7 @@ class Horde_Auth_Ldap extends Horde_Auth_Base sprintf('STARTTLS failed: [%d] %s', @ldap_errno($this->_ds), @ldap_error($this->_ds)), - __FILE__, __LINE__, PEAR_LOG_ERR); + 'ERR'); } } @@ -120,7 +120,7 @@ class Horde_Auth_Ldap extends Horde_Auth_Base sprintf('Unable to disable directory referrals on this connection to Active Directory: [%d] %s', @ldap_errno($this->_ds), @ldap_error($this->_ds)), - __FILE__, __LINE__, PEAR_LOG_ERR); + 'ERR'); } } @@ -155,7 +155,7 @@ class Horde_Auth_Ldap extends Horde_Auth_Base $search = @$func($this->_ds, $this->_params['basedn'], $filter, array($this->_params['uid'])); if (!$search) { - Horde::logMessage(ldap_error($this->_ds), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage(ldap_error($this->_ds), 'ERR'); throw new Horde_Auth_Exception(_("Could not search the LDAP server.")); } @@ -236,7 +236,7 @@ class Horde_Auth_Ldap extends Horde_Auth_Base $lookupshadow['shadowmin'] = $this->_params['minage']; $lookupshadow['shadowmax'] = $this->_params['maxage']; } else { - Horde::logMessage('Wrong time format: ' . $information[0]['passwordexpirationtime'][0], __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage('Wrong time format: ' . $information[0]['passwordexpirationtime'][0], 'ERR'); } } else { if (isset($information[0]['shadowmax'][0])) { diff --git a/framework/Auth/lib/Horde/Auth/Passwd.php b/framework/Auth/lib/Horde/Auth/Passwd.php index d22715417..ae416174b 100644 --- a/framework/Auth/lib/Horde/Auth/Passwd.php +++ b/framework/Auth/lib/Horde/Auth/Passwd.php @@ -253,7 +253,7 @@ class Horde_Auth_Passwd extends Horde_Auth_Base try { $this->_read(); } catch (Horde_Auth_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); throw new Horde_Auth_Exception('', Horde_Auth::REASON_FAILED); } diff --git a/framework/Auth/lib/Horde/Auth/Signup/Sql.php b/framework/Auth/lib/Horde/Auth/Signup/Sql.php index 0e5ac3b39..b9c0ce264 100644 --- a/framework/Auth/lib/Horde/Auth/Signup/Sql.php +++ b/framework/Auth/lib/Horde/Auth/Signup/Sql.php @@ -56,16 +56,15 @@ class Horde_Auth_Signup_Sql extends Horde_Auth_Signup time(), $_SERVER['REMOTE_ADDR'], serialize($signup->data)); - Horde::logMessage('SQL query by Auth_Signup_sql::_queueSignup(): ' . $query, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL query by Auth_Signup_sql::_queueSignup(): ' . $query, 'DEBUG'); $stmt = $this->_write_db->prepare($query, null, MDB2_PREPARE_MANIP); if (is_a($stmt, 'PEAR_Error')) { - Horde::logMessage($stmt, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($stmt, 'ERR'); return $stmt; } $result = $stmt->execute($values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } $stmt->free(); @@ -88,12 +87,12 @@ class Horde_Auth_Signup_Sql extends Horde_Auth_Signup . ' WHERE user_name = ?'); if (is_a($stmt, 'PEAR_Error')) { - Horde::logMessage($stmt, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($stmt, 'ERR'); return $stmt; } $result = $stmt->execute(array($user)); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -116,17 +115,17 @@ class Horde_Auth_Signup_Sql extends Horde_Auth_Signup { $stmt = $this->_db->prepare('SELECT * FROM ' . $this->_params['table'] . ' WHERE user_name = ?'); if (is_a($stmt, 'PEAR_Error')) { - Horde::logMessage($stmt, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($stmt, 'ERR'); return $stmt; } $results = $stmt->execute(array($username)); if (is_a($results, 'PEAR_Error')) { - Horde::logMessage($results, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($results, 'ERR'); return $results; } $data = $results->fetchRow(MDB2_FETCHMODE_ASSOC); if (is_a($data, 'PEAR_Error')) { - Horde::logMessage($data, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($data, 'ERR'); return $data; } elseif (empty($data)) { return PEAR::RaiseError(sprintf(_("User \"%s\" does not exist."), $name)); @@ -151,7 +150,7 @@ class Horde_Auth_Signup_Sql extends Horde_Auth_Signup $query = 'SELECT * FROM ' . $this->_params['table'] . ' ORDER BY signup_date'; $result = $this->_db->query($query); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } elseif (empty($result)) { return array(); @@ -178,12 +177,12 @@ class Horde_Auth_Signup_Sql extends Horde_Auth_Signup { $stmt = $this->_write_db->prepare('DELETE FROM ' . $this->_params['table'] . ' WHERE user_name = ?', null, MDB2_PREPARE_MANIP); if (is_a($stmt, 'PEAR_Error')) { - Horde::logMessage($stmt, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($stmt, 'ERR'); return $stmt; } $result = $stmt->execute(array($username)); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } $stmt->free(); diff --git a/framework/Auth/lib/Horde/Auth/Sql.php b/framework/Auth/lib/Horde/Auth/Sql.php index 5ea086b55..d1e743da1 100644 --- a/framework/Auth/lib/Horde/Auth/Sql.php +++ b/framework/Auth/lib/Horde/Auth/Sql.php @@ -119,7 +119,7 @@ class Horde_Auth_Sql extends Horde_Auth_Base try { $this->_connect(); } catch (Horde_Auth_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); throw new Horde_Auth_Exception('', Horde_Auth::REASON_FAILED); } @@ -129,11 +129,11 @@ class Horde_Auth_Sql extends Horde_Auth_Base $this->_params['username_field']); $values = array($userId); - Horde::logMessage('SQL Query by Auth_sql::_authenticate(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Auth_sql::_authenticate(): ' . $query, 'DEBUG'); $result = $this->_db->query($query, $values); if ($result instanceof PEAR_Error) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); throw new Horde_Auth_Exception('', Horde_Auth::REASON_FAILED); } @@ -186,7 +186,7 @@ class Horde_Auth_Sql extends Horde_Auth_Base $this->_params['encryption'], $this->_params['show_encryption'])); - Horde::logMessage('SQL Query by Auth_sql::addUser(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Auth_sql::addUser(): ' . $query, 'DEBUG'); $result = $this->_write_db->query($query, $values); if ($result instanceof PEAR_Error) { @@ -254,11 +254,11 @@ class Horde_Auth_Sql extends Horde_Auth_Base $this->_params['username_field']); $values = array($oldID); - Horde::logMessage('SQL Query by Auth_sql:updateUser(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Auth_sql:updateUser(): ' . $query, 'DEBUG'); $result = $this->_write_db->query($query, $values); if ($result instanceof PEAR_Error) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); throw new Horde_Auth_Exception($result); } } @@ -290,7 +290,7 @@ class Horde_Auth_Sql extends Horde_Auth_Base $this->_params['show_encryption']), $userId); - Horde::logMessage('SQL Query by Auth_sql::resetPassword(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Auth_sql::resetPassword(): ' . $query, 'DEBUG'); $result = $this->_write_db->query($query, $values); if ($result instanceof PEAR_Error) { @@ -317,7 +317,7 @@ class Horde_Auth_Sql extends Horde_Auth_Base $this->_params['username_field']); $values = array($userId); - Horde::logMessage('SQL Query by Auth_sql::removeUser(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Auth_sql::removeUser(): ' . $query, 'DEBUG'); $result = $this->_write_db->query($query, $values); if ($result instanceof PEAR_Error) { @@ -342,7 +342,7 @@ class Horde_Auth_Sql extends Horde_Auth_Base $this->_params['username_field'], $this->_params['table']); - Horde::logMessage('SQL Query by Auth_sql::listUsers(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Auth_sql::listUsers(): ' . $query, 'DEBUG'); $res = $this->_db->getCol($query); if ($res instanceof PEAR_Error) { @@ -367,7 +367,7 @@ class Horde_Auth_Sql extends Horde_Auth_Base $this->_params['username_field']); $values = array($userId); - Horde::logMessage('SQL Query by Auth_sql::exists(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Auth_sql::exists(): ' . $query, 'DEBUG'); $res = $this->_db->getOne($query, $values); return ($res instanceof PEAR_Error) diff --git a/framework/Auth/test/Horde/Auth/Kolab/Class/KolabTest.php b/framework/Auth/test/Horde/Auth/Kolab/Class/KolabTest.php index 28f73e801..7cd618b5a 100644 --- a/framework/Auth/test/Horde/Auth/Kolab/Class/KolabTest.php +++ b/framework/Auth/test/Horde/Auth/Kolab/Class/KolabTest.php @@ -34,11 +34,6 @@ class Horde_Auth_Kolab_Class_KolabTest extends PHPUnit_Framework_TestCase { public function setUp() { - @include_once 'Log.php'; - if (!defined('PEAR_LOG_DEBUG')) { - $this->markTestSkipped('The PEAR_LOG_DEBUG constant is not available!'); - } - $this->session = $this->getMock('Horde_Kolab_Session_Interface'); $this->factory = $this->getMock('Horde_Kolab_Session_Factory_Interface'); @@ -128,4 +123,4 @@ class Horde_Auth_Kolab_Class_KolabTest extends PHPUnit_Framework_TestCase $auth->authenticate('user', array('password' => 'test'), false); $this->assertEquals(Horde_Auth::REASON_BADLOGIN, Horde_Auth::getAuthError()); } -} \ No newline at end of file +} diff --git a/framework/Auth/test/Horde/Auth/Kolab/Integration/AuthTest.php b/framework/Auth/test/Horde/Auth/Kolab/Integration/AuthTest.php index 3b02c7d77..73a305f7a 100644 --- a/framework/Auth/test/Horde/Auth/Kolab/Integration/AuthTest.php +++ b/framework/Auth/test/Horde/Auth/Kolab/Integration/AuthTest.php @@ -36,11 +36,6 @@ class Horde_Auth_Kolab_Integration_AuthTest extends PHPUnit_Framework_TestCase { public function setUp() { - @include_once 'Log.php'; - if (!defined('PEAR_LOG_DEBUG')) { - $this->markTestSkipped('The PEAR_LOG_DEBUG constant is not available!'); - } - /** Provide the mock configuration for the server */ $config = array(); $config['ldap']['basedn'] = 'dc=test'; @@ -153,4 +148,4 @@ class Horde_Auth_Kolab_Dummy extends Horde_Auth_Kolab { return $this->_credentials['userId']; } -} \ No newline at end of file +} diff --git a/framework/Cache/lib/Horde/Cache/Sql.php b/framework/Cache/lib/Horde/Cache/Sql.php index c14fc8ed6..1933c976f 100644 --- a/framework/Cache/lib/Horde/Cache/Sql.php +++ b/framework/Cache/lib/Horde/Cache/Sql.php @@ -122,7 +122,7 @@ class Horde_Cache_Sql extends Horde_Cache_Base try { $this->_connect(); } catch (Horde_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); return; } @@ -132,7 +132,7 @@ class Horde_Cache_Sql extends Horde_Cache_Base $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); } } @@ -160,7 +160,7 @@ class Horde_Cache_Sql extends Horde_Cache_Base try { $this->_connect(); } catch (Horde_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); return false; } @@ -180,18 +180,18 @@ class Horde_Cache_Sql extends Horde_Cache_Base $result = $this->_db->getOne($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return false; } elseif (is_null($result)) { /* No rows were found - cache miss */ - Horde::logMessage(sprintf('Cache miss: %s (Id %s newer than %d)', $okey, $key, $maxage), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Cache miss: %s (Id %s newer than %d)', $okey, $key, $maxage), 'DEBUG'); return false; } if ($this->_mc) { $this->_mc->set($key, $result); } - Horde::logMessage(sprintf('Cache hit: %s (Id %s newer than %d)', $okey, $key, $maxage), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Cache hit: %s (Id %s newer than %d)', $okey, $key, $maxage), 'DEBUG'); return $result; } @@ -218,7 +218,7 @@ class Horde_Cache_Sql extends Horde_Cache_Base try { $this->_connect(); } catch (Horde_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); return false; } @@ -229,7 +229,7 @@ class Horde_Cache_Sql extends Horde_Cache_Base ? 0 : $this->_getLifetime($lifetime) + $timestamp; - Horde::logMessage(sprintf('Cache set: %s (Id %s set at %d expires at %d)', $okey, $key, $timestamp, $expiration), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Cache set: %s (Id %s set at %d expires at %d)', $okey, $key, $timestamp, $expiration), 'DEBUG'); // Remove any old cache data and prevent duplicate keys $query = 'DELETE FROM ' . $this->_params['table'] . ' WHERE cache_id=?'; @@ -244,7 +244,7 @@ class Horde_Cache_Sql extends Horde_Cache_Base $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return false; } @@ -273,7 +273,7 @@ class Horde_Cache_Sql extends Horde_Cache_Base try { $this->_connect(); } catch (Horde_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); return false; } @@ -290,16 +290,16 @@ class Horde_Cache_Sql extends Horde_Cache_Base $result = $this->_db->getRow($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return false; } $timestamp = time(); if (empty($result)) { - Horde::logMessage(sprintf('Cache exists() miss: %s (Id %s newer than %d)', $okey, $key, $timestamp), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Cache exists() miss: %s (Id %s newer than %d)', $okey, $key, $timestamp), 'DEBUG'); return false; } - Horde::logMessage(sprintf('Cache exists() hit: %s (Id %s newer than %d)', $okey, $key, $timestamp), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Cache exists() hit: %s (Id %s newer than %d)', $okey, $key, $timestamp), 'DEBUG'); return true; } @@ -322,7 +322,7 @@ class Horde_Cache_Sql extends Horde_Cache_Base try { $this->_connect(); } catch (Horde_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); return false; } @@ -332,7 +332,7 @@ class Horde_Cache_Sql extends Horde_Cache_Base $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return false; } diff --git a/framework/Core/lib/Horde.php b/framework/Core/lib/Horde.php index dce624e1b..8c518da9f 100644 --- a/framework/Core/lib/Horde.php +++ b/framework/Core/lib/Horde.php @@ -15,13 +15,6 @@ class Horde { /** - * Log instance. - * - * @var Log - */ - static protected $_logger; - - /** * Has compression been started? * * @var boolean @@ -64,119 +57,15 @@ class Horde static protected $_inlineScript = array(); /** - * Logs a message to the global Horde log backend. - * - * @param mixed $message Either a string or an object with a - * getMessage() method (e.g. PEAR_Error, - * Exception). - * @param string $file What file was the log function called from - * (e.g. __FILE__)? - * @param integer $line What line was the log function called from - * (e.g. __LINE__)? - * @param integer $priority The priority of the message. One of: - * 
-     * PEAR_LOG_EMERG
-     * PEAR_LOG_ALERT
-     * PEAR_LOG_CRIT
-     * PEAR_LOG_ERR
-     * PEAR_LOG_WARNING
-     * PEAR_LOG_NOTICE
-     * PEAR_LOG_INFO
-     * PEAR_LOG_DEBUG
-     *
- */ - static public function logMessage($message, $file, $line, - $priority = PEAR_LOG_INFO) - { - $logger = self::getLogger(); - - if ($logger === false) { - return; - } - - if ($priority > $GLOBALS['conf']['log']['priority']) { - return; - } - - if ($message instanceof PEAR_Error) { - $userinfo = $message->getUserInfo(); - $message = $message->getMessage(); - if (!empty($userinfo)) { - if (is_array($userinfo)) { - $old_error = error_reporting(0); - $userinfo = implode(', ', $userinfo); - error_reporting($old_error); - } - $message .= ': ' . $userinfo; - } - } elseif (is_object($message)) { - if (is_callable(array($message, 'toString'))) { - $message = $message->toString(); - } elseif (is_callable(array($message, 'getMessage'))) { - $message = $message->getMessage(); - } - } - - $app = isset($GLOBALS['registry']) - ? $GLOBALS['registry']->getApp() - : null; - $message = '[' . ($app ? $app : 'horde') . '] ' . $message . ' [pid ' . getmypid() . ' on line ' . $line . ' of "' . $file . '"]'; - - /* Make sure to log in the system's locale and timezone. */ - $locale = setlocale(LC_TIME, 0); - setlocale(LC_TIME, 'C'); - $tz = getenv('TZ'); - @putenv('TZ'); - - $logger->log($message, $priority); - - /* Restore original locale and timezone. */ - setlocale(LC_TIME, $locale); - if ($tz) { - @putenv('TZ=' . $tz); - } - - return true; - } - - /** - * Get an instantiated instance of the configured logger, if enabled. - * getLogger() will fatally exit if a Log object can not be - * instantiated. + * Shortcut to logging method. * - * @return mixed Log object on success, false if disabled. - * @throws Horde_Exception + * @see Horde_Core_Log_Logger */ - static public function getLogger() + static public function logMessage($event, $priority = 'INFO', + $options = array()) { - global $conf; - - if (empty($conf['log']['enabled'])) { - return false; - } - - if (isset(self::$_logger)) { - return self::$_logger; - } - - // Try to make sure that we can log messages somehow. - if (empty($conf['log']) || - empty($conf['log']['type']) || - empty($conf['log']['name']) || - empty($conf['log']['ident']) || - !isset($conf['log']['params'])) { - throw new Horde_Exception('Horde is not correctly configured to log error messages. You must configure at least a text file log in horde/config/conf.php.'); - } - - self::$_logger = Log::singleton($conf['log']['type'], - $conf['log']['name'], - $conf['log']['ident'], - $conf['log']['params']); - if (!self::$_logger instanceof Log) { - throw new Horde_Exception('An error has occurred. Furthermore, Horde encountered an error attempting to log this error. Please check your Horde logging configuration in horde/config/conf.php.'); - } - - return self::$_logger; + $options['trace'] = 2; + $GLOBALS['injector']->getInstance('Horde_Log_Logger')->log($event, $priority, $options); } /** @@ -247,7 +136,7 @@ class Horde // Log the error via logMessage() if requested. if ($log) { - self::logMessage($error, $file, $line, PEAR_LOG_EMERG); + self::logMessage($error, 'EMERG'); } if ($cli) { @@ -275,7 +164,7 @@ HTML; static public function logDeprecated($errno, $errstr, $errfile, $errline, $errcontext) { - self::logMessage($errstr, $errfile, $errline, PEAR_LOG_DEBUG); + self::logMessage(new ErrorException($errstr, 0, $errno, $errfile, $errline), 'DEBUG'); } /** @@ -861,7 +750,7 @@ HTML; // Return an error if neither main or vhosted versions of the config // file exist. if (!$was_included) { - self::logMessage(sprintf('Failed to import configuration file "%s".', $config_dir . $config_file), __FILE__, __LINE__, PEAR_LOG_DEBUG); + self::logMessage(sprintf('Failed to import configuration file "%s".', $config_dir . $config_file), 'DEBUG'); return is_array($var_names) ? array() : null; } @@ -1697,10 +1586,10 @@ HTML; $used = array_keys(self::$_used); sort($used); $remaining = str_replace($used, array(), 'abcdefghijklmnopqrstuvwxyz'); - self::logMessage('Access key information for ' . $script, __FILE__, __LINE__); - self::logMessage('Used labels: ' . implode(',', $labels), __FILE__, __LINE__); - self::logMessage('Used keys: ' . implode('', $used), __FILE__, __LINE__); - self::logMessage('Free keys: ' . $remaining, __FILE__, __LINE__); + self::logMessage('Access key information for ' . $script); + self::logMessage('Used labels: ' . implode(',', $labels)); + self::logMessage('Used keys: ' . implode('', $used)); + self::logMessage('Free keys: ' . $remaining); return; } @@ -1858,15 +1747,15 @@ HTML; if ($error) { $error = sprintf('Hook %s in application %s not called.', $hook, $app); - self::logMessage($error, __FILE__, __LINE__, PEAR_LOG_DEBUG); + self::logMessage($error, 'DEBUG'); throw new Horde_Exception_HookNotSet($error); } try { - self::logMessage(sprintf('Hook %s in application %s called.', $hook, $app), __FILE__, __LINE__, PEAR_LOG_DEBUG); + self::logMessage(sprintf('Hook %s in application %s called.', $hook, $app), 'DEBUG'); return call_user_func_array(array($hook_ob, $hook), $args); } catch (Horde_Exception $e) { - self::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + self::logMessage($e, 'ERR'); throw $e; } } diff --git a/framework/Core/lib/Horde/Core/Binder/Logger.php b/framework/Core/lib/Horde/Core/Binder/Logger.php index 1e8ec7582..8bd263471 100644 --- a/framework/Core/lib/Horde/Core/Binder/Logger.php +++ b/framework/Core/lib/Horde/Core/Binder/Logger.php @@ -3,7 +3,35 @@ class Horde_Core_Binder_Logger implements Horde_Injector_Binder { public function create(Horde_Injector $injector) { - return new Horde_Log_Logger(new Horde_Log_Handler_Null()); + global $conf; + + // Try to make sure that we can log messages somehow. + if (empty($conf['log']['enabled'])) { + $handler = new Horde_Log_Handler_Null(); + } else { + switch ($conf['log']['type']) { + case 'file': + $handler = new Horde_Log_Handler_Stream($conf['log']['name'], $conf['log']['params']['append'] ? 'a+' : 'w+'); + break; + + case 'stream': + $handler = new Horde_Log_Handler_Stream($conf['log']['name']); + break; + + case 'syslog': + $handler = new Horde_Log_Handler_Syslog(); + break; + + case 'null': + default: + $handler = new Horde_Log_Handler_Null(); + break; + } + + $handler->addFilter(constant('Horde_Log::' . $conf['log']['priority'])); + } + + return new Horde_Core_Log_Logger($handler); } public function equals(Horde_Injector_Binder $binder) diff --git a/framework/Core/lib/Horde/Core/Log/Logger.php b/framework/Core/lib/Horde/Core/Log/Logger.php new file mode 100644 index 000000000..4bf4b6b47 --- /dev/null +++ b/framework/Core/lib/Horde/Core/Log/Logger.php @@ -0,0 +1,122 @@ + + * @package Horde_Core + */ +class Horde_Core_Log_Logger extends Horde_Log_Logger +{ + /** + * Logs a message to the global Horde log backend. + * + * @param mixed $event Either a string (log string), an array + * (containing 'level', 'message', and 'timestamp' + entries) or an object with a getMessage() + method (e.g. PEAR_Error, Exception, + ErrorException). + * @param mixed $priority The priority of the message. Integers + * correspond to Horde_Log constants. String + * values are auto translated to Horde_Log + * constants. + * @param array $options Additional options: + * 
+     * 'file' - (string) The filename to use in the log message.
+     * 'line' - (integer) The file line to use in the log message.
+     * 'trace' - (integer) The trace level of the original log location.
+     *
+ */ + public function log($event, $priority = 'INFO', $options = array()) + { + /* If an array is passed in, assume that the caller knew what they + * were doing and pass it directly to the log backend. */ + if (is_array($event)) { + parent::log($event, $priority); + exit; + } + + if ($event instanceof Exception) { + $text = $event->getMessage(); + if ($event instanceof ErrorException) { + $trace = array( + 'file' => $event->getFile(), + 'line' => $event->getLine() + ); + } else { + $trace = reset($event->getTrace()); + } + } else { + if ($event instanceof PEAR_Error) { + $userinfo = $event->getUserInfo(); + $text = $event->getMessage(); + if (!empty($userinfo)) { + if (is_array($userinfo)) { + $old_error = error_reporting(0); + $userinfo = implode(', ', $userinfo); + error_reporting($old_error); + } + $text .= ': ' . $userinfo; + } + } elseif (is_object($event)) { + $text = strval($event); + if (!is_string($text)) { + $text = is_callable(array($event, 'getMessage')) + ? $event->getMessage() + : ''; + } + } else { + $text = $event; + } + + $trace = debug_backtrace(); + $trace = $trace[isset($options['trace']) ? ($options['trace'] - 1) : 0]; + } + + $file = isset($options['file']) + ? $options['file'] + : $trace['file']; + $line = isset($options['line']) + ? $options['line'] + : $trace['line']; + + $app = isset($GLOBALS['registry']) + ? $GLOBALS['registry']->getApp() + : 'horde'; + + $message = ($app ? '[' . $app . '] ' : '') . $text . ' [pid ' . getmypid() . ' on line ' . $line . ' of "' . $file . '"]'; + + if (is_string($priority)) { + $priority = defined('Horde_Log::' . $priority) + ? constant('Horde_Log::' . $priority) + : Horde_Log::INFO; + } + + /* Make sure to log in the system's locale and timezone. */ + // TODO: Needed? + $locale = setlocale(LC_TIME, 0); + setlocale(LC_TIME, 'C'); + $tz = getenv('TZ'); + @putenv('TZ'); + + parent::log(array( + 'level' => $priority, + 'message' => $message, + //'timestamp' + )); + + /* Restore original locale and timezone. */ + // TODO: Needed? + setlocale(LC_TIME, $locale); + if ($tz) { + @putenv('TZ=' . $tz); + } + } + +} diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php index 602a190a0..d967dbbb2 100644 --- a/framework/Core/lib/Horde/Registry.php +++ b/framework/Core/lib/Horde/Registry.php @@ -331,7 +331,7 @@ class Horde_Registry } /** - * Stores cacheable member variables in the session at shutdown. + * Events to do on shutdown. */ public function __destruct() { @@ -341,10 +341,8 @@ class Horde_Registry } /* Register memory tracker if logging in debug mode. */ - if (!empty($GLOBALS['conf']['log']['enabled']) && - ($GLOBALS['conf']['log']['priority'] == PEAR_LOG_DEBUG) && - function_exists('memory_get_peak_usage')) { - Horde::logMessage('Max memory usage: ' . memory_get_peak_usage(true) . ' bytes', __FILE__, __LINE__, PEAR_LOG_DEBUG); + if (function_exists('memory_get_peak_usage')) { + Horde::logMessage('Max memory usage: ' . memory_get_peak_usage(true) . ' bytes', 'DEBUG'); } } @@ -494,7 +492,7 @@ class Horde_Registry 'noperms' => $api->noPerms ); } catch (Horde_Exception $e) { - Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($e, 'DEBUG'); } } } @@ -1029,7 +1027,7 @@ class Horde_Registry throw new Horde_Exception('User is not authorized', self::AUTH_FAILURE); } - Horde::logMessage(sprintf('%s does not have READ permission for %s', Horde_Auth::getAuth() ? 'User ' . Horde_Auth::getAuth() : 'Guest user', $app), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('%s does not have READ permission for %s', Horde_Auth::getAuth() ? 'User ' . Horde_Auth::getAuth() : 'Guest user', $app), 'DEBUG'); throw new Horde_Exception(sprintf(_('%s is not authorized for %s.'), Horde_Auth::getAuth() ? 'User ' . Horde_Auth::getAuth() : 'Guest user', $this->applications[$app]['name']), self::PERMISSION_DENIED); } @@ -1405,7 +1403,7 @@ class Horde_Registry $_SESSION['_registry']['md5'][$name] = $md5sum = hash('md5', $data); $id = $this->_getCacheId($name, false) . '|' . $md5sum; if ($ob->set($id, $data, 86400)) { - Horde::logMessage('Horde_Registry: stored ' . $name . ' with cache ID ' . $id, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Horde_Registry: stored ' . $name . ' with cache ID ' . $id, 'DEBUG'); } } } @@ -1431,7 +1429,7 @@ class Horde_Registry $result = $GLOBALS['injector']->getInstance('Horde_Cache')->get($id, 86400); if ($result !== false) { $this->_cache[$name] = unserialize($result); - Horde::logMessage('Horde_Registry: retrieved ' . $name . ' with cache ID ' . $id, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Horde_Registry: retrieved ' . $name . ' with cache ID ' . $id, 'DEBUG'); return true; } } diff --git a/framework/Core/package.xml b/framework/Core/package.xml index 23b2a1df0..e20b07691 100644 --- a/framework/Core/package.xml +++ b/framework/Core/package.xml @@ -37,7 +37,8 @@ Application Framework. beta LGPL - * Add Horde_Themes:: class. + * Convert from PEAR Log to Horde_Log for logging. + * Add Horde_Themes:: class. * Add Horde::nocacheUrl(). * Remove dependency on Horde_DOM package. * Added Horde_Registry_Api:: and Horde_Registry_Application:: classes. @@ -75,6 +76,9 @@ Application Framework. + + + @@ -144,7 +148,7 @@ Application Framework. Log - pear.php.net + pear.horde.org Prefs @@ -185,6 +189,7 @@ Application Framework. + diff --git a/framework/DataTree/DataTree/sql.php b/framework/DataTree/DataTree/sql.php index 7ea673002..86e8533a3 100644 --- a/framework/DataTree/DataTree/sql.php +++ b/framework/DataTree/DataTree/sql.php @@ -76,7 +76,7 @@ class DataTree_sql extends DataTree { { $query = 'SELECT DISTINCT group_uid FROM ' . $this->_params['table']; - Horde::logMessage('SQL Query by DataTree_sql::getGroups(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by DataTree_sql::getGroups(): ' . $query, 'DEBUG'); return $this->_db->getCol($query); } @@ -123,7 +123,7 @@ class DataTree_sql extends DataTree { return true; } - Horde::logMessage('SQL Query by DataTree_sql::_load(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by DataTree_sql::_load(): ' . $query, 'DEBUG'); $data = $this->_db->getAll($query); if (is_a($data, 'PEAR_Error')) { return $data; @@ -148,7 +148,7 @@ class DataTree_sql extends DataTree { if (empty($query)) { return 0; } - Horde::logMessage('SQL Query by DataTree_sql::_count(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by DataTree_sql::_count(): ' . $query, 'DEBUG'); return (int)$this->_db->getOne($query); } @@ -253,7 +253,7 @@ class DataTree_sql extends DataTree { $values = array($root, $this->_params['group']); - Horde::logMessage('SQL Query by DataTree_sql::_buildParentIds(): ' . $query . ', ' . var_export($values, true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by DataTree_sql::_buildParentIds(): ' . $query . ', ' . var_export($values, true), 'DEBUG'); $root = $this->_db->getAssoc($query, false, $values); if (is_a($root, 'PEAR_Error') || !count($root)) { return ''; @@ -334,7 +334,7 @@ class DataTree_sql extends DataTree { $this->_params['table'], $in, $this->_db->quote($this->_params['group'])); - Horde::logMessage('SQL Query by DataTree_sql::_loadById(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by DataTree_sql::_loadById(): ' . $query, 'DEBUG'); $parents = $this->_db->getAssoc($query); if (is_a($parents, 'PEAR_Error')) { return $parents; @@ -367,7 +367,7 @@ class DataTree_sql extends DataTree { ' AND group_uid = ? ORDER BY datatree_id'; $values = array_merge($ids, array($this->_params['group'])); - Horde::logMessage('SQL Query by DataTree_sql::_loadById(): ' . $query . ', ' . var_export($values, true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by DataTree_sql::_loadById(): ' . $query . ', ' . var_export($values, true), 'DEBUG'); $data = $this->_db->getAll($query, $values); if (is_a($data, 'PEAR_Error')) { return $data; @@ -392,7 +392,7 @@ class DataTree_sql extends DataTree { $object_parents = ''; foreach ($object_names as $name) { $values = array($this->_params['group'], $name, $object_parents); - Horde::logMessage('SQL Query by DataTree_sql::_exists(): ' . $query . ', ' . var_export($values, true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by DataTree_sql::_exists(): ' . $query . ', ' . var_export($values, true), 'DEBUG'); $result = $this->_db->getOne($query, $values); if (is_a($result, 'PEAR_Error') || !$result) { @@ -444,7 +444,7 @@ class DataTree_sql extends DataTree { $query = 'SELECT datatree_name FROM ' . $this->_params['table'] . ' WHERE group_uid = ? AND datatree_id = ?'; $values = array($this->_params['group'], (int)$id); - Horde::logMessage('SQL Query by DataTree_sql::_getName(): ' . $query . ', ' . var_export($values, true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by DataTree_sql::_getName(): ' . $query . ', ' . var_export($values, true), 'DEBUG'); $name = $this->_db->getOne($query, $values); if (is_a($name, 'PEAR_Error')) { @@ -536,7 +536,7 @@ class DataTree_sql extends DataTree { /* Get the next unique ID. */ $id = $this->_write_db->nextId($this->_params['table']); if (is_a($id, 'PEAR_Error')) { - Horde::logMessage($id, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($id, 'ERR'); return $id; } @@ -606,16 +606,16 @@ class DataTree_sql extends DataTree { (int)$ser, $parents); - Horde::logMessage('SQL Query by DataTree_sql::add(): ' . $query . ', ' . var_export($values, true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by DataTree_sql::add(): ' . $query . ', ' . var_export($values, true), 'DEBUG'); $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } $reorder = $this->reorder($parents, $order, $id); if (is_a($reorder, 'PEAR_Error')) { - Horde::logMessage($reorder, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($reorder, 'ERR'); return $reorder; } @@ -676,7 +676,7 @@ class DataTree_sql extends DataTree { $this->_write_db->quote($parent), is_null($order) ? 'NULL' : (int)$order) . $pquery; - Horde::logMessage('SQL Query by DataTree_sql::reorder(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by DataTree_sql::reorder(): ' . $query, 'DEBUG'); $result = $this->_write_db->query($query); } elseif (is_array($order)) { /* Multi update. */ @@ -687,7 +687,7 @@ class DataTree_sql extends DataTree { $values = array($this->_params['group'], $parent); - Horde::logMessage('SQL Query by DataTree_sql::reorder(): ' . $query . ', ' . var_export($values, true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by DataTree_sql::reorder(): ' . $query . ', ' . var_export($values, true), 'DEBUG'); $result = $this->_db->getOne($query, $values); if (is_a($result, 'PEAR_Error')) { @@ -702,7 +702,7 @@ class DataTree_sql extends DataTree { ' SET datatree_order = ? WHERE datatree_id = ?'; $values = array($o_key, is_null($o_cid) ? NULL : (int)$o_cid); - Horde::logMessage('SQL Query by DataTree_sql::reorder(): ' . $query . ', ' . var_export($values, true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by DataTree_sql::reorder(): ' . $query . ', ' . var_export($values, true), 'DEBUG'); $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { return $result; @@ -731,7 +731,7 @@ class DataTree_sql extends DataTree { $values = array(is_null($order) ? NULL : (int)$order, (int)$id); - Horde::logMessage('SQL Query by DataTree_sql::setOrder(): ' . $query . ', ' . var_export($values, true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by DataTree_sql::setOrder(): ' . $query . ', ' . var_export($values, true), 'DEBUG'); return $this->_write_db->query($query, $values); } @@ -755,7 +755,7 @@ class DataTree_sql extends DataTree { $values = array($this->_params['group'], '%:' . (int)$id . ''); - Horde::logMessage('SQL Query by DataTree_sql::remove(): ' . $query . ', ' . var_export($values, true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by DataTree_sql::remove(): ' . $query . ', ' . var_export($values, true), 'DEBUG'); $children = $this->_db->getAll($query, $values, DB_FETCHMODE_ASSOC); if (count($children)) { @@ -777,7 +777,7 @@ class DataTree_sql extends DataTree { ' WHERE datatree_id = ?'; $values = array((int)$id); - Horde::logMessage('SQL Query by DataTree_sql::remove(): ' . $query . ', ' . var_export($values, true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by DataTree_sql::remove(): ' . $query . ', ' . var_export($values, true), 'DEBUG'); $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { return $result; @@ -787,7 +787,7 @@ class DataTree_sql extends DataTree { ' WHERE datatree_id = ?'; $values = array((int)$id); - Horde::logMessage('SQL Query by DataTree_sql::remove(): ' . $query . ', ' . var_export($values, true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by DataTree_sql::remove(): ' . $query . ', ' . var_export($values, true), 'DEBUG'); $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { return $result; @@ -836,7 +836,7 @@ class DataTree_sql extends DataTree { ' WHERE datatree_id IN (?' . str_repeat(', ?', count($ids) - 1) . ')'; $values = $ids; - Horde::logMessage('SQL Query by DataTree_sql::removeByIds(): ' . $query . ', ' . var_export($values, true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by DataTree_sql::removeByIds(): ' . $query . ', ' . var_export($values, true), 'DEBUG'); $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { return $result; @@ -846,7 +846,7 @@ class DataTree_sql extends DataTree { ' WHERE datatree_id IN (?' . str_repeat(', ?', count($ids) - 1) . ')'; $values = $ids; - Horde::logMessage('SQL Query by DataTree_sql::removeByIds(): ' . $query . ', ' . var_export($values, true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by DataTree_sql::removeByIds(): ' . $query . ', ' . var_export($values, true), 'DEBUG'); return $this->_write_db->query($query, $values); } @@ -876,7 +876,7 @@ class DataTree_sql extends DataTree { ' WHERE datatree_name IN (?' . str_repeat(', ?', count($names) - 1) . ')'; $values = $names; - Horde::logMessage('SQL Query by DataTree_sql::removeByNames(): ' . $query . ', ' . var_export($values, true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by DataTree_sql::removeByNames(): ' . $query . ', ' . var_export($values, true), 'DEBUG'); $ids = $this->_db->getCol($query, 0, $values); if (is_a($ids, 'PEAR_Error')) { return $ids; @@ -912,7 +912,7 @@ class DataTree_sql extends DataTree { $old_parent_path . ':' . $id . ':%', (int)$id); - Horde::logMessage('SQL Query by DataTree_sql::move(): ' . $query . ', ' . var_export($values, true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by DataTree_sql::move(): ' . $query . ', ' . var_export($values, true), 'DEBUG'); $rowset = $this->_db->query($query, $values); if (is_a($rowset, 'PEAR_Error')) { return $rowset; @@ -942,7 +942,7 @@ class DataTree_sql extends DataTree { $this->_write_db->quote($ppath), (int)$row['datatree_id']); - Horde::logMessage('SQL Query by DataTree_sql::move(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by DataTree_sql::move(): ' . $query, 'DEBUG'); $result = $this->_write_db->query($query); if (is_a($result, 'PEAR_Error')) { return $result; @@ -981,7 +981,7 @@ class DataTree_sql extends DataTree { $values = array(Horde_String::convertCharset($new_object_name, Horde_Nls::getCharset(), $this->_params['charset']), (int)$id); - Horde::logMessage('SQL Query by DataTree_sql::rename(): ' . $query . ', ' . var_export($values, true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by DataTree_sql::rename(): ' . $query . ', ' . var_export($values, true), 'DEBUG'); $result = $this->_write_db->query($query, $values); return is_a($result, 'PEAR_Error') ? $result : true; @@ -1005,10 +1005,10 @@ class DataTree_sql extends DataTree { $this->_params['table'], implode(', ', $cid)); - Horde::logMessage('SQL Query by DataTree_sql::getData(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by DataTree_sql::getData(): ' . $query, 'DEBUG'); $result = $this->_db->getAssoc($query); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -1034,7 +1034,7 @@ class DataTree_sql extends DataTree { ' WHERE datatree_id = ?'; $values = array((int)$cid); - Horde::logMessage('SQL Query by DataTree_sql::getData(): ' . $query . ', ' . var_export($values, true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by DataTree_sql::getData(): ' . $query . ', ' . var_export($values, true), 'DEBUG'); $row = $this->_db->getRow($query, $values, DB_FETCHMODE_ASSOC); $data = Horde_Serialize::unserialize($row['datatree_data'], @@ -1077,7 +1077,7 @@ class DataTree_sql extends DataTree { implode(', ', $cid), $filter); - Horde::logMessage('SQL Query by DataTree_sql::getAttributes(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by DataTree_sql::getAttributes(): ' . $query, 'DEBUG'); $rows = $this->_db->getAll($query, DB_FETCHMODE_ASSOC); if (is_a($rows, 'PEAR_Error')) { return $rows; @@ -1099,7 +1099,7 @@ class DataTree_sql extends DataTree { (int)$cid, $filter); - Horde::logMessage('SQL Query by DataTree_sql::getAttributes(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by DataTree_sql::getAttributes(): ' . $query, 'DEBUG'); $rows = $this->_db->getAll($query, DB_FETCHMODE_ASSOC); for ($i = 0; $i < count($rows); $i++) { $rows[$i]['value'] = Horde_String::convertCharset($rows[$i]['value'], @@ -1139,16 +1139,16 @@ class DataTree_sql extends DataTree { } list($query, $values) = $aq; - Horde::logMessage('SQL Query by DataTree_sql::countByAttributes(): ' . $query . ', ' . var_export($values, true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by DataTree_sql::countByAttributes(): ' . $query . ', ' . var_export($values, true), 'DEBUG'); $result = $this->_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } $row = $result->fetchRow(); if (is_a($row, 'PEAR_Error')) { - Horde::logMessage($row, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($row, 'ERR'); return $row; } @@ -1206,11 +1206,11 @@ class DataTree_sql extends DataTree { $query = $this->_db->modifyLimitQuery($query, $from, $count); } - Horde::logMessage('SQL Query by DataTree_sql::getByAttributes(): ' . $query . ', ' . var_export($values, true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by DataTree_sql::getByAttributes(): ' . $query . ', ' . var_export($values, true), 'DEBUG'); $result = $this->_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } while ($row = $result->fetchRow()) { @@ -1241,10 +1241,10 @@ class DataTree_sql extends DataTree { $query = $this->_db->modifyLimitQuery($query, $from, $count); } - Horde::logMessage('SQL Query by DataTree_sql::getByAttributes(): ' . $query . ', ' . var_export($values, true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by DataTree_sql::getByAttributes(): ' . $query . ', ' . var_export($values, true), 'DEBUG'); $result = $this->_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -1290,7 +1290,7 @@ class DataTree_sql extends DataTree { $where, ($direction == 1) ? 'DESC' : 'ASC'); - Horde::logMessage('SQL Query by DataTree_sql::sortByAttributes(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by DataTree_sql::sortByAttributes(): ' . $query, 'DEBUG'); $ordered_ids = $this->_db->getCol($query); /* Make sure that some ids didn't get lost because has no such @@ -1480,11 +1480,11 @@ class DataTree_sql extends DataTree { $where, $levelQuery); - Horde::logMessage('SQL Query by DataTree_sql::getAttributeValues(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by DataTree_sql::getAttributeValues(): ' . $query, 'DEBUG'); $rows = $this->_db->getCol($query); if (is_a($rows, 'PEAR_Error')) { - Horde::logMessage($rows, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($rows, 'ERR'); } return $rows; @@ -1777,7 +1777,7 @@ class DataTree_sql extends DataTree { ' SET datatree_data = ? WHERE datatree_id = ?'; $values = array(NULL, (int)$id); - Horde::logMessage('SQL Query by DataTree_sql::updateData(): ' . $query . ', ' . var_export($values, true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by DataTree_sql::updateData(): ' . $query . ', ' . var_export($values, true), 'DEBUG'); $this->_write_db->query($query, $values); /* Start a transaction. */ @@ -1788,7 +1788,7 @@ class DataTree_sql extends DataTree { ' WHERE datatree_id = ?'; $values = array((int)$id); - Horde::logMessage('SQL Query by DataTree_sql::updateData(): ' . $query . ', ' . var_export($values, true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by DataTree_sql::updateData(): ' . $query . ', ' . var_export($values, true), 'DEBUG'); $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { $this->_write_db->rollback(); @@ -1810,7 +1810,7 @@ class DataTree_sql extends DataTree { $attr['key'], Horde_String::convertCharset($attr['value'], Horde_Nls::getCharset(), $this->_params['charset'])); - Horde::logMessage('SQL Query by DataTree_sql::updateData(): ' . $query . ', ' . var_export($values, true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by DataTree_sql::updateData(): ' . $query . ', ' . var_export($values, true), 'DEBUG'); $result = $this->_write_db->execute($statement, $values); if (is_a($result, 'PEAR_Error')) { @@ -1838,7 +1838,7 @@ class DataTree_sql extends DataTree { (int)$ser, (int)$id); - Horde::logMessage('SQL Query by DataTree_sql::updateData(): ' . $query . ', ' . var_export($values, true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by DataTree_sql::updateData(): ' . $query . ', ' . var_export($values, true), 'DEBUG'); $result = $this->_write_db->query($query, $values); return is_a($result, 'PEAR_Error') ? $result : true; diff --git a/framework/Form/Form.php b/framework/Form/Form.php index 9e70e784b..b17d9678a 100644 --- a/framework/Form/Form.php +++ b/framework/Form/Form.php @@ -692,7 +692,7 @@ class Horde_Form { function execute() { - Horde::logMessage('Warning: Horde_Form::execute() called, should be overridden', __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Warning: Horde_Form::execute() called, should be overridden', 'DEBUG'); } /** diff --git a/framework/Group/Group.php b/framework/Group/Group.php index 1105c66c6..0ba3ec52c 100644 --- a/framework/Group/Group.php +++ b/framework/Group/Group.php @@ -565,7 +565,7 @@ class Group { } elseif ($subgroups) { $groups = $this->getGroupMemberships($user, true); if (is_a($groups, 'PEAR_Error')) { - Horde::logMessage($groups, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($groups, 'ERR'); return false; } @@ -573,7 +573,7 @@ class Group { } else { $users = $this->listUsers($gid); if (is_a($users, 'PEAR_Error')) { - Horde::logMessage($users, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($users, 'ERR'); return false; } return in_array($user, $users); diff --git a/framework/Group/Group/contactlists.php b/framework/Group/Group/contactlists.php index 718727f07..9ddcbcc62 100644 --- a/framework/Group/Group/contactlists.php +++ b/framework/Group/Group/contactlists.php @@ -414,7 +414,7 @@ class Group_contactlists extends Group { $results = $this->_db[$source]->getRow($sql,array(), DB_FETCHMODE_ASSOC); if (is_a($results, 'PEAR_Error')) { - Horde::logMessage($results, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($results, 'ERR'); } $this->_listEntries[$gid] = $results; @@ -467,7 +467,7 @@ class Group_contactlists extends Group { $results = $this->_db[$newSource]->getRow($sql); if (is_a($results, 'PEAR_Error')) { - Horde::logMessage($results, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($results, 'ERR'); return $results; } @@ -561,7 +561,7 @@ class Group_contactlists extends Group { $users = $this->_getAllMembers($gid, $subgroups); if (is_a($users, 'PEAR_Error')) { - Horde::logMessage($users, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($users, 'ERR'); return false; } $result = !empty($users[$user]); diff --git a/framework/Group/Group/ldap.php b/framework/Group/Group/ldap.php index b8484667f..b49a3993f 100644 --- a/framework/Group/Group/ldap.php +++ b/framework/Group/Group/ldap.php @@ -88,7 +88,7 @@ class Group_ldap extends Group { sprintf('STARTTLS failed: [%d] %s', @ldap_errno($this->_ds), @ldap_error($this->_ds)), - __FILE__, __LINE__, PEAR_LOG_ERR); + 'ERR'); } } diff --git a/framework/Group/Group/sql.php b/framework/Group/Group/sql.php index 899e77ce8..ac20516d4 100644 --- a/framework/Group/Group/sql.php +++ b/framework/Group/Group/sql.php @@ -676,7 +676,7 @@ class Group_sql extends Group { if ($subgroups) { $groups = $this->getGroupMemberships($user, true); if (is_a($groups, 'PEAR_Error')) { - Horde::logMessage($groups, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($groups, 'ERR'); return false; } diff --git a/framework/History/lib/Horde/History/Sql.php b/framework/History/lib/Horde/History/Sql.php index ea764c47d..d2b2def20 100644 --- a/framework/History/lib/Horde/History/Sql.php +++ b/framework/History/lib/Horde/History/Sql.php @@ -261,7 +261,7 @@ class Horde_History_Sql extends Horde_History if (!empty($this->_logger)) { $this->_logger->error($result->getMessage()); } else { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); } throw new Horde_Exception($result->getMessage()); } diff --git a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Base.php b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Base.php index 872c51867..7808e0fe7 100644 --- a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Base.php +++ b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Base.php @@ -102,22 +102,22 @@ class Horde_Kolab_Filter_Base return $result; } - Horde::logMessage(sprintf("%s starting up (sender=%s, recipients=%s, client_address=%s)", - get_class($this), $this->_sender, - join(', ',$this->_recipients), + Horde::logMessage(sprintf("%s starting up (sender=%s, recipients=%s, client_address=%s)", + get_class($this), $this->_sender, + join(', ',$this->_recipients), $this->_client_address), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + 'DEBUG'); $result = $this->_parse($inh, $transport); if (is_a($result, 'PEAR_Error')) { return $result; } - Horde::logMessage(sprintf("%s successfully completed (sender=%s, recipients=%s, client_address=%s, id=%s)", - get_class($this), $this->_sender, - join(', ',$this->_recipients), + Horde::logMessage(sprintf("%s successfully completed (sender=%s, recipients=%s, client_address=%s, id=%s)", + get_class($this), $this->_sender, + join(', ',$this->_recipients), $this->_client_address, $this->_id), - __FILE__, __LINE__, PEAR_LOG_INFO); + 'INFO'); } /** @@ -208,7 +208,7 @@ class Horde_Kolab_Filter_Base } if (empty($values['recipient'])) { - $msg = 'Please provide one or more recipients.' + $msg = 'Please provide one or more recipients.' . "\n\n" . $p->getUsage(); return PEAR::raiseError($msg, OUT_STDOUT | EX_USAGE); } @@ -219,8 +219,7 @@ class Horde_Kolab_Filter_Base $this->_fqhostname = strtolower($values['host']); $this->_sasl_username = strtolower($values['user']); - Horde::logMessage(sprintf("Arguments: %s", print_r($values, true)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf("Arguments: %s", print_r($values, true)), 'DEBUG'); Horde_Nls::setCharset('utf-8'); @@ -265,7 +264,7 @@ class Horde_Kolab_Filter_Base */ if (!isset($conf['log'])) { $conf['log']['enabled'] = true; - $conf['log']['priority'] = PEAR_LOG_DEBUG; + $conf['log']['priority'] = 'DEBUG'; $conf['log']['type'] = 'syslog'; $conf['log']['name'] = LOG_MAIL; $conf['log']['ident'] = 'kolabfilter'; @@ -274,7 +273,7 @@ class Horde_Kolab_Filter_Base } } -class Horde_Kolab_Filter_Argv_Parser extends Horde_Argv_Parser +class Horde_Kolab_Filter_Argv_Parser extends Horde_Argv_Parser { public function parserError($msg) { diff --git a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Content.php b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Content.php index 84de39872..daf5804dd 100644 --- a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Content.php +++ b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Content.php @@ -84,7 +84,7 @@ class Horde_Kolab_Filter_Content extends Horde_Kolab_Filter_Base /* Done with headers */ $state = RM_STATE_READING_BODY; if ($from && $verify_from_header) { - $rc = $this->_verify_sender($this->_sasl_username, $this->_sender, + $rc = $this->_verify_sender($this->_sasl_username, $this->_sender, $from, $this->_client_address); if (is_a($rc, 'PEAR_Error')) { return $rc; @@ -97,8 +97,7 @@ class Horde_Kolab_Filter_Content extends Horde_Kolab_Filter_Base /* Rewrite from */ if (strpos($from, $rc) === false) { Horde::logMessage(sprintf("Rewriting '%s' to '%s'", - $from, $rc), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $from, $rc), 'DEBUG'); $rewrittenfrom = "From: $rc\r\n"; } } @@ -120,8 +119,7 @@ class Horde_Kolab_Filter_Content extends Horde_Kolab_Filter_Base $subject = $regs[1]; $state = RM_STATE_READING_SUBJECT; } else if (eregi('^Content-Type: text/calendar', $line)) { - Horde::logMessage("Found iCal data in message", - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage("Found iCal data in message", 'DEBUG'); $ical = true; } else if (eregi('^Message-ID: (.*)', $line, $regs)) { $this->_id = $regs[1]; @@ -211,8 +209,8 @@ class Horde_Kolab_Filter_Content extends Horde_Kolab_Filter_Base $port = 10025; } - $transport = &Horde_Kolab_Filter_Transport::factory($transport, - array('host' => $host, + $transport = &Horde_Kolab_Filter_Transport::factory($transport, + array('host' => $host, 'port' => $port)); $tmpf = @fopen($this->_tmpfile, 'r'); @@ -338,7 +336,7 @@ class Horde_Kolab_Filter_Content extends Horde_Kolab_Filter_Base } /* Allow anything from localhost and - * fellow Kolab-hosts + * fellow Kolab-hosts */ if ($client_addr == $local_addr) { return true; @@ -409,30 +407,27 @@ class Horde_Kolab_Filter_Content extends Horde_Kolab_Filter_Base if ($sasluser) { if (!in_array(strtolower($from), $allowed_addrs)) { - Horde::logMessage(sprintf("%s is not an allowed From address for %s", - $from, $sasluser), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf("%s is not an allowed From address for %s", $from, $sasluser), 'DEBUG'); return false; } } else { foreach ($domains as $domain) { - if (strtolower($fromdom) == $domain + if (strtolower($fromdom) == $domain || ($verify_subdomains && substr($fromdom, -strlen($domain)-1) == ".$domain")) { if ($reject_forged_from_header) { - Horde::logMessage(sprintf("%s is not an allowed From address for unauthenticated users.", - $from), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf("%s is not an allowed From address for unauthenticated users.", $from), 'DEBUG'); return false; } else { require_once 'Horde/String.php'; require_once 'Horde/MIME.php'; /* Rewrite */ - Horde::logMessage(sprintf("%s is not an allowed From address for unauthenticated users, rewriting.", - $from), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf("%s is not an allowed From address for unauthenticated users, rewriting.", $from), 'DEBUG'); if (property_exists($adr, 'personal')) { - $name = str_replace(array("\\", '"'), - array("\\\\",'\"'), + $name = str_replace(array("\\", '"'), + array("\\\\",'\"'), MIME::decode($adr->personal, 'utf-8')); } else { $name = ''; diff --git a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Incoming.php b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Incoming.php index b80fc1dcc..41981c23e 100644 --- a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Incoming.php +++ b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Incoming.php @@ -70,8 +70,7 @@ class Horde_Kolab_Filter_Incoming extends Horde_Kolab_Filter_Base /* Done with headers */ $headers_done = true; } else if (eregi('^Content-Type: text/calendar', $line)) { - Horde::logMessage("Found iCal data in message", - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage("Found iCal data in message", 'DEBUG'); $ical = true; } else if (eregi('^Message-ID: (.*)', $line, $regs)) { $this->_id = $regs[1]; @@ -137,8 +136,7 @@ class Horde_Kolab_Filter_Incoming extends Horde_Kolab_Filter_Base } Horde::logMessage(sprintf("Calling resmgr_filter(%s, %s, %s, %s)", $this->_fqhostname, $this->_sender, - $resource, $this->_tmpfile), __FILE__, __LINE__, - PEAR_LOG_DEBUG); + $resource, $this->_tmpfile), 'DEBUG'); $r = new Kolab_Resource(); $rc = $r->handleMessage($this->_fqhostname, $this->_sender, $resource, $this->_tmpfile); @@ -157,8 +155,7 @@ class Horde_Kolab_Filter_Incoming extends Horde_Kolab_Filter_Base /* Check if we still have recipients */ if (empty($this->_recipients)) { - Horde::logMessage("No recipients left.", - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage("No recipients left.", 'DEBUG'); return; } else { $result = $this->_deliver($transport); @@ -167,8 +164,7 @@ class Horde_Kolab_Filter_Incoming extends Horde_Kolab_Filter_Base } } - Horde::logMessage("Filter_Incoming successfully completed.", - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage("Filter_Incoming successfully completed.", 'DEBUG'); } /** @@ -216,15 +212,13 @@ class Horde_Kolab_Filter_Incoming extends Horde_Kolab_Filter_Base return $dn; } if (!$dn) { - Horde::logMessage(sprintf('User %s does not exist!', $real_recipient), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('User %s does not exist!', $real_recipient), 'DEBUG'); } try { $user = $server->fetch($dn, 'Horde_Kolab_Server_Object_Kolab_User'); } catch (Horde_Kolab_Server_Exception $e) { Horde::logMessage(sprintf('Failed fetching user object %s. Error was:', - $dn, $e->getMessage()), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $dn, $e->getMessage()), 'DEBUG'); $user->code = OUT_LOG | EX_TEMPFAIL; return $user; } diff --git a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Outlook.php b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Outlook.php index 598917d98..94ce53d62 100644 --- a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Outlook.php +++ b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Outlook.php @@ -114,8 +114,7 @@ class Kolab_Filter_Outlook array(), false); } Horde::logMessage(sprintf("Adding missing organizer '%s <%s>' to iCal.", - $org_name, $org_email), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $org_name, $org_email), 'DEBUG'); $icaltxt = $iCal->exportvCalendar(); } } @@ -167,8 +166,7 @@ class Kolab_Filter_Outlook function embedICal($fqhostname, $sender, $recipients, $origfrom, $subject, $tmpfname, $transport) { - Horde::logMessage(sprintf("Encapsulating iCal message forwarded by %s", $sender), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf("Encapsulating iCal message forwarded by %s", $sender), 'DEBUG'); $forwardtext = "This is an invitation forwarded by outlook and\n". "was rectified by the Kolab server.\n". @@ -195,8 +193,7 @@ class Kolab_Filter_Outlook list( $headers, $mime) = Kolab_Filter_Outlook::_mimeParse($requestText); $parts = $mime->contentTypeMap(); if (count($parts) != 1 || $parts[1] != 'text/calendar') { - Horde::logMessage("Message does not contain exactly one toplevel text/calendar part, passing through.", - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage("Message does not contain exactly one toplevel text/calendar part, passing through.", 'DEBUG'); return false; } $basepart = $mime->getBasePart(); diff --git a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Response.php b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Response.php index 8a4695cdd..3962fb095 100644 --- a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Response.php +++ b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Response.php @@ -156,7 +156,7 @@ class Horde_Kolab_Filter_Response */ if (!isset($conf['kolab']['filter']['debug']) || !$conf['kolab']['filter']['debug']) { - Horde::logMessage($msg, $file, $line, PEAR_LOG_ERR); + Horde::logMessage($msg, 'ERR'); } else { $msg .= ' (Line ' . $frame['line'] . ' in ' . basename($frame['file']) . ")\n"; fwrite(STDOUT, $msg); diff --git a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/DovecotLDA.php b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/DovecotLDA.php index 69411ae77..21fd30dd0 100644 --- a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/DovecotLDA.php +++ b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/DovecotLDA.php @@ -209,8 +209,7 @@ class Dovecot_LDA Horde::logMessage(sprintf("Starting Dovecot delivery process with UID %d, GID %d (sender=%s, recipient=%s) ...", getmyuid(), getmygid(), - $this->_envelopeSender, $recipient), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $this->_envelopeSender, $recipient), 'DEBUG'); $deliver = $conf['kolab']['filter']['dovecot_deliver']; @@ -229,11 +228,9 @@ class Dovecot_LDA */ function _stop_deliver() { - Horde::logMessage("Stoping Dovecot delivery process ...", - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage("Stoping Dovecot delivery process ...", 'DEBUG'); $retval = pclose($this->_deliver_fh); - Horde::logMessage(sprintf("... return value was %d\n", $retval), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf("... return value was %d\n", $retval), 'DEBUG'); if ($retval != 0) { return PEAR::raiseError('Dovecot LDA Backend delivery process signaled an error.'); } diff --git a/framework/Kolab_Filter/lib/Horde/Kolab/Resource.php b/framework/Kolab_Filter/lib/Horde/Kolab/Resource.php index 9bed33c3b..be51078be 100644 --- a/framework/Kolab_Filter/lib/Horde/Kolab/Resource.php +++ b/framework/Kolab_Filter/lib/Horde/Kolab/Resource.php @@ -75,8 +75,7 @@ class Kolab_Resource if (is_array($dn)) { if (count($dn) > 1) { Horde::logMessage(sprintf("%s objects returned for %s", - $count($dn), $resource), - __FILE__, __LINE__, PEAR_LOG_WARNING); + $count($dn), $resource), 'WARN'); return false; } else { $dn = $dn[0]; @@ -313,8 +312,7 @@ class Kolab_Resource $object['alarm'] = -$trigger / 60; } } else { - Horde::logMessage('No TRIGGER in VALARM. ' . $trigger->getMessage(), - __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage('No TRIGGER in VALARM. ' . $trigger->getMessage(), 'ERR'); } } @@ -328,8 +326,7 @@ class Kolab_Resource } Horde::logMessage(sprintf('Assembled event object: %s', - print_r($object, true)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + print_r($object, true)), 'DEBUG'); return $object; } @@ -358,13 +355,11 @@ class Kolab_Resource $action = RM_ACT_MANUAL; } Horde::logMessage(sprintf('Action for %s is %s', - $sender, $action), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $sender, $action), 'DEBUG'); // Get out as early as possible if manual if ($action == RM_ACT_MANUAL) { - Horde::logMessage(sprintf('Passing through message to %s', $id), - __FILE__, __LINE__, PEAR_LOG_INFO); + Horde::logMessage(sprintf('Passing through message to %s', $id), 'INFO'); return true; } @@ -372,15 +367,13 @@ class Kolab_Resource $iCalendar = &$this->_getICal($tmpfname); if ($iCalendar === false) { // No iCal in mail - Horde::logMessage(sprintf('Could not parse iCalendar data, passing through to %s', $id), - __FILE__, __LINE__, PEAR_LOG_INFO); + Horde::logMessage(sprintf('Could not parse iCalendar data, passing through to %s', $id), 'INFO'); return true; } // Get the event details out of the iTip request $itip = &$iCalendar->findComponent('VEVENT'); if ($itip === false) { - Horde::logMessage(sprintf('No VEVENT found in iCalendar data, passing through to %s', $id), - __FILE__, __LINE__, PEAR_LOG_INFO); + Horde::logMessage(sprintf('No VEVENT found in iCalendar data, passing through to %s', $id), 'INFO'); return true; } @@ -390,18 +383,15 @@ class Kolab_Resource $itip->getAttributeDefault('METHOD', 'REQUEST'))); // What resource are we managing? - Horde::logMessage(sprintf('Processing %s method for %s', $method, $id), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Processing %s method for %s', $method, $id), 'DEBUG'); // This is assumed to be constant across event creation/modification/deletipn $uid = $itip->getAttributeDefault('UID', ''); - Horde::logMessage(sprintf('Event has UID %s', $uid), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Event has UID %s', $uid), 'DEBUG'); // Who is the organiser? $organiser = preg_replace('/^mailto:\s*/i', '', $itip->getAttributeDefault('ORGANIZER', '')); - Horde::logMessage(sprintf('Request made by %s', $organiser), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Request made by %s', $organiser), 'DEBUG'); // What is the events summary? $summary = $itip->getAttributeDefault('SUMMARY', ''); @@ -410,19 +400,16 @@ class Kolab_Resource $dtend = $this->convert2epoch($itip->getAttributeDefault('DTEND', 0)); Horde::logMessage(sprintf('Event starts on <%s> %s and ends on <%s> %s.', - $dtstart, $this->iCalDate2Kolab($dtstart), $dtend, $this->iCalDate2Kolab($dtend)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $dtstart, $this->iCalDate2Kolab($dtstart), $dtend, $this->iCalDate2Kolab($dtend)), 'DEBUG'); if ($action == RM_ACT_ALWAYS_REJECT) { if ($method == 'REQUEST') { - Horde::logMessage(sprintf('Rejecting %s method', $method), - __FILE__, __LINE__, PEAR_LOG_INFO); + Horde::logMessage(sprintf('Rejecting %s method', $method), 'INFO'); $this->sendITipReply($cn, $resource, $itip, RM_ITIP_DECLINE, $organiser, $uid, $is_update); return false; } else { - Horde::logMessage(sprintf('Passing through %s method for ACT_ALWAYS_REJECT policy', $method), - __FILE__, __LINE__, PEAR_LOG_INFO); + Horde::logMessage(sprintf('Passing through %s method for ACT_ALWAYS_REJECT policy', $method), 'INFO'); return true; } } @@ -449,8 +436,7 @@ class Kolab_Resource if (is_a($imap_error, 'PEAR_Error')) { Horde::logMessage(sprintf('Failed accessing IMAP calendar: %s', - $folder->getMessage()), - __FILE__, __LINE__, PEAR_LOG_ERR); + $folder->getMessage()), 'ERR'); if ($action == RM_ACT_MANUAL_IF_CONFLICTS) { return true; } @@ -459,8 +445,7 @@ class Kolab_Resource switch ($method) { case 'REQUEST': if ($action == RM_ACT_MANUAL) { - Horde::logMessage(sprintf('Passing through %s method', $method), - __FILE__, __LINE__, PEAR_LOG_INFO); + Horde::logMessage(sprintf('Passing through %s method', $method), 'INFO'); break; } @@ -493,8 +478,7 @@ class Kolab_Resource $vfbstart = $vfb->getAttributeDefault('DTSTART', 0); $vfbend = $vfb->getAttributeDefault('DTEND', 0); Horde::logMessage(sprintf('Free/busy info starts on <%s> %s and ends on <%s> %s', - $vfbstart, $this->iCalDate2Kolab($vfbstart), $vfbend, $this->iCalDate2Kolab($vfbend)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $vfbstart, $this->iCalDate2Kolab($vfbstart), $vfbend, $this->iCalDate2Kolab($vfbend)), 'DEBUG'); if ($vfbstart && $dtstart > $this->convert2epoch ($vfbend)) { $outofperiod=1; @@ -502,12 +486,10 @@ class Kolab_Resource // Check whether we are busy or not $busyperiods = $vfb->getBusyPeriods(); Horde::logMessage(sprintf('Busyperiods: %s', - print_r($busyperiods, true)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + print_r($busyperiods, true)), 'DEBUG'); $extraparams = $vfb->getExtraParams(); Horde::logMessage(sprintf('Extraparams: %s', - print_r($extraparams, true)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + print_r($extraparams, true)), 'DEBUG'); $conflict = false; if (!empty($object['recurrence'])) { $recurrence = new Horde_Date_Recurrence(time()); @@ -538,8 +520,7 @@ class Kolab_Resource Horde::logMessage(sprintf('Busy period from %s to %s', strftime('%a, %d %b %Y %H:%M:%S %z', $busyfrom), strftime('%a, %d %b %Y %H:%M:%S %z', $busyto) - ), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + ), 'DEBUG'); if ((isset($extraparams[$busyfrom]['X-UID']) && in_array(base64_decode($extraparams[$busyfrom]['X-UID']), $ignore)) || (isset($extraparams[$busyfrom]['X-SID']) @@ -548,8 +529,7 @@ class Kolab_Resource continue; } if (($busyfrom >= $dtstart && $busyfrom < $dtend) || ($dtstart >= $busyfrom && $dtstart < $busyto)) { - Horde::logMessage('Request overlaps', - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Request overlaps', 'DEBUG'); $conflict = true; break; } @@ -562,12 +542,10 @@ class Kolab_Resource if ($conflict) { if ($action == RM_ACT_MANUAL_IF_CONFLICTS) { //sendITipReply(RM_ITIP_TENTATIVE); - Horde::logMessage('Conflict detected; Passing mail through', - __FILE__, __LINE__, PEAR_LOG_INFO); + Horde::logMessage('Conflict detected; Passing mail through', 'INFO'); return true; } else if ($action == RM_ACT_REJECT_IF_CONFLICTS) { - Horde::logMessage('Conflict detected; rejecting', - __FILE__, __LINE__, PEAR_LOG_INFO); + Horde::logMessage('Conflict detected; rejecting', 'INFO'); $this->sendITipReply($cn, $id, $itip, RM_ITIP_DECLINE, $organiser, $uid, $is_update); return false; @@ -577,8 +555,7 @@ class Kolab_Resource } if (is_a($imap_error, 'PEAR_Error')) { - Horde::logMessage('Could not access users calendar; rejecting', - __FILE__, __LINE__, PEAR_LOG_INFO); + Horde::logMessage('Could not access users calendar; rejecting', 'INFO'); $this->sendITipReply($cn, $id, $itip, RM_ITIP_DECLINE, $organiser, $uid, $is_update); return false; @@ -588,8 +565,7 @@ class Kolab_Resource // was specified; either way we add the new event & send an 'ACCEPT' // iTip reply - Horde::logMessage(sprintf('Adding event %s', $uid), - __FILE__, __LINE__, PEAR_LOG_INFO); + Horde::logMessage(sprintf('Adding event %s', $uid), 'INFO'); if (!empty($conf['kolab']['filter']['simple_locks'])) { if (!empty($conf['kolab']['filter']['simple_locks_timeout'])) { @@ -613,22 +589,19 @@ class Kolab_Resource $counter++; } if ($counter == $timeout) { - Horde::logMessage(sprintf('Lock timeout of %s seconds exceeded. Rejecting invitation.', $timeout), - __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage(sprintf('Lock timeout of %s seconds exceeded. Rejecting invitation.', $timeout), 'ERR'); $this->sendITipReply($cn, $id, $itip, RM_ITIP_DECLINE, $organiser, $uid, $is_update); return false; } $result = file_put_contents($lockfile, 'LOCKED'); if ($result === false) { - Horde::logMessage(sprintf('Failed creating lock file %s.', $lockfile), - __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage(sprintf('Failed creating lock file %s.', $lockfile), 'ERR'); } else { $this->lockfile = $lockfile; } } else { - Horde::logMessage(sprintf('The lock directory %s is missing. Disabled locking.', $lockdir), - __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage(sprintf('The lock directory %s is missing. Disabled locking.', $lockdir), 'ERR'); } } @@ -668,8 +641,7 @@ class Kolab_Resource if ($outofperiod) { $this->sendITipReply($cn, $resource, $itip, RM_ITIP_TENTATIVE, $organiser, $uid, $is_update); - Horde::logMessage('No freebusy information available', - __FILE__, __LINE__, PEAR_LOG_NOTICE); + Horde::logMessage('No freebusy information available', 'NOTICE'); } else { $this->sendITipReply($cn, $resource, $itip, RM_ITIP_ACCEPT, $organiser, $uid, $is_update); @@ -677,16 +649,14 @@ class Kolab_Resource return false; case 'CANCEL': - Horde::logMessage(sprintf('Removing event %s', $uid), - __FILE__, __LINE__, PEAR_LOG_INFO); + Horde::logMessage(sprintf('Removing event %s', $uid), 'INFO'); if (is_a($imap_error, 'PEAR_Error')) { $body = sprintf(_("Unable to access %s's calendar:"), $resource) . "\n\n" . $summary; $subject = sprintf(_("Error processing \"%s\""), $summary); } else if (!$data->objectUidExists($uid)) { Horde::logMessage(sprintf('Canceled event %s is not present in %s\'s calendar', - $uid, $resource), - __FILE__, __LINE__, PEAR_LOG_WARNING); + $uid, $resource), 'WARNING'); $body = sprintf(_("The following event that was canceled is not present in %s's calendar:"), $resource) . "\n\n" . $summary; $subject = sprintf(_("Error processing \"%s\""), $summary); } else { @@ -695,22 +665,19 @@ class Kolab_Resource * Delete any old events that we updated */ Horde::logMessage(sprintf('Deleting %s because of cancel', - $uid), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $uid), 'DEBUG'); $result = $data->delete($uid); if (is_a($result, 'PEAR_Error')) { Horde::logMessage(sprintf('Deleting %s failed with %s', - $uid, $result->getMessage()), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $uid, $result->getMessage()), 'DEBUG'); } $body = _("The following event has been successfully removed:") . "\n\n" . $summary; $subject = sprintf(_("%s has been cancelled"), $summary); } - Horde::logMessage(sprintf('Sending confirmation of cancelation to %s', $organiser), - __FILE__, __LINE__, PEAR_LOG_WARNING); + Horde::logMessage(sprintf('Sending confirmation of cancelation to %s', $organiser), 'WARNING'); $body = new MIME_Part('text/plain', Horde_String::wrap($body, 76, "\n", 'utf-8'), 'utf-8'); $mime = &MIME_Message::convertMimePart($body); @@ -731,8 +698,7 @@ class Kolab_Resource return $result; } - Horde::logMessage('Successfully sent cancellation reply', - __FILE__, __LINE__, PEAR_LOG_INFO); + Horde::logMessage('Successfully sent cancellation reply', 'INFO'); return false;; @@ -740,8 +706,7 @@ class Kolab_Resource // We either don't currently handle these iTip methods, or they do not // apply to what we're trying to accomplish here Horde::logMessage(sprintf('Ignoring %s method and passing message through to %s', - $method, $resource), - __FILE__, __LINE__, PEAR_LOG_INFO); + $method, $resource), 'INFO'); return true; } } @@ -756,8 +721,7 @@ class Kolab_Resource if (!empty($this->lockfile)) { @unlink($this->lockfile); if (file_exists($this->lockfile)) { - Horde::logMessage(sprintf('Failed removing the lockfile %s.', $lockfile), - __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage(sprintf('Failed removing the lockfile %s.', $lockfile), 'ERR'); } $this->lockfile = null; } @@ -779,8 +743,7 @@ class Kolab_Resource $organiser, $uid, $is_update) { Horde::logMessage(sprintf('sendITipReply(%s, %s, %s, %s)', - $cn, $resource, get_class($itip), $type), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $cn, $resource, get_class($itip), $type), 'DEBUG'); // Build the reply. $vCal = new Horde_iCalendar(); @@ -835,8 +798,7 @@ class Kolab_Resource switch ($type) { case RM_ITIP_DECLINE: Horde::logMessage(sprintf('Sending DECLINE iTip reply to %s', - $organiser), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $organiser), 'DEBUG'); $message = $is_update ? sprintf(_("%s has declined the update to the following event:"), $resource) . "\n\n" . $summary : sprintf(_("%s has declined the invitation to the following event:"), $resource) . "\n\n" . $summary; @@ -845,8 +807,7 @@ class Kolab_Resource break; case RM_ITIP_ACCEPT: - Horde::logMessage(sprintf('Sending ACCEPT iTip reply to %s', $organiser), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Sending ACCEPT iTip reply to %s', $organiser), 'DEBUG'); $message = $is_update ? sprintf(_("%s has accepted the update to the following event:"), $resource) . "\n\n" . $summary : sprintf(_("%s has accepted the invitation to the following event:"), $resource) . "\n\n" . $summary; @@ -855,8 +816,7 @@ class Kolab_Resource break; case RM_ITIP_TENTATIVE: - Horde::logMessage(sprintf('Sending TENTATIVE iTip reply to %s', $organiser), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Sending TENTATIVE iTip reply to %s', $organiser), 'DEBUG'); $message = $is_update ? sprintf(_("%s has tentatively accepted the update to the following event:"), $resource) . "\n\n" . $summary : sprintf(_("%s has tentatively accepted the invitation to the following event:"), $resource) . "\n\n" . $summary; @@ -865,8 +825,7 @@ class Kolab_Resource break; default: - Horde::logMessage(sprintf('Unknown iTip method (%s passed to sendITipReply())', $type), - __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage(sprintf('Unknown iTip method (%s passed to sendITipReply())', $type), 'ERR'); } $itip_reply->setAttribute('ATTENDEE', 'MAILTO:' . $resource, $params); @@ -903,8 +862,7 @@ class Kolab_Resource return $result; } - Horde::logMessage('Successfully sent iTip reply', - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Successfully sent iTip reply', 'DEBUG'); } @@ -983,8 +941,7 @@ class Kolab_Resource function iCalDate2Kolab($ical_date, $type= ' ') { Horde::logMessage(sprintf('Converting to kolab format %s', - print_r($ical_date, true)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + print_r($ical_date, true)), 'DEBUG'); // $ical_date should be a timestamp if (is_array($ical_date)) { @@ -1008,8 +965,7 @@ class Kolab_Resource } else { $date = gmstrftime('%Y-%m-%dT%H:%M:%SZ', $ical_date); } - Horde::logMessage(sprintf('To <%s>', $date), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('To <%s>', $date), 'DEBUG'); return $date; } @@ -1023,8 +979,7 @@ class Kolab_Resource function convert2epoch($values) { Horde::logMessage(sprintf('Converting to epoch %s', - print_r($values, true)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + print_r($values, true)), 'DEBUG'); if (is_array($values)) { $temp = $this->cleanArray($values); @@ -1034,8 +989,7 @@ class Kolab_Resource $epoch = $values; } - Horde::logMessage(sprintf('Converted <%s>', $epoch), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Converted <%s>', $epoch), 'DEBUG'); return $epoch; } } diff --git a/framework/Kolab_Filter/lib/Horde/Kolab/Resource/Freebusy/Kolab.php b/framework/Kolab_Filter/lib/Horde/Kolab/Resource/Freebusy/Kolab.php index ed6074ec9..89bbb5df5 100644 --- a/framework/Kolab_Filter/lib/Horde/Kolab/Resource/Freebusy/Kolab.php +++ b/framework/Kolab_Filter/lib/Horde/Kolab/Resource/Freebusy/Kolab.php @@ -59,8 +59,7 @@ class Horde_Kolab_Resource_Freebusy_Kolab extends Horde_Kolab_Resource_Freebusy $url = self::getUrl($resource); Horde::logMessage(sprintf('Freebusy URL for resource %s is %s', - $resource, $url), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $resource, $url), 'DEBUG'); list($user, $domain) = explode('@', $resource); if (empty($domain)) { @@ -115,4 +114,4 @@ class Horde_Kolab_Resource_Freebusy_Kolab extends Horde_Kolab_Resource_Freebusy return $vfb; } -} \ No newline at end of file +} diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage.php index d73f5d594..e3f40ad68 100644 --- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage.php +++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage.php @@ -510,7 +510,7 @@ class Horde_Kolab_Storage $owner = $folder->getOwner(); } catch (Exception $e) { Horde::logMessage(sprintf("Error while updating the Kolab folder list cache: %s.", - $e->getMessage()), __FILE__, __LINE__, PEAR_LOG_ERR); + $e->getMessage()), 'ERR'); return; } diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Data.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Data.php index 19de0aa2c..39765913d 100644 --- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Data.php +++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Data.php @@ -245,8 +245,7 @@ class Horde_Kolab_Storage_Data $result = $this->_folder->trigger(); if (is_a($result, 'PEAR_Error')) { Horde::logMessage(sprintf('Failed triggering folder %s!', - $this->_folder->name), - __FILE__, __LINE__, PEAR_LOG_ERR); + $this->_folder->name), 'ERR'); } return true; @@ -365,7 +364,7 @@ class Horde_Kolab_Storage_Data false); $text = $mime[0]; } catch (Horde_Kolab_Storage_Exception $e) { - Horde::logMessage($mime, __FILE__, __LINE__, PEAR_LOG_WARNING); + Horde::logMessage($mime, 'WARN'); $text = false; } @@ -374,8 +373,7 @@ class Horde_Kolab_Storage_Data if (is_a($object, 'PEAR_Error')) { $this->_cache->ignore($id); $object->addUserInfo('STORAGE ID: ' . $id); - Horde::logMessage($object, __FILE__, __LINE__, - PEAR_LOG_WARNING); + Horde::logMessage($object, 'WARN'); continue; } } else { @@ -400,8 +398,7 @@ class Horde_Kolab_Storage_Data if (is_a($result, 'PEAR_Error')) { Horde::logMessage(sprintf('Failed storing attachment of object %s: %s', $id, - $result->getMessage()), - __FILE__, __LINE__, PEAR_LOG_ERR); + $result->getMessage()), 'ERR'); $object = false; break; } diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php index 017e411f7..e9e88630b 100644 --- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php +++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php @@ -340,8 +340,7 @@ class Horde_Kolab_Storage_Folder if (isset($attributes['type'])) { if ($attributes['type'] != $type) { Horde::logMessage(sprintf('Cannot modify the type of a folder from %s to %s!', - $type, $attributes['type']), - __FILE__, __LINE__, PEAR_LOG_ERR); + $type, $attributes['type']), 'ERR'); } unset($attributes['type']); } @@ -377,8 +376,7 @@ class Horde_Kolab_Storage_Folder $this->_connection->delete($this->name); } catch (Exception $e) { Horde::logMessage(sprintf('Failed handling the dummy folder: %s!', - $e->getMessage()), - __FILE__, __LINE__, PEAR_LOG_ERR); + $e->getMessage()), 'ERR'); } $this->name = $this->new_name; @@ -391,8 +389,7 @@ class Horde_Kolab_Storage_Folder if (isset($attributes['owner'])) { if ($attributes['owner'] != $this->getOwner()) { Horde::logMessage(sprintf('Cannot modify the owner of a folder from %s to %s!', - $this->getOwner(), $attributes['owner']), - __FILE__, __LINE__, PEAR_LOG_ERR); + $this->getOwner(), $attributes['owner']), 'ERR'); } unset($attributes['owner']); } @@ -457,8 +454,7 @@ class Horde_Kolab_Storage_Folder $this->trigger(); } catch (Horde_Kolab_Storage_Exception $e) { Horde::logMessage(sprintf('Failed triggering folder %s! Error was: %s', - $this->name, $e->getMessage()), - __FILE__, __LINE__, PEAR_LOG_ERR); + $this->name, $e->getMessage()), 'ERR'); } return true; @@ -726,8 +722,7 @@ class Horde_Kolab_Storage_Folder $result = $this->trigger(); } catch (Horde_Kolab_Storage_Exception $e) { Horde::logMessage(sprintf('Failed triggering folder %s! Error was: %s', - $this->name, $result->getMessage()), - __FILE__, __LINE__, PEAR_LOG_ERR); + $this->name, $result->getMessage()), 'ERR'); } } @@ -763,8 +758,7 @@ class Horde_Kolab_Storage_Folder $result = $this->trigger(); if (is_a($result, 'PEAR_Error')) { Horde::logMessage(sprintf('Failed triggering folder %s! Error was: %s', - $this->name, $result->getMessage()), - __FILE__, __LINE__, PEAR_LOG_ERR); + $this->name, $result->getMessage()), 'ERR'); } return true; @@ -791,8 +785,7 @@ class Horde_Kolab_Storage_Folder $result = $this->trigger(); if (is_a($result, 'PEAR_Error')) { Horde::logMessage(sprintf('Failed triggering folder %s! Error was: %s', - $this->name, $result->getMessage()), - __FILE__, __LINE__, PEAR_LOG_ERR); + $this->name, $result->getMessage()), 'ERR'); } return $success; } @@ -853,8 +846,7 @@ class Horde_Kolab_Storage_Folder return $handlers[$type]; } Horde::logMessage(sprintf('Loading format handler "%s" failed: %s', - $type, $handlers[$type]->getMessage()), - __FILE__, __LINE__, PEAR_LOG_ERR); + $type, $handlers[$type]->getMessage()), 'ERR'); continue; } } @@ -1009,8 +1001,7 @@ class Horde_Kolab_Storage_Folder $this->trigger(); } catch (Horde_Kolab_Storage_Exception $e) { Horde::logMessage(sprintf('Failed triggering folder %s! Error was: %s', - $this->name, $result->getMessage()), - __FILE__, __LINE__, PEAR_LOG_ERR); + $this->name, $result->getMessage()), 'ERR'); } return true; @@ -1330,8 +1321,7 @@ class Horde_Kolab_Storage_Folder $result = $this->trigger(); if (is_a($result, 'PEAR_Error')) { Horde::logMessage(sprintf('Failed triggering folder %s! Error was: %s', - $this->name, $result->getMessage()), - __FILE__, __LINE__, PEAR_LOG_ERR); + $this->name, $result->getMessage()), 'ERR'); } return $result; @@ -1357,8 +1347,7 @@ class Horde_Kolab_Storage_Folder $result = $this->trigger(); if (is_a($result, 'PEAR_Error')) { Horde::logMessage(sprintf('Failed triggering folder %s! Error was: %s', - $this->name, $result->getMessage()), - __FILE__, __LINE__, PEAR_LOG_ERR); + $this->name, $result->getMessage()), 'ERR'); } return $iresult; @@ -1398,8 +1387,7 @@ class Horde_Kolab_Storage_Folder $data = $this->_annotation_data->getObject('KOLAB_FOLDER_CONFIGURATION'); if (is_a($data, 'PEAR_Error')) { Horde::logMessage(sprintf('Error retrieving annotation data on folder %s: %s', - $this->name, $data->getMessage()), - __FILE__, __LINE__, PEAR_LOG_ERR); + $this->name, $data->getMessage()), 'ERR'); return ''; } if (isset($data[$key])) { @@ -1429,8 +1417,7 @@ class Horde_Kolab_Storage_Folder $data = $this->_annotation_data->getObject('KOLAB_FOLDER_CONFIGURATION'); if (is_a($data, 'PEAR_Error')) { Horde::logMessage(sprintf('Error retrieving annotation data on folder %s: %s', - $this->name, $data->getMessage()), - __FILE__, __LINE__, PEAR_LOG_ERR); + $this->name, $data->getMessage()), 'ERR'); $data = array(); $uid = null; } else { diff --git a/framework/Lock/lib/Horde/Lock/Sql.php b/framework/Lock/lib/Horde/Lock/Sql.php index a83827844..b10f74098 100644 --- a/framework/Lock/lib/Horde/Lock/Sql.php +++ b/framework/Lock/lib/Horde/Lock/Sql.php @@ -110,7 +110,7 @@ class Horde_Lock_Sql extends Horde_Lock public function getLockInfo($lockid) { if (is_a(($result = $this->_connect()), 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); throw new Horde_Lock_Exception(_("Internal database error. Details have been logged for the administrator.")); } @@ -121,8 +121,7 @@ class Horde_Lock_Sql extends Horde_Lock ' WHERE lock_id = ? AND lock_expiry_timestamp >= ?'; $values = array($lockid, $now); - Horde::logMessage('SQL Query by Horde_Lock_sql::getLockInfo(): ' . $sql, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Horde_Lock_sql::getLockInfo(): ' . $sql, 'DEBUG'); $result = $this->_db->query($sql, $values); if (is_a($result, 'PEAR_Error')) { throw new Horde_Lock_Exception($result->getMessage()); @@ -147,7 +146,7 @@ class Horde_Lock_Sql extends Horde_Lock public function getLocks($scope = null, $principal = null, $type = null) { if (is_a(($result = $this->_connect()), 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); throw new Horde_Lock_Exception(_("Internal database error. Details have been logged for the administrator.")); } @@ -172,8 +171,7 @@ class Horde_Lock_Sql extends Horde_Lock $values[] = $type; } - Horde::logMessage('SQL Query by Horde_Lock_sql::getLocks(): ' . $sql, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Horde_Lock_sql::getLocks(): ' . $sql, 'DEBUG'); $result = $this->_db->query($sql, $values); if (is_a($result, 'PEAR_Error')) { throw new Horde_Lock_Exception($result->getMessage()); @@ -198,7 +196,7 @@ class Horde_Lock_Sql extends Horde_Lock public function resetLock($lockid, $extend) { if (is_a(($result = $this->_connect()), 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); throw new Horde_Lock_Exception(_("Internal database error. Details have been logged for the administrator.")); } @@ -212,13 +210,12 @@ class Horde_Lock_Sql extends Horde_Lock 'WHERE lock_id = ?'; $values = array($now, $expiry, $lockid); - Horde::logMessage('SQL Query by Horde_Lock_sql::resetLock(): ' . - $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Horde_Lock_sql::resetLock(): ' . $sql, 'DEBUG'); $result = $this->_write_db->query($sql, $values); if (is_a($result, 'PEAR_Error')) { throw new Horde_Lock_Exception($result->getMessage()); } - Horde::logMessage(sprintf('Lock %s reset successfully.', $lockid), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Lock %s reset successfully.', $lockid), 'DEBUG'); return true; } elseif (is_a($lockinfo, 'PEAR_Error')) { throw new Horde_Lock_Exception($lockinfo->getMessage()); @@ -240,7 +237,7 @@ class Horde_Lock_Sql extends Horde_Lock $lifetime = 1, $type = self::TYPE_SHARED) { if (is_a(($result = $this->_connect()), 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); throw new Horde_Lock_Exception(_("Internal database error. Details have been logged for the administrator.")); } @@ -251,7 +248,7 @@ class Horde_Lock_Sql extends Horde_Lock if (count($oldlocks) != 0) { // An exclusive lock exists. Deny the new request. - Horde::logMessage(sprintf('Lock requested for %s denied due to existing exclusive lock.', $principal), __FILE__, __LINE__, PEAR_LOG_NOTICE); + Horde::logMessage(sprintf('Lock requested for %s denied due to existing exclusive lock.', $principal), 'NOTICE'); return false; } @@ -263,14 +260,13 @@ class Horde_Lock_Sql extends Horde_Lock $values = array($lockid, $requestor, $scope, $principal, $now, $now, $expiration, $type); - Horde::logMessage('SQL Query by Horde_Lock_sql::setLock(): ' . $sql, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Horde_Lock_sql::setLock(): ' . $sql, 'DEBUG'); $result = $this->_write_db->query($sql, $values); if (is_a($result, 'PEAR_Error')) { throw new Horde_Lock_Exception($result->getMessage()); } - Horde::logMessage(sprintf('Lock %s set successfully by %s in scope %s on "%s"', $lockid, $requestor, $scope, $principal), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Lock %s set successfully by %s in scope %s on "%s"', $lockid, $requestor, $scope, $principal), 'DEBUG'); return $lockid; } @@ -285,7 +281,7 @@ class Horde_Lock_Sql extends Horde_Lock public function clearLock($lockid) { if (is_a(($result = $this->_connect()), 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); throw new Horde_Lock_Exception(_("Internal database error. Details have been logged for the administrator.")); } @@ -299,14 +295,13 @@ class Horde_Lock_Sql extends Horde_Lock $sql = 'DELETE FROM ' . $this->_params['table'] . ' WHERE lock_id = ?'; $values = array($lockid); - Horde::logMessage('SQL Query by Horde_Lock_sql::clearLock(): ' . $sql, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Horde_Lock_sql::clearLock(): ' . $sql, 'DEBUG'); $result = $this->_write_db->query($sql, $values); if (is_a($result, 'PEAR_Error')) { throw new Horde_Lock_Exception($result->getMessage()); } - Horde::logMessage(sprintf('Lock %s cleared successfully.', $lockid), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Lock %s cleared successfully.', $lockid), 'DEBUG'); return true; } @@ -324,7 +319,7 @@ class Horde_Lock_Sql extends Horde_Lock try { Horde_Util::assertDriverConfig($this->_params, array('phptype'), 'Lock SQL'); } catch (Horde_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); throw new Horde_Lock_Exception($e); } @@ -334,7 +329,7 @@ class Horde_Lock_Sql extends Horde_Lock 'ssl' => !empty($this->_params['ssl'])) ); if (is_a($this->_write_db, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); throw new Horde_Lock_Exception($this->_write_db->getMessage()); } @@ -355,7 +350,7 @@ class Horde_Lock_Sql extends Horde_Lock 'ssl' => !empty($params['ssl'])) ); if (is_a($this->_db, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); throw new Horde_Lock_Exception($this->_db->getMessage()); } @@ -382,7 +377,7 @@ class Horde_Lock_Sql extends Horde_Lock private function _doGC() { if (is_a(($result = $this->_connect()), 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return false; } @@ -392,15 +387,14 @@ class Horde_Lock_Sql extends Horde_Lock 'lock_expiry_timestamp < ? AND lock_expiry_timestamp != 0'; $values = array($now); - Horde::logMessage('SQL Query by Horde_Lock_sql::_doGC(): ' . $sql, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Horde_Lock_sql::_doGC(): ' . $sql, 'DEBUG'); $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return false; } - Horde::logMessage(sprintf('Lock garbage collection cleared %d locks.', $this->_write_db->affectedRows()), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Lock garbage collection cleared %d locks.', $this->_write_db->affectedRows()), 'DEBUG'); return true; } diff --git a/framework/Memcache/lib/Horde/Memcache.php b/framework/Memcache/lib/Horde/Memcache.php index 9c589d217..96fad4142 100644 --- a/framework/Memcache/lib/Horde/Memcache.php +++ b/framework/Memcache/lib/Horde/Memcache.php @@ -129,7 +129,7 @@ class Horde_Memcache // Force consistent hashing ini_set('memcache.hash_strategy', 'consistent'); - Horde::logMessage('Connected to the following memcache servers:' . implode($servers, ', '), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Connected to the following memcache servers:' . implode($servers, ', '), 'DEBUG'); } /** diff --git a/framework/Notification/lib/Horde/Notification/Handler/Decorator/Hordelog.php b/framework/Notification/lib/Horde/Notification/Handler/Decorator/Hordelog.php index 380c3dd05..b85cb75ca 100644 --- a/framework/Notification/lib/Horde/Notification/Handler/Decorator/Hordelog.php +++ b/framework/Notification/lib/Horde/Notification/Handler/Decorator/Hordelog.php @@ -23,7 +23,7 @@ extends Horde_Notification_Handler_Decorator_Base */ public function push(Horde_Notification_Event $event, $options) { - Horde::logMessage($event->message, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($event->message, 'DEBUG'); } } diff --git a/framework/Perms/lib/Horde/Perms.php b/framework/Perms/lib/Horde/Perms.php index 18ca2a1ca..4911b8a40 100644 --- a/framework/Perms/lib/Horde/Perms.php +++ b/framework/Perms/lib/Horde/Perms.php @@ -299,7 +299,7 @@ class Horde_Perms try { $permission = $this->getPermission($permission); } catch (Horde_Perms_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($e, 'DEBUG'); return false; } } diff --git a/framework/Prefs/lib/Horde/Prefs.php b/framework/Prefs/lib/Horde/Prefs.php index 0b1409362..ea923667d 100644 --- a/framework/Prefs/lib/Horde/Prefs.php +++ b/framework/Prefs/lib/Horde/Prefs.php @@ -317,7 +317,7 @@ class Horde_Prefs $result = $this->_setValue($pref, $val, true, $convert); - Horde::logMessage(__CLASS__ . ': Storing preference value (' . $pref . ')', __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(__CLASS__ . ': Storing preference value (' . $pref . ')', 'DEBUG'); if ($result && $this->isDirty($pref)) { $scope = $this->_getPreferenceScope($pref); diff --git a/framework/Prefs/lib/Horde/Prefs/File.php b/framework/Prefs/lib/Horde/Prefs/File.php index 99c1e6663..34b427902 100644 --- a/framework/Prefs/lib/Horde/Prefs/File.php +++ b/framework/Prefs/lib/Horde/Prefs/File.php @@ -57,10 +57,10 @@ class Horde_Prefs_File extends Horde_Prefs // Sanity check for directory $error = false; if (empty($params['directory']) || !is_dir($params['directory'])) { - Horde::logMessage(_("Preference storage directory is not available."), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage(_("Preference storage directory is not available."), 'ERR'); $error = true; } elseif (!is_writable($params['directory'])) { - Horde::logMessage(sprintf(_("Directory %s is not writeable"), $params['directory']), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage(sprintf(_("Directory %s is not writeable"), $params['directory']), 'ERR'); $error = true; } diff --git a/framework/Prefs/lib/Horde/Prefs/Imsp.php b/framework/Prefs/lib/Horde/Prefs/Imsp.php index 84b04a565..095e4ab0b 100644 --- a/framework/Prefs/lib/Horde/Prefs/Imsp.php +++ b/framework/Prefs/lib/Horde/Prefs/Imsp.php @@ -62,7 +62,7 @@ class Horde_Prefs_Imsp extends Horde_Prefs $prefs = $this->_imsp->get($scope . '.*'); if ($prefs instanceof PEAR_Error) { - Horde::logMessage($prefs, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($prefs, 'ERR'); return; } @@ -110,7 +110,7 @@ class Horde_Prefs_Imsp extends Horde_Prefs $result = $this->_imsp->set($scope . '.' . $name, $value); if ($result instanceof PEAR_Error) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return; } @@ -146,7 +146,7 @@ class Horde_Prefs_Imsp extends Horde_Prefs $this->_imsp = Net_IMSP::factory('Options', $this->_params); $result = $this->_imsp->init(); if ($result instanceof PEAR_Error) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); throw new Horde_Exception_Prior($result); } diff --git a/framework/Prefs/lib/Horde/Prefs/KolabImap.php b/framework/Prefs/lib/Horde/Prefs/KolabImap.php index ad8d2a00c..063550f1e 100644 --- a/framework/Prefs/lib/Horde/Prefs/KolabImap.php +++ b/framework/Prefs/lib/Horde/Prefs/KolabImap.php @@ -40,7 +40,7 @@ class Horde_Prefs_KolabImap extends Horde_Prefs $shares = Horde_Share::singleton('h-prefs'); $default = $shares->getDefaultShare(); if ($default instanceof PEAR_Error) { - Horde::logMessage($default, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($default, 'ERR'); throw new Horde_Exception_Prior($default); } $this->_share = $default->getName(); @@ -48,13 +48,13 @@ class Horde_Prefs_KolabImap extends Horde_Prefs require_once 'Horde/Kolab.php'; $connection = new Kolab('h-prefs'); if ($connection instanceof PEAR_Error) { - Horde::logMessage($connection, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($connection, 'ERR'); throw new Horde_Exception_Prior($connection); } $result = $this->_connection->open($this->_share, 1); if ($result instanceof PEAR_Error) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); throw new Horde_Exception_Prior($result); } @@ -127,7 +127,7 @@ class Horde_Prefs_KolabImap extends Horde_Prefs $prefs = $this->_connection->getObjects(); if ($prefs instanceof PEAR_Error) { - Horde::logMessage($prefs, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($prefs, 'ERR'); throw new Horde_Exception_Prior($prefs); } @@ -193,7 +193,7 @@ class Horde_Prefs_KolabImap extends Horde_Prefs $result = $this->_connection->_storage->save($object, $old_uid); if ($result instanceof PEAR_Error) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return; } } diff --git a/framework/Prefs/lib/Horde/Prefs/Ldap.php b/framework/Prefs/lib/Horde/Prefs/Ldap.php index 2a78042a4..bf90c97de 100644 --- a/framework/Prefs/lib/Horde/Prefs/Ldap.php +++ b/framework/Prefs/lib/Horde/Prefs/Ldap.php @@ -131,8 +131,7 @@ class Horde_Prefs_Ldap extends Horde_Prefs if (!$conn) { Horde::logMessage( sprintf('Failed to open an LDAP connection to %s.', - $this->_params['hostspec']), - __FILE__, __LINE__, PEAR_LOG_ERR); + $this->_params['hostspec']), 'ERR'); throw new Horde_Exception('Internal LDAP error. Details have been logged for the administrator.'); } @@ -145,8 +144,7 @@ class Horde_Prefs_Ldap extends Horde_Prefs sprintf('Set LDAP protocol version to %d failed: [%d] %s', $this->_params['version'], @ldap_errno($conn), - @ldap_error($conn)), - __FILE__, __LINE__, PEAR_LOG_WARNING); + @ldap_error($conn)), 'WARN'); throw new Horde_Exception('Internal LDAP error. Details have been logged for the administrator.'); } } @@ -157,8 +155,7 @@ class Horde_Prefs_Ldap extends Horde_Prefs Horde::logMessage( sprintf('STARTTLS failed: [%d] %s', @ldap_errno($this->_ds), - @ldap_error($this->_ds)), - __FILE__, __LINE__, PEAR_LOG_ERR); + @ldap_error($this->_ds)), 'ERR'); } } @@ -174,8 +171,7 @@ class Horde_Prefs_Ldap extends Horde_Prefs $this->_params['port'], $this->_params['searchdn'], @ldap_errno($conn), - @ldap_error($conn)), - __FILE__, __LINE__, PEAR_LOG_ERR); + @ldap_error($conn)), 'ERR'); throw new Horde_Exception('Internal LDAP error. Details have been logged for the administrator.', @ldap_errno($conn)); } } @@ -187,8 +183,7 @@ class Horde_Prefs_Ldap extends Horde_Prefs Horde::logMessage( sprintf('Setting referral callback failed: [%d] %s', @ldap_errno($conn), - @ldap_error($conn)), - __FILE__, __LINE__, PEAR_LOG_WARNING); + @ldap_error($conn)), 'WARN'); throw new Horde_Exception(_("Internal LDAP error. Details have been logged for the administrator."), @ldap_errno($conn)); } } @@ -203,8 +198,7 @@ class Horde_Prefs_Ldap extends Horde_Prefs Horde::logMessage( sprintf('Error while searching the directory for the user\'s DN: [%d]: %s', @ldap_errno($this->_connection), - @ldap_error($this->_connection)), - __FILE__, __LINE__, PEAR_LOG_ERR); + @ldap_error($this->_connection)), 'ERR'); throw new Horde_Exception('Internal LDAP error. Details have been logged for the administrator.', @ldap_errno($conn)); } @@ -213,15 +207,13 @@ class Horde_Prefs_Ldap extends Horde_Prefs Horde::logMessage( sprintf('Error while retrieving LDAP search results for the user\'s DN: [%d]: %s', @ldap_errno($this->_connection), - @ldap_error($this->_connection)), - __FILE__, __LINE__, PEAR_LOG_ERR); + @ldap_error($this->_connection)), 'ERR'); throw new Horde_Exception('Internal LDAP error. Details have been logged for the administrator.', @ldap_errno($this->_connection)); } if ($result['count'] != 1) { Horde::logMessage( - 'Zero or more than one DN returned from search; unable to determine user\'s correct DN.', - __FILE__, __LINE__, PEAR_LOG_ERR); + 'Zero or more than one DN returned from search; unable to determine user\'s correct DN.', 'ERR'); throw new Horde_Exception('Internal LDAP error. Details have been logged for the administrator.'); } $this->_dn = $result[0]['dn']; @@ -251,8 +243,7 @@ class Horde_Prefs_Ldap extends Horde_Prefs Horde::logMessage( sprintf('Error rebinding for prefs writing: [%d]: %s', @ldap_errno($this->_connection), - @ldap_error($this->_connection)), - __FILE__, __LINE__, PEAR_LOG_ERR); + @ldap_error($this->_connection)), 'ERR'); throw new Horde_Exception('Internal LDAP error. Details have been logged for the administrator.', @ldap_errno($this->_connection)); } @@ -276,8 +267,7 @@ class Horde_Prefs_Ldap extends Horde_Prefs if (strpos($this->_params['hostspec'], $who) === false) { Horde::logMessage( sprintf('Referral target %s for DN %s is not in the authorized server list.', - $who, $bind_dn), - __FILE__, __LINE__, PEAR_LOG_ERR); + $who, $bind_dn), 'ERR'); return 1; } @@ -308,8 +298,7 @@ class Horde_Prefs_Ldap extends Horde_Prefs $this->_params['port'], $bind_dn, @ldap_errno($this->_connection), - @ldap_error($this->_connection)), - __FILE__, __LINE__, PEAR_LOG_ERR); + @ldap_error($this->_connection)), 'ERR'); } return 0; @@ -341,8 +330,7 @@ class Horde_Prefs_Ldap extends Horde_Prefs Horde::logMessage( sprintf('Error while searching for the user\'s prefs: [%d]: %s', @ldap_errno($this->_connection), - @ldap_error($this->_connection)), - __FILE__, __LINE__, PEAR_LOG_ERR); + @ldap_error($this->_connection)), 'ERR'); return; } @@ -351,8 +339,7 @@ class Horde_Prefs_Ldap extends Horde_Prefs Horde::logMessage( sprintf('Error while retrieving LDAP search results for the user\'s prefs: [%d]: %s', @ldap_errno($this->_connection), - @ldap_error($this->_connection)), - __FILE__, __LINE__, PEAR_LOG_ERR); + @ldap_error($this->_connection)), 'ERR'); return; } @@ -429,8 +416,7 @@ class Horde_Prefs_Ldap extends Horde_Prefs Horde::logMessage( sprintf('Error searching the directory for required objectClasses: [%d] %s', @ldap_errno($this->_connection), - @ldap_error($this->_connection)), - __FILE__, __LINE__, PEAR_LOG_ERR); + @ldap_error($this->_connection)), 'ERR'); return; } @@ -439,8 +425,7 @@ class Horde_Prefs_Ldap extends Horde_Prefs Horde::logMessage( sprintf('Error retrieving results while checking for required objectClasses: [%d] %s', @ldap_errno($this->_connection), - @ldap_error($this->_connection)), - __FILE__, __LINE__, PEAR_LOG_ERR); + @ldap_error($this->_connection)), 'ERR'); return; } @@ -473,8 +458,7 @@ class Horde_Prefs_Ldap extends Horde_Prefs Horde::logMessage( sprintf('Unable to modify user\'s objectClass for preferences: [%d] %s', @ldap_errno($this->_connection), - @ldap_error($this->_connection)), - __FILE__, __LINE__, PEAR_LOG_ERR); + @ldap_error($this->_connection)), 'ERR'); return; } @@ -509,8 +493,7 @@ class Horde_Prefs_Ldap extends Horde_Prefs Horde::logMessage( sprintf('Error while getting preferenes from LDAP: [%d] %s', @ldap_errno($this->_connection), - @ldap_error($this->_connection)), - __FILE__, __LINE__, PEAR_LOG_ERR); + @ldap_error($this->_connection)), 'ERR'); return; } @@ -519,8 +502,7 @@ class Horde_Prefs_Ldap extends Horde_Prefs Horde::logMessage( sprintf('Error while retrieving results from LDAP: [%d] %s', @ldap_errno($this->_connection), - @ldap_error($this->_connection)), - __FILE__, __LINE__, PEAR_LOG_ERR); + @ldap_error($this->_connection)), 'ERR'); return; } @@ -533,8 +515,7 @@ class Horde_Prefs_Ldap extends Horde_Prefs Horde::logMessage( sprintf('Unable to clear user\'s preferences: [%d] %s', @ldap_errno($this->_connection), - @ldap_error($this->_connection)), - __FILE__, __LINE__, PEAR_LOG_ERR); + @ldap_error($this->_connection)), 'ERR'); } $this->cleanup(true); diff --git a/framework/Prefs/lib/Horde/Prefs/Sql.php b/framework/Prefs/lib/Horde/Prefs/Sql.php index e64bf0e17..fd3a25014 100644 --- a/framework/Prefs/lib/Horde/Prefs/Sql.php +++ b/framework/Prefs/lib/Horde/Prefs/Sql.php @@ -116,17 +116,17 @@ class Horde_Prefs_Sql extends Horde_Prefs $values = array($this->_user, $scope); - Horde::logMessage('SQL Query by Horde_Prefs_Sql::retrieve(): ' . $query . ', values: ' . implode(', ', $values), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Horde_Prefs_Sql::retrieve(): ' . $query . ', values: ' . implode(', ', $values), 'DEBUG'); $result = $this->_db->query($query, $values); if ($result instanceof PEAR_Error) { - Horde::logMessage('No preferences were retrieved.', __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('No preferences were retrieved.', 'DEBUG'); return; } $row = $result->fetchRow(DB_FETCHMODE_ASSOC); if ($row instanceof PEAR_Error) { - Horde::logMessage($row, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($row, 'ERR'); return; } @@ -184,11 +184,11 @@ class Horde_Prefs_Sql extends Horde_Prefs $query = 'SELECT 1 FROM ' . $this->_params['table'] . ' WHERE pref_uid = ? AND pref_name = ?' . ' AND pref_scope = ?'; - Horde::logMessage('SQL Query by Horde_Prefs_Sql::store(): ' . $query . ', values: ' . implode(', ', $values), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Horde_Prefs_Sql::store(): ' . $query . ', values: ' . implode(', ', $values), 'DEBUG'); $check = $this->_write_db->getOne($query, $values); if ($check instanceof PEAR_Error) { - Horde::logMessage('Failed checking prefs for ' . $this->_user . ': ' . $check->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage('Failed checking prefs for ' . $this->_user . ': ' . $check->getMessage(), 'ERR'); return; } @@ -224,11 +224,11 @@ class Horde_Prefs_Sql extends Horde_Prefs $value); } - Horde::logMessage('SQL Query by Horde_Prefs_Sql::store(): ' . $query . ', values: ' . implode(', ', $values), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Horde_Prefs_Sql::store(): ' . $query . ', values: ' . implode(', ', $values), 'DEBUG'); $result = $this->_write_db->query($query, $values); if ($result instanceof PEAR_Error) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return; } @@ -256,7 +256,7 @@ class Horde_Prefs_Sql extends Horde_Prefs $values = array($this->_user); - Horde::logMessage('SQL Query by Horde_Prefs_Sql::clear():' . $query . ', values: ' . implode(', ', $values), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Horde_Prefs_Sql::clear():' . $query . ', values: ' . implode(', ', $values), 'DEBUG'); // Execute the query. $this->_write_db->query($query, $values); @@ -341,7 +341,7 @@ class Horde_Prefs_Sql extends Horde_Prefs 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__, PEAR_LOG_ERR); + Horde::logMessage($this->_write_db, 'ERR'); throw new Horde_Exception_Prior($this->_write_db); } @@ -364,7 +364,7 @@ class Horde_Prefs_Sql extends Horde_Prefs array('persistent' => !empty($params['persistent']), 'ssl' => !empty($params['ssl']))); if ($this->_db instanceof PEAR_Error) { - Horde::logMessage($this->_db, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($this->_db, 'ERR'); throw new Horde_Exception_Prior($this->_db); } diff --git a/framework/Rpc/lib/Horde/Rpc/Phpgw.php b/framework/Rpc/lib/Horde/Rpc/Phpgw.php index 7b14abe97..1b8d2886e 100644 --- a/framework/Rpc/lib/Horde/Rpc/Phpgw.php +++ b/framework/Rpc/lib/Horde/Rpc/Phpgw.php @@ -77,13 +77,13 @@ class Horde_Rpc_Phpgw extends Horde_Rpc $method = str_replace('.', '/', 'phpgw.' . $method); if (!$registry->hasMethod($method)) { - Horde::logMessage(sprintf(_("Method \"%s\" is not defined"), $method), __FILE__, __LINE__, PEAR_LOG_NOTICE); + Horde::logMessage(sprintf(_("Method \"%s\" is not defined"), $method), 'NOTICE'); return sprintf(_("Method \"%s\" is not defined"), $method); } // Try to resume a session if (isset($params[0]['kp3']) && $params[0]["kp3"] == session_name() && session_id() != $params[0]["sessionid"]) { - Horde::logMessage("manually reload session ".$params[0]["sessionid"], __FILE__, __LINE__, PEAR_LOG_NOTICE); + Horde::logMessage("manually reload session ".$params[0]["sessionid"], 'NOTICE'); session_regenerate_id(); session_unset(); session_id($params[0]["sessionid"]); @@ -93,7 +93,7 @@ class Horde_Rpc_Phpgw extends Horde_Rpc $authenticated = Horde_Auth::isAuthenticated() || $method== "phpgw/system/login"; if ($authenticated) { - Horde::logMessage("rpc call $method allowed", __FILE__, __LINE__, PEAR_LOG_NOTICE); + Horde::logMessage("rpc call $method allowed", 'NOTICE'); return $registry->call($method, $params); } else { return PEAR::raiseError(_("You did not authenticate."), 'horde.error'); diff --git a/framework/Rpc/lib/Horde/Rpc/Soap.php b/framework/Rpc/lib/Horde/Rpc/Soap.php index 467c37971..35ab32f63 100644 --- a/framework/Rpc/lib/Horde/Rpc/Soap.php +++ b/framework/Rpc/lib/Horde/Rpc/Soap.php @@ -93,8 +93,7 @@ class Horde_Rpc_Soap extends Horde_Rpc $GLOBALS['__horde_rpc_PhpSoap']['lastMethodParams'])), Horde_Auth::getAuth(), time() - $beginTime, - ob_get_length()), - __FILE__, __LINE__, PEAR_LOG_INFO + ob_get_length()), 'INFO'); ); return ob_get_clean(); } diff --git a/framework/Rpc/lib/Horde/Rpc/Syncml.php b/framework/Rpc/lib/Horde/Rpc/Syncml.php index 53eb1c05f..6b9bb0ccd 100644 --- a/framework/Rpc/lib/Horde/Rpc/Syncml.php +++ b/framework/Rpc/lib/Horde/Rpc/Syncml.php @@ -43,7 +43,7 @@ class Horde_Rpc_Syncml extends Horde_Rpc /* Log all (wb)xml packets received or sent to debug_dir. */ 'debug_files' => true, /* Log everything. */ - 'log_level' => PEAR_LOG_DEBUG); + 'log_level' => 'DEBUG'); /* Create the backend. */ $GLOBALS['backend'] = SyncML_Backend::factory('Horde', $backendparms); diff --git a/framework/Rpc/lib/Horde/Rpc/Webdav.php b/framework/Rpc/lib/Horde/Rpc/Webdav.php index 301e7b2b5..300befebf 100644 --- a/framework/Rpc/lib/Horde/Rpc/Webdav.php +++ b/framework/Rpc/lib/Horde/Rpc/Webdav.php @@ -321,7 +321,7 @@ class Horde_Rpc_Webdav extends Horde_Rpc try { $GLOBALS['registry']->callByPackage($pieces[0], 'put', array('path' => $path, 'content' => $content, 'type' => $options['content_type'])); } catch (Horde_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); if ($e->getCode()) { return $this->_checkHTTPCode($e->getCode()) . ' ' . $result->getMessage(); } @@ -351,7 +351,7 @@ class Horde_Rpc_Webdav extends Horde_Rpc $pieces = explode('/', trim($this->path, '/'), 2); if (count($pieces) != 2) { - Horde::logMessage(sprintf(_("Error deleting from path %s; must be [app]/[path]", $options['path'])), __FILE__, __LINE__, PEAR_LOG_INFO); + Horde::logMessage(sprintf(_("Error deleting from path %s; must be [app]/[path]", $options['path'])), 'INFO'); return '403 Must supply a resource within the application to delete.'; } @@ -364,7 +364,7 @@ class Horde_Rpc_Webdav extends Horde_Rpc try { $GLOBALS['registry']->callByPackage($app, 'path_delete', array($path)); } catch (Horde_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_INFO); + Horde::logMessage($e, 'INFO'); if ($e->getCode()) { return $this->_checkHTTPCode($e->getCode()) . ' ' . $e->getMessage(); } @@ -412,7 +412,7 @@ class Horde_Rpc_Webdav extends Horde_Rpc // Take the module name from the path $pieces = explode('/', $path, 2); if (count($pieces) != 2) { - Horde::logMessage(sprintf(_("Unable to create directory %s; must be [app]/[path]"), $path), __FILE__, __LINE__, PEAR_LOG_INFO); + Horde::logMessage(sprintf(_("Unable to create directory %s; must be [app]/[path]"), $path), 'INFO'); return '403 Must specify a resource within an application. MKCOL disallowed at top level.'; } @@ -420,7 +420,7 @@ class Horde_Rpc_Webdav extends Horde_Rpc try { $GLOBALS['registry']->callByPackage($pieces[0], 'mkcol', array('path' => $path)); } catch (Horde_Exception $e) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); if ($e->getCode()) { return $this->_checkHTTPCode($e->getCode()) . ' ' . $e->getMessage(); } @@ -447,7 +447,7 @@ class Horde_Rpc_Webdav extends Horde_Rpc // Take the module name from the path $sourcePieces = explode('/', $path, 2); if (count($sourcePieces) != 2) { - Horde::logMessage(sprintf(_("Unable to rename %s; must be [app]/[path] and within the same application."), $path), __FILE__, __LINE__, PEAR_LOG_INFO); + Horde::logMessage(sprintf(_("Unable to rename %s; must be [app]/[path] and within the same application."), $path), 'INFO'); return '403 Must specify a resource within an application. MOVE disallowed at top level.'; } @@ -460,7 +460,7 @@ class Horde_Rpc_Webdav extends Horde_Rpc try { $GLOBALS['registry']->callByPackage($sourcePieces[0], 'move', array('path' => $path, 'dest' => $options['dest'])); } catch (Horde_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); if ($e->getCode()) { return $this->_checkHTTPCode($e->getCode()) . ' ' . $e->getMessage(); } @@ -511,7 +511,7 @@ class Horde_Rpc_Webdav extends Horde_Rpc $apps = $registry->listApps(null, false, Horde_Perms::READ); if (is_a($apps, 'PEAR_Error')) { - Horde::logMessage($apps, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($apps, 'ERR'); return $apps; } foreach ($apps as $app) { @@ -529,7 +529,7 @@ class Horde_Rpc_Webdav extends Horde_Rpc try { $items = $registry->callByPackage($pieces[0], 'browse', array('path' => $path, 'properties' => array('name', 'browseable', 'contenttype', 'contentlength', 'created', 'modified'))); } catch (Horde_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); return $e; } @@ -668,7 +668,7 @@ class Horde_Rpc_Webdav extends Horde_Rpc } if (empty($params['path'])) { - Horde::logMessage('Empty path supplied to LOCK()', __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage('Empty path supplied to LOCK()', 'ERR'); return 403; } if ($params['path'] == '/') { @@ -699,7 +699,7 @@ class Horde_Rpc_Webdav extends Horde_Rpc try { $locks = Horde_Lock::singleton($GLOBALS['conf']['lock']['driver']); } catch (Horde_Lock_Exception $e) { - Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e->getMessage(), 'ERR'); return 500; } @@ -712,7 +712,7 @@ class Horde_Rpc_Webdav extends Horde_Rpc $lockid = $locks->setLock(Horde_Auth::getAuth(), 'webdav', $params['path'], $timeout, $locktype); } catch (Horde_Lock_Exception $e) { - Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e->getMessage(), 'ERR'); return 500; } if ($lockid === false) { @@ -746,18 +746,18 @@ class Horde_Rpc_Webdav extends Horde_Rpc try { $locks = Horde_Lock::singleton($GLOBALS['conf']['lock']['driver']); } catch (Horde_Lock_Exception $e) { - Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e->getMessage(), 'ERR'); return 500; } try { $res = $locks->clearLock($params['token']); } catch (Horde_Lock_Exception $e) { - Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e->getMessage(), 'ERR'); return 500; } if ($res === false) { - Horde::logMessage('clearLock() returned false', __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage('clearLock() returned false', 'ERR'); // Something else has failed: 424 (Method Failure) return 424; } @@ -771,21 +771,21 @@ class Horde_Rpc_Webdav extends Horde_Rpc { if (!isset($GLOBALS['conf']['lock']['driver']) || $GLOBALS['conf']['lock']['driver'] == 'none') { - Horde::logMessage('WebDAV locking failed because no lock driver has been configured.', __FILE__, __LINE__, PEAR_LOG_WARNING); + Horde::logMessage('WebDAV locking failed because no lock driver has been configured.', 'WARN'); return false; } try { $locks = Horde_Lock::singleton($GLOBALS['conf']['lock']['driver']); } catch (Horde_Lock_Exception $e) { - Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e->getMessage(), 'ERR'); return false; } try { $res = $locks->getLocks('webdav', $resource); } catch (Horde_Lock_Exception $e) { - Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e->getMessage(), 'ERR'); return false; } diff --git a/framework/SQL/SQL.php b/framework/SQL/SQL.php index 49594cc2f..747ac6a01 100644 --- a/framework/SQL/SQL.php +++ b/framework/SQL/SQL.php @@ -294,8 +294,7 @@ class Horde_SQL { } /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('SQL Query by Horde_SQL::insertBlob(): query = "%s"', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('SQL Query by Horde_SQL::insertBlob(): query = "%s"', $query), 'DEBUG'); /* Execute the query. */ return $this->_db->query($query, $values); @@ -365,8 +364,7 @@ class Horde_SQL { } /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('SQL Query by Horde_SQL::updateBlob(): query = "%s"', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('SQL Query by Horde_SQL::updateBlob(): query = "%s"', $query), 'DEBUG'); /* Execute the query. */ return $dbh->query($query, $values); diff --git a/framework/Scheduler/lib/Horde/Scheduler.php b/framework/Scheduler/lib/Horde/Scheduler.php index d88d0a77e..5ef91e96e 100644 --- a/framework/Scheduler/lib/Horde/Scheduler.php +++ b/framework/Scheduler/lib/Horde/Scheduler.php @@ -87,7 +87,7 @@ class Horde_Scheduler $vfs->writeData('.horde/scheduler', Horde_String::lower(get_class($this)) . $id, serialize($this), true); return true; } catch (VFS_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); return false; } } @@ -119,7 +119,7 @@ class Horde_Scheduler $scheduler = $tmp; } } catch (VFS_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); } if ($autosave) { diff --git a/framework/Scheduler/lib/Horde/Scheduler/Cron.php b/framework/Scheduler/lib/Horde/Scheduler/Cron.php index 6cea92804..0c2fc2c6f 100644 --- a/framework/Scheduler/lib/Horde/Scheduler/Cron.php +++ b/framework/Scheduler/lib/Horde/Scheduler/Cron.php @@ -119,7 +119,7 @@ class Horde_Scheduler_Cron extends Horde_Scheduler */ public function runcmd(&$task) { - Horde::logMessage('runcmd(): ' . $task['cmd'] . ' run by ' . $task['uid'], __FILE__, __LINE__, PEAR_LOG_INFO); + Horde::logMessage('runcmd(): ' . $task['cmd'] . ' run by ' . $task['uid'], 'INFO'); return shell_exec($task['cmd']); } diff --git a/framework/SessionHandler/lib/Horde/SessionHandler.php b/framework/SessionHandler/lib/Horde/SessionHandler.php index 2400fd3e9..a52ecdadc 100644 --- a/framework/SessionHandler/lib/Horde/SessionHandler.php +++ b/framework/SessionHandler/lib/Horde/SessionHandler.php @@ -163,7 +163,7 @@ class Horde_SessionHandler try { $this->_open($save_path, $session_name); } catch (Horde_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); return false; } @@ -195,7 +195,7 @@ class Horde_SessionHandler try { $this->_close(); } catch (Horde_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); return false; } @@ -253,7 +253,7 @@ class Horde_SessionHandler public function write($id, $session_data) { if (!$this->_force && ($this->_sig == md5($session_data))) { - Horde::logMessage('Session data unchanged (id = ' . $id . ')', __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Session data unchanged (id = ' . $id . ')', 'DEBUG'); return true; } diff --git a/framework/SessionHandler/lib/Horde/SessionHandler/Memcache.php b/framework/SessionHandler/lib/Horde/SessionHandler/Memcache.php index 5d98880fb..e92cc11ab 100644 --- a/framework/SessionHandler/lib/Horde/SessionHandler/Memcache.php +++ b/framework/SessionHandler/lib/Horde/SessionHandler/Memcache.php @@ -158,7 +158,7 @@ class Horde_SessionHandler_Memcache extends Horde_SessionHandler } if ($result === false) { - Horde::logMessage('Error retrieving session data (id = ' . $id . ')', __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Error retrieving session data (id = ' . $id . ')', 'DEBUG'); return false; } @@ -169,7 +169,7 @@ class Horde_SessionHandler_Memcache extends Horde_SessionHandler $this->_id = $id; } - Horde::logMessage('Read session data (id = ' . $id . ')', __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Read session data (id = ' . $id . ')', 'DEBUG'); return $result; } @@ -195,7 +195,7 @@ class Horde_SessionHandler_Memcache extends Horde_SessionHandler if (!$res && !$this->_memcache->set($id, $session_data)) { - Horde::logMessage('Error writing session data (id = ' . $id . ')', __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage('Error writing session data (id = ' . $id . ')', 'ERR'); return false; } @@ -215,7 +215,7 @@ class Horde_SessionHandler_Memcache extends Horde_SessionHandler $this->_memcache->unlock($this->_trackID); } - Horde::logMessage('Wrote session data (id = ' . $id . ')', __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Wrote session data (id = ' . $id . ')', 'DEBUG'); return true; } @@ -232,7 +232,7 @@ class Horde_SessionHandler_Memcache extends Horde_SessionHandler $this->_memcache->unlock($id); if ($result === false) { - Horde::logMessage('Failed to delete session (id = ' . $id . ')', __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Failed to delete session (id = ' . $id . ')', 'DEBUG'); return false; } @@ -250,7 +250,7 @@ class Horde_SessionHandler_Memcache extends Horde_SessionHandler $this->_memcache->unlock($this->_trackID); } - Horde::logMessage('Deleted session data (id = ' . $id . ')', __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Deleted session data (id = ' . $id . ')', 'DEBUG'); return true; } diff --git a/framework/SessionHandler/lib/Horde/SessionHandler/Mysql.php b/framework/SessionHandler/lib/Horde/SessionHandler/Mysql.php index b6bd9f298..901e62dd7 100644 --- a/framework/SessionHandler/lib/Horde/SessionHandler/Mysql.php +++ b/framework/SessionHandler/lib/Horde/SessionHandler/Mysql.php @@ -124,11 +124,11 @@ class Horde_SessionHandler_Mysql extends Horde_SessionHandler } /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Mysql::_read(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Mysql::_read(): query = "%s"', $query), 'DEBUG'); $result = @mysql_query($query, $this->_db); if (!$result) { - Horde::logMessage('Error retrieving session data (id = ' . $id . '): ' . mysql_error($this->_db), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage('Error retrieving session data (id = ' . $id . '): ' . mysql_error($this->_db), 'ERR'); return ''; } @@ -167,7 +167,7 @@ class Horde_SessionHandler_Mysql extends Horde_SessionHandler } if (!$result) { @mysql_query('ROLLBACK', $this->_db); - Horde::logMessage('Error writing session data: ' . $error, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage('Error writing session data: ' . $error, 'ERR'); return false; } @@ -195,7 +195,7 @@ class Horde_SessionHandler_Mysql extends Horde_SessionHandler $this->_params['table'], $this->_quote($id)); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Mysql::destroy(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Mysql::destroy(): query = "%s"', $query), 'DEBUG'); /* Execute the query. */ $result = @mysql_query($query, $this->_db); @@ -207,7 +207,7 @@ class Horde_SessionHandler_Mysql extends Horde_SessionHandler } if (!$result) { @mysql_query('ROLLBACK', $this->_db); - Horde::logMessage('Failed to delete session (id = ' . $id . '): ' . $error, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage('Failed to delete session (id = ' . $id . '): ' . $error, 'ERR'); return false; } @@ -235,12 +235,12 @@ class Horde_SessionHandler_Mysql extends Horde_SessionHandler $this->_params['table'], (int)(time() - $maxlifetime)); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Mysql::gc(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Mysql::gc(): query = "%s"', $query), 'DEBUG'); /* Execute the query. */ $result = @mysql_query($query, $this->_db); if (!$result) { - Horde::logMessage('Error garbage collecting old sessions: ' . mysql_error($this->_db), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage('Error garbage collecting old sessions: ' . mysql_error($this->_db), 'ERR'); return false; } @@ -264,7 +264,7 @@ class Horde_SessionHandler_Mysql extends Horde_SessionHandler time() - ini_get('session.gc_maxlifetime')); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Mysql::getSessionIDs(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Mysql::getSessionIDs(): query = "%s"', $query), 'DEBUG'); $result = @mysql_query($query, $this->_db); if (!$result) { diff --git a/framework/SessionHandler/lib/Horde/SessionHandler/None.php b/framework/SessionHandler/lib/Horde/SessionHandler/None.php index 406037daa..1a6be3c74 100644 --- a/framework/SessionHandler/lib/Horde/SessionHandler/None.php +++ b/framework/SessionHandler/lib/Horde/SessionHandler/None.php @@ -30,7 +30,7 @@ class Horde_SessionHandler_None extends Horde_SessionHandler $file = session_save_path() . DIRECTORY_SEPARATOR . 'sess_' . $id; $session_data = @file_get_contents($file); if ($session_data === false) { - Horde::logMessage('Unable to read file: ' . $file, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage('Unable to read file: ' . $file, 'ERR'); $session_data = ''; } diff --git a/framework/SessionHandler/lib/Horde/SessionHandler/Oci8.php b/framework/SessionHandler/lib/Horde/SessionHandler/Oci8.php index 0dc3ce29f..4939dd5e9 100644 --- a/framework/SessionHandler/lib/Horde/SessionHandler/Oci8.php +++ b/framework/SessionHandler/lib/Horde/SessionHandler/Oci8.php @@ -97,7 +97,7 @@ class Horde_SessionHandler_Oci8 extends Horde_SessionHandler $select_query = sprintf('SELECT session_data FROM %s WHERE session_id = %s FOR UPDATE', $this->_params['table'], $this->_quote($id)); - Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Oci8::_read(): query = "%s"', $select_query), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Oci8::_read(): query = "%s"', $select_query), 'DEBUG'); $select_statement = OCIParse($this->_db, $select_query); OCIExecute($select_statement, OCI_DEFAULT); @@ -125,7 +125,7 @@ class Horde_SessionHandler_Oci8 extends Horde_SessionHandler $select_query = sprintf('SELECT session_data FROM %s WHERE session_id = %s FOR UPDATE', $this->_params['table'], $this->_quote($id)); - Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Oci8::_write(): query = "%s"', $select_query), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Oci8::_write(): query = "%s"', $select_query), 'DEBUG'); $select_statement = OCIParse($this->_db, $select_query); OCIExecute($select_statement, OCI_DEFAULT); @@ -150,7 +150,7 @@ class Horde_SessionHandler_Oci8 extends Horde_SessionHandler $this->_quote($id), $this->_quote(time())); - Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Oci8::_read(): query = "%s"', $insert_query), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Oci8::_read(): query = "%s"', $insert_query), 'DEBUG'); $insert_statement = OCIParse($this->_db, $insert_query); $lob = OCINewDescriptor($this->_db); @@ -181,14 +181,14 @@ class Horde_SessionHandler_Oci8 extends Horde_SessionHandler $this->_params['table'], $this->_quote($id)); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Oci8::destroy(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Oci8::destroy(): query = "%s"', $query), 'DEBUG'); /* Execute the query. */ $statement = OCIParse($this->_db, $query); $result = OCIExecute($statement); if (!$result) { OCIFreeStatement($statement); - Horde::logMessage('Failed to delete session (id = ' . $id . ')', __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage('Failed to delete session (id = ' . $id . ')', 'ERR'); return false; } @@ -211,14 +211,14 @@ class Horde_SessionHandler_Oci8 extends Horde_SessionHandler $this->_params['table'], $this->_quote(time() - $maxlifetime)); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Oci8::gc(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Oci8::gc(): query = "%s"', $query), 'DEBUG'); /* Execute the query. */ $statement = OCIParse($this->_db, $query); $result = OCIExecute($statement); if (!$result) { OCIFreeStatement($statement); - Horde::logMessage('Error garbage collecting old sessions', __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage('Error garbage collecting old sessions', 'ERR'); return false; } @@ -245,7 +245,7 @@ class Horde_SessionHandler_Oci8 extends Horde_SessionHandler time() - ini_get('session.gc_maxlifetime')); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Oci8::getSessionIDs(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Oci8::getSessionIDs(): query = "%s"', $query), 'DEBUG'); /* Execute query */ $statement = OCIParse($this->_db, $query); diff --git a/framework/SessionHandler/lib/Horde/SessionHandler/Pgsql.php b/framework/SessionHandler/lib/Horde/SessionHandler/Pgsql.php index b74b6c291..ad164b740 100644 --- a/framework/SessionHandler/lib/Horde/SessionHandler/Pgsql.php +++ b/framework/SessionHandler/lib/Horde/SessionHandler/Pgsql.php @@ -113,7 +113,7 @@ class Horde_SessionHandler_Pgsql extends Horde_SessionHandler $this->_quote($id)); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Pgsql::' . '_read(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Pgsql::' . '_read(): query = "%s"', $query), 'DEBUG'); $result = @pg_query($this->_db, $query); $data = pg_fetch_result($result, 0, 'session_data'); @@ -158,7 +158,7 @@ class Horde_SessionHandler_Pgsql extends Horde_SessionHandler } /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Pgsql::' . '_write(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Pgsql::' . '_write(): query = "%s"', $query), 'DEBUG'); $result = @pg_query($this->_db, $query); $rows = pg_affected_rows($result); @@ -167,7 +167,7 @@ class Horde_SessionHandler_Pgsql extends Horde_SessionHandler @pg_query($this->_db, 'COMMIT;'); if ($rows != 1) { - Horde::logMessage('Error writing session data', __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage('Error writing session data', 'ERR'); return false; } @@ -188,7 +188,7 @@ class Horde_SessionHandler_Pgsql extends Horde_SessionHandler $this->_params['table'], $this->_quote($id)); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Pgsql::' . 'destroy(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Pgsql::' . 'destroy(): query = "%s"', $query), 'DEBUG'); /* Execute the query. */ $result = @pg_query($this->_db, $query); @@ -197,7 +197,7 @@ class Horde_SessionHandler_Pgsql extends Horde_SessionHandler if (!$result) { pg_free_result($result); - Horde::logMessage('Failed to delete session (id = ' . $id . ')', __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage('Failed to delete session (id = ' . $id . ')', 'ERR'); return false; } @@ -220,12 +220,12 @@ class Horde_SessionHandler_Pgsql extends Horde_SessionHandler $this->_quote(time() - $maxlifetime)); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Pgsql::' . 'gc(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Pgsql::' . 'gc(): query = "%s"', $query), 'DEBUG'); /* Execute the query. */ $result = @pg_query($this->_db, $query); if (!$result) { - Horde::logMessage('Error garbage collecting old sessions', __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage('Error garbage collecting old sessions', 'ERR'); } pg_free_result($result); @@ -251,7 +251,7 @@ class Horde_SessionHandler_Pgsql extends Horde_SessionHandler time() - ini_get('session.gc_maxlifetime')); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Pgsql::' . 'getSessionIDs(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Pgsql::' . 'getSessionIDs(): query = "%s"', $query), 'DEBUG'); /* Execute the query. */ $result = @pg_query($this->_db, $query); diff --git a/framework/SessionHandler/lib/Horde/SessionHandler/Sql.php b/framework/SessionHandler/lib/Horde/SessionHandler/Sql.php index e9f74b663..b2aea32f4 100644 --- a/framework/SessionHandler/lib/Horde/SessionHandler/Sql.php +++ b/framework/SessionHandler/lib/Horde/SessionHandler/Sql.php @@ -139,7 +139,7 @@ class Horde_SessionHandler_Sql extends Horde_SessionHandler /* Begin a transaction. */ $result = $this->_write_db->autocommit(false); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return ''; } @@ -147,7 +147,7 @@ class Horde_SessionHandler_Sql extends Horde_SessionHandler $result = Horde_SQL::readBlob($this->_write_db, $this->_params['table'], 'session_data', array('session_id' => $id)); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return ''; } @@ -170,12 +170,12 @@ class Horde_SessionHandler_Sql extends Horde_SessionHandler $values = array($id); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Sql::write(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Sql::write(): query = "%s"', $query), 'DEBUG'); /* Execute the query. */ $result = $this->_write_db->getOne($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return false; } @@ -192,14 +192,14 @@ class Horde_SessionHandler_Sql extends Horde_SessionHandler if (is_a($result, 'PEAR_Error')) { $this->_write_db->rollback(); $this->_write_db->autoCommit(true); - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return false; } $result = $this->_write_db->commit(); if (is_a($result, 'PEAR_Error')) { $this->_write_db->autoCommit(true); - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return false; } @@ -222,18 +222,18 @@ class Horde_SessionHandler_Sql extends Horde_SessionHandler $values = array($id); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Sql::destroy(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Sql::destroy(): query = "%s"', $query), 'DEBUG'); /* Execute the query. */ $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return false; } $result = $this->_write_db->commit(); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return false; } @@ -255,12 +255,12 @@ class Horde_SessionHandler_Sql extends Horde_SessionHandler $values = array(time() - $maxlifetime); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Sql::gc(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Sql::gc(): query = "%s"', $query), 'DEBUG'); /* Execute the query. */ $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return false; } @@ -283,12 +283,12 @@ class Horde_SessionHandler_Sql extends Horde_SessionHandler $values = array(time() - ini_get('session.gc_maxlifetime')); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Sql::getSessionIDs(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Sql::getSessionIDs(): query = "%s"', $query), 'DEBUG'); /* Execute the query. */ $result = $this->_db->getCol($query, 0, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return false; } diff --git a/framework/Share/Share.php b/framework/Share/Share.php index 70addd92d..bd4d029c7 100644 --- a/framework/Share/Share.php +++ b/framework/Share/Share.php @@ -472,14 +472,14 @@ class Horde_Share { function getPermissions($share, $user = null) { if (is_a($share, 'PEAR_Error')) { - Horde::logMessage($share, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($share, 'ERR'); return false; } if (!is_a($share, 'Horde_Share_Object')) { $share = $this->getShare($share); if (is_a($share, 'PEAR_Error')) { - Horde::logMessage($share, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($share, 'ERR'); return false; } } @@ -793,7 +793,7 @@ class Horde_Share_Object { $locks = &Horde_Lock::singleton($GLOBALS['conf']['lock']['driver']); } catch (Horde_Lock_Exception $e) { $locks = PEAR::raiseError($e->getMessage()); - Horde::logMessage($locks, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($locks, 'ERR'); return $locks; } @@ -853,7 +853,7 @@ class Horde_Share_Object { $locks = &Horde_Lock::singleton($GLOBALS['conf']['lock']['driver']); } catch (Horde_Lock_Exception $e) { $locks = PEAR::raiseError($e->getMessage()); - Horde::logMessage($locks, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($locks, 'ERR'); return $locks; } @@ -879,7 +879,7 @@ class Horde_Share_Object { $locks = &Horde_Lock::singleton($GLOBALS['conf']['lock']['driver']); } catch (Horde_Lock_Exception $e) { $locks = PEAR::raiseError($e->getMessage()); - Horde::logMessage($locks, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($locks, 'ERR'); return $locks; } @@ -891,7 +891,7 @@ class Horde_Share_Object { $result = $locks->getLocks($this->_shareOb->getApp(), $shareid, $locktype); } catch (Horde_Lock_Exception $e) { $result = PEAR::raiseError($e->getMessage()); - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -902,7 +902,7 @@ class Horde_Share_Object { $result = $locks->getLocks($this->_shareOb->getApp() . ':' . $shareid, $item_uid, $locktype); } catch (Horde_Lock_Exception $e) { $result = PEAR::raiseError($e->getMessage()); - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } } else { diff --git a/framework/Share/Share/sql.php b/framework/Share/Share/sql.php index 66f812ea3..50dc29664 100644 --- a/framework/Share/Share/sql.php +++ b/framework/Share/Share/sql.php @@ -128,12 +128,12 @@ class Horde_Share_sql extends Horde_Share { if ($this->_hasUsers($share)) { $stmt = $this->_db->prepare('SELECT user_uid, perm FROM ' . $this->_table . '_users WHERE share_id = ?'); if (is_a($stmt, 'PEAR_Error')) { - Horde::logMessage($stmt, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($stmt, 'ERR'); return $stmt; } $result = $stmt->execute(array($share['share_id'])); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } elseif (!empty($result)) { while ($row = $result->fetchRow(MDB2_FETCHMODE_ASSOC)) { @@ -156,12 +156,12 @@ class Horde_Share_sql extends Horde_Share { // Get groups permissions $stmt = $this->_db->prepare('SELECT group_uid, perm FROM ' . $this->_table . '_groups WHERE share_id = ?'); if (is_a($stmt, 'PEAR_Error')) { - Horde::logMessage($stmt, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($stmt, 'ERR'); return $stmt; } $result = $stmt->execute(array($share['share_id'])); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } elseif (!empty($result)) { while ($row = $result->fetchRow(MDB2_FETCHMODE_ASSOC)) { @@ -185,17 +185,17 @@ class Horde_Share_sql extends Horde_Share { { $stmt = $this->_db->prepare('SELECT * FROM ' . $this->_table . ' WHERE share_name = ?'); if (is_a($stmt, 'PEAR_Error')) { - Horde::logMessage($stmt, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($stmt, 'ERR'); return $stmt; } $results = $stmt->execute(array($name)); if (is_a($results, 'PEAR_Error')) { - Horde::logMessage($results, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($results, 'ERR'); return $results; } $data = $results->fetchRow(MDB2_FETCHMODE_ASSOC); if (is_a($data, 'PEAR_Error')) { - Horde::logMessage($data, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($data, 'ERR'); return $data; } elseif (empty($data)) { return PEAR::RaiseError(sprintf(_("Share \"%s\" does not exist."), $name)); @@ -246,17 +246,17 @@ class Horde_Share_sql extends Horde_Share { $params = array($id); $stmt = $this->_db->prepare('SELECT * FROM ' . $this->_table . ' WHERE share_id = ?'); if (is_a($stmt, 'PEAR_Error')) { - Horde::logMessage($stmt, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($stmt, 'ERR'); return $stmt; } $results = $stmt->execute($params); if (is_a($results, 'PEAR_Error')) { - Horde::logMessage($results, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($results, 'ERR'); return $results; } $data = $results->fetchRow(MDB2_FETCHMODE_ASSOC); if (is_a($data, 'PEAR_Error')) { - Horde::logMessage($data, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($data, 'ERR'); return $data; } elseif (empty($data)) { return PEAR::RaiseError(sprintf(_("Share ID %d does not exist."), $id)); @@ -289,7 +289,7 @@ class Horde_Share_sql extends Horde_Share { $query = 'SELECT * FROM ' . $this->_table . ' WHERE share_id IN (' . implode(', ', $ids) . ')'; $result = $this->_db->query($query); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } elseif (empty($result)) { return array(); @@ -314,7 +314,7 @@ class Horde_Share_sql extends Horde_Share { . ' WHERE share_id IN (' . implode(', ', $users) . ')'; $result = $this->_db->query($query); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } elseif (!empty($result)) { while ($share = $result->fetchRow(MDB2_FETCHMODE_ASSOC)) { @@ -330,7 +330,7 @@ class Horde_Share_sql extends Horde_Share { . ' WHERE share_id IN (' . implode(', ', $groups) . ')'; $result = $this->_db->query($query); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } elseif (!empty($result)) { while ($share = $result->fetchRow(MDB2_FETCHMODE_ASSOC)) { @@ -375,7 +375,7 @@ class Horde_Share_sql extends Horde_Share { $query = 'SELECT * FROM ' . $this->_table . ' ORDER BY share_name ASC'; $result = $this->_db->query($query); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } elseif (empty($result)) { return array(); @@ -390,7 +390,7 @@ class Horde_Share_sql extends Horde_Share { $query = 'SELECT share_id, user_uid, perm FROM ' . $this->_table . '_users'; $result = $this->_db->query($query); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } elseif (!empty($result)) { while ($share = $result->fetchRow(MDB2_FETCHMODE_ASSOC)) { @@ -403,7 +403,7 @@ class Horde_Share_sql extends Horde_Share { $query = 'SELECT share_id, group_uid, perm FROM ' . $this->_table . '_groups'; $result = $this->_db->query($query); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } elseif (!empty($result)) { while ($share = $result->fetchRow(MDB2_FETCHMODE_ASSOC)) { @@ -463,10 +463,10 @@ class Horde_Share_sql extends Horde_Share { @sqlite_query('PRAGMA short_column_names=1', $connection); } - Horde::logMessage(sprintf("SQL Query by Horde_Share_sql::listShares: %s", $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf("SQL Query by Horde_Share_sql::listShares: %s", $query), 'DEBUG'); $result = $this->_db->query($query); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } elseif (empty($result)) { return array(); @@ -492,7 +492,7 @@ class Horde_Share_sql extends Horde_Share { . ')'; $result = $this->_db->query($query); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } elseif (!empty($result)) { while ($share = $result->fetchRow(MDB2_FETCHMODE_ASSOC)) { @@ -509,7 +509,7 @@ class Horde_Share_sql extends Horde_Share { . ')'; $result = $this->_db->query($query); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } elseif (!empty($result)) { while ($share = $result->fetchRow(MDB2_FETCHMODE_ASSOC)) { @@ -550,10 +550,10 @@ class Horde_Share_sql extends Horde_Share { } $query = 'SELECT * FROM ' . $this->_table . ' WHERE share_owner IS NULL'; - Horde::logMessage('SQL Query by Horde_Share_sql::listSystemShares: ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Horde_Share_sql::listSystemShares: ' . $query, 'DEBUG'); $result = $this->_db->query($query); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } elseif (empty($result)) { return array(); @@ -588,7 +588,7 @@ class Horde_Share_sql extends Horde_Share { { $query = $this->_getShareCriteria($userid, $perm, $attributes); $query = 'SELECT COUNT(DISTINCT s.share_id) ' . $query; - Horde::logMessage(sprintf("SQL Query by Horde_Share_sql::_countShares: %s", $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf("SQL Query by Horde_Share_sql::_countShares: %s", $query), 'DEBUG'); return $this->_db->queryOne($query); } @@ -634,12 +634,12 @@ class Horde_Share_sql extends Horde_Share { /* Remove the share entry */ $stmt = $this->_write_db->prepare('DELETE FROM ' . $table . ' WHERE share_id = ?', null, MDB2_PREPARE_MANIP); if (is_a($stmt, 'PEAR_Error')) { - Horde::logMessage($stmt, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($stmt, 'ERR'); return $stmt; } $result = $stmt->execute($params); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } $stmt->free(); @@ -661,12 +661,12 @@ class Horde_Share_sql extends Horde_Share { . ' WHERE share_name = ?'); if (is_a($stmt, 'PEAR_Error')) { - Horde::logMessage($stmt, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($stmt, 'ERR'); return $stmt; } $result = $stmt->execute(array($share)); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -724,7 +724,7 @@ class Horde_Share_sql extends Horde_Share { $where .= ' OR (g.group_uid IN (' . implode(',', $group_ids) . ')' . ' AND (' . Horde_SQL::buildClause($this->_db, 'g.perm', '&', $perm) . '))'; } elseif (is_a($groups, 'PEAR_Error')) { - Horde::logMessage($groups, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($groups, 'ERR'); } } else { $where = '(' . Horde_SQL::buildClause($this->_db, 's.perm_guest', '&', $perm) . ')'; @@ -1046,7 +1046,7 @@ class Horde_Share_Object_sql extends Horde_Share_Object { if (empty($this->data['share_id'])) { $share_id = $db->nextId($table); if (is_a($share_id, 'PEAR_Error')) { - Horde::logMessage($share_id, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($share_id, 'ERR'); return $share_id; } @@ -1061,12 +1061,12 @@ class Horde_Share_Object_sql extends Horde_Share_Object { } $stmt = $db->prepare($query, null, MDB2_PREPARE_MANIP); if (is_a($stmt, 'PEAR_Error')) { - Horde::logMessage($stmt, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($stmt, 'ERR'); return $stmt; } $result = $stmt->execute($params); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } $stmt->free(); @@ -1074,12 +1074,12 @@ class Horde_Share_Object_sql extends Horde_Share_Object { // Update the share's user permissions $stmt = $db->prepare('DELETE FROM ' . $table . '_users WHERE share_id = ?', null, MDB2_PREPARE_MANIP); if (is_a($stmt, 'PEAR_Error')) { - Horde::logMessage($stmt, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($stmt, 'ERR'); return $stmt; } $result = $stmt->execute(array($this->data['share_id'])); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } $stmt->free(); @@ -1089,12 +1089,12 @@ class Horde_Share_Object_sql extends Horde_Share_Object { foreach ($this->data['perm']['users'] as $user => $perm) { $stmt = $db->prepare('INSERT INTO ' . $table . '_users (share_id, user_uid, perm) VALUES (?, ?, ?)', null, MDB2_PREPARE_MANIP); if (is_a($stmt, 'PEAR_Error')) { - Horde::logMessage($stmt, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($stmt, 'ERR'); return $stmt; } $result = $stmt->execute(array($this->data['share_id'], $user, $perm)); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } $stmt->free(); @@ -1104,12 +1104,12 @@ class Horde_Share_Object_sql extends Horde_Share_Object { // Update the share's group permissions $stmt = $db->prepare('DELETE FROM ' . $table . '_groups WHERE share_id = ?', null, MDB2_PREPARE_MANIP); if (is_a($stmt, 'PEAR_Error')) { - Horde::logMessage($stmt, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($stmt, 'ERR'); return $stmt; } $result = $stmt->execute(array($this->data['share_id'])); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } $stmt->free(); @@ -1119,12 +1119,12 @@ class Horde_Share_Object_sql extends Horde_Share_Object { foreach ($this->data['perm']['groups'] as $group => $perm) { $stmt = $db->prepare('INSERT INTO ' . $table . '_groups (share_id, group_uid, perm) VALUES (?, ?, ?)', null, MDB2_PREPARE_MANIP); if (is_a($stmt, 'PEAR_Error')) { - Horde::logMessage($stmt, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($stmt, 'ERR'); return $stmt; } $result = $stmt->execute(array($this->data['share_id'], $group, $perm)); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } $stmt->free(); diff --git a/framework/Share/Share/sql_hierarchical.php b/framework/Share/Share/sql_hierarchical.php index 727c0b472..937ea0e79 100644 --- a/framework/Share/Share/sql_hierarchical.php +++ b/framework/Share/Share/sql_hierarchical.php @@ -84,11 +84,10 @@ class Horde_Share_sql_hierarchical extends Horde_Share_sql { $this->_db->setLimit($count, $from); } - Horde::logMessage('Query By Horde_Share_sql_hierarchical: ' . $query, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Query By Horde_Share_sql_hierarchical: ' . $query, 'DEBUG'); $result = $this->_db->query($query); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } elseif (empty($result)) { return array(); @@ -114,7 +113,7 @@ class Horde_Share_sql_hierarchical extends Horde_Share_sql { . ')'; $result = $this->_db->query($query); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } elseif (!empty($result)) { while ($share = $result->fetchRow(MDB2_FETCHMODE_ASSOC)) { @@ -131,7 +130,7 @@ class Horde_Share_sql_hierarchical extends Horde_Share_sql { . ')'; $result = $this->_db->query($query); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } elseif (!empty($result)) { while ($share = $result->fetchRow(MDB2_FETCHMODE_ASSOC)) { @@ -314,7 +313,7 @@ class Horde_Share_sql_hierarchical extends Horde_Share_sql { $allowners = $this->_db->queryCol($sql); if (is_a($allowners, 'PEAR_Error')) { - Horde::logMessage($allowners, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($allowners, 'ERR'); return $allowners; } @@ -478,7 +477,7 @@ class Horde_Share_sql_hierarchical extends Horde_Share_sql { $query = 'SELECT * FROM ' . $this->_table . ' WHERE share_id IN (' . implode(', ', $ids) . ')'; $result = $this->_db->query($query); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } elseif (empty($result)) { return array(); @@ -503,7 +502,7 @@ class Horde_Share_sql_hierarchical extends Horde_Share_sql { . ' WHERE share_id IN (' . implode(', ', $users) . ')'; $result = $this->_db->query($query); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } elseif (!empty($result)) { while ($share = $result->fetchRow(MDB2_FETCHMODE_ASSOC)) { @@ -519,7 +518,7 @@ class Horde_Share_sql_hierarchical extends Horde_Share_sql { . ' WHERE share_id IN (' . implode(', ', $groups) . ')'; $result = $this->_db->query($query); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } elseif (!empty($result)) { while ($share = $result->fetchRow(MDB2_FETCHMODE_ASSOC)) { @@ -666,7 +665,7 @@ class Horde_Share_Object_sql_hierarchical extends Horde_Share_Object_sql { if (!is_null($parent) && !is_a($parent, 'Horde_Share_Object')) { $parent = $this->_shareOb->getShareById($parent); if (is_a($parent, 'PEAR_Error')) { - Horde::logMessage($parent, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($parent, 'ERR'); return $parent; } } diff --git a/framework/SyncML/SyncML.php b/framework/SyncML/SyncML.php index 09ba6ed9b..af148e067 100644 --- a/framework/SyncML/SyncML.php +++ b/framework/SyncML/SyncML.php @@ -36,9 +36,6 @@ require_once 'SyncML/Sync.php'; require_once 'SyncML/XMLOutput.php'; require_once 'SyncML/Backend.php'; -/* PEAR_LOG_* constants */ -require_once 'Log.php'; - class SyncML_ContentHandler { /** @@ -148,8 +145,7 @@ class SyncML_ContentHandler { $s = sprintf('XML error: %s at line %d', xml_error_string(xml_get_error_code($parser)), xml_get_current_line_number($parser)); - $GLOBALS['backend']->logMessage($s, __FILE__, __LINE__, - PEAR_LOG_ERR); + $GLOBALS['backend']->logMessage($s, 'ERR'); xml_parser_free($parser); return new PEAR_Error($s); } @@ -188,9 +184,7 @@ class SyncML_ContentHandler { $errorLogging = ob_get_clean(); if (!empty($errorLogging)) { - $GLOBALS['backend']->logMessage('Caught output: ' . $errorLogging, - __FILE__, __LINE__, - PEAR_LOG_WARNING); + $GLOBALS['backend']->logMessage('Caught output: ' . $errorLogging, 'WARN'); } return $output; @@ -402,9 +396,7 @@ class SyncML_ContentHandler { } else { $statuscode = RESPONSE_INVALID_CREDENTIALS; } - $GLOBALS['backend']->logMessage('Invalid authentication', - __FILE__, __LINE__, - PEAR_LOG_DEBUG); + $GLOBALS['backend']->logMessage('Invalid authentication', 'DEBUG'); } } else { $statuscode = RESPONSE_OK; @@ -435,7 +427,7 @@ class SyncML_ContentHandler { . '; charset: ' . $GLOBALS['backend']->getCharset() . '; wbxml: ' . ($state->wbxml ? 'yes' : 'no'); - $GLOBALS['backend']->logMessage($str, __FILE__, __LINE__, PEAR_LOG_DEBUG); + $GLOBALS['backend']->logMessage($str, 'DEBUG'); } /** @@ -481,8 +473,7 @@ class SyncML_ContentHandler { foreach ($p as $pendingSync) { if (!$messageFull) { $GLOBALS['backend']->logMessage( - 'Continuing sync for syncType ' . $pendingSync, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + 'Continuing sync for syncType ' . $pendingSync, 'DEBUG'); $sync = &$state->getSync($pendingSync); $sync->createSyncOutput($this->_xmlWriter); } @@ -504,9 +495,7 @@ class SyncML_ContentHandler { !$state->hasPendingSyncs()) { /* Create . */ $this->_xmlWriter->outputFinal(); - $GLOBALS['backend']->logMessage('Sending to client', - __FILE__, __LINE__, - PEAR_LOG_DEBUG); + $GLOBALS['backend']->logMessage('Sending to client', 'DEBUG'); $state->delayedFinal = false; } else { $GLOBALS['message_expectresponse'] = true; @@ -519,8 +508,7 @@ class SyncML_ContentHandler { /* Create . */ $this->_xmlWriter->outputFinal(); $GLOBALS['backend']->logMessage( - 'Sending delayed to client', - __FILE__, __LINE__, PEAR_LOG_DEBUG); + 'Sending delayed to client', 'DEBUG'); $state->delayedFinal = false; } else { $GLOBALS['message_expectresponse'] = true; @@ -539,14 +527,12 @@ class SyncML_ContentHandler { foreach ($state->getSyncs() as $sync) { $sync->closeSync(); } - $GLOBALS['backend']->logMessage('Session completed and closed', - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $GLOBALS['backend']->logMessage('Session completed and closed', 'DEBUG'); /* Session can be closed here. */ $GLOBALS['backend']->sessionClose(); } else { - $GLOBALS['backend']->logMessage('Return message completed', - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $GLOBALS['backend']->logMessage('Return message completed', 'DEBUG'); } } diff --git a/framework/SyncML/SyncML/Backend.php b/framework/SyncML/SyncML/Backend.php index 29d843421..f98de3d5f 100644 --- a/framework/SyncML/SyncML/Backend.php +++ b/framework/SyncML/SyncML/Backend.php @@ -211,13 +211,12 @@ class SyncML_Backend { var $_debugFiles; /** - * The log level. One of the PEAR_LOG_* constants. + * The log level. * - * @see PEAR Log package * @see SyncML_Backend() - * @var integer + * @var string */ - var $_logLevel = PEAR_LOG_INFO; + var $_logLevel = 'INFO'; /** * The charset used in the SyncML messages. @@ -267,9 +266,8 @@ class SyncML_Backend { * outgoing packets and data * conversions and devinf log in * debug_dir. - * - log_level: PEAR_LOG_*. Only log entries with - * at least this level. Defaults to - * PEAR_LOG_INFO. + * - log_level: Only log entries with at least + * this level. Defaults to 'INFO'. */ function SyncML_Backend($params) { @@ -281,8 +279,7 @@ class SyncML_Backend { $this->_logLevel = $params['log_level']; } - $this->logMessage('Backend of class ' . get_class($this) . ' created', - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $this->logMessage('Backend of class ' . get_class($this) . ' created', 'DEBUG'); } /** @@ -460,8 +457,7 @@ class SyncML_Backend { default: $this->logMessage('Invalid database "' . $database - . '". Try tasks, calendar, notes or contacts.', - __FILE__, __LINE__, PEAR_LOG_ERR); + . '". Try tasks, calendar, notes or contacts.', 'ERR'); return false; } } @@ -603,8 +599,7 @@ class SyncML_Backend { switch ($credType) { case 'syncml:auth-basic': list($username, $pwd) = explode(':', base64_decode($credData), 2); - $this->logMessage('Checking authentication for user ' . $username, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $this->logMessage('Checking authentication for user ' . $username, 'DEBUG'); return $this->_checkAuthentication($username, $pwd); case 'syncml:auth-md5': @@ -636,8 +631,7 @@ class SyncML_Backend { return false; default: - $this->logMessage('Unsupported authentication type ' . $credType, - __FILE__, __LINE__, PEAR_LOG_ERR); + $this->logMessage('Unsupported authentication type ' . $credType, 'ERR'); return false; } } @@ -761,52 +755,68 @@ class SyncML_Backend { /** * Logs a message in the backend. * + * TODO: This should be done via Horde_Log or the equivalent. + * * @param mixed $message Either a string or a PEAR_Error object. * @param string $file What file was the log function called from * (e.g. __FILE__)? * @param integer $line What line was the log function called from * (e.g. __LINE__)? * @param integer $priority The priority of the message. One of: - * - PEAR_LOG_EMERG - * - PEAR_LOG_ALERT - * - PEAR_LOG_CRIT - * - PEAR_LOG_ERR - * - PEAR_LOG_WARNING - * - PEAR_LOG_NOTICE - * - PEAR_LOG_INFO - * - PEAR_LOG_DEBUG + * - EMERG + * - ALERT + * - CRIT + * - ERR + * - WARN + * - NOTICE + * - INFO + * - DEBUG */ - function logMessage($message, $file, $line, $priority = PEAR_LOG_INFO) + function logMessage($message, $priority = 'INFO') { - if ($priority > $this->_logLevel) { + if (is_string($priority)) { + $priority = defined('Horde_Log::' . $priority) + ? constant('Horde_Log::' . $priority) + : Horde_Log::INFO; + } + + if (is_string($this->_logLevel)) { + $loglevel = defined('Horde_Log::' . $this->_logLevel) + ? constant('Horde_Log::' . $this->_logLevel) + : Horde_Log::INFO; + } else { + $loglevel = $this->_logLevel; + } + + if ($priority > $loglevel) { return; } // Internal logging to logtext if (is_string($this->_logtext)) { switch ($priority) { - case PEAR_LOG_EMERG: + case 'EMERG': $this->_logtext .= 'EMERG: '; break; - case PEAR_LOG_ALERT: + case 'ALERT': $this->_logtext .= 'ALERT: '; break; - case PEAR_LOG_CRIT: + case 'CRIT': $this->_logtext .= 'CIRT: '; break; - case PEAR_LOG_ERR: + case 'ERR': $this->_logtext .= 'ERR: '; break; - case PEAR_LOG_WARNING: + case 'WARNING': $this->_logtext .= 'WARNING:'; break; - case PEAR_LOG_NOTICE: + case 'NOTICE': $this->_logtext .= 'NOTICE: '; break; - case PEAR_LOG_INFO: + case 'INFO': $this->_logtext .= 'INFO: '; break; - case PEAR_LOG_DEBUG: + case 'DEBUG': $this->_logtext .= 'DEBUG: '; break; default: @@ -885,16 +895,14 @@ class SyncML_Backend { if ($type === SYNCML_LOGFILE_CLIENTMESSAGE) { $this->logMessage('Started at ' . date('Y-m-d H:i:s') . '. Packet logged in ' - . $this->_debugDir . '/' . $filename, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + . $this->_debugDir . '/' . $filename, 'DEBUG'); } /* Increase packet number. */ if ($type === SYNCML_LOGFILE_SERVERMESSAGE) { $this->logMessage('Finished at ' . date('Y-m-d H:i:s') . '. Packet logged in ' - . $this->_debugDir . '/' . $filename, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + . $this->_debugDir . '/' . $filename, 'DEBUG'); $fp = @fopen($this->_debugDir . '/packetnum.txt', 'w'); if ($fp) { diff --git a/framework/SyncML/SyncML/Backend/Horde.php b/framework/SyncML/SyncML/Backend/Horde.php index a16968e16..bacf65eb6 100644 --- a/framework/SyncML/SyncML/Backend/Horde.php +++ b/framework/SyncML/SyncML/Backend/Horde.php @@ -33,7 +33,7 @@ class SyncML_Backend_Horde extends SyncML_Backend { $this->_db = DB::connect($GLOBALS['conf']['sql']); if (is_a($this->_db, 'PEAR_Error')) { - Horde::logMessage($this->_db, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($this->_db, 'ERR'); } /* Set DB portability options. */ @@ -143,8 +143,7 @@ class SyncML_Backend_Horde extends SyncML_Backend { $start .= '000000'; } $start = new Horde_Date($start); - $this->logMessage('Slow-syncing all events starting from ' . (string)$start, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $this->logMessage('Slow-syncing all events starting from ' . (string)$start, 'DEBUG'); $data = $registry->call( $database . '/list', array(SyncML_Backend::getParameter($databaseURI, 'source'), @@ -165,8 +164,7 @@ class SyncML_Backend_Horde extends SyncML_Backend { if (is_a($data, 'PEAR_Error')) { $this->logMessage("$database/list or $database/listBy failed while retrieving server additions:" - . $data->getMessage(), - __FILE__, __LINE__, PEAR_LOG_ERR); + . $data->getMessage(), 'ERR'); return $data; } @@ -184,8 +182,7 @@ class SyncML_Backend_Horde extends SyncML_Backend { $cuid = $this->_getCuid($database, $suid); if ($cuid) { $this->logMessage( - "Added to server from client during SlowSync: $suid ignored", - __FILE__, __LINE__, PEAR_LOG_DEBUG); + "Added to server from client during SlowSync: $suid ignored", 'DEBUG'); continue; } } @@ -195,13 +192,11 @@ class SyncML_Backend_Horde extends SyncML_Backend { if ($sync_ts && $sync_ts >= $add_ts[$suid]) { // Change was done by us upon request of client. Don't mirror // that back to the client. - $this->logMessage("Added to server from client: $suid ignored", - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $this->logMessage("Added to server from client: $suid ignored", 'DEBUG'); continue; } $this->logMessage( - "Adding to client from db $database, server id $suid", - __FILE__, __LINE__, PEAR_LOG_DEBUG); + "Adding to client from db $database, server id $suid", 'DEBUG'); $adds[$suid] = 0; } @@ -221,8 +216,7 @@ class SyncML_Backend_Horde extends SyncML_Backend { if (is_a($data, 'PEAR_Error')) { $this->logMessage( "$database/listBy failed while retrieving server modifications:" - . $data->getMessage(), - __FILE__, __LINE__, PEAR_LOG_WARNING); + . $data->getMessage(), 'WARN'); return $data; } @@ -242,15 +236,13 @@ class SyncML_Backend_Horde extends SyncML_Backend { if ($sync_ts && $sync_ts >= $mod_ts[$suid]) { // Change was done by us upon request of client. Don't // mirror that back to the client. - $this->logMessage("Changed on server after sent from client: $suid ignored", - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $this->logMessage("Changed on server after sent from client: $suid ignored", 'DEBUG'); continue; } $cuid = $this->_getCuid($database, $suid); if (!$cuid) { $this->logMessage( - "Unable to create change for server id $suid: client id not found in map, adding instead.", - __FILE__, __LINE__, PEAR_LOG_WARNING); + "Unable to create change for server id $suid: client id not found in map, adding instead.", 'WARN'); $adds[$suid] = 0; continue; } else { @@ -260,8 +252,7 @@ class SyncML_Backend_Horde extends SyncML_Backend { $mods[$suid] = $suid; } $this->logMessage( - "Modifying on client from db $database, client id $cuid -> server id $suid", - __FILE__, __LINE__, PEAR_LOG_DEBUG); + "Modifying on client from db $database, client id $cuid -> server id $suid", 'DEBUG'); } // Handle deletions. @@ -274,8 +265,7 @@ class SyncML_Backend_Horde extends SyncML_Backend { if (is_a($data, 'PEAR_Error')) { $this->logMessage( "$database/listBy failed while retrieving server deletions:" - . $data->getMessage(), - __FILE__, __LINE__, PEAR_LOG_WARNING); + . $data->getMessage(), 'WARN'); return $data; } @@ -302,15 +292,13 @@ class SyncML_Backend_Horde extends SyncML_Backend { if ($sync_ts && $sync_ts >= $suid_ts) { // Change was done by us upon request of client. Don't // mirror that back to the client. - $this->logMessage("Deleted on server after request from client: $suid ignored", - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $this->logMessage("Deleted on server after request from client: $suid ignored", 'DEBUG'); continue; } $cuid = $this->_getCuid($database, $suid); if (!$cuid) { $this->logMessage( - "Unable to create delete for server id $suid: client id not found in map", - __FILE__, __LINE__, PEAR_LOG_WARNING); + "Unable to create delete for server id $suid: client id not found in map", 'WARN'); continue; } $dels[$suid] = $cuid; @@ -318,8 +306,7 @@ class SyncML_Backend_Horde extends SyncML_Backend { $dels[$suid] = $suid; } $this->logMessage( - "Deleting on client from db $database, client id $cuid -> server id $suid", - __FILE__, __LINE__, PEAR_LOG_DEBUG); + "Deleting on client from db $database, client id $cuid -> server id $suid", 'DEBUG'); } return true; @@ -375,8 +362,7 @@ class SyncML_Backend_Horde extends SyncML_Backend { if (!is_a($suid, 'PEAR_Error')) { $this->logMessage( - "Added to server db $database client id $cuid -> server id $suid", - __FILE__, __LINE__, PEAR_LOG_DEBUG); + "Added to server db $database client id $cuid -> server id $suid", 'DEBUG'); $ts = $registry->call( $database . '/getActionTimestamp', array($suid, @@ -384,8 +370,7 @@ class SyncML_Backend_Horde extends SyncML_Backend { SyncML_Backend::getParameter($databaseURI, 'source'))); if (!$ts) { $this->logMessage( - "Unable to find addition timestamp for server id $suid at $ts" - , __FILE__, __LINE__, PEAR_LOG_ERR); + "Unable to find addition timestamp for server id $suid at $ts", 'ERR'); } // Only server needs to do a cuid<->suid map if ($this->_backendMode == SYNCML_BACKENDMODE_SERVER) { @@ -397,8 +382,7 @@ class SyncML_Backend_Horde extends SyncML_Backend { if ($suid->getDebugInfo()) { $suid = $suid->getDebugInfo(); $this->logMessage( - 'Adding client entry to server: already exists with server id ' . $suid, - __FILE__, __LINE__, PEAR_LOG_NOTICE); + 'Adding client entry to server: already exists with server id ' . $suid, 'NOTICE'); if ($this->_backendMode == SYNCML_BACKENDMODE_SERVER) { $this->createUidMap($database, $cuid, $suid, 0); } @@ -446,8 +430,7 @@ class SyncML_Backend_Horde extends SyncML_Backend { return $ok; } $this->logMessage( - "Replaced in server db $database client id $cuid -> server id $suid", - __FILE__, __LINE__, PEAR_LOG_DEBUG); + "Replaced in server db $database client id $cuid -> server id $suid", 'DEBUG'); $ts = $registry->call( $database . '/getActionTimestamp', array($suid, @@ -494,8 +477,7 @@ class SyncML_Backend_Horde extends SyncML_Backend { } $this->logMessage( - "Deleted in server db $database client id $cuid -> server id $suid", - __FILE__, __LINE__, PEAR_LOG_DEBUG); + "Deleted in server db $database client id $cuid -> server id $suid", 'DEBUG'); $ts = $registry->call($database . '/getActionTimestamp', array($suid, 'delete')); // We can't remove the mapping entry as we need to keep the timestamp @@ -580,8 +562,7 @@ class SyncML_Backend_Horde extends SyncML_Backend { $this->logMessage( 'SQL Query by SyncML_Backend_Horde::writeSyncAnchors(): ' - . $query . ', values: ' . implode(', ', $values), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + . $query . ', values: ' . implode(', ', $values), 'DEBUG'); return $this->_db->query($query, $values); } @@ -610,11 +591,10 @@ class SyncML_Backend_Horde extends SyncML_Backend { $this->logMessage( 'SQL Query by SyncML_Backend_Horde::readSyncAnchors(): ' - . $query . ', values: ' . implode(', ', $values), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + . $query . ', values: ' . implode(', ', $values), 'DEBUG'); $result = $this->_db->getRow($query, $values); if (is_a($result, 'PEAR_Error')) { - $this->logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + $this->logMessage($result, 'ERR'); } return $result; @@ -637,12 +617,11 @@ class SyncML_Backend_Horde extends SyncML_Backend { $this->logMessage( 'SQL Query by SyncML_Backend_Horde::getUserAnchors(): ' - . $query . ', values: ' . implode(', ', $values), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + . $query . ', values: ' . implode(', ', $values), 'DEBUG'); $result = $this->_db->getAssoc($query, false, $values, DB_FETCHMODE_ASSOC, true); if (is_a($result, 'PEAR_Error')) { - $this->logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + $this->logMessage($result, 'ERR'); } return $result; @@ -677,11 +656,10 @@ class SyncML_Backend_Horde extends SyncML_Backend { $this->logMessage( 'SQL Query by SyncML_Backend_Horde::removeAnchor(): ' - . $query . ', values: ' . implode(', ', $values), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + . $query . ', values: ' . implode(', ', $values), 'DEBUG'); $result = $this->_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - $this->logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + $this->logMessage($result, 'ERR'); } return $result; @@ -726,11 +704,10 @@ class SyncML_Backend_Horde extends SyncML_Backend { $database, $this->_user, $cuid); $this->logMessage('SQL Query by SyncML_Backend_Horde::createUidMap(): ' - . $query . ', values: ' . implode(', ', $values), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + . $query . ', values: ' . implode(', ', $values), 'DEBUG'); $result = $this->_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - $this->logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + $this->logMessage($result, 'ERR'); return $result; } @@ -758,11 +735,10 @@ class SyncML_Backend_Horde extends SyncML_Backend { $values = array($this->_syncDeviceID, $database, $this->_user, $cuid); $this->logMessage('SQL Query by SyncML_Backend_Horde::_getSuid(): ' - . $query . ', values: ' . implode(', ', $values), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + . $query . ', values: ' . implode(', ', $values), 'DEBUG'); $result = $this->_db->getOne($query, $values); if (is_a($result, 'PEAR_Error')) { - $this->logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + $this->logMessage($result, 'ERR'); } return $result; @@ -789,11 +765,10 @@ class SyncML_Backend_Horde extends SyncML_Backend { $values = array($this->_syncDeviceID, $database, $this->_user, $suid); $this->logMessage('SQL Query by SyncML_Backend_Horde::_getCuid(): ' - . $query . ', values: ' . implode(', ', $values), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + . $query . ', values: ' . implode(', ', $values), 'DEBUG'); $result = $this->_db->getOne($query, $values); if (is_a($result, 'PEAR_Error')) { - $this->logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + $this->logMessage($result, 'ERR'); } return $result; @@ -830,11 +805,10 @@ class SyncML_Backend_Horde extends SyncML_Backend { $values = array($this->_syncDeviceID, $database, $this->_user, $suid); $this->logMessage('SQL Query by SyncML_Backend_Horde::_getChangeTS(): ' - . $query . ', values: ' . implode(', ', $values), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + . $query . ', values: ' . implode(', ', $values), 'DEBUG'); $result = $this->_db->getOne($query, $values); if (is_a($result, 'PEAR_Error')) { - $this->logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + $this->logMessage($result, 'ERR'); } return $result; @@ -861,11 +835,10 @@ class SyncML_Backend_Horde extends SyncML_Backend { $values = array($this->_syncDeviceID, $database, $this->_user); $this->logMessage('SQL Query by SyncML_Backend_Horde::eraseMap(): ' - . $query . ', values: ' . implode(', ', $values), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + . $query . ', values: ' . implode(', ', $values), 'DEBUG'); $result = $this->_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - $this->logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + $this->logMessage($result, 'ERR'); } return $result; @@ -874,28 +847,27 @@ class SyncML_Backend_Horde extends SyncML_Backend { /** * Logs a message in the backend. * - * @param mixed $message Either a string or a PEAR_Error object. - * @param string $file What file was the log function called from - * (e.g. __FILE__)? - * @param integer $line What line was the log function called from - * (e.g. __LINE__)? - * @param integer $priority The priority of the message. One of: - * - PEAR_LOG_EMERG - * - PEAR_LOG_ALERT - * - PEAR_LOG_CRIT - * - PEAR_LOG_ERR - * - PEAR_LOG_WARNING - * - PEAR_LOG_NOTICE - * - PEAR_LOG_INFO - * - PEAR_LOG_DEBUG + * @param mixed $message Either a string or a PEAR_Error object. + * @param string $priority The priority of the message. One of: + * - EMERG + * - ALERT + * - CRIT + * - ERR + * - WARN + * - NOTICE + * - INFO + * - DEBUG */ - function logMessage($message, $file, $line, $priority = PEAR_LOG_INFO) + function logMessage($message, $priority = 'INFO') { + $trace = debug_backtrace(); + $trace = $trace[1]; + // Internal logging to $this->_logtext. - parent::logMessage($message, $file, $line, $priority); + parent::logMessage($message, $priority); // Logging to Horde log: - Horde::logMessage($message, $file, $line, $priority); + Horde::logMessage($message, $priority, array('file' => $trace['file'], 'line' => $trace['line'])); } /** diff --git a/framework/SyncML/SyncML/Backend/Sql.php b/framework/SyncML/SyncML/Backend/Sql.php index 6de93a48c..f190a7f6d 100644 --- a/framework/SyncML/SyncML/Backend/Sql.php +++ b/framework/SyncML/SyncML/Backend/Sql.php @@ -94,8 +94,7 @@ class SyncML_Backend_Sql extends SyncML_Backend { $this ->_db = &MDB2::connect($params['dsn']); if (is_a($this->_db, 'PEAR_Error')) { - $this->logMessage($this->_db, - __FILE__, __LINE__, PEAR_LOG_ERR); + $this->logMessage($this->_db, 'ERR'); } } @@ -124,8 +123,7 @@ class SyncML_Backend_Sql extends SyncML_Backend { default: $this->logMessage('Invalid database ' . $database - . '. Try tasks, calendar, notes or contacts.', - __FILE__, __LINE__, PEAR_LOG_ERR); + . '. Try tasks, calendar, notes or contacts.', 'ERR'); return false; } } @@ -175,8 +173,7 @@ class SyncML_Backend_Sql extends SyncML_Backend { if ($sync_ts && $sync_ts >= $suid_ts) { // Change was done by us upon request of client, don't mirror // that back to the client. - $this->logMessage("Added to server from client: $suid ignored", - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $this->logMessage("Added to server from client: $suid ignored", 'DEBUG'); continue; } $adds[$suid] = 0; @@ -212,8 +209,7 @@ class SyncML_Backend_Sql extends SyncML_Backend { // Change was done by us upon request of client, don't // mirror that back to the client. $this->logMessage( - "Changed on server after sent from client: $suid ignored", - __FILE__, __LINE__, PEAR_LOG_DEBUG); + "Changed on server after sent from client: $suid ignored", 'DEBUG'); continue; } $mods[$suid] = $this->_getCuid($databaseURI, $suid); @@ -873,8 +869,7 @@ class SyncML_Backend_Sql extends SyncML_Backend { } $this->logMessage('_trackDeletes() with ' . count($currentSuids) - . ' current ids', - __FILE__, __LINE__, PEAR_LOG_DEBUG); + . ' current ids', 'DEBUG'); $r = $this->_db->queryCol( 'SELECT syncml_suid FROM syncml_suidlist ' @@ -889,8 +884,7 @@ class SyncML_Backend_Sql extends SyncML_Backend { } $this->logMessage('_trackDeletes() found ' . count($r) - . ' items in prevlist', - __FILE__, __LINE__, PEAR_LOG_DEBUG); + . ' items in prevlist', 'DEBUG'); // Convert to hash with suid as key. if (is_array($r)) { @@ -930,8 +924,7 @@ class SyncML_Backend_Sql extends SyncML_Backend { } $this->logMessage('_trackDeletes() with ' . count($prevSuids) - . ' deleted items', - __FILE__, __LINE__, PEAR_LOG_DEBUG); + . ' deleted items', 'DEBUG'); return array_keys($prevSuids); } @@ -952,8 +945,7 @@ class SyncML_Backend_Sql extends SyncML_Backend { { $database = $this->_normalize($databaseURI); - $this->logMessage('_removeFromSuidList(): item ' . $suid, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $this->logMessage('_removeFromSuidList(): item ' . $suid, 'DEBUG'); $r = $this->_db->queryCol( 'DELETE FROM syncml_suidlist ' . 'WHERE syncml_syncpartner = ' @@ -968,8 +960,7 @@ class SyncML_Backend_Sql extends SyncML_Backend { return $r; } - $this->logMessage('_removeFromSuidList(): result ' . implode('!', $r), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $this->logMessage('_removeFromSuidList(): result ' . implode('!', $r), 'DEBUG'); return true; } diff --git a/framework/SyncML/SyncML/Command.php b/framework/SyncML/SyncML/Command.php index a27b87a17..21551e419 100644 --- a/framework/SyncML/SyncML/Command.php +++ b/framework/SyncML/SyncML/Command.php @@ -160,8 +160,7 @@ class SyncML_Command { $cmd = new $class($outputHandler); } else { $msg = 'Class definition of ' . $class . ' not found.'; - $GLOBALS['backend']->logMessage($msg, __FILE__, __LINE__, - PEAR_LOG_ERR); + $GLOBALS['backend']->logMessage($msg, __FILE__, __LINE__, 'ERR'); $cmd = PEAR::raiseError($msg); } diff --git a/framework/SyncML/SyncML/Command/Alert.php b/framework/SyncML/SyncML/Command/Alert.php index 4f07515f2..aa0d82460 100644 --- a/framework/SyncML/SyncML/Command/Alert.php +++ b/framework/SyncML/SyncML/Command/Alert.php @@ -168,8 +168,7 @@ class SyncML_Command_Alert extends SyncML_Command { list($clientlast, $serverAnchorLast) = $r; $GLOBALS['backend']->logMessage( 'Previous sync found for database ' . $database - . '; client timestamp: ' . $clientlast, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + . '; client timestamp: ' . $clientlast, 'DEBUG'); // Check if anchor sent from client matches our own stored // data. @@ -178,8 +177,7 @@ class SyncML_Command_Alert extends SyncML_Command { $anchormatch = true; $GLOBALS['backend']->logMessage( 'Anchor timestamps match, TwoWaySync possible. Syncing data since ' - . date('Y-m-d H:i:s', $serverAnchorLast), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + . date('Y-m-d H:i:s', $serverAnchorLast), 'DEBUG'); } else { // Server and client have different anchors, enforce // SlowSync/RefreshSync @@ -187,8 +185,7 @@ class SyncML_Command_Alert extends SyncML_Command { 'Client requested sync with anchor timestamp ' . $this->_metaAnchorLast . ' but server has recorded timestamp ' - . $clientlast . '. Enforcing SlowSync', - __FILE__, __LINE__, PEAR_LOG_INFO); + . $clientlast . '. Enforcing SlowSync', 'INFO'); $anchormatch = false; $clientlast = 0; } @@ -196,8 +193,7 @@ class SyncML_Command_Alert extends SyncML_Command { // No info about previous sync, use SlowSync or RefreshSync. $GLOBALS['backend']->logMessage( 'No info about previous syncs found for device ' . - $state->sourceURI . ' and database ' . $database, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $state->sourceURI . ' and database ' . $database, 'DEBUG'); $clientlast = 0; $serverAnchorLast = 0; $anchormatch = false; @@ -262,8 +258,7 @@ class SyncML_Command_Alert extends SyncML_Command { default: $GLOBALS['backend']->logMessage( - 'Unknown sync type ' . $this->_alert, - __FILE__, __LINE__, PEAR_LOG_ERR); + 'Unknown sync type ' . $this->_alert, 'ERR'); break; } @@ -289,8 +284,7 @@ class SyncML_Command_Alert extends SyncML_Command { if (!$sync) { $GLOBALS['backend']->logMessage( 'Creating SyncML_Sync object for database ' - . $this->_targetLocURI . '; sync type ' . $synctype, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + . $this->_targetLocURI . '; sync type ' . $synctype, 'DEBUG'); $sync = new SyncML_Sync($synctype, $this->_targetLocURI, $this->_sourceLocURI, diff --git a/framework/SyncML/SyncML/Command/Final.php b/framework/SyncML/SyncML/Command/Final.php index d4396cbd0..8be2be98b 100644 --- a/framework/SyncML/SyncML/Command/Final.php +++ b/framework/SyncML/SyncML/Command/Final.php @@ -43,8 +43,7 @@ class SyncML_Command_Final extends SyncML_Command { $this->_outputHandler->outputGetDevInf(); } - $GLOBALS['backend']->logMessage('Received from client.', - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $GLOBALS['backend']->logMessage('Received from client.', 'DEBUG'); $state->handleFinal($this->_outputHandler, $debug); } diff --git a/framework/SyncML/SyncML/Command/Map.php b/framework/SyncML/SyncML/Command/Map.php index 8d05b452e..bfe16bc6b 100644 --- a/framework/SyncML/SyncML/Command/Map.php +++ b/framework/SyncML/SyncML/Command/Map.php @@ -101,8 +101,7 @@ class SyncML_Command_Map extends SyncML_Command { $sync = &$state->getSync($this->_targetLocURI); if (!$state->authenticated) { $GLOBALS['backend']->logMessage( - 'Not authenticated while processing ', - __FILE__, __LINE__, PEAR_LOG_ERR); + 'Not authenticated while processing ', 'ERR'); } else { foreach ($this->_mapSources as $key => $source) { $sync->createUidMap($this->_targetLocURI, diff --git a/framework/SyncML/SyncML/Command/Sync.php b/framework/SyncML/SyncML/Command/Sync.php index 58fe2b98e..dd7c1f3c7 100644 --- a/framework/SyncML/SyncML/Command/Sync.php +++ b/framework/SyncML/SyncML/Command/Sync.php @@ -289,8 +289,7 @@ class SyncML_Command_Sync extends SyncML_Command { if (!is_object($sync)) { $GLOBALS['backend']->logMessage( - 'No sync object found for URI ' . $this->_targetURI, - __FILE__, __LINE__, PEAR_LOG_ERR); + 'No sync object found for URI ' . $this->_targetURI, 'ERR'); // @todo: create meaningful status code here. } } diff --git a/framework/SyncML/SyncML/Command/SyncHdr.php b/framework/SyncML/SyncML/Command/SyncHdr.php index 56f4a49d2..69184122c 100644 --- a/framework/SyncML/SyncML/Command/SyncHdr.php +++ b/framework/SyncML/SyncML/Command/SyncHdr.php @@ -190,15 +190,13 @@ class SyncML_Command_SyncHdr extends SyncML_Command { if (!isset($_SESSION['SyncML.state'])) { $GLOBALS['backend']->logMessage( - 'New session created: ' . session_id(), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + 'New session created: ' . session_id(), 'DEBUG'); $_SESSION['SyncML.state'] = new SyncML_State($this->_sourceURI, $this->user, $this->_sessionID); } else { $GLOBALS['backend']->logMessage( - 'Existing session continued: ' . session_id(), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + 'Existing session continued: ' . session_id(), 'DEBUG'); } $state = &$_SESSION['SyncML.state']; diff --git a/framework/SyncML/SyncML/Device.php b/framework/SyncML/SyncML/Device.php index 7d1c298d5..93a121cff 100644 --- a/framework/SyncML/SyncML/Device.php +++ b/framework/SyncML/SyncML/Device.php @@ -35,8 +35,7 @@ class SyncML_Device { if (empty($driver) || $driver == 'none' || $driver == 'default') { $GLOBALS['backend']->logMessage( - 'Using default device class', - __FILE__, __LINE__, PEAR_LOG_DEBUG); + 'Using default device class', 'DEBUG'); return new SyncML_Device(); } @@ -49,8 +48,7 @@ class SyncML_Device { } $device = new $class(); - $GLOBALS['backend']->logMessage('Created device class ' . $class, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $GLOBALS['backend']->logMessage('Created device class ' . $class, 'DEBUG'); return $device; } diff --git a/framework/SyncML/SyncML/Device/Sync4j.php b/framework/SyncML/SyncML/Device/Sync4j.php index a5f7a77d4..8f436b08f 100644 --- a/framework/SyncML/SyncML/Device/Sync4j.php +++ b/framework/SyncML/SyncML/Device/Sync4j.php @@ -920,8 +920,7 @@ class SyncML_Device_sync4j extends SyncML_Device { sprintf('Sync4j for name %s, value %s', $item['name'], is_string($item['value']) - ? $item['value'] : var_export($item['value'], true)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + ? $item['value'] : var_export($item['value'], true)), 'DEBUG'); switch (Horde_String::upper($item['name'])) { case 'DTSTART': @@ -1121,8 +1120,7 @@ class SyncML_Device_sync4j extends SyncML_Device { !empty($end) && $start != $end) { $hash['Duration'] = ($end - $start) / 60; $GLOBALS['backend']->logMessage( - 'Duration set to ' . $hash['Duration'], - __FILE__, __LINE__, PEAR_LOG_DEBUG); + 'Duration set to ' . $hash['Duration'], 'DEBUG'); } diff --git a/framework/SyncML/SyncML/Sync.php b/framework/SyncML/SyncML/Sync.php index 83b376f9e..35103f9ab 100644 --- a/framework/SyncML/SyncML/Sync.php +++ b/framework/SyncML/SyncML/Sync.php @@ -204,8 +204,7 @@ class SyncML_Sync { global $backend; $backend->logMessage( - 'Handling <' . $item->elementType . '> sent from client', - __FILE__, __LINE__, PEAR_LOG_DEBUG); + 'Handling <' . $item->elementType . '> sent from client', 'DEBUG'); /* if size of item is set: check it first */ if ($item->size > 0) { @@ -218,8 +217,7 @@ class SyncML_Sync { $item->responseCode = RESPONSE_SIZE_MISMATCH; $backend->logMessage( 'Item size mismatch. Size reported as ' . $item->size - . ' but actual size is ' . strlen($item->content), - __FILE__, __LINE__, PEAR_LOG_ERR); + . ' but actual size is ' . strlen($item->content), 'ERR'); $this->_errors++; return false; } @@ -270,32 +268,30 @@ class SyncML_Sync { if (!is_a($suid, 'PEAR_Error')) { $this->_client_add_count++; $item->responseCode = RESPONSE_ITEM_ADDED; - $backend->logMessage('Added client entry as ' . $suid, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $backend->logMessage('Added client entry as ' . $suid, 'DEBUG'); } else { $this->_errors++; /* @todo: better response code. */ $item->responseCode = RESPONSE_NO_EXECUTED; - $backend->logMessage('Error in adding client entry: ' . $suid->message, __FILE__, __LINE__, PEAR_LOG_ERR); + $backend->logMessage('Error in adding client entry: ' . $suid->message, 'ERR'); } } elseif ($item->elementType == 'Delete') { /* Handle client delete requests. */ $ok = $backend->deleteEntry($database, $cuid); if (!$ok && $tasksincalendar) { $backend->logMessage( - 'Task ' . $cuid . ' deletion sent with calendar request', - __FILE__, __LINE__, PEAR_LOG_DEBUG); + 'Task ' . $cuid . ' deletion sent with calendar request', 'DEBUG'); $ok = $backend->deleteEntry($this->_taskToCalendar($backend->_normalize($database)), $cuid); } if ($ok) { $this->_client_delete_count++; $item->responseCode = RESPONSE_OK; - $backend->logMessage('Deleted entry ' . $suid . ' due to client request', __FILE__, __LINE__, PEAR_LOG_DEBUG); + $backend->logMessage('Deleted entry ' . $suid . ' due to client request', 'DEBUG'); } else { $this->_errors++; $item->responseCode = RESPONSE_ITEM_NO_DELETED; - $backend->logMessage('Failure deleting client entry, maybe already disappeared from server', __FILE__, __LINE__, PEAR_LOG_DEBUG); + $backend->logMessage('Failure deleting client entry, maybe already disappeared from server', 'DEBUG'); } } elseif ($item->elementType == 'Replace') { @@ -306,9 +302,9 @@ class SyncML_Sync { if (!is_a($suid, 'PEAR_Error')) { $this->_client_replace_count++; $item->responseCode = RESPONSE_OK; - $backend->logMessage('Replaced entry ' . $suid . ' due to client request', __FILE__, __LINE__, PEAR_LOG_DEBUG); + $backend->logMessage('Replaced entry ' . $suid . ' due to client request', 'DEBUG'); } else { - $backend->logMessage($suid->message, __FILE__, __LINE__, PEAR_LOG_DEBUG); + $backend->logMessage($suid->message, 'DEBUG'); /* Entry may have been deleted; try adding it. */ $suid = $backend->addEntry($hordedatabase, $content, @@ -317,22 +313,19 @@ class SyncML_Sync { $this->_client_addreplaces++; $item->responseCode = RESPONSE_ITEM_ADDED; $backend->logMessage( - 'Added instead of replaced entry ' . $suid, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + 'Added instead of replaced entry ' . $suid, 'DEBUG'); } else { $this->_errors++; /* @todo: better response code. */ $item->responseCode = RESPONSE_NO_EXECUTED; $backend->logMessage( 'Error in adding client entry due to replace request: ' - . $suid->message, - __FILE__, __LINE__, PEAR_LOG_ERR); + . $suid->message, 'ERR'); } } } else { $backend->logMessage( - 'Unexpected elementType: ' . $item->elementType, - __FILE__, __LINE__, PEAR_LOG_ERR); + 'Unexpected elementType: ' . $item->elementType, 'ERR'); } return $suid; @@ -349,8 +342,7 @@ class SyncML_Sync { $backend->logMessage( 'Creating output for server changes in database ' - . $this->_targetLocURI, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + . $this->_targetLocURI, 'DEBUG'); /* If sync data from client only, nothing to be done here. */ if($this->_syncType == ALERT_ONE_WAY_FROM_CLIENT || @@ -387,8 +379,7 @@ class SyncML_Sync { $backend->logMessage( 'Compiling server changes from ' . date('Y-m-d H:i:s', $this->_serverAnchorLast) - . ' to ' . date('Y-m-d H:i:s', $this->_serverAnchorNext), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + . ' to ' . date('Y-m-d H:i:s', $this->_serverAnchorNext), 'DEBUG'); $result = $this->_retrieveChanges($this->_targetLocURI, $this->_server_adds, @@ -400,11 +391,8 @@ class SyncML_Sync { /* If tasks are handled inside calendar, do the same again for * tasks. Merge resulting arrays. */ - if ($backend->_normalize($this->_targetLocURI) == 'calendar' && + if ($backend->_normalize($this->_targetLocURI) == 'calendar' && $device->handleTasksInCalendar()) { - $backend->logMessage('Handling tasks in calendar sync', - __FILE__, __LINE__, PEAR_LOG_DEBUG); - $this->_server_task_adds = $deletes2 = $replaces2 = array(); $result = $this->_retrieveChanges('tasks', $this->_server_task_adds, @@ -426,8 +414,7 @@ class SyncML_Sync { + count($this->_server_deletes); $backend->logMessage( 'Sending ' . $numChanges . ' server changes ' . 'for client URI ' - . $this->_targetLocURI, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + . $this->_targetLocURI, 'DEBUG'); /* Now we know the number of Changes and can send them to the * client. */ @@ -458,16 +445,14 @@ class SyncML_Sync { $backend->logMessage( 'Maximum message size ' . $state->maxMsgSize . ' approached during delete; current size: ' - . $output->getOutputSize(), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + . $output->getOutputSize(), 'DEBUG'); $messageFull = true; $output->outputSyncEnd(); $this->_syncsSent += 1; return; } $backend->logMessage( - "Sending delete from server: client id $cuid, server id $suid", - __FILE__, __LINE__, PEAR_LOG_DEBUG); + "Sending delete from server: client id $cuid, server id $suid", 'DEBUG'); /* Create a Delete request for client. */ $cmdId = $output->outputSyncCommand('Delete', null, null, null, $cuid, null); unset($this->_server_deletes[$suid]); @@ -478,8 +463,7 @@ class SyncML_Sync { /* Handle additions. */ $adds = $this->_server_adds; foreach ($adds as $suid => $cuid) { - $backend->logMessage("Sending add from server: $suid", - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $backend->logMessage("Sending add from server: $suid", 'DEBUG'); $syncDB = isset($this->_server_task_adds[$suid]) ? 'tasks' : $this->_targetLocURI; $ct = isset($this->_server_task_adds[$suid]) ? $contentTypeTasks : $contentType; @@ -490,8 +474,7 @@ class SyncML_Sync { if (is_a($c, 'PEAR_Error')) { $backend->logMessage( 'API export call for ' . $suid . ' failed: ' - . $c->getMessage(), - __FILE__, __LINE__, PEAR_LOG_ERR); + . $c->getMessage(), 'ERR'); } else { list($clientContent, $clientContentType, $clientEncodingType) = $device->convertServer2Client($c, $contentType, $syncDB); @@ -500,12 +483,10 @@ class SyncML_Sync { $backend->logMessage( 'Maximum message size ' . $state->maxMsgSize . ' approached during add; current size: ' - . $output->getOutputSize(), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + . $output->getOutputSize(), 'DEBUG'); if (strlen($clientContent) + MSG_DEFAULT_LEN > $state->maxMsgSize) { $backend->logMessage( - 'Data item won\'t fit into a single message. Partial sending not implemented yet. Item will not be sent!', - __FILE__, __LINE__, PEAR_LOG_WARNING); + 'Data item won\'t fit into a single message. Partial sending not implemented yet. Item will not be sent!', 'WARN'); /* @todo: implement partial sending instead of * dropping item! */ unset($this->_server_adds[$suid]); @@ -546,8 +527,7 @@ class SyncML_Sync { } $backend->logMessage( - "Sending replace from server: $suid", - __FILE__, __LINE__, PEAR_LOG_DEBUG); + "Sending replace from server: $suid", 'DEBUG'); list($clientContent, $clientContentType, $clientEncodingType) = $device->convertServer2Client($c, $contentType, $syncDB); /* Check if we have space left in the message. */ @@ -555,12 +535,10 @@ class SyncML_Sync { $backend->logMessage( 'Maximum message size ' . $state->maxMsgSize . ' approached during replace; current size: ' - . $output->getOutputSize(), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + . $output->getOutputSize(), 'DEBUG'); if (strlen($clientContent) + MSG_DEFAULT_LEN > $state->maxMsgSize) { $backend->logMessage( - 'Data item won\'t fit into a single message. Partial sending not implemented yet. Item will not be sent!', - __FILE__, __LINE__, PEAR_LOG_WARNING); + 'Data item won\'t fit into a single message. Partial sending not implemented yet. Item will not be sent!', 'WARNING'); /* @todo: implement partial sending instead of * dropping item! */ unset($this->_server_replaces[$suid]); @@ -608,7 +586,7 @@ class SyncML_Sync { $this->_serverAnchorNext, $adds, $replaces, $deletes); if (is_a($result, 'PEAR_Error')) { - $GLOBALS['backend']->logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + $GLOBALS['backend']->logMessage($result, 'ERR'); return $result; } } @@ -640,8 +618,7 @@ class SyncML_Sync { break; } - $GLOBALS['backend']->logMessage('Handle for state ' . $state, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $GLOBALS['backend']->logMessage('Handle for state ' . $state, 'DEBUG'); switch ($this->_state) { case STATE_INIT: @@ -725,7 +702,7 @@ class SyncML_Sync { $this->_server_add_count, $this->_server_replace_count, $this->_server_delete_count); - $GLOBALS['backend']->logMessage($s , __FILE__, __LINE__, PEAR_LOG_INFO); + $GLOBALS['backend']->logMessage($s, 'INFO'); } function getServerLocURI() @@ -768,8 +745,7 @@ class SyncML_Sync { $GLOBALS['backend']->createUidMap($db, $cuid, $suid); $GLOBALS['backend']->logMessage( 'Created map for client id ' . $cuid . ' and server id ' . $suid - . ' in database ' . $db, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + . ' in database ' . $db, 'DEBUG'); } diff --git a/framework/SyncML/tests/sif.phpt b/framework/SyncML/tests/sif.phpt index 8fe21d93d..36dc0e7cb 100644 --- a/framework/SyncML/tests/sif.phpt +++ b/framework/SyncML/tests/sif.phpt @@ -8,7 +8,6 @@ class BackendStub { function logMessage() {} } $backend = new BackendStub(); -define('PEAR_LOG_DEBUG', null); // Load device handler. require_once dirname(__FILE__) . '/../SyncML/Device.php'; diff --git a/framework/SyncML/tests/testpacket.php b/framework/SyncML/tests/testpacket.php index c3aa0c9d9..cfaf23ffa 100755 --- a/framework/SyncML/tests/testpacket.php +++ b/framework/SyncML/tests/testpacket.php @@ -22,11 +22,11 @@ require_once 'SyncML.php'; class Backend extends SyncML_Backend { - var $_logLevel = PEAR_LOG_DEBUG; + var $_logLevel = 'DEBUG'; - function logMessage($message, $file, $line, $priority = PEAR_LOG_INFO) + function logMessage($message, $priority = 'INFO') { - parent::logMessage($message, $file, $line, $priority); + parent::logMessage($message, $priority); echo $this->_logtext; $this->_logtext = ''; } diff --git a/framework/SyncML/tests/testsync.php b/framework/SyncML/tests/testsync.php index dadcc7405..06c59e0ce 100755 --- a/framework/SyncML/tests/testsync.php +++ b/framework/SyncML/tests/testsync.php @@ -45,7 +45,7 @@ $syncml_backend_parms = array( /* log all (wb)xml packets received or sent to debug_dir: */ 'debug_files' => true, /* Log everything: */ - 'log_level' => PEAR_LOG_DEBUG); + 'log_level' => 'DEBUG'); /* Get any options. */ if (!isset($argv)) { diff --git a/framework/Template/lib/Horde/Template.php b/framework/Template/lib/Horde/Template.php index ad2829b4b..616e45f17 100644 --- a/framework/Template/lib/Horde/Template.php +++ b/framework/Template/lib/Horde/Template.php @@ -231,7 +231,7 @@ class Horde_Template if ($this->_cache && isset($cacheid) && !$this->_cache->set($cacheid, $this->_template)) { - Horde::logMessage(sprintf(_("Could not save the compiled template file '%s'."), $file), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage(sprintf(_("Could not save the compiled template file '%s'."), $file), 'ERR'); } } diff --git a/framework/Token/lib/Horde/Token/Sql.php b/framework/Token/lib/Horde/Token/Sql.php index c77de0e7b..7d91d15c1 100644 --- a/framework/Token/lib/Horde/Token/Sql.php +++ b/framework/Token/lib/Horde/Token/Sql.php @@ -105,7 +105,7 @@ class Horde_Token_Sql extends Horde_Token /* Return an error if the update fails. */ $result = $this->_write_db->query($query, $values); if ($result instanceof PEAR_Error) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); throw new Horde_Exception_Prior($result); } } @@ -131,7 +131,7 @@ class Horde_Token_Sql extends Horde_Token $result = $this->_db->getOne($query, $values); if ($result instanceof PEAR_Error) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return false; } else { return !empty($result); @@ -156,7 +156,7 @@ class Horde_Token_Sql extends Horde_Token $result = $this->_write_db->query($query, $values); if ($result instanceof PEAR_Error) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); throw new Horde_Exception_Prior($result); } } diff --git a/framework/Util/lib/Horde/String.php b/framework/Util/lib/Horde/String.php index d21e361a8..409b72616 100644 --- a/framework/Util/lib/Horde/String.php +++ b/framework/Util/lib/Horde/String.php @@ -104,7 +104,7 @@ class Horde_String // this line, but add a check and a log message to help the devs // track down and fix this issue. if (is_a($input, 'PEAR_Error')) { - Horde::logMessage('Called convertCharset() on a PEAR_Error object. ' . print_r($input, true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Called convertCharset() on a PEAR_Error object. ' . print_r($input, true), 'DEBUG'); return ''; } $input = Horde_Util::cloneObject($input); diff --git a/framework/Util/lib/Horde/Util.php b/framework/Util/lib/Horde/Util.php index bc7345df7..589c2ade6 100644 --- a/framework/Util/lib/Horde/Util.php +++ b/framework/Util/lib/Horde/Util.php @@ -91,7 +91,7 @@ class Horde_Util } $caller .= ' on line ' . $bt[0]['line'] . ' of ' . $bt[0]['file']; - Horde::logMessage('Horde_Util::cloneObject called on variable of type ' . gettype($obj) . ' by ' . $caller, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Horde_Util::cloneObject called on variable of type ' . gettype($obj) . ' by ' . $caller, 'DEBUG'); $ret = $obj; return $ret; diff --git a/gollem/lib/Auth.php b/gollem/lib/Auth.php index 93e5b2649..c4cb2b6b8 100644 --- a/gollem/lib/Auth.php +++ b/gollem/lib/Auth.php @@ -45,8 +45,7 @@ class Gollem_Auth $entry = sprintf('Login success for %s [%s] to {%s}', $user, $_SERVER['REMOTE_ADDR'], $backend_key); - Horde::logMessage($entry, __FILE__, __LINE__, - PEAR_LOG_NOTICE); + Horde::logMessage($entry, 'NOTICE'); return true; } } @@ -210,7 +209,7 @@ class Gollem_Auth require GOLLEM_BASE . '/config/backends.php'; if (empty($backends[$key])) { $entry = sprintf('Invalid server key from client [%s]', $_SERVER['REMOTE_ADDR']); - Horde::logMessage($entry, __FILE__, __LINE__, PEAR_LOG_INFO); + Horde::logMessage($entry, 'INFO'); return false; } @@ -279,7 +278,7 @@ class Gollem_Auth if (!Gollem::verifyDir($ptr['home'])) { $error_msg = 'Backend Configuration Error: Home directory not below root.'; $auth_gollem->gollemSetAuthErrorMsg($error_msg); - Horde::logMessage(PEAR::raiseError($error_msg), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($error_msg, 'ERR'); unset($_SESSION['gollem']['backends'][$key]); $_SESSION['gollem']['backend_key'] = null; return false; @@ -295,7 +294,7 @@ class Gollem_Auth if (is_a($res, 'PEAR_Error')) { $error_msg = 'Backend Configuration Error: Could not create home directory ' . $ptr['home'] . '.'; $auth_gollem->gollemSetAuthErrorMsg($error_msg); - Horde::logMessage(PEAR::raiseError($error_msg), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($error_msg, 'ERR'); unset($_SESSION['gollem']['backends'][$key]); $_SESSION['gollem']['backend_key'] = null; return false; diff --git a/gollem/view.php b/gollem/view.php index 6e6ad016a..9bc2caab8 100644 --- a/gollem/view.php +++ b/gollem/view.php @@ -31,14 +31,14 @@ $data = ''; if (is_callable(array($GLOBALS['gollem_vfs'], 'readStream'))) { $stream = $GLOBALS['gollem_vfs']->readStream($filedir, $filename); if (is_a($stream, 'PEAR_Error')) { - Horde::logMessage($stream, __FILE__, __LINE__, PEAR_LOG_NOTICE); + Horde::logMessage($stream, 'NOTICE'); printf(_("Access denied to %s"), $filename); exit; } } else { $data = $GLOBALS['gollem_vfs']->read($filedir, $filename); if (is_a($data, 'PEAR_Error')) { - Horde::logMessage($data, __FILE__, __LINE__, PEAR_LOG_NOTICE); + Horde::logMessage($data, 'NOTICE'); printf(_("Access denied to %s"), $filename); exit; } diff --git a/horde/admin/groups.php b/horde/admin/groups.php index 33dada176..92a5f12d8 100644 --- a/horde/admin/groups.php +++ b/horde/admin/groups.php @@ -42,14 +42,14 @@ case 'addchildform': $child = &$groups->newGroup(Horde_Util::getFormData('child'), $parent); } if (is_a($child, 'PEAR_Error')) { - Horde::logMessage($child, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($child, 'ERR'); $notification->push(sprintf(_("Group was not created: %s."), $child->getMessage()), 'horde.error'); break; } $result = $groups->addGroup($child); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); $notification->push(sprintf(_("\"%s\" was not created: %s."), $child->getShortName(), $result->getMessage()), 'horde.error'); } else { $notification->push(sprintf(_("\"%s\" was added to the groups system."), $child->getShortName()), 'horde.success'); diff --git a/horde/admin/signup_confirm.php b/horde/admin/signup_confirm.php index a28f3a77d..e3e9081b1 100644 --- a/horde/admin/signup_confirm.php +++ b/horde/admin/signup_confirm.php @@ -19,7 +19,7 @@ if ($conf['signup']['allow'] !== true || } $signup = Horde_Auth_Signup::factory(); if (is_a($signup, 'PEAR_Error')) { - Horde::logMessage($signup, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($signup, 'ERR'); throw new Horde_Exception(_("User Registration is not properly configured for this site.")); } diff --git a/horde/config/conf.xml b/horde/config/conf.xml index 53063edda..f1def9a67 100644 --- a/horde/config/conf.xml +++ b/horde/config/conf.xml @@ -728,63 +728,24 @@ true - PEAR_LOG_NOTICE + NOTICE - PEAR_LOG_EMERG - PEAR_LOG_ALERT - PEAR_LOG_CRIT - PEAR_LOG_ERR - PEAR_LOG_WARNING - PEAR_LOG_NOTICE - PEAR_LOG_INFO - PEAR_LOG_DEBUG + EMERG + ALERT + CRIT + ERR + WARNING + NOTICE + INFO + DEBUG HORDE - - - - file - - - - false - - - - - - - - - - - - - - - - - - - /tmp/horde.log @@ -792,63 +753,17 @@ true - - - - - - - - - - - - - - - - - log_table - - $conf['sql'] - - - - - log_table - - - - false - + + - - - - - - - @@ -858,7 +773,7 @@ false + INFO.">false diff --git a/horde/docs/INSTALL b/horde/docs/INSTALL index 4d98c1f1c..41912db7f 100644 --- a/horde/docs/INSTALL +++ b/horde/docs/INSTALL @@ -86,7 +86,7 @@ below at Prerequisites_. 3. Install PEAR packages:: - pear install -o Log Mail DB Date File + pear install -o Mail DB Date File pear -d preferred_state=beta install -a Services_Weather 4. Extract tarball:: @@ -311,12 +311,11 @@ The following prerequisites are **REQUIRED** for Horde to function properly. These PEAR modules are **REQUIRED** to be installed for complete Horde functionality: - a. Log - b. Mail (>= 1.2.0) + a. Mail (>= 1.2.0) To install, enter the following at the command prompt:: - pear install Log Mail + pear install Mail These PEAR modules are **RECOMMENDED** to be installed: diff --git a/horde/lib/Api.php b/horde/lib/Api.php index ebbb3b47e..7e3ab5df6 100644 --- a/horde/lib/Api.php +++ b/horde/lib/Api.php @@ -192,7 +192,7 @@ class Horde_Api extends Horde_Registry_Api /* Remove user's prefs */ $prefs = Horde_Prefs::singleton($conf['prefs']['driver'], null, $user); if (is_a($result = $prefs->clear(), 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); $haveError = true; } @@ -201,7 +201,7 @@ class Horde_Api extends Horde_Registry_Api $groups = Group::singleton(); $allGroups = $groups->getGroupMemberships($user); if (is_a($groups, 'PEAR_Error')) { - Horde::logMessage($allGroups, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($allGroups, 'ERR'); $haveError = true; } else { foreach (array_keys($allGroups) as $id) { @@ -214,13 +214,13 @@ class Horde_Api extends Horde_Registry_Api $perms = $GLOBALS['injector']->getInstance('Horde_Perms'); $tree = $perms->getTree(); if (is_a($tree, 'PEAR_Error')) { - Horde::logMessage($tree, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($tree, 'ERR'); $haveError = true; } else { foreach (array_keys($tree) as $id) { $perm = $perms->getPermissionById($id); if (is_a($perm, 'PEAR_Error')) { - Horde::logMessage($perm, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($perm, 'ERR'); $haveError = true; continue; } @@ -257,14 +257,14 @@ class Horde_Api extends Horde_Registry_Api /* Get all APIs */ $apis = $this->listAPIs(); if (is_a($apis, 'PEAR_Error')) { - Horde::logMessage($apis, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($apis, 'ERR'); return PEAR::raiseError(_("No API found.")); } foreach ($apis as $api) { if ($GLOBALS['registry']->hasAppMethod($api, 'removeUserData')) { $result = $GLOBALS['registry']->callAppMethod($api, 'removeUserData', array('args' => array($user))); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); $haveError = true; } } diff --git a/horde/lib/Block/metar.php b/horde/lib/Block/metar.php index 282c3c23e..27492adc3 100644 --- a/horde/lib/Block/metar.php +++ b/horde/lib/Block/metar.php @@ -34,8 +34,7 @@ class Horde_Block_Horde_metar extends Horde_Block { function _params() { if (!@include_once 'Services/Weather.php') { - Horde::logMessage('The metar block will not work without Services_Weather from PEAR. Run pear install Services_Weather.', - __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage('The metar block will not work without Services_Weather from PEAR. Run pear install Services_Weather.', 'ERR'); return array( 'error' => array( 'type' => 'error', @@ -120,8 +119,7 @@ class Horde_Block_Horde_metar extends Horde_Block { function _content() { if (!@include_once 'Services/Weather.php') { - Horde::logMessage('The metar block will not work without Services_Weather from PEAR. Run pear install Services_Weather.', - __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage('The metar block will not work without Services_Weather from PEAR. Run pear install Services_Weather.', 'ERR'); return _("Metar block not available. Details have been logged for the administrator."); } diff --git a/horde/lib/Block/twitter.php b/horde/lib/Block/twitter.php index 57244f6fc..b2f35ebb9 100644 --- a/horde/lib/Block/twitter.php +++ b/horde/lib/Block/twitter.php @@ -44,8 +44,7 @@ class Horde_Block_Horde_twitter extends Horde_Block { function _params() { if (!@include_once 'Services/Twitter.php') { - Horde::logMessage('The Twitter block will not work without Services_Twitter from PEAR. Run pear install Services_Twitter.', - __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage('The Twitter block will not work without Services_Twitter from PEAR. Run pear install Services_Twitter.', 'ERR'); return array( 'error' => array( 'type' => 'error', @@ -79,8 +78,7 @@ class Horde_Block_Horde_twitter extends Horde_Block { function _content() { if (!@include_once 'Services/Twitter.php') { - Horde::logMessage('The Twitter block will not work without Services_Twitter from PEAR. Run pear install Services_Twitter.', - __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage('The Twitter block will not work without Services_Twitter from PEAR. Run pear install Services_Twitter.', 'ERR'); return _("Twitter block not available. Details have been logged for the administrator."); } @@ -90,12 +88,12 @@ class Horde_Block_Horde_twitter extends Horde_Block { empty($this->_params['password'])) { return _("Must configure a Twitter username and password to use this block."); } - + // Store the username and password in the session to enable // services/twitterapi.php's functionality. $_SESSION['horde']['twitterblock']['username'] = $this->_params['username']; $_SESSION['horde']['twitterblock']['password'] = $this->_params['password']; - + // Get a unique instance ID in case someone likes to have multiple // Twitter blocks. $instance = md5(serialize(array($this->_params['username'], @@ -136,7 +134,7 @@ EOF; . '' . '
' . _("Update") . '
' . Horde::img('loading.gif', '', array('id' => $instance . '_loading', 'style' => 'display:none;')); - + return $html; } diff --git a/horde/lib/Block/weatherdotcom.php b/horde/lib/Block/weatherdotcom.php index 1096788f2..10d0c6ab5 100644 --- a/horde/lib/Block/weatherdotcom.php +++ b/horde/lib/Block/weatherdotcom.php @@ -43,8 +43,7 @@ class Horde_Block_Horde_weatherdotcom extends Horde_Block { !(@include_once 'Cache.php') || !(@include_once 'XML/Serializer.php') || !ini_get('allow_url_fopen')) { - Horde::logMessage('The weather.com block will not work without PEAR\'s Services_Weather, Cache, and XML_ Serializer packages, and allow_url_fopen enabled. Run `pear install Services_Weather Cache XML_Serializer´ and ensure that allow_url_fopen is enabled in php.ini.', - __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage('The weather.com block will not work without PEAR\'s Services_Weather, Cache, and XML_ Serializer packages, and allow_url_fopen enabled. Run `pear install Services_Weather Cache XML_Serializer´ and ensure that allow_url_fopen is enabled in php.ini.', 'ERR'); $params = array( 'error' => array( 'type' => 'error', @@ -103,8 +102,7 @@ class Horde_Block_Horde_weatherdotcom extends Horde_Block { if (!(@include_once 'Services/Weather.php') || !(@include_once 'Cache.php') || !ini_get('allow_url_fopen')) { - Horde::logMessage('The weather.com block will not work without the PEARServices_Weather and Cache packages, and allow_url_fopen enabled. Run pear install Services_Weather Cache, and ensure that allow_url_fopen_wrappers is enabled in php.ini.', - __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage('The weather.com block will not work without the PEARServices_Weather and Cache packages, and allow_url_fopen enabled. Run pear install Services_Weather Cache, and ensure that allow_url_fopen_wrappers is enabled in php.ini.', 'ERR'); return _("The weather.com block is not available."); } diff --git a/horde/lib/LoginTasks/SystemTask/GarbageCollection.php b/horde/lib/LoginTasks/SystemTask/GarbageCollection.php index 7723bccf7..a58bdb07f 100644 --- 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__, PEAR_LOG_DEBUG); + Horde::logMessage('Cleaned out static files for ' . $type, __FILE__, __LINE__, 'DEBUG'); } } diff --git a/horde/lib/Test.php b/horde/lib/Test.php index f0fe84316..4e68a1d37 100644 --- a/horde/lib/Test.php +++ b/horde/lib/Test.php @@ -271,11 +271,6 @@ class Horde_Test 'HTTP_WebDAV_Server' => array( 'error' => 'The HTTP_WebDAV_Server is required if you want to use the WebDAV interface of Horde, e.g. to access calendars or tasklists with external clients.' ), - 'Log' => array( - 'error' => 'Make sure you are using a version of PEAR which includes the Log classes, or that you have installed the Log package seperately. See the INSTALL file for instructions on installing Log.', - 'function' => '_checkPearLogVersion', - 'required' => true - ), 'Mail' => array( 'path' => 'Mail/RFC822.php', 'error' => 'You do not have the Mail package installed on your system. See the INSTALL file for instructions on how to install the package.' @@ -649,18 +644,6 @@ class Horde_Test } /** - * Additional check for PEAR Log module for its version. - * - * @return string Returns error string on error. - */ - protected function _checkPearLogVersion() - { - if (!defined('PEAR_LOG_INFO')) { - return 'Your version of Log is not recent enough.'; - } - } - - /** * Additional check for PEAR DB module for its version. * * @return string Returns error string on error. diff --git a/horde/lib/core.php b/horde/lib/core.php index 7d996b43c..63490cf90 100644 --- a/horde/lib/core.php +++ b/horde/lib/core.php @@ -37,9 +37,6 @@ if (file_exists(HORDE_BASE . '/config/horde.local.php')) { include_once 'Horde/Autoloader.php'; Horde_Autoloader::addClassPattern('/^Horde(?:$|_)/i', dirname(__FILE__)); -/* Log (need to include because of LOG constants). */ -include_once 'Log.php'; - /* Default exception handler for uncaught exceptions. The default fatal * exception handler output may include things like passwords, etc. so don't * output this unless an admin. */ diff --git a/horde/login.php b/horde/login.php index 0b7800139..deba6298c 100644 --- a/horde/login.php +++ b/horde/login.php @@ -156,7 +156,7 @@ if ($error_reason) { : Horde_Nls::select(); $entry = sprintf('User %s [%s] logged out of Horde', $is_auth, $_SERVER['REMOTE_ADDR']); - Horde::logMessage($entry, __FILE__, __LINE__, PEAR_LOG_NOTICE); + Horde::logMessage($entry, 'NOTICE'); Horde_Auth::clearAuth(); @session_destroy(); @@ -201,7 +201,7 @@ if ($error_reason) { if ($auth->authenticate(Horde_Util::getPost('horde_user'), $auth_params)) { $entry = sprintf('Login success for %s [%s] to %s.', Horde_Auth::getAuth(), $_SERVER['REMOTE_ADDR'], ($app && $is_auth) ? $app : 'horde'); - Horde::logMessage($entry, __FILE__, __LINE__, PEAR_LOG_NOTICE); + Horde::logMessage($entry, 'NOTICE'); if (!empty($url_in)) { /* $horde_login_url is used by horde/index.php to redirect to URL @@ -232,7 +232,7 @@ if ($error_reason) { $entry = sprintf('FAILED LOGIN for %s [%s] to Horde', Horde_Util::getFormData('horde_user'), $_SERVER['REMOTE_ADDR']); - Horde::logMessage($entry, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($entry, 'ERR'); } else { $new_lang = Horde_Util::getGet('new_lang'); if ($new_lang) { diff --git a/horde/services/ajax.php b/horde/services/ajax.php index 5871358d4..83accd4ac 100644 --- a/horde/services/ajax.php +++ b/horde/services/ajax.php @@ -61,7 +61,7 @@ try { // Clear the output buffer that we started above, and log any unexpected // output at a DEBUG level. if (ob_get_length()) { - Horde::logMessage('Unexpected output (' . $app . '): ' . ob_get_clean(), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Unexpected output (' . $app . '): ' . ob_get_clean(), __FILE__, __LINE__, 'DEBUG'); } // Send the final result. diff --git a/horde/services/images/view.php b/horde/services/images/view.php index b33302c07..7a107a777 100644 --- a/horde/services/images/view.php +++ b/horde/services/images/view.php @@ -37,7 +37,7 @@ case 'vfs': $vfs = VFS::singleton($conf['vfs']['type'], Horde::getDriverConfig('vfs', $conf['vfs']['type'])); $file_data = $vfs->read($path, $file); } catch (VFS_Exception $e) { - Horde::logMessage(sprintf('Error displaying image [%s]: %s', $path . '/' . $file, $e->getMessage()), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage(sprintf('Error displaying image [%s]: %s', $path . '/' . $file, $e->getMessage()), 'ERR'); exit; } @@ -60,7 +60,7 @@ case 'tmp': } } if (!file_exists($file_name)) { - Horde::logMessage(sprintf('Image not found [%s]', $file_name), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage(sprintf('Image not found [%s]', $file_name), 'ERR'); exit; } $file_data = file_get_contents($file_name); diff --git a/horde/services/portal/sidebar.php b/horde/services/portal/sidebar.php index fcd363175..d61bfa968 100644 --- a/horde/services/portal/sidebar.php +++ b/horde/services/portal/sidebar.php @@ -227,14 +227,14 @@ foreach ($menu as $app => $params) { try { $block = Horde_Block_Collection::getBlock($params['app'], $params['blockname']); } catch (Horde_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); continue; } try { $block->buildTree($tree, 0, isset($params['menu_parent']) ? $params['menu_parent'] : null); } catch (Horde_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); continue; } } else { diff --git a/horde/services/prefs.php b/horde/services/prefs.php index f21700920..5556d63aa 100644 --- a/horde/services/prefs.php +++ b/horde/services/prefs.php @@ -126,7 +126,7 @@ if ($group == 'identities') { } } catch (Horde_Exception $e) { $notification->push(_("The new from address can't be verified, try again later: ") . $e->getMessage(), 'horde.error'); - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); } break; } diff --git a/horde/services/problem.php b/horde/services/problem.php index 4a068eb07..6526b1084 100644 --- a/horde/services/problem.php +++ b/horde/services/problem.php @@ -120,7 +120,7 @@ case 'send_problem_report': $_SERVER['REMOTE_ADDR'], preg_replace('/^.*<([^>]+)>.*$/', '$1', $conf['problems']['email']), preg_replace('/^.*<([^>]+)>.*$/', '$1', $email)), - __FILE__, __LINE__, PEAR_LOG_INFO); + __FILE__, __LINE__, 'INFO'); /* Return to previous page and exit this script. */ _returnToPage(); diff --git a/horde/services/resetpassword.php b/horde/services/resetpassword.php index e1b334b74..39e5b4944 100644 --- a/horde/services/resetpassword.php +++ b/horde/services/resetpassword.php @@ -82,7 +82,7 @@ if ($can_validate && $form->validate($vars)) { header('Location: ' . Horde::getServiceLink('login')->add('url', $info['url'])->setRaw(true)); exit; } catch (Horde_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); $notification->push(_("Your password has been reset, but couldn't be sent to you. Please contact the administrator."), 'horde.error'); } } else { diff --git a/horde/services/shares/edit.php b/horde/services/shares/edit.php index e8a0665d2..33ee6c177 100644 --- a/horde/services/shares/edit.php +++ b/horde/services/shares/edit.php @@ -266,7 +266,7 @@ if ($auth->hasCapability('list') && $conf['auth']['list_users'] == 'both')) { $userList = $auth->listUsers(); if ($userList instanceof PEAR_Error) { - Horde::logMessage($userList, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($userList, 'ERR'); $userList = array(); } sort($userList); @@ -280,7 +280,7 @@ if (!empty($conf['share']['any_group'])) { $groupList = $groups->getGroupMemberships(Horde_Auth::getAuth(), true); } if ($groupList instanceof PEAR_Error) { - Horde::logMessage($groupList, __FILE__, __LINE__, PEAR_LOG_NOTICE); + Horde::logMessage($groupList, 'NOTICE'); $groupList = array(); } asort($groupList); diff --git a/horde/services/twitterapi.php b/horde/services/twitterapi.php index f9f55e1a6..f36ac04a9 100644 --- a/horde/services/twitterapi.php +++ b/horde/services/twitterapi.php @@ -27,11 +27,11 @@ switch ($action) { case 'updateStatus': try { $result = $twitter->statuses->update(Horde_Util::getPost('statusText')); - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($result, 'DEBUG'); $notification->push(_("Status successfully updated."), 'horde.success'); } catch (Services_Twitter_Exception $e) { $error = $e->getMessage(); - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); $notification->push($error); } } diff --git a/horde/signup.php b/horde/signup.php index f68992260..74ecf5305 100644 --- a/horde/signup.php +++ b/horde/signup.php @@ -23,7 +23,7 @@ if ($conf['signup']['allow'] !== true || $signup = Horde_Auth_Signup::factory(); if (is_a($signup, 'PEAR_Error')) { - Horde::logMessage($signup->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($signup, 'ERR'); $notification->push(_("User Registration is not properly configured for this site."), 'horde.error'); header('Location: ' . Horde::getServiceLink('login')->setRaw(true)); exit; diff --git a/hylax/lib/Image.php b/hylax/lib/Image.php index a0eb8b291..049d068bb 100644 --- a/hylax/lib/Image.php +++ b/hylax/lib/Image.php @@ -36,20 +36,20 @@ class Hylax_Image { function getDimensions() { $tmp_file = Horde_Util::getTempFile('fax', true, '/tmp'); - Horde::logMessage('Created temp file:' . Horde_Util::bufferOutput('var_dump', $tmp_file) . ':', __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Created temp file:' . Horde_Util::bufferOutput('var_dump', $tmp_file) . ':', 'DEBUG'); $fp = fopen($tmp_file, 'w'); fwrite($fp, $this->_data); fclose($fp); /* Run a ImageMagick identify command on the file to get the details. */ $command = sprintf('%s %s', $this->_cmd['identify'], $tmp_file); - Horde::logMessage('External command call by Hylax_Image::getDimensions(): :' . $command . ':', __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('External command call by Hylax_Image::getDimensions(): :' . $command . ':', 'DEBUG'); exec($command, $output, $retval); $init = strlen($tmp_file); /* Figure out the dimensions from the output. */ - Horde::logMessage('External command output by Hylax_Image::getDimensions(): ' . serialize($output), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('External command output by Hylax_Image::getDimensions(): ' . serialize($output), 'DEBUG'); foreach ($output as $key => $line) { if (substr($line, 0, $init) != $tmp_file) { continue; @@ -89,7 +89,7 @@ class Hylax_Image { $tmp_file, $page, $tmp_file_out); - Horde::logMessage('Executing command: ' . $command, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Executing command: ' . $command, 'DEBUG'); exec($command); echo file_get_contents($tmp_file_out); } @@ -103,7 +103,7 @@ class Hylax_Image { /* Convert the page from the postscript file to PDF. */ $command = sprintf('%s %s -', $this->_cmd['ps2pdf'], $tmp_file); - Horde::logMessage('Executing command: ' . $command, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Executing command: ' . $command, 'DEBUG'); passthru($command); } diff --git a/hylax/lib/SQL/Attributes.php b/hylax/lib/SQL/Attributes.php index ce5c2363e..178149344 100644 --- a/hylax/lib/SQL/Attributes.php +++ b/hylax/lib/SQL/Attributes.php @@ -65,7 +65,7 @@ class Hylax_SQL_Attributes { $this->_params['attribute_table'], implode(', ', $id)); - Horde::logMessage('SQL Query by Hylax_SQL_Attributes::getAttributes(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Hylax_SQL_Attributes::getAttributes(): ' . $query, 'DEBUG'); $rows = $this->_db->getAll($query, DB_FETCHMODE_ASSOC); if (is_a($rows, 'PEAR_Error')) { return $rows; @@ -87,7 +87,7 @@ class Hylax_SQL_Attributes { $this->_params['id_column'], $this->_params['attribute_table'], (int)$id); - Horde::logMessage('SQL Query by Hylax_SQL_Attributes::getAttributes(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Hylax_SQL_Attributes::getAttributes(): ' . $query, 'DEBUG'); return $this->_db->getAll($query, DB_FETCHMODE_ASSOC); } } @@ -145,7 +145,7 @@ class Hylax_SQL_Attributes { $query, $pairs); - Horde::logMessage('SQL Query by Hylax_SQL_Attributes::getByAttributes(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Hylax_SQL_Attributes::getByAttributes(): ' . $query, 'DEBUG'); return $this->_db->getCol($query); } @@ -170,7 +170,7 @@ class Hylax_SQL_Attributes { $attr['key'], $attr['value']); - Horde::logMessage('SQL Query by Hylax_SQL_Attributes::insertAttributes(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Hylax_SQL_Attributes::insertAttributes(): ' . $query, 'DEBUG'); $result = $this->_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { @@ -200,7 +200,7 @@ class Hylax_SQL_Attributes { $this->_params['id_column'], (int)$id); - Horde::logMessage('SQL Query by Hylax_SQL_Attributes::deleteAttributes(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Hylax_SQL_Attributes::deleteAttributes(): ' . $query, 'DEBUG'); $result = $this->_db->query($query); if (is_a($result, 'PEAR_Error')) { return $result; diff --git a/hylax/lib/Storage.php b/hylax/lib/Storage.php index 6cbfe8076..b879bb286 100644 --- a/hylax/lib/Storage.php +++ b/hylax/lib/Storage.php @@ -59,7 +59,7 @@ class Hylax_Storage { try { $this->_vfs->writeData($path, $file, $data, true); } catch (VFS_Exception $e) { - Horde::logMessage('Could not save fax file to VFS: ' . $e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage('Could not save fax file to VFS: ' . $e->getMessage(), 'ERR'); throw $e; } return $fax_id; @@ -83,7 +83,7 @@ class Hylax_Storage { $data = $this->getFaxData($info['fax_id']); if (is_a($data, 'PEAR_Error')) { - Horde::logMessage('Could not get fax data: ' . $data->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage('Could not get fax data: ' . $data->getMessage(), 'ERR'); return $data; } @@ -115,7 +115,7 @@ class Hylax_Storage { try { return $this->_vfs->read($path, $file); } catch (VFS_Exception $e) { - Horde::logMessage(sprintf("%s '%s/%s'.", $e->getMessage(), $path, $file), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage(sprintf("%s '%s/%s'.", $e->getMessage(), $path, $file), 'ERR'); throw $e; } } diff --git a/hylax/lib/Storage/sql.php b/hylax/lib/Storage/sql.php index 48b21045b..19683a73c 100644 --- a/hylax/lib/Storage/sql.php +++ b/hylax/lib/Storage/sql.php @@ -43,9 +43,9 @@ class Hylax_Storage_sql extends Hylax_Storage { { $id = $this->_db->nextId('hylax_faxes'); if (is_a($id, 'PEAR_Error')) { - Horde::logMessage('Could not generate new fax id. %s' . $id->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage('Could not generate new fax id. %s' . $id->getMessage(), 'ERR'); } else { - Horde::logMessage('Generated new fax id: ' . $id, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Generated new fax id: ' . $id, 'DEBUG'); } return $id; } @@ -61,10 +61,10 @@ class Hylax_Storage_sql extends Hylax_Storage { $info['fax_pages'], $info['fax_created'], $info['fax_folder']); - Horde::logMessage('SQL Query by Hylax_Storage_sql::_createFax(): ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Hylax_Storage_sql::_createFax(): ' . $sql, 'DEBUG'); $result = $this->_db->query($sql, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); } return $result; } @@ -139,10 +139,10 @@ class Hylax_Storage_sql extends Hylax_Storage { { /* Get the gateways. */ $sql = 'SELECT * FROM swoosh_gateways'; - Horde::logMessage('SQL Query by Hylax_Storage_sql::_getGateways(): ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Hylax_Storage_sql::_getGateways(): ' . $sql, 'DEBUG'); $result = $this->_db->getAll($sql, DB_FETCHMODE_ASSOC); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); } return $result; @@ -160,10 +160,10 @@ class Hylax_Storage_sql extends Hylax_Storage { /* Get the gateways. */ $sql = 'SELECT * FROM swoosh_gateways WHERE gateway_id = ?'; $values = array((int)$gateway_id); - Horde::logMessage('SQL Query by Hylax_Storage_sql::getGateway(): ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Hylax_Storage_sql::getGateway(): ' . $sql, 'DEBUG'); $gateway = $this->_db->getRow($sql, $values, DB_FETCHMODE_ASSOC); if (is_a($gateway, 'PEAR_Error')) { - Horde::logMessage($gateway, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($gateway, 'ERR'); return $gateway; } @@ -190,7 +190,7 @@ class Hylax_Storage_sql extends Hylax_Storage { /* No existing gateway id, so new gateway and get next id. */ $info['gateway_id'] = $this->_db->nextId('swoosh_gateways'); if (is_a($info['gateway_id'], 'PEAR_Error')) { - Horde::logMessage($info['gateway_id'], __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($info['gateway_id'], 'ERR'); return $info['gateway_id']; } $sql = 'INSERT INTO swoosh_gateways (gateway_id, gateway_driver, gateway_name, gateway_params, gateway_sendparams) VALUES (?, ?, ?, ?, ?)'; @@ -222,10 +222,10 @@ class Hylax_Storage_sql extends Hylax_Storage { $info['gateway_name'], $info['gateway_params'], $info['gateway_sendparams']); - Horde::logMessage('SQL Query by Hylax_Storage_sql::saveGateway(): ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Hylax_Storage_sql::saveGateway(): ' . $sql, 'DEBUG'); $result = $this->_db->query($sql, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -243,10 +243,10 @@ class Hylax_Storage_sql extends Hylax_Storage { { $sql = 'DELETE FROM swoosh_gateways WHERE gateway_id = ?'; $values = array((int)$gateway_id); - Horde::logMessage('SQL Query by Hylax_Storage_sql::deleteGateway(): ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Hylax_Storage_sql::deleteGateway(): ' . $sql, 'DEBUG'); $result = $this->_db->query($sql, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); } return $result; @@ -268,7 +268,7 @@ class Hylax_Storage_sql extends Hylax_Storage { { $message_id = $this->_db->nextId('swoosh_messages'); if (is_a($message_id, 'PEAR_Error')) { - Horde::logMessage($message_id, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($message_id, 'ERR'); return $message_id; } @@ -285,7 +285,7 @@ class Hylax_Storage_sql extends Hylax_Storage { (int)time()); $result = $this->_db->query($sql, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -307,7 +307,7 @@ class Hylax_Storage_sql extends Hylax_Storage { { $send_id = $this->_db->nextId('swoosh_sends'); if (is_a($send_id, 'PEAR_Error')) { - Horde::logMessage($send_id, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($send_id, 'ERR'); return $send_id; } $sql = 'INSERT INTO swoosh_sends (send_id, message_id, send_remote_id, send_recipient, send_status) VALUES (?, ?, ?, ?, ?)'; @@ -318,7 +318,7 @@ class Hylax_Storage_sql extends Hylax_Storage { (is_null($error) ? 'NULL' : $error)); $result = $this->_db->query($sql, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -336,10 +336,10 @@ class Hylax_Storage_sql extends Hylax_Storage { { $sql = 'SELECT * FROM swoosh_messages WHERE user_uid = ?'; $values = array(Horde_Auth::getAuth()); - Horde::logMessage('SQL Query by Hylax_Storage_sql::_getMessages(): ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Hylax_Storage_sql::_getMessages(): ' . $sql, 'DEBUG'); $result = $this->_db->getAssoc($sql, false, $values, DB_FETCHMODE_ASSOC); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); } return $result; @@ -362,10 +362,10 @@ class Hylax_Storage_sql extends Hylax_Storage { $sql = 'SELECT message_id, swoosh_sends.* FROM swoosh_sends' . ' WHERE message_id IN (' . str_repeat('?, ', count($message_ids) - 1) . '?)'; $values = $message_ids; - Horde::logMessage('SQL Query by Hylax_Storage_sql::_getSends(): ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Hylax_Storage_sql::_getSends(): ' . $sql, 'DEBUG'); $result = $this->_db->getAssoc($sql, false, $values, DB_FETCHMODE_ASSOC, true); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); } return $result; diff --git a/hylax/scripts/fax_create.php b/hylax/scripts/fax_create.php index c410f66b0..a586f551c 100755 --- a/hylax/scripts/fax_create.php +++ b/hylax/scripts/fax_create.php @@ -16,6 +16,6 @@ if (isset($args[1])) { if (isset($args[2])) { $info['fax_user'] = $args[2]; } -Horde::logMessage(sprintf('Creating fax ID %s for user %s.', $info['fax_id'], $info['fax_user']), __FILE__, __LINE__, PEAR_LOG_DEBUG); +Horde::logMessage(sprintf('Creating fax ID %s for user %s.', $info['fax_id'], $info['fax_user']), 'DEBUG'); $hylax->storage->createFax($info, true); diff --git a/hylax/scripts/fax_save_data.php b/hylax/scripts/fax_save_data.php index a0d6a5947..44cc34b74 100755 --- a/hylax/scripts/fax_save_data.php +++ b/hylax/scripts/fax_save_data.php @@ -7,7 +7,7 @@ $hylax = Horde_Registry::appInit('hylax', array('authentication' => 'none', 'cli /* Store the raw fax postscript data. */ $data = $cli->readStdin(); if (empty($data)) { - Horde::logMessage('No print data received from standard input. Exiting fax submission.', __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage('No print data received from standard input. Exiting fax submission.', 'ERR'); exit; } diff --git a/hylax/scripts/fax_save_recv_data.php b/hylax/scripts/fax_save_recv_data.php index f8d90c08a..f8c8a9512 100755 --- a/hylax/scripts/fax_save_recv_data.php +++ b/hylax/scripts/fax_save_recv_data.php @@ -15,7 +15,7 @@ if (isset($args[1])) { /* Store the raw fax postscript data. */ $data = $cli->readStdin(); if (empty($data)) { - Horde::logMessage('No print data received from standard input. Exiting fax submission.', __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage('No print data received from standard input. Exiting fax submission.', 'ERR'); exit; } @@ -25,5 +25,5 @@ if (is_a($fax_id, 'PEAR_Error')) { echo '0'; exit; } -Horde::logMessage(sprintf('Creating fax ID %s for received fax.', $fax_id), __FILE__, __LINE__, PEAR_LOG_DEBUG); +Horde::logMessage(sprintf('Creating fax ID %s for received fax.', $fax_id), 'DEBUG'); echo $fax_id; diff --git a/imp/attachment.php b/imp/attachment.php index b823795d7..f9fea8815 100644 --- a/imp/attachment.php +++ b/imp/attachment.php @@ -61,7 +61,7 @@ if ($conf['compose']['link_attachments_notify']) { exit; } } catch (VFS_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($read_id, 'ERR'); } } else { /* Create a random identifier for this file. */ @@ -106,7 +106,7 @@ if ($conf['compose']['link_attachments_notify']) { $msg->send($mail_address, $msg_headers); } } catch (VFS_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); } } } @@ -115,7 +115,7 @@ if ($conf['compose']['link_attachments_notify']) { try { $file_data = $vfsroot->read($full_path, $file_name); } catch (VFS_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($file_data, 'ERR'); throw new IMP_Exception(_("The specified file cannot be read.")); } $mime_type = Horde_Mime_Magic::analyzeData($file_data, isset($conf['mime']['magic_db']) ? $conf['mime']['magic_db'] : null); diff --git a/imp/compose.php b/imp/compose.php index 5e89cdfe8..22bcfe3b5 100644 --- a/imp/compose.php +++ b/imp/compose.php @@ -574,7 +574,7 @@ if ($browser->hasFeature('javascript')) { $spellcheck = true; $imp_ui->attachSpellChecker(); } catch (Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); } } Horde::addScriptFile('ieEscGuard.js', 'horde'); diff --git a/imp/lib/Auth.php b/imp/lib/Auth.php index 6c2ad9710..a459c86ef 100644 --- a/imp/lib/Auth.php +++ b/imp/lib/Auth.php @@ -60,7 +60,7 @@ class IMP_Auth } if (!$GLOBALS['imp_imap']->createImapObject($credentials['userId'], $credentials['password'], $credentials['server'])) { - self::logMessage('failed', __FILE__, __LINE__); + self::_logMessage('failed'); throw new Horde_Auth_Exception('', Horde_Auth::REASON_FAILED); } } @@ -68,7 +68,7 @@ class IMP_Auth try { $GLOBALS['imp_imap']->ob()->login(); } catch (Horde_Imap_Client_Exception $e) { - self::logMessage($e->getMessage(), __FILE__, __LINE__); + self::_logMessage($e->getMessage(), 'ERR'); if ($e->getCode() == Horde_Imap_Client_Exception::SERVER_CONNECT) { throw new Horde_Auth_Exception(_("Could not connect to the remote server.")); } @@ -114,14 +114,11 @@ class IMP_Auth /** * Log login related message. * - * @param string $status Either 'login', 'logout', 'failed', or an - * error message. - * @param string $file The file where the error occurred. - * @param integer $line The line where the error occurred. - * @param integer $level The logging level. + * @param Exception $status Message should contain either 'login', + * 'logout', 'failed', or an error message. + * @param mixed $level The logging level. See Horde::logMessage(). */ - static public function logMessage($status, $file, $line, - $level = PEAR_LOG_ERR) + static protected function _logMessage($status, $level) { switch ($status) { case 'login': @@ -154,7 +151,7 @@ class IMP_Auth empty($_SESSION['imp']['protocol']) ? '' : $_SESSION['imp']['protocol'] ); - Horde::logMessage($msg, $file, $line, $level); + Horde::logMessage($msg, $level); } /** @@ -502,7 +499,7 @@ class IMP_Auth $imp_compose = IMP_Compose::singleton(); $imp_compose->recoverSessionExpireDraft(); - IMP_Auth::logMessage('login', __FILE__, __LINE__, PEAR_LOG_NOTICE); + self::_logMessage('login', 'NOTICE'); } } diff --git a/imp/lib/Compose.php b/imp/lib/Compose.php index ad892077e..e342526aa 100644 --- a/imp/lib/Compose.php +++ b/imp/lib/Compose.php @@ -596,7 +596,7 @@ class IMP_Compose $this->sendMessage($val['to'], $headers, $val['msg']); } catch (IMP_Compose_Exception $e) { /* Unsuccessful send. */ - Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); if (isset($sentmail)) { $sentmail->log($this->getMetadata('reply_type') || 'new', $headers->getValue('message-id'), $val['recipients'], false); } @@ -641,7 +641,7 @@ class IMP_Compose } $entry = sprintf("%s Message sent to %s from %s", $_SERVER['REMOTE_ADDR'], $recipients, Horde_Auth::getAuth()); - Horde::logMessage($entry, __FILE__, __LINE__, PEAR_LOG_INFO); + Horde::logMessage($entry, 'INFO'); /* Should we save this message in the sent mail folder? */ if (!empty($opts['sent_folder']) && @@ -750,7 +750,7 @@ class IMP_Compose $timelimit = $GLOBALS['injector']->getInstance('Horde_Perms')->hasAppPermission('max_timelimit'); if ($timelimit !== true) { if ($conf['sentmail']['driver'] == 'none') { - Horde::logMessage('The permission for the maximum number of recipients per time period has been enabled, but no backend for the sent-mail logging has been configured for IMP.', __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage('The permission for the maximum number of recipients per time period has been enabled, but no backend for the sent-mail logging has been configured for IMP.', 'ERR'); throw new IMP_Compose_Exception(_("The system is not properly configured. A detailed error description has been logged for the administrator.")); } $sentmail = IMP_Sentmail::factory(); @@ -868,7 +868,7 @@ class IMP_Compose try { $results = $registry->call('contacts/search', array($emails, array($abook), array($abook => array('email')))); } catch (Horde_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); $notification->push(_("Could not save recipients.")); return; } @@ -2337,7 +2337,7 @@ class IMP_Compose $vfs->writeData($fullpath, escapeshellcmd($att['part']->getName()), $data, true); } } catch (VFS_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); return IMP_Compose_Exception($e); } } @@ -2708,7 +2708,7 @@ class IMP_Compose try { $res = $GLOBALS['registry']->call('contacts/search', array($search, $sparams['sources'], $sparams['fields'], false)); } catch (Horde_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); return array(); } diff --git a/imp/lib/Crypt/Pgp.php b/imp/lib/Crypt/Pgp.php index 7d4de5e9f..83a207a0d 100644 --- a/imp/lib/Crypt/Pgp.php +++ b/imp/lib/Crypt/Pgp.php @@ -174,7 +174,7 @@ class IMP_Crypt_Pgp extends Horde_Crypt_Pgp if (empty($options['nocache']) && ($cache = $GLOBALS['injector']->getInstance('Horde_Cache'))) { $result = $cache->get("PGPpublicKey_" . $address . $keyid, 3600); if ($result) { - Horde::logMessage('PGPpublicKey: ' . serialize($result), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('PGPpublicKey: ' . serialize($result), 'DEBUG'); return $result; } } @@ -211,7 +211,7 @@ class IMP_Crypt_Pgp extends Horde_Crypt_Pgp } } catch (Horde_Exception $e) { /* Return now, if no public key found at all. */ - Horde::logMessage('PGPpublicKey: ' . $e->getMessage(), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('PGPpublicKey: ' . $e->getMessage(), 'DEBUG'); throw new Horde_Exception(sprintf(_("Could not retrieve public key for %s."), $address)); } } else { diff --git a/imp/lib/IMP.php b/imp/lib/IMP.php index ea6b13a56..b9c2f69fc 100644 --- a/imp/lib/IMP.php +++ b/imp/lib/IMP.php @@ -588,7 +588,7 @@ class IMP $quotaDriver = IMP_Quota::singleton($_SESSION['imp']['imap']['quota']['driver'], isset($_SESSION['imp']['imap']['quota']['params']) ? $_SESSION['imp']['imap']['quota']['params'] : array()); $quota = $quotaDriver->getQuota(); } catch (Horde_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); return false; } diff --git a/imp/lib/Imap.php b/imp/lib/Imap.php index 5fc3658b1..fb2bff879 100644 --- a/imp/lib/Imap.php +++ b/imp/lib/Imap.php @@ -96,7 +96,7 @@ class IMP_Imap $servers = false; } } catch (Horde_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); return false; } @@ -113,7 +113,7 @@ class IMP_Imap /* Check for the existence of the server in the config file. */ if (empty($servers[$server]) || !is_array($servers[$server])) { $entry = sprintf('Invalid server key "%s" from client [%s]', $server, $_SERVER['REMOTE_ADDR']); - Horde::logMessage($entry, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($entry, 'ERR'); return false; } @@ -343,7 +343,7 @@ class IMP_Imap */ public function logException($e) { - Horde::logMessage($e, $e->getFile(), $e->getLine(), PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); } /** diff --git a/imp/lib/Maillog.php b/imp/lib/Maillog.php index e682c3949..38bb1c564 100644 --- a/imp/lib/Maillog.php +++ b/imp/lib/Maillog.php @@ -61,7 +61,7 @@ class IMP_Maillog * confusion, especially since they most likely don't even * know the message is being logged. */ $entry = sprintf('Could not log message details to Horde_History. Error returned: %s', $e->getMessage()); - Horde::logMessage($entry, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($entry, 'ERR'); } } } diff --git a/imp/lib/Quota/Hook.php b/imp/lib/Quota/Hook.php index 7d62a9c48..b84319627 100644 --- a/imp/lib/Quota/Hook.php +++ b/imp/lib/Quota/Hook.php @@ -36,7 +36,7 @@ class IMP_Quota_Hook extends IMP_Quota } if (count($quota) != 2) { - Horde::logMessage('Incorrect number of return values from quota hook.', __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage('Incorrect number of return values from quota hook.', 'ERR'); throw new Horde_Exception(_("Unable to retrieve quota")); } diff --git a/imp/lib/Quota/Sql.php b/imp/lib/Quota/Sql.php index c7ed327c0..3964b4d7d 100644 --- a/imp/lib/Quota/Sql.php +++ b/imp/lib/Quota/Sql.php @@ -90,7 +90,7 @@ class IMP_Quota_Sql extends IMP_Quota $quota['limit'] = current($row); } } else { - Horde::logMessage('IMP_Quota_Sql: query_quota SQL query not set', __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('IMP_Quota_Sql: query_quota SQL query not set', 'DEBUG'); } if (!empty($this->_params['query_used'])) { @@ -111,7 +111,7 @@ class IMP_Quota_Sql extends IMP_Quota $quota['usage'] = current($row); } } else { - Horde::logMessage('IMP_Quota_Sql: query_used SQL query not set', __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('IMP_Quota_Sql: query_used SQL query not set', 'DEBUG'); } return $quota; diff --git a/imp/lib/Sentmail/Sql.php b/imp/lib/Sentmail/Sql.php index b4c5bf4c3..f5ece5375 100644 --- a/imp/lib/Sentmail/Sql.php +++ b/imp/lib/Sentmail/Sql.php @@ -100,15 +100,14 @@ class IMP_Sentmail_Sql extends IMP_Sentmail (int)$success); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('IMP_Sentmail_Sql::_log(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('IMP_Sentmail_Sql::_log(): %s', $query), 'DEBUG'); /* Execute the query. */ $result = $this->_db->query($query, $values); /* Log errors. */ if ($result instanceof PEAR_Error) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); } } @@ -139,13 +138,12 @@ class IMP_Sentmail_Sql extends IMP_Sentmail $limit); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('IMP_Sentmail_Sql::favouriteRecipients(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('IMP_Sentmail_Sql::favouriteRecipients(): %s', $query), 'DEBUG'); /* Execute the query. */ $recipients = $this->_db->getAll($query); if ($recipients instanceof PEAR_Error) { - Horde::logMessage($recipients, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($recipients, 'ERR'); throw new Horde_Exception_Prior($recipients); } @@ -178,13 +176,12 @@ class IMP_Sentmail_Sql extends IMP_Sentmail } /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('IMP_Sentmail_Sql::numberOfRecipients(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('IMP_Sentmail_Sql::numberOfRecipients(): %s', $query), 'DEBUG'); /* Execute the query. */ $recipients = $this->_db->getOne($query, array(time() - $hours * 3600)); if ($recipients instanceof PEAR_Error) { - Horde::logMessage($recipients, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($recipients, 'ERR'); throw new Horde_Exception_Prior($recipients); } @@ -204,13 +201,12 @@ class IMP_Sentmail_Sql extends IMP_Sentmail $this->_params['table']); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('IMP_Sentmail_Sql::_deleteOldEntries(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('IMP_Sentmail_Sql::_deleteOldEntries(): %s', $query), 'DEBUG'); /* Execute the query. */ $result = $this->_db->query($query, array($before)); if ($result instanceof PEAR_Error) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); } } diff --git a/imp/lib/Spam.php b/imp/lib/Spam.php index cbea196fe..fa948f186 100644 --- a/imp/lib/Spam.php +++ b/imp/lib/Spam.php @@ -75,7 +75,7 @@ class IMP_Spam 2 => array('pipe', 'w') ), $pipes); if (!is_resource($proc)) { - Horde::logMessage('Cannot open process ' . $prog, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage('Cannot open process ' . $prog, 'ERR'); return 0; } stream_copy_to_stream($raw_msg, $pipes[0]); @@ -86,7 +86,7 @@ class IMP_Spam } fclose($pipes[2]); if (!empty($stderr)) { - Horde::logMessage('Error reporting spam: ' . $stderr, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage('Error reporting spam: ' . $stderr, 'ERR'); } proc_close($proc); $report_flag = true; @@ -141,7 +141,7 @@ class IMP_Spam $imp_compose->sendMessage($to, $spam_headers, $mime, Horde_Nls::getCharset()); $report_flag = true; } catch (IMP_Compose_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); } } diff --git a/imp/lib/Ui/Compose.php b/imp/lib/Ui/Compose.php index 378764503..f3d6e38d3 100644 --- a/imp/lib/Ui/Compose.php +++ b/imp/lib/Ui/Compose.php @@ -106,7 +106,7 @@ class IMP_Ui_Compose $entry = sprintf("%s Redirected message sent to %s from %s", $_SERVER['REMOTE_ADDR'], $recipients, Horde_Auth::getAuth()); - Horde::logMessage($entry, __FILE__, __LINE__, PEAR_LOG_INFO); + Horde::logMessage($entry, 'INFO'); if ($GLOBALS['conf']['sentmail']['driver'] != 'none') { $sentmail = IMP_Sentmail::factory(); diff --git a/ingo/lib/Application.php b/ingo/lib/Application.php index 89dd9ed16..99f021fb9 100644 --- a/ingo/lib/Application.php +++ b/ingo/lib/Application.php @@ -170,7 +170,7 @@ class Ingo_Application extends Horde_Registry_Application try { $GLOBALS['ingo_storage']->removeUserData($user); } catch (Ingo_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); throw new Horde_Auth_Exception($e); } @@ -179,13 +179,13 @@ class Ingo_Application extends Horde_Registry_Application /* Get the user's default share. */ $share = $GLOBALS['ingo_shares']->getShare($user); if ($share instanceof PEAR_Error) { - Horde::logMessage($share, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($share, 'ERR'); throw new Horde_Auth_Exception($share); } $result = $GLOBALS['ingo_shares']->removeShare($share); if ($result instanceof PEAR_Error) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); throw new Horde_Auth_Exception($share); } @@ -193,7 +193,7 @@ class Ingo_Application extends Horde_Registry_Application * perms. */ $shares = $GLOBALS['ingo_shares']->listShares($user); if ($shares instanceof PEAR_Error) { - Horde::logMessage($shares, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($shares, 'ERR'); } else { foreach ($shares as $share) { $share->removeUser($user); @@ -204,7 +204,7 @@ class Ingo_Application extends Horde_Registry_Application * and remove them. */ $shares = $GLOBALS['ingo_shares']->listShares($user, Horde_Perms::DELETE, $user); if ($shares instanceof PEAR_Error) { - Horde::logMessage($shares, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($shares, 'ERR'); throw new Horde_Auth_Exception($share); } diff --git a/ingo/lib/Driver/Timsieved.php b/ingo/lib/Driver/Timsieved.php index e7c3af42d..cee7a8a34 100644 --- a/ingo/lib/Driver/Timsieved.php +++ b/ingo/lib/Driver/Timsieved.php @@ -84,7 +84,7 @@ class Ingo_Driver_Timsieved extends Ingo_Driver */ protected function _debug($sieve, $message) { - Horde::logMessage($message, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($message, 'DEBUG'); } /** diff --git a/ingo/lib/Ingo.php b/ingo/lib/Ingo.php index 785bf1ee0..7afb8691b 100644 --- a/ingo/lib/Ingo.php +++ b/ingo/lib/Ingo.php @@ -378,7 +378,7 @@ class Ingo { $rulesets = $GLOBALS['ingo_shares']->listShares(Horde_Auth::getAuth(), $permission, $owneronly ? Horde_Auth::getAuth() : null); if ($rulesets instanceof PEAR_Error) { - Horde::logMessage($rulesets, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($rulesets, 'ERR'); return array(); } diff --git a/ingo/lib/Storage/Filters/Sql.php b/ingo/lib/Storage/Filters/Sql.php index 2202d72c1..75ad33775 100644 --- a/ingo/lib/Storage/Filters/Sql.php +++ b/ingo/lib/Storage/Filters/Sql.php @@ -60,7 +60,7 @@ class Ingo_Storage_Filters_Sql extends Ingo_Storage_Filters { $query = sprintf('SELECT * FROM %s WHERE rule_owner = ? ORDER BY rule_order', $this->_params['table_rules']); $values = array(Ingo::getUser()); - Horde::logMessage('Ingo_Storage_Filters_Sql(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Ingo_Storage_Filters_Sql(): ' . $query, 'DEBUG'); $result = $this->_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { return $result; @@ -156,10 +156,10 @@ class Ingo_Storage_Filters_Sql extends Ingo_Storage_Filters { $values = array_merge(array($id, Ingo::getUser()), $this->_ruleToBackend($rule), array($order)); - Horde::logMessage('Ingo_Storage_Filters_Sql::addRule(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Ingo_Storage_Filters_Sql::addRule(): ' . $query, 'DEBUG'); $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -179,10 +179,10 @@ class Ingo_Storage_Filters_Sql extends Ingo_Storage_Filters { $this->_params['table_rules']); $values = array_merge($this->_ruleToBackend($rule), array($id, $rule['id'], Ingo::getUser())); - Horde::logMessage('Ingo_Storage_Filters_Sql::updateRule(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Ingo_Storage_Filters_Sql::updateRule(): ' . $query, 'DEBUG'); $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -205,10 +205,10 @@ class Ingo_Storage_Filters_Sql extends Ingo_Storage_Filters { $query = sprintf('DELETE FROM %s WHERE rule_id = ? AND rule_owner = ?', $this->_params['table_rules']); $values = array($this->_filters[$id]['id'], Ingo::getUser()); - Horde::logMessage('Ingo_Storage_Filters_Sql::deleteRule(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Ingo_Storage_Filters_Sql::deleteRule(): ' . $query, 'DEBUG'); $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } unset($this->_filters[$id]); @@ -216,11 +216,10 @@ class Ingo_Storage_Filters_Sql extends Ingo_Storage_Filters { $query = sprintf('UPDATE %s SET rule_order = rule_order - 1 WHERE rule_owner = ? AND rule_order > ?', $this->_params['table_rules']); $values = array(Ingo::getUser(), $id); - Horde::logMessage('Ingo_Storage_Filters_Sql::deleteRule(): ' . $query, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Ingo_Storage_Filters_Sql::deleteRule(): ' . $query, 'DEBUG'); $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -294,11 +293,10 @@ class Ingo_Storage_Filters_Sql extends Ingo_Storage_Filters { $values[] = (int)$id; $values[] = (int)($id + $steps); } - Horde::logMessage('Ingo_Storage_Filters_Sql::ruleUp(): ' . $query, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Ingo_Storage_Filters_Sql::ruleUp(): ' . $query, 'DEBUG'); $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } $query = sprintf('UPDATE %s SET rule_order = ? WHERE rule_owner = ? AND rule_id = ?', @@ -306,11 +304,10 @@ class Ingo_Storage_Filters_Sql extends Ingo_Storage_Filters { $values = array((int)($id + $steps), Ingo::getUser(), $this->_filters[$id]['id']); - Horde::logMessage('Ingo_Storage_Filters_Sql::ruleUp(): ' . $query, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Ingo_Storage_Filters_Sql::ruleUp(): ' . $query, 'DEBUG'); $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } diff --git a/ingo/lib/Storage/Sql.php b/ingo/lib/Storage/Sql.php index 2daba7181..8a1ffc5f0 100644 --- a/ingo/lib/Storage/Sql.php +++ b/ingo/lib/Storage/Sql.php @@ -151,11 +151,10 @@ class Ingo_Storage_Sql extends Ingo_Storage $this->_params['table_lists']); $values = array(Ingo::getUser(), (int)($field == self::ACTION_BLACKLIST)); - Horde::logMessage('Ingo_Storage_Sql::_retrieve(): ' . $query, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Ingo_Storage_Sql::_retrieve(): ' . $query, 'DEBUG'); $addresses = $this->_db->getCol($query, 0, $values); if (is_a($addresses, 'PEAR_Error')) { - Horde::logMessage($addresses, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($addresses, 'ERR'); return $addresses; } if ($field == self::ACTION_BLACKLIST) { @@ -175,8 +174,7 @@ class Ingo_Storage_Sql extends Ingo_Storage case self::ACTION_FORWARD: $query = sprintf('SELECT * FROM %s WHERE forward_owner = ?', $this->_params['table_forwards']); - Horde::logMessage('Ingo_Storage_Sql::_retrieve(): ' . $query, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Ingo_Storage_Sql::_retrieve(): ' . $query, 'DEBUG'); $result = $this->_db->query($query, Ingo::getUser()); $data = $result->fetchRow(DB_FETCHMODE_ASSOC); @@ -194,8 +192,7 @@ class Ingo_Storage_Sql extends Ingo_Storage case self::ACTION_VACATION: $query = sprintf('SELECT * FROM %s WHERE vacation_owner = ?', $this->_params['table_vacations']); - Horde::logMessage('Ingo_Storage_Sql::_retrieve(): ' . $query, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Ingo_Storage_Sql::_retrieve(): ' . $query, 'DEBUG'); $result = $this->_db->query($query, Ingo::getUser()); $data = $result->fetchRow(DB_FETCHMODE_ASSOC); @@ -229,8 +226,7 @@ class Ingo_Storage_Sql extends Ingo_Storage case self::ACTION_SPAM: $query = sprintf('SELECT * FROM %s WHERE spam_owner = ?', $this->_params['table_spam']); - Horde::logMessage('Ingo_Storage_Sql::_retrieve(): ' . $query, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Ingo_Storage_Sql::_retrieve(): ' . $query, 'DEBUG'); $result = $this->_db->query($query, Ingo::getUser()); $data = $result->fetchRow(DB_FETCHMODE_ASSOC); @@ -282,17 +278,15 @@ class Ingo_Storage_Sql extends Ingo_Storage $query = sprintf('DELETE FROM %s WHERE list_owner = ? AND list_blacklist = ?', $this->_params['table_lists']); $values = array(Ingo::getUser(), $is_blacklist); - Horde::logMessage('Ingo_Storage_Sql::_store(): ' . $query, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Ingo_Storage_Sql::_store(): ' . $query, 'DEBUG'); $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } $query = sprintf('INSERT INTO %s (list_owner, list_blacklist, list_address) VALUES (?, ?, ?)', $this->_params['table_lists']); - Horde::logMessage('Ingo_Storage_Sql::_store(): ' . $query, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Ingo_Storage_Sql::_store(): ' . $query, 'DEBUG'); $addresses = $is_blacklist ? $ob->getBlacklist() : $ob->getWhitelist(); foreach ($addresses as $address) { $result = $this->_write_db->query($query, @@ -300,7 +294,7 @@ class Ingo_Storage_Sql extends Ingo_Storage $is_blacklist, $address)); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } } @@ -323,8 +317,7 @@ class Ingo_Storage_Sql extends Ingo_Storage implode("\n", $ob->getForwardAddresses()), (int)(bool)$ob->getForwardKeep(), Ingo::getUser()); - Horde::logMessage('Ingo_Storage_Sql::_store(): ' . $query, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Ingo_Storage_Sql::_store(): ' . $query, 'DEBUG'); $ret = $this->_write_db->query($query, $values); if (!is_a($ret, 'PEAR_Error')) { $ob->setSaved(true); @@ -352,8 +345,7 @@ class Ingo_Storage_Sql extends Ingo_Storage implode("\n", $ob->getVacationExcludes()), (int)(bool)$ob->getVacationIgnorelist(), Ingo::getUser()); - Horde::logMessage('Ingo_Storage_Sql::_store(): ' . $query, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Ingo_Storage_Sql::_store(): ' . $query, 'DEBUG'); $ret = $this->_write_db->query($query, $values); if (!is_a($ret, 'PEAR_Error')) { $ob->setSaved(true); @@ -371,8 +363,7 @@ class Ingo_Storage_Sql extends Ingo_Storage (int)$ob->getSpamLevel(), $ob->getSpamFolder(), Ingo::getUser()); - Horde::logMessage('Ingo_Storage_Sql::_store(): ' . $query, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Ingo_Storage_Sql::_store(): ' . $query, 'DEBUG'); $ret = $this->_write_db->query($query, $values); if (!is_a($ret, 'PEAR_Error')) { $ob->setSaved(true); @@ -417,7 +408,7 @@ class Ingo_Storage_Sql extends Ingo_Storage $values = array($user); foreach ($queries as $query) { - Horde::logMessage('Ingo_Storage_sql::removeUserData(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Ingo_Storage_sql::removeUserData(): ' . $query, 'DEBUG'); $result = $this->_write_db->query($query, $values); if ($result instanceof PEAR_Error) { throw new Ingo_Exception($result); diff --git a/ingo/scripts/ingo-postfix-policyd b/ingo/scripts/ingo-postfix-policyd index 14c3df236..cf8b55deb 100755 --- a/ingo/scripts/ingo-postfix-policyd +++ b/ingo/scripts/ingo-postfix-policyd @@ -81,18 +81,18 @@ while (!feof(STDIN)) { $query[$key] = $value; } elseif ($line == "\n") { if (empty($query['request']) || $query['request'] != 'smtpd_access_policy') { - Horde::logMessage('Unrecognized request: ' . substr(var_export($query, true), 0, 200), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage('Unrecognized request: ' . substr(var_export($query, true), 0, 200), 'ERR'); exit(1); } - Horde::logMessage(var_export($query, true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(var_export($query, true), 'DEBUG'); $action = smtpd_access_policy($query); - Horde::logMessage("Action: $action", __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage("Action: $action", 'DEBUG'); echo "action=$action\n\n"; @ob_flush(); $query = array(); } else { - Horde::logMessage('Ignoring garbage: ' . substr($line, 0, 100), __FILE__, __LINE__, PEAR_LOG_INFO); + Horde::logMessage('Ignoring garbage: ' . substr($line, 0, 100), 'INFO'); } } diff --git a/koward/lib/Koward.php b/koward/lib/Koward.php index 5399d5903..dcb74c5e1 100644 --- a/koward/lib/Koward.php +++ b/koward/lib/Koward.php @@ -193,7 +193,7 @@ class Koward { } } } catch (Exception $e) { - Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($e, 'DEBUG'); } } return $global; diff --git a/koward/lib/Koward/Controller/Application.php b/koward/lib/Koward/Controller/Application.php index 09ab8c959..fb14d2480 100644 --- a/koward/lib/Koward/Controller/Application.php +++ b/koward/lib/Koward/Controller/Application.php @@ -98,8 +98,7 @@ class Koward_Controller_Application extends Horde_Controller_Base if (!$this->koward->hasAccess($id, $permission)) { $this->koward->notification->push(_("Access denied."), 'horde.error'); - Horde::logMessage(sprintf('User %s does not have access to action %s!', Horde_Auth::getAuth(), $id), - __FILE__, __LINE__, PEAR_LOG_NOTICE); + Horde::logMessage(sprintf('User %s does not have access to action %s!', Horde_Auth::getAuth(), $id), 'NOTICE'); if (Horde_Auth::getAuth()) { $url = $this->urlFor(array('controller' => 'index', 'action' => 'index')); } else { diff --git a/koward/lib/Koward/Controller/IndexController.php b/koward/lib/Koward/Controller/IndexController.php index 1b6488729..21bd5b694 100644 --- a/koward/lib/Koward/Controller/IndexController.php +++ b/koward/lib/Koward/Controller/IndexController.php @@ -25,7 +25,7 @@ class IndexController extends Koward_Controller_Application $this->title = _("Login"); - $this->post = $this->urlFor(array('controller' => 'index', + $this->post = $this->urlFor(array('controller' => 'index', 'action' => 'login')); if (isset($_POST['horde_user']) && isset($_POST['horde_pass'])) { @@ -36,7 +36,7 @@ class IndexController extends Koward_Controller_Application array('password' => Horde_Util::getPost('horde_pass')))) { $entry = sprintf('Login success for %s [%s] to Horde', Horde_Auth::getAuth(), $_SERVER['REMOTE_ADDR']); - Horde::logMessage($entry, __FILE__, __LINE__, PEAR_LOG_NOTICE); + Horde::logMessage($entry, 'NOTICE'); $type = $this->koward->getType(); if (!empty($type) && isset($this->koward->objects[$type]['default_view'])) { @@ -51,7 +51,7 @@ class IndexController extends Koward_Controller_Application } else { $entry = sprintf('FAILED LOGIN for %s [%s] to Horde', Horde_Util::getFormData('horde_user'), $_SERVER['REMOTE_ADDR']); - Horde::logMessage($entry, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($entry, 'ERR'); } } @@ -65,7 +65,7 @@ class IndexController extends Koward_Controller_Application { $entry = sprintf('User %s [%s] logged out of Horde', Horde_Auth::getAuth(), $_SERVER['REMOTE_ADDR']); - Horde::logMessage($entry, __FILE__, __LINE__, PEAR_LOG_NOTICE); + Horde::logMessage($entry, 'NOTICE'); Horde_Auth::clearAuth(); @session_destroy(); diff --git a/koward/www/horde/config/conf.php.dist b/koward/www/horde/config/conf.php.dist index c836e5b9b..63dbecc1a 100644 --- a/koward/www/horde/config/conf.php.dist +++ b/koward/www/horde/config/conf.php.dist @@ -23,7 +23,7 @@ $conf['imsp']['enabled'] = false; $conf['kolab']['enabled'] = true; $conf['kolab']['server']['driver'] = 'ldap'; $conf['kolab']['imap']['allow_special_users'] = true; -$conf['log']['priority'] = PEAR_LOG_DEBUG; +$conf['log']['priority'] = 'DEBUG'; $conf['log']['ident'] = 'HORDE'; $conf['log']['params'] = array(); $conf['log']['name'] = '/tmp/horde.log'; diff --git a/koward/www/htdocs/koward/koward.php b/koward/www/htdocs/koward/koward.php index 556a2ef3f..38f9ed6ff 100644 --- a/koward/www/htdocs/koward/koward.php +++ b/koward/www/htdocs/koward/koward.php @@ -18,7 +18,7 @@ try { } catch (Exception $e) { global $notification, $registry; - Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($e, 'DEBUG'); if (isset($notification)) { $notification->push($e->getMessage(), 'horde.error'); diff --git a/kronolith/fb.php b/kronolith/fb.php index 02ba217a9..666abd589 100644 --- a/kronolith/fb.php +++ b/kronolith/fb.php @@ -53,7 +53,7 @@ if (!$fb) { try { $fb = Kronolith_FreeBusy::generate(explode('|', $cal), null, null, false, $user); } catch (Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); exit; } $cache->set($key, $fb); diff --git a/kronolith/feed/index.php b/kronolith/feed/index.php index bb19492f7..fab022d5c 100644 --- a/kronolith/feed/index.php +++ b/kronolith/feed/index.php @@ -74,7 +74,7 @@ try { new Horde_Date($startDate), array($calendar)); } catch (Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); $events = array(); } diff --git a/kronolith/lib/Ajax/Imple/ContactAutoCompleter.php b/kronolith/lib/Ajax/Imple/ContactAutoCompleter.php index b0f2f5c52..bce74599d 100644 --- a/kronolith/lib/Ajax/Imple/ContactAutoCompleter.php +++ b/kronolith/lib/Ajax/Imple/ContactAutoCompleter.php @@ -98,7 +98,7 @@ class Kronolith_Ajax_Imple_ContactAutoCompleter extends Horde_Ajax_Imple_AutoCom try { $res = $GLOBALS['registry']->call('contacts/search', array($search, $src, $fields, true)); } catch (Horde_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); return array(); } diff --git a/kronolith/lib/Application.php b/kronolith/lib/Application.php index 7dba3212f..1a2fad094 100644 --- a/kronolith/lib/Application.php +++ b/kronolith/lib/Application.php @@ -331,17 +331,17 @@ class Kronolith_Application extends Horde_Registry_Application $result = $GLOBALS['kronolith_shares']->removeShare($share); if ($result instanceof PEAR_Error) { $hasError = true; - Horde::logMessage($result->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); } } catch (Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); } /* Get a list of all shares this user has perms to and remove the * perms */ $shares = $GLOBALS['kronolith_shares']->listShares($user); if ($shares instanceof PEAR_Error) { - Horde::logMessage($shares, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($shares, 'ERR'); } foreach ($shares as $share) { $share->removeUser($user); diff --git a/kronolith/lib/Driver/Holidays.php b/kronolith/lib/Driver/Holidays.php index 6d76557f4..82c18237a 100644 --- a/kronolith/lib/Driver/Holidays.php +++ b/kronolith/lib/Driver/Holidays.php @@ -43,8 +43,7 @@ class Kronolith_Driver_Holidays extends Kronolith_Driver $json = false, $coverDates = true) { if (!class_exists('Date_Holidays')) { - Horde::logMessage('Support for Date_Holidays has been enabled but the package seems to be missing.', - __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage('Support for Date_Holidays has been enabled but the package seems to be missing.', 'ERR'); return array(); } @@ -73,8 +72,7 @@ class Kronolith_Driver_Holidays extends Kronolith_Driver $dh = Date_Holidays::factory($this->calendar, $year, $this->_params['language']); if (Date_Holidays::isError($dh)) { Horde::logMessage(sprintf('Factory was unable to produce driver object for driver %s in year %s with locale %s', - $this->calendar, $year, $this->_params['language']), - __FILE__, __LINE__, PEAR_LOG_ERR); + $this->calendar, $year, $this->_params['language']), 'ERR'); continue; } $dh->addTranslation($this->_params['language']); @@ -105,8 +103,7 @@ class Kronolith_Driver_Holidays extends Kronolith_Driver $dh = Date_Holidays::factory($this->calendar, $year, $this->_params['language']); if (Date_Holidays::isError($dh)) { Horde::logMessage(sprintf('Factory was unable to produce driver object for driver %s in year %s with locale %s', - $this->calendar, $year, $this->_params['language']), - __FILE__, __LINE__, PEAR_LOG_ERR); + $this->calendar, $year, $this->_params['language']), 'ERR'); return false; } $dh->addTranslation($this->_params['language']); diff --git a/kronolith/lib/Driver/Ical.php b/kronolith/lib/Driver/Ical.php index 5c1b4a0b5..16d4f0f34 100644 --- a/kronolith/lib/Driver/Ical.php +++ b/kronolith/lib/Driver/Ical.php @@ -219,22 +219,20 @@ class Kronolith_Driver_Ical extends Kronolith_Driver try { $response = $http->get($url); } catch (Horde_Http_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_INFO); + Horde::logMessage($e, 'INFO'); $_SESSION['kronolith']['remote'][$signature] = $e->getMessage(); throw new Kronolith_Exception($e); } if ($response->code != 200) { Horde::logMessage(sprintf('Failed to retrieve remote calendar: url = "%s", status = %s', - $url, $response->code), - __FILE__, __LINE__, PEAR_LOG_INFO); + $url, $response->code), 'INFO'); $_SESSION['kronolith']['remote'][$signature] = sprintf(_("Could not open %s."), $url); throw new Kronolith_Exception($_SESSION['kronolith']['remote'][$signature], $response->code); } /* Log fetch at DEBUG level. */ Horde::logMessage(sprintf('Retrieved remote calendar for %s: url = "%s"', - Horde_Auth::getAuth(), $url), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde_Auth::getAuth(), $url), 'DEBUG'); $data = $response->getBody(); $_SESSION['kronolith']['remote'][$signature] = new Horde_iCalendar(); diff --git a/kronolith/lib/Driver/Kolab.php b/kronolith/lib/Driver/Kolab.php index df6a6ab2a..181dd38a6 100644 --- a/kronolith/lib/Driver/Kolab.php +++ b/kronolith/lib/Driver/Kolab.php @@ -209,7 +209,7 @@ class Kronolith_Driver_Kolab extends Kronolith_Driver { // Log error if someone uses this function in an unsupported way if ($calendar_id != $this->calendar) { - Horde::logMessage(sprintf("Kolab::exists called for calendar %s. Currently active is %s.", $calendar_id, $this->calendar), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage(sprintf("Kolab::exists called for calendar %s. Currently active is %s.", $calendar_id, $this->calendar), 'ERR'); throw new Kronolith_Exception(sprintf("Kolab::exists called for calendar %s. Currently active is %s.", $calendar_id, $this->calendar)); } diff --git a/kronolith/lib/Driver/Sql.php b/kronolith/lib/Driver/Sql.php index 21c543dff..3db4643c3 100644 --- a/kronolith/lib/Driver/Sql.php +++ b/kronolith/lib/Driver/Sql.php @@ -228,8 +228,7 @@ class Kronolith_Driver_Sql extends Kronolith_Driver /* Log the query at a DEBUG log level. */ Horde::logMessage(sprintf('Kronolith_Driver_Sql::exists(): user = "%s"; query = "%s"', - Horde_Auth::getAuth(), $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde_Auth::getAuth(), $query), 'DEBUG'); $event = $this->_db->getRow($query, $values, DB_FETCHMODE_ASSOC); $this->handleError($event); @@ -334,8 +333,7 @@ class Kronolith_Driver_Sql extends Kronolith_Driver /* Log the query at a DEBUG log level. */ Horde::logMessage(sprintf('Kronolith_Driver_Sql::_listEventsConditional(): user = "%s"; query = "%s"; values = "%s"', - Horde_Auth::getAuth(), $q, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde_Auth::getAuth(), $q, implode(',', $values)), 'DEBUG'); /* Run the query. */ $qr = $this->_db->query($q, $values); @@ -355,12 +353,11 @@ class Kronolith_Driver_Sql extends Kronolith_Driver /* Log the query at a DEBUG log level. */ Horde::logMessage(sprintf('Kronolith_Driver_Sql::_listEventsConditional(): user = %s; query = "%s"; values = "%s"', - Horde_Auth::getAuth(), $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde_Auth::getAuth(), $query, implode(',', $values)), 'DEBUG'); $result = $this->_write_db->query($query, $values); if ($result instanceof PEAR_Error) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); } } @@ -396,8 +393,7 @@ class Kronolith_Driver_Sql extends Kronolith_Driver $this->_params['table']); /* Log the query at a DEBUG log level. */ Horde::logMessage(sprintf('Kronolith_Driver_Sql::_countEvents(): user = "%s"; query = "%s"; values = "%s"', - Horde_Auth::getAuth(), $query, $this->calendar), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde_Auth::getAuth(), $query, $this->calendar), 'DEBUG'); /* Run the query. */ $result = $this->_db->getOne($query, array($this->calendar)); @@ -431,8 +427,7 @@ class Kronolith_Driver_Sql extends Kronolith_Driver /* Log the query at a DEBUG log level. */ Horde::logMessage(sprintf('Kronolith_Driver_Sql::getEvent(): user = "%s"; query = "%s"; values = "%s"', - Horde_Auth::getAuth(), $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde_Auth::getAuth(), $query, implode(',', $values)), 'DEBUG'); $event = $this->_db->getRow($query, $values, DB_FETCHMODE_ASSOC); $this->handleError($event); @@ -480,8 +475,7 @@ class Kronolith_Driver_Sql extends Kronolith_Driver /* Log the query at a DEBUG log level. */ Horde::logMessage(sprintf('Kronolith_Driver_Sql::getByUID(): user = "%s"; query = "%s"; values = "%s"', - Horde_Auth::getAuth(), $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde_Auth::getAuth(), $query, implode(',', $values)), 'DEBUG'); $events = $this->_db->getAll($query, $values, DB_FETCHMODE_ASSOC); $this->handleError($events); @@ -556,8 +550,7 @@ class Kronolith_Driver_Sql extends Kronolith_Driver /* Log the query at a DEBUG log level. */ Horde::logMessage(sprintf('Kronolith_Driver_Sql::saveEvent(): user = "%s"; query = "%s"; values = "%s"', - Horde_Auth::getAuth(), $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde_Auth::getAuth(), $query, implode(',', $values)), 'DEBUG'); $result = $this->_write_db->query($query, $values); $this->handleError($result); @@ -620,8 +613,7 @@ class Kronolith_Driver_Sql extends Kronolith_Driver /* Log the query at a DEBUG log level. */ Horde::logMessage(sprintf('Kronolith_Driver_Sql::saveEvent(): user = "%s"; query = "%s"; values = "%s"', - Horde_Auth::getAuth(), $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde_Auth::getAuth(), $query, implode(',', $values)), 'DEBUG'); $result = $this->_write_db->query($query, $values); $this->handleError($result); @@ -669,8 +661,7 @@ class Kronolith_Driver_Sql extends Kronolith_Driver /* Log the query at a DEBUG log level. */ Horde::logMessage(sprintf('Kronolith_Driver_Sql::move(): %s; values = "%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); /* Attempt the move query. */ $result = $this->_write_db->query($query, $values); @@ -693,8 +684,7 @@ class Kronolith_Driver_Sql extends Kronolith_Driver /* Log the query at a DEBUG log level. */ Horde::logMessage(sprintf('Kronolith_Driver_Sql::delete(): user = "%s"; query = "%s"; values = "%s"', - Horde_Auth::getAuth(), $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde_Auth::getAuth(), $query, implode(',', $values)), 'DEBUG'); $result = $this->_write_db->query($query, $values); $this->handleError($result); @@ -721,8 +711,7 @@ class Kronolith_Driver_Sql extends Kronolith_Driver /* Log the query at a DEBUG log level. */ Horde::logMessage(sprintf('Kronolith_Driver_Sql::deleteEvent(): user = "%s"; query = "%s"; values = "%s"', - Horde_Auth::getAuth(), $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde_Auth::getAuth(), $query, implode(',', $values)), 'DEBUG'); $result = $this->_write_db->query($query, $values); $this->handleError($result); @@ -784,8 +773,7 @@ class Kronolith_Driver_Sql extends Kronolith_Driver . 'AND event_uid IN (' . str_repeat('?,', count($uids) - 1) . '?)'; /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Kronolith_Driver_Sql::filterEventsByCalendar(): %s', $sql), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Kronolith_Driver_Sql::filterEventsByCalendar(): %s', $sql), 'DEBUG'); $result = $this->_db->getCol($sql, 0, array_merge($calendar, $uids)); $this->handleError($result); @@ -858,8 +846,7 @@ class Kronolith_Driver_Sql extends Kronolith_Driver /* Log the query at a DEBUG log level. */ Horde::logMessage(sprintf('Kronolith_Driver_Sql::_initConn(): user = "%s"; query = "%s"', - Horde_Auth::getAuth(), $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde_Auth::getAuth(), $query), 'DEBUG'); $db->query($query); break; @@ -869,8 +856,7 @@ class Kronolith_Driver_Sql extends Kronolith_Driver /* Log the query at a DEBUG log level. */ Horde::logMessage(sprintf('Kronolith_Driver_Sql::_initConn(): user = "%s"; query = "%s"', - Horde_Auth::getAuth(), $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde_Auth::getAuth(), $query), 'DEBUG'); $db->query($query); break; @@ -954,7 +940,7 @@ class Kronolith_Driver_Sql extends Kronolith_Driver protected function handleError($result) { if ($result instanceof PEAR_Error) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); throw new Kronolith_Exception($result); } } diff --git a/kronolith/lib/Geo/Mysql.php b/kronolith/lib/Geo/Mysql.php index 0d145d88c..db36c8a2c 100644 --- a/kronolith/lib/Geo/Mysql.php +++ b/kronolith/lib/Geo/Mysql.php @@ -29,7 +29,7 @@ class Kronolith_Geo_Mysql extends Kronolith_Geo_Sql $sql = 'SELECT COUNT(*) FROM kronolith_events_geo WHERE event_id = ?'; $count = $this->_db->getOne($sql, array($event_id)); if ($count instanceof PEAR_Error) { - Horde::logMessage($count, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($count, 'ERR'); throw new Horde_Exception($count); } @@ -50,7 +50,7 @@ class Kronolith_Geo_Mysql extends Kronolith_Geo_Sql } $result = $this->_write_db->query($sql, array($event_id)); if ($result instanceof PEAR_Error) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); throw new Horde_Exception($result); } @@ -68,7 +68,7 @@ class Kronolith_Geo_Mysql extends Kronolith_Geo_Sql $sql = 'SELECT x(event_coordinates) as lat, y(event_coordinates) as lon FROM kronolith_events_geo WHERE event_id = ?'; $result = $this->_db->getRow($sql, array($event_id), DB_FETCHMODE_ASSOC); if ($result instanceof PEAR_Error) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); throw new Horde_Exception($result); } return $result; @@ -103,7 +103,7 @@ class Kronolith_Geo_Mysql extends Kronolith_Geo_Sql $results = $this->_db->getAssoc($sql, false, $params, DB_FETCHMODE_ASSOC); if ($results instanceof PEAR_Error) { - Horde::logMessage($results, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($results, 'ERR'); throw new Horde_Exception($results); } diff --git a/kronolith/lib/Geo/Sql.php b/kronolith/lib/Geo/Sql.php index 4db7031db..0ee67ffde 100644 --- a/kronolith/lib/Geo/Sql.php +++ b/kronolith/lib/Geo/Sql.php @@ -89,7 +89,7 @@ class Kronolith_Geo_Sql extends Kronolith_Geo $sql = 'SELECT COUNT(*) FROM kronolith_events_geo WHERE event_id = ?'; $count = $this->_db->getOne($sql, array($event_id)); if ($count instanceof PEAR_Error) { - Horde::logMessage($count, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($count, 'ERR'); throw new Horde_Exception($count); } @@ -113,7 +113,7 @@ class Kronolith_Geo_Sql extends Kronolith_Geo } $result = $this->_write_db->query($sql, $params); if ($result instanceof PEAR_Error) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); throw new Horde_Exception($result); } @@ -131,7 +131,7 @@ class Kronolith_Geo_Sql extends Kronolith_Geo $sql = 'SELECT event_lat as lat, event_lon as lon FROM kronolith_events_geo WHERE event_id = ?'; $result = $this->_db->getRow($sql, array($event_id), DB_FETCHMODE_ASSOC); if ($result instanceof PEAR_Error) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); throw new Horde_Exception($result); } @@ -152,7 +152,7 @@ class Kronolith_Geo_Sql extends Kronolith_Geo $sql = 'DELETE FROM kronolith_events_geo WHERE event_id = ?'; $result = $this->_write_db->query($sql, array($event_id)); if ($result instanceof PEAR_Error) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); throw new Horde_Exception($result); } } @@ -174,4 +174,4 @@ class Kronolith_Geo_Sql extends Kronolith_Geo { throw new Horde_Exception(_("Searching requires a GIS enabled database.")); } -} \ No newline at end of file +} diff --git a/kronolith/lib/Kronolith.php b/kronolith/lib/Kronolith.php index 0e7c61e9a..26acfa537 100644 --- a/kronolith/lib/Kronolith.php +++ b/kronolith/lib/Kronolith.php @@ -1025,7 +1025,7 @@ class Kronolith try { $categories = $GLOBALS['registry']->call($api . '/listTimeObjectCategories'); } catch (Horde_Exception $e) { - Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($e, 'DEBUG'); continue; } @@ -1368,7 +1368,7 @@ class Kronolith $calendars = $GLOBALS['kronolith_shares']->listShares(Horde_Auth::getAuth(), $permission, $owneronly ? Horde_Auth::getAuth() : null, 0, 0, 'name'); if ($calendars instanceof PEAR_Error) { - Horde::logMessage($calendars, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($calendars, 'ERR'); return array(); } @@ -2111,7 +2111,7 @@ class Kronolith } $group_users = $group->listAllUsers(); if ($group_users instanceof PEAR_Error) { - Horde::logMessage($group_users, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($group_users, 'ERR'); continue; } foreach ($group_users as $user) { @@ -2178,7 +2178,7 @@ class Kronolith 'charset' => Horde_Nls::getCharset())); $mime_mail->addHeader('User-Agent', 'Kronolith ' . $GLOBALS['registry']->getVersion()); $mime_mail->setBody($message, Horde_Nls::getCharset(), true); - Horde::logMessage(sprintf('Sending event notifications for %s to %s', $event->title, implode(', ', $df_recipients)), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Sending event notifications for %s to %s', $event->title, implode(', ', $df_recipients)), 'DEBUG'); $mime_mail->send(Horde::getMailerConfig(), false, false); } } @@ -2685,7 +2685,7 @@ class Kronolith try { return Kronolith_Geo::factory($GLOBALS['conf']['maps']['geodriver']); } catch (Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); } } return false; diff --git a/kronolith/lib/LoginTasks/Task/PurgeEvents.php b/kronolith/lib/LoginTasks/Task/PurgeEvents.php index e1bdc0cd6..fd9b75585 100644 --- a/kronolith/lib/LoginTasks/Task/PurgeEvents.php +++ b/kronolith/lib/LoginTasks/Task/PurgeEvents.php @@ -65,7 +65,7 @@ class Kronolith_LoginTasks_Task_PurgeEvents extends Horde_LoginTasks_Task $kronolith_driver->deleteEvent($event->id, true); ++$count; } catch (Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); throw $e; } } diff --git a/kronolith/lib/Storage/sql.php b/kronolith/lib/Storage/sql.php index 94ca8d963..017dc9411 100644 --- a/kronolith/lib/Storage/sql.php +++ b/kronolith/lib/Storage/sql.php @@ -125,8 +125,7 @@ class Kronolith_Storage_sql extends Kronolith_Storage /* Log the query at debug level. */ Horde::logMessage(sprintf('SQL search by %s: query = "%s"', - Horde_Auth::getAuth(), $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde_Auth::getAuth(), $query), 'DEBUG'); /* Execute the query. */ $result = $this->_db->query($query, $values); @@ -161,8 +160,7 @@ class Kronolith_Storage_sql extends Kronolith_Storage /* Log the query at debug level. */ Horde::logMessage(sprintf('SQL insert by %s: query = "%s"', - Horde_Auth::getAuth(), $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde_Auth::getAuth(), $query), 'DEBUG'); /* Execute the query. */ $result = $this->_write_db->query($query, $values); @@ -180,7 +178,7 @@ class Kronolith_Storage_sql extends Kronolith_Storage protected function handleError($result) { if ($result instanceof PEAR_Error) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); throw new Kronolith_Exception($result); } } diff --git a/kronolith/perms.php b/kronolith/perms.php index a7dd8ac2c..3a3289b54 100644 --- a/kronolith/perms.php +++ b/kronolith/perms.php @@ -87,7 +87,7 @@ if ($auth->hasCapability('list') && try { $userList = $auth->listUsers(); } catch (Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); $userList = array(); } sort($userList); @@ -101,7 +101,7 @@ if (!empty($conf['share']['any_group'])) { $groupList = $groups->getGroupMemberships(Horde_Auth::getAuth(), true); } if ($groupList instanceof PEAR_Error) { - Horde::logMessage($groupList, __FILE__, __LINE__, PEAR_LOG_NOTICE); + Horde::logMessage($groupList, 'NOTICE'); $groupList = array(); } asort($groupList); diff --git a/kronolith/scripts/agenda.php b/kronolith/scripts/agenda.php index 2dfd053f6..2938dd979 100755 --- a/kronolith/scripts/agenda.php +++ b/kronolith/scripts/agenda.php @@ -155,8 +155,7 @@ function send_agendas() try { $mime_mail->addRecipients($email); } catch (Horde_Mime_Exception $e) {} - Horde::logMessage(sprintf('Sending daily agenda to %s', $email), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Sending daily agenda to %s', $email), 'DEBUG'); try { $mime_mail->send(Horde::getMailerConfig(), false, false); } catch (Horde_Mime_Exception $e) {} diff --git a/nag/lib/Application.php b/nag/lib/Application.php index cceefa3d3..50e015d53 100644 --- a/nag/lib/Application.php +++ b/nag/lib/Application.php @@ -156,14 +156,14 @@ class Nag_Application extends Horde_Registry_Application /* Get the share for later deletion */ $share = $GLOBALS['nag_shares']->getShare($user); if(is_a($share, 'PEAR_Error')) { - Horde::logMessage($share->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($share, 'ERR'); unset($share); } else { /* Get the list of all tasks */ $tasks = Nag::listTasks(null, null, null, $user, 1); if (is_a($tasks, 'PEAR_Error')) { $hasError = true; - Horde::logMessage($share->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($share, 'ERR'); } else { $uids = array(); $tasks->reset(); @@ -187,7 +187,7 @@ class Nag_Application extends Horde_Registry_Application $result = $GLOBALS['nag_shares']->removeShare($share); if (is_a($result, 'PEAR_Error')) { $hasError = true; - Horde::logMessage($result->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); } } @@ -195,7 +195,7 @@ class Nag_Application extends Horde_Registry_Application $shares = $GLOBALS['nag_shares']->listShares($user); if (is_a($shares, 'PEAR_Error')) { $hasError = true; - Horde::logMessage($shares, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($shares, 'ERR'); } foreach ($shares as $share) { $share->removeUser($user); diff --git a/nag/lib/Driver.php b/nag/lib/Driver.php index dd4c97cb1..44e78c564 100644 --- a/nag/lib/Driver.php +++ b/nag/lib/Driver.php @@ -237,7 +237,7 @@ class Nag_Driver /* Notify users about the new event. */ $result = Nag::sendNotification('add', $task); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); } /* Add an alarm if necessary. */ @@ -373,7 +373,7 @@ class Nag_Driver /* Notify users about the changed event. */ $result = Nag::sendNotification('edit', $new_task, $task); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); } return true; @@ -403,7 +403,7 @@ class Nag_Driver /* Notify users about the deleted event. */ $result = Nag::sendNotification('delete', $task); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); } /* Delete alarm if necessary. */ diff --git a/nag/lib/Driver/Sql.php b/nag/lib/Driver/Sql.php index 63a8bcdd0..2fd9c211b 100644 --- a/nag/lib/Driver/Sql.php +++ b/nag/lib/Driver/Sql.php @@ -79,8 +79,7 @@ class Nag_Driver_Sql extends Nag_Driver { $values = array($this->_tasklist, $taskId); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Nag_Driver_Sql::get(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Nag_Driver_Sql::get(): %s', $query), 'DEBUG'); /* Execute the query. */ $result = $this->_db->query($query, $values); @@ -116,8 +115,7 @@ class Nag_Driver_Sql extends Nag_Driver { $values = array($uid); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Nag_Driver_Sql::getByUID(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Nag_Driver_Sql::getByUID(): %s', $query), 'DEBUG'); /* Execute the query. */ $result = $this->_db->query($query, $values); @@ -195,15 +193,14 @@ class Nag_Driver_Sql extends Nag_Driver { $parent); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Nag_Driver_Sql::_add(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Nag_Driver_Sql::_add(): %s', $query), 'DEBUG'); /* Attempt the insertion query. */ $result = $this->_write_db->query($query, $values); /* Return an error immediately if the query failed. */ if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -274,13 +271,12 @@ class Nag_Driver_Sql extends Nag_Driver { $taskId); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Nag_Driver_Sql::modify(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Nag_Driver_Sql::modify(): %s', $query), 'DEBUG'); /* Attempt the update query. */ $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -300,13 +296,12 @@ class Nag_Driver_Sql extends Nag_Driver { $values = array($newTasklist, $this->_tasklist, $taskId); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Nag_Driver_Sql::move(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Nag_Driver_Sql::move(): %s', $query), 'DEBUG'); /* Attempt the move query. */ $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -328,14 +323,13 @@ class Nag_Driver_Sql extends Nag_Driver { $values = array($this->_tasklist, $taskId); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Nag_Driver_Sql::delete(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Nag_Driver_Sql::delete(): %s', $query), 'DEBUG'); /* Attempt the delete query. */ $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -354,8 +348,7 @@ class Nag_Driver_Sql extends Nag_Driver { $values = array($this->_tasklist); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Nag_Driver_Sql::deleteAll(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Nag_Driver_Sql::deleteAll(): %s', $query), 'DEBUG'); /* Attempt the delete query. */ $result = $this->_write_db->query($query, $values); @@ -397,8 +390,7 @@ class Nag_Driver_Sql extends Nag_Driver { } /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Nag_Driver_Sql::retrieve(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Nag_Driver_Sql::retrieve(): %s', $query), 'DEBUG'); /* Execute the query. */ $result = $this->_db->query($query, $values); @@ -461,8 +453,7 @@ class Nag_Driver_Sql extends Nag_Driver { $values = array($this->_tasklist, $parentId); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Nag_Driver_Sql::getChildren(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Nag_Driver_Sql::getChildren(): %s', $query), 'DEBUG'); /* Execute the query. */ $result = $this->_db->query($query, $values); @@ -513,8 +504,7 @@ class Nag_Driver_Sql extends Nag_Driver { /* Log the query at a DEBUG log level. */ Horde::logMessage(sprintf('SQL alarms list by %s: table = %s; query = "%s"', - Horde_Auth::getAuth(), $this->_params['table'], $q), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde_Auth::getAuth(), $this->_params['table'], $q), 'DEBUG'); /* Run the query. */ $result = $this->_db->query($q, $values); @@ -546,8 +536,7 @@ class Nag_Driver_Sql extends Nag_Driver { $values = array($row['task_uid'], $row['task_owner'], $row['task_id']); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Nag_Driver_Sql adding missing UID: %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Nag_Driver_Sql adding missing UID: %s', $query), 'DEBUG'); $this->_write_db->query($query, $values); } diff --git a/nag/lib/Nag.php b/nag/lib/Nag.php index 470f9e0dd..d24ce7cdd 100644 --- a/nag/lib/Nag.php +++ b/nag/lib/Nag.php @@ -195,7 +195,7 @@ class Nag if (!empty($types['taskHash'])) { $newtasks = $registry->callByPackage($app, 'listAs', array('taskHash')); if (is_a($newtasks, 'PEAR_Error')) { - Horde::logMessage($newtasks, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($newtasks, 'ERR'); } else { foreach ($newtasks as $task) { $task['tasklist_id'] = '**EXTERNAL**'; @@ -370,7 +370,7 @@ class Nag } $tasklists = $GLOBALS['nag_shares']->listShares(Horde_Auth::getAuth(), $permission, $owneronly ? Horde_Auth::getAuth() : null, 0, 0, 'name'); if (is_a($tasklists, 'PEAR_Error')) { - Horde::logMessage($tasklists, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($tasklists, 'ERR'); return array(); } @@ -779,7 +779,7 @@ class Nag $now = time(); $alarmList = Nag::listAlarms($now); if (is_a($alarmList, 'PEAR_Error')) { - Horde::logMessage($alarmList, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($alarmList, 'ERR'); $notification->push($alarmList, 'horde.error'); } else { $messages = array(); @@ -858,7 +858,7 @@ class Nag } $group_users = $group->listAllUsers(); if (is_a($group_users, 'PEAR_Error')) { - Horde::logMessage($group_users, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($group_users, 'ERR'); continue; } foreach ($group_users as $user) { @@ -1035,8 +1035,7 @@ class Nag $mail->addRecipients($df_recipients); Horde::logMessage(sprintf('Sending event notifications for %s to %s', - $task->name, implode(', ', $df_recipients)), - __FILE__, __LINE__, PEAR_LOG_INFO); + $task->name, implode(', ', $df_recipients)), 'INFO'); $sent = $mail->send(Horde::getMailerConfig()); if (is_a($sent, 'PEAR_Error')) { return $sent; diff --git a/news/lib/Categories.php b/news/lib/Categories.php index d04a50fdd..799a18bf4 100644 --- a/news/lib/Categories.php +++ b/news/lib/Categories.php @@ -350,7 +350,7 @@ class News_Categories { { $new_id = $this->_write_db->nextId('news_categories'); if ($new_id instanceof PEAR_Error) { - Horde::logMessage($new_id, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($new_id, 'ERR'); return $new_id; } @@ -360,7 +360,7 @@ class News_Categories { $category = $this->_write_db->query($sql, $values); if ($category instanceof PEAR_Error) { - Horde::logMessage($category, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($category, 'ERR'); return $category; } @@ -373,7 +373,7 @@ class News_Categories { $data['category_description_' . $lang]); $result = $this->_write_db->query($sql, $values); if ($result instanceof PEAR_Error) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } } @@ -398,7 +398,7 @@ class News_Categories { $category = $this->_write_db->query($sql, $values); if ($category instanceof PEAR_Error) { - Horde::logMessage($category, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($category, 'ERR'); return $category; } diff --git a/news/lib/Driver/sql.php b/news/lib/Driver/sql.php index 935d6e440..4d0de1a13 100644 --- a/news/lib/Driver/sql.php +++ b/news/lib/Driver/sql.php @@ -337,7 +337,7 @@ class News_Driver_sql extends News_Driver { $source = $this->write_db->query($sql, $values); if ($source instanceof PEAR_Error) { - Horde::logMessage($source, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($source, 'ERR'); return $source; } @@ -363,7 +363,7 @@ class News_Driver_sql extends News_Driver { $source = $this->write_db->query($sql, $values); if ($source instanceof PEAR_Error) { - Horde::logMessage($source, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($source, 'ERR'); return $source; } } diff --git a/news/pdf.php b/news/pdf.php index 5244e08cb..6a200759d 100644 --- a/news/pdf.php +++ b/news/pdf.php @@ -45,7 +45,7 @@ if ($row['picture']) { try { $pdf->image($file, 120, 20); } catch (Horde_Pdf_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_INFO); + Horde::logMessage($e, 'INFO'); } } diff --git a/operator/lib/Driver/asterisksql.php b/operator/lib/Driver/asterisksql.php index 667b7cb91..55dbb417a 100644 --- a/operator/lib/Driver/asterisksql.php +++ b/operator/lib/Driver/asterisksql.php @@ -90,11 +90,11 @@ class Operator_Driver_asterisksql extends Operator_Driver { $values = array(); if (!is_numeric($rowstart)) { - Horde::logMessage('Invalid start row requested.', __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage('Invalid start row requested.', 'ERR'); throw new Operator_Exception(_("Internal error. Details have been logged for the administrator.")); } if (!is_null($rowlimit) && !is_numeric($rowlimit)) { - Horde::logMessage('Invalid row limit requested.', __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage('Invalid row limit requested.', 'ERR'); throw new Operator_Exception(_("Internal error. Details have been logged for the administrator.")); } @@ -125,7 +125,7 @@ class Operator_Driver_asterisksql extends Operator_Driver { $filterstring = implode(' AND ', $filter); $sql = sprintf($sql, $filterstring); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Operator_Driver_asterisksql::getData(): %s', $sql), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Operator_Driver_asterisksql::getData(): %s', $sql), 'DEBUG'); /* Execute the query. */ if (is_null($rowlimit)) { @@ -134,7 +134,7 @@ class Operator_Driver_asterisksql extends Operator_Driver { $res = $this->_db->limitQuery($sql, $rowstart, $rowlimit, $values); } if (is_a($res, 'PEAR_Error')) { - Horde::logMessage($res, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($res, 'ERR'); throw new Operator_Exception(_("Internal error. Details have been logged for the administrator.")); } @@ -148,12 +148,12 @@ class Operator_Driver_asterisksql extends Operator_Driver { 'SUM(CASE disposition WHEN "FAILED" THEN 1 ELSE 0 END) AS ' . 'failed FROM ' . $this->_params['table'] . ' WHERE %s'; $sql = sprintf($sql, $filterstring); - Horde::logMessage(sprintf('Operator_Driver_asterisksql::getData(): %s', $sql), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Operator_Driver_asterisksql::getData(): %s', $sql), 'DEBUG'); /* Execute the query. */ $res = $this->_db->getRow($sql, $values, DB_FETCHMODE_ASSOC); if (is_a($res, 'PEAR_Error')) { - Horde::logMessage($res, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($res, 'ERR'); throw new Operator_Exception(_("Internal error. Details have been logged for the administrator.")); } @@ -181,7 +181,7 @@ class Operator_Driver_asterisksql extends Operator_Driver { $dcontext = null) { if (!is_a($start, 'Horde_Date') || !is_a($end, 'Horde_Date')) { - Horde::logMessage('Start ane end date must be Horde_Date objects.', __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage('Start ane end date must be Horde_Date objects.', 'ERR'); throw new Operator_Exception(_("Internal error. Details have been logged for the administrator.")); } @@ -241,27 +241,27 @@ class Operator_Driver_asterisksql extends Operator_Driver { /* Log the query at a DEBUG log level. */ $sql = sprintf($numcalls_query, $filterstring); - Horde::logMessage(sprintf('Operator_Driver_asterisksql::getCallStats(): Values: %s', print_r($values, true)), __FILE__, __LINE__, PEAR_LOG_DEBUG); - Horde::logMessage(sprintf('Operator_Driver_asterisksql::getCallStats(): %s', $sql), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Operator_Driver_asterisksql::getCallStats(): Values: %s', print_r($values, true)), 'DEBUG'); + Horde::logMessage(sprintf('Operator_Driver_asterisksql::getCallStats(): %s', $sql), 'DEBUG'); $numcalls_res = $this->_db->getAll($sql, $values, DB_FETCHMODE_ASSOC); if (is_a($numcalls_res, 'PEAR_Error')) { - Horde::logMessage($numcalls_res, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($numcalls_res, 'ERR'); throw new Operator_Exception(_("Internal error. Details have been logged for the administrator.")); } $sql = sprintf($minutes_query, $filterstring); - Horde::logMessage(sprintf('Operator_Driver_asterisksql::getCallStats(): %s', $sql), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Operator_Driver_asterisksql::getCallStats(): %s', $sql), 'DEBUG'); $minutes_res = $this->_db->getAll($sql, $values, DB_FETCHMODE_ASSOC); if (is_a($minutes_res, 'PEAR_Error')) { - Horde::logMessage($minutes_res, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($minutes_res, 'ERR'); throw new Operator_Exception(_("Internal error. Details have been logged for the administrator.")); } $sql = sprintf($failed_query, $filterstring); - Horde::logMessage(sprintf('Operator_Driver_asterisksql::getCallStats(): %s', $sql), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Operator_Driver_asterisksql::getCallStats(): %s', $sql), 'DEBUG'); $failed_res = $this->_db->getAll($sql, $values, DB_FETCHMODE_ASSOC); if (is_a($failed_res, 'PEAR_Error')) { - Horde::logMessage($failed_res, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($failed_res, 'ERR'); throw new Operator_Exception(_("Internal error. Details have been logged for the administrator.")); } @@ -332,10 +332,10 @@ class Operator_Driver_asterisksql extends Operator_Driver { $sql = 'SELECT DISTINCT(accountcode) FROM ' . $this->_params['table'] . ' ORDER BY accountcode'; - Horde::logMessage(sprintf('Operator_Driver_asterisksql::getAccountCodes(): %s', $sql), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Operator_Driver_asterisksql::getAccountCodes(): %s', $sql), 'DEBUG'); $res = $this->_db->getCol($sql, 'accountcode'); if (is_a($res, 'PEAR_Error')) { - Horde::logMessage($res, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($res, 'ERR'); throw new Operator_Exception(_("Internal error. Details have been logged for the administrator.")); } diff --git a/operator/viewgraph.php b/operator/viewgraph.php index ab93a6a4e..39ec3086b 100644 --- a/operator/viewgraph.php +++ b/operator/viewgraph.php @@ -49,7 +49,7 @@ if ($form->isSubmitted() && $form->validate($vars, true)) { $res = $cache->set($cachekey, serialize($stats), 600); if ($res === false) { - Horde::logMessage('The cache system has experienced an error. Unable to continue.', __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage('The cache system has experienced an error. Unable to continue.', 'ERR'); $notification->push(_("Internal error. Details have been logged for the administrator.")); $stats = array(); } diff --git a/shout/lib/Ajax/Application.php b/shout/lib/Ajax/Application.php index 83f20d583..9fe31afe0 100644 --- a/shout/lib/Ajax/Application.php +++ b/shout/lib/Ajax/Application.php @@ -42,7 +42,7 @@ class Shout_Ajax_Application extends Horde_Ajax_Application_Base return $shout->extensions->getExtensions($account); } 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, 'ERR'); return false; } } @@ -63,7 +63,7 @@ class Shout_Ajax_Application extends Horde_Ajax_Application_Base return $shout->extensions->getExtensions($account); } 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, 'ERR'); return false; } } @@ -80,7 +80,7 @@ class Shout_Ajax_Application extends Horde_Ajax_Application_Base return $shout->extensions->getExtensions($account); } 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, 'ERR'); return false; } } @@ -97,7 +97,7 @@ class Shout_Ajax_Application extends Horde_Ajax_Application_Base $menus = $shout->storage->getMenus($account); $menu = $vars->menu; if (!isset($menus[$menu])) { - Horde::logMessage("User requested a menu that does not exist.", __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage("User requested a menu that does not exist.", 'ERR'); //$GLOBALS['notification']->push(_("That menu does not exist."), 'horde.error'); // FIXME notifications return false; @@ -109,7 +109,7 @@ class Shout_Ajax_Application extends Horde_Ajax_Application_Base } catch (Exception $e) { //FIXME: Create a way to notify the user of the failure. die(var_dump($e)); - Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); return false; } } @@ -127,7 +127,7 @@ class Shout_Ajax_Application extends Horde_Ajax_Application_Base return $actions; } 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, 'ERR'); return false; } } @@ -168,7 +168,7 @@ class Shout_Ajax_Application extends Horde_Ajax_Application_Base } 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, 'ERR'); return false; } } @@ -196,7 +196,7 @@ class Shout_Ajax_Application extends Horde_Ajax_Application_Base $shout->dialplan->saveMenuAction($account, $menu, $digit, $action, $args); } 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, 'ERR'); return false; } } diff --git a/shout/lib/Driver/Ldap.php b/shout/lib/Driver/Ldap.php index c70a16446..5d85ca41b 100644 --- a/shout/lib/Driver/Ldap.php +++ b/shout/lib/Driver/Ldap.php @@ -173,7 +173,7 @@ class Shout_Driver_Ldap extends Shout_Driver if ($res === false) { $msg = sprintf('Error while modifying the LDAP entry. Code %s; Message "%s"', ldap_errno($this->_LDAP), ldap_error($this->_LDAP)); - Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($msg, 'ERR'); throw new Shout_Exception(_("Internal error modifing the directory. Details have been logged for the administrator.")); } @@ -201,7 +201,7 @@ class Shout_Driver_Ldap extends Shout_Driver if ($res === false) { $msg = sprintf('Error while searching LDAP. Code %s; Message "%s"', ldap_errno($this->_LDAP), ldap_error($this->_LDAP)); - Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($msg, 'ERR'); throw new Shout_Exception(_("Internal error searching the directory.")); } @@ -210,14 +210,14 @@ class Shout_Driver_Ldap extends Shout_Driver if ($res === false) { $msg = sprintf('Error while searching LDAP. Code %s; Message "%s"', ldap_errno($this->_LDAP), ldap_error($this->_LDAP)); - Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($msg, 'ERR'); throw new Shout_Exception(_("Internal error searching the directory.")); } if ($res['count'] != 1) { $msg = sprintf('Error while searching LDAP. Code %s; Message "%s"', ldap_errno($this->_LDAP), ldap_error($this->_LDAP)); - Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($msg, 'ERR'); throw new Shout_Exception(_("Wrong number of entries found for this search.")); } @@ -234,7 +234,7 @@ class Shout_Driver_Ldap extends Shout_Driver if ($res === false) { $msg = sprintf('Error while modifying the LDAP entry. Code %s; Message "%s"', ldap_errno($this->_LDAP), ldap_error($this->_LDAP)); - Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($msg, 'ERR'); throw new Shout_Exception(_("Internal error modifing the directory. Details have been logged for the administrator.")); } @@ -291,7 +291,7 @@ class Shout_Driver_Ldap extends Shout_Driver // if ($res === false) { // $msg = sprintf('LDAP Error (%s): %s', ldap_errno($this->_LDAP), // ldap_error($this->_LDAP)); -// Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_ERR); +// Horde::logMessage($msg, 'ERR'); // throw new Shout_Exception(_("Error while searching the directory. Details have been logged for the administrator.")); // } // if (($res['count'] != 1) || @@ -328,7 +328,7 @@ class Shout_Driver_Ldap extends Shout_Driver if ($res === false) { $msg = sprintf('LDAP Error (%s): %s', ldap_errno($this->_LDAP), ldap_error($this->_LDAP)); - Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($msg, 'ERR'); throw new Shout_Exception(_("Error while modifying the directory. Details have been logged for the administrator.")); } } @@ -340,7 +340,7 @@ class Shout_Driver_Ldap extends Shout_Driver if ($res === false) { $msg = sprintf('LDAP Error (%s): %s', ldap_errno($this->_LDAP), ldap_error($this->_LDAP)); - Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($msg, 'ERR'); throw new Shout_Exception(_("Error while modifying the directory. Details have been logged for the administrator.")); } @@ -351,7 +351,7 @@ class Shout_Driver_Ldap extends Shout_Driver if ($res === false) { $msg = sprintf('LDAP Error (%s): %s', ldap_errno($this->_LDAP), ldap_error($this->_LDAP)); - Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($msg, 'ERR'); throw new Shout_Exception(_("Error while modifying the directory. Details have been logged for the administrator.")); } return true; @@ -380,7 +380,7 @@ class Shout_Driver_Ldap extends Shout_Driver if ($res === false) { $msg = sprintf('LDAP Error (%s): %s', ldap_errno($this->_LDAP), ldap_error($this->_LDAP)); - Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($msg, 'ERR'); throw new Horde_Exception(_("Error while deleting from the directory. Details have been logged for the administrator.")); } @@ -404,7 +404,7 @@ class Shout_Driver_Ldap extends Shout_Driver if ($res === false) { $msg = sprintf('LDAP Error (%s): %s', ldap_errno($this->_LDAP), ldap_error($this->_LDAP)); - Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($msg, 'ERR'); throw new Shout_Exception(_("Error while searching the directory. Details have been logged for the administrator.")); } @@ -416,7 +416,7 @@ class Shout_Driver_Ldap extends Shout_Driver if ($res === false) { $msg = sprintf('LDAP Error (%s): %s', ldap_errno($this->_LDAP), ldap_error($this->_LDAP)); - Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($msg, 'ERR'); throw new Shout_Exception(_("Error while searching the directory. Details have been logged for the administrator.")); } @@ -424,7 +424,7 @@ class Shout_Driver_Ldap extends Shout_Driver if ($dn === false) { $msg = sprintf('LDAP Error (%s): %s', ldap_errno($this->_LDAP), ldap_error($this->_LDAP)); - Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($msg, 'ERR'); throw new Shout_Exception(_("Internal LDAP error. Details have been logged for the administrator.")); } @@ -456,8 +456,7 @@ class Shout_Driver_Ldap extends Shout_Driver if (!$conn) { Horde::logMessage( sprintf('Failed to open an LDAP connection to %s.', - $this->_params['hostspec']), - __FILE__, __LINE__, PEAR_LOG_ERR); + $this->_params['hostspec']), 'ERR'); throw new Shout_Exception('Internal LDAP error. Details have been logged for the administrator.'); } @@ -470,8 +469,7 @@ class Shout_Driver_Ldap extends Shout_Driver sprintf('Set LDAP protocol version to %d failed: [%d] %s', $this->_params['version'], ldap_errno($conn), - ldap_error($conn)), - __FILE__, __LINE__, PEAR_LOG_WARNING); + ldap_error($conn)), 'WARN'); throw new Shout_Exception('Internal LDAP error. Details have been logged for the administrator.', ldap_errno($conn)); } } @@ -482,8 +480,7 @@ class Shout_Driver_Ldap extends Shout_Driver Horde::logMessage( sprintf('STARTTLS failed: [%d] %s', @ldap_errno($this->_ds), - @ldap_error($this->_ds)), - __FILE__, __LINE__, PEAR_LOG_ERR); + @ldap_error($this->_ds)), 'ERR'); } } @@ -499,8 +496,7 @@ class Shout_Driver_Ldap extends Shout_Driver $this->_params['port'], $this->_params['searchdn'], @ldap_errno($conn), - @ldap_error($conn)), - __FILE__, __LINE__, PEAR_LOG_ERR); + @ldap_error($conn)), 'ERR'); throw new Shout_Exception('Internal LDAP error. Details have been logged for the administrator.', ldap_errno($conn)); } } diff --git a/shout/lib/Driver/Sql.php b/shout/lib/Driver/Sql.php index d44a984e9..c683e9098 100644 --- a/shout/lib/Driver/Sql.php +++ b/shout/lib/Driver/Sql.php @@ -52,7 +52,7 @@ class Shout_Driver_Sql extends Shout_Driver $vars = array(); $msg = 'SQL query in Shout_Driver_Sql#getAccounts(): ' . $sql; - Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($msg, 'DEBUG'); $result = $this->_db->query($sql, $vars); if ($result instanceof PEAR_Error) { throw new Shout_Exception($result); @@ -84,7 +84,7 @@ class Shout_Driver_Sql extends Shout_Driver $values = array($account); $msg = 'SQL query in Shout_Driver_Sql#getMenus(): ' . $sql; - Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($msg, 'DEBUG'); $result = $this->_db->query($sql, $values); if ($result instanceof PEAR_Error) { throw new Shout_Exception($result); @@ -131,7 +131,7 @@ class Shout_Driver_Sql extends Shout_Driver } $msg = 'SQL query in Shout_Driver_Sql#saveMenu(): ' . $sql; - Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($msg, 'DEBUG'); $result = $this->_write_db->query($sql, $values); if ($result instanceof PEAR_Error) { throw new Shout_Exception($result); @@ -148,7 +148,7 @@ class Shout_Driver_Sql extends Shout_Driver } $sql = "SELECT accounts.code AS account, menus.name AS description, " . - "actions.name AS action, menu_entries.digit AS digit, " . + "actions.name AS action, menu_entries.digit AS digit, " . "menu_entries.args AS args FROM menu_entries " . "INNER JOIN menus ON menu_entries.menu_id = menus.id " . "INNER JOIN actions ON menu_entries.action_id = actions.id " . @@ -157,7 +157,7 @@ class Shout_Driver_Sql extends Shout_Driver $values = array($account, $menu); $msg = 'SQL query in Shout_Driver_Sql#getMenuActions(): ' . $sql; - Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($msg, 'DEBUG'); $result = $this->_db->query($sql, $values); if ($result instanceof PEAR_Error) { throw new Shout_Exception($result); @@ -188,7 +188,7 @@ class Shout_Driver_Sql extends Shout_Driver $sql = 'DELETE FROM menu_entries WHERE digit = ?'; $values = array($digit); $msg = 'SQL query in Shout_Driver_Sql#saveMenuAction(): ' . $sql; - Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($msg, 'DEBUG'); $result = $this->_write_db->query($sql, $values); if ($result instanceof PEAR_Error) { throw new Shout_Exception($result); @@ -200,9 +200,9 @@ class Shout_Driver_Sql extends Shout_Driver '(SELECT id FROM actions WHERE name = ?), ?)'; $yamlargs = Horde_Yaml::dump($args); $values = array($account, $menu, $digit, $action, $yamlargs); - Horde::logMessage("Data: ".print_r($values, true), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage("Data: ".print_r($values, true), 'ERR'); $msg = 'SQL query in Shout_Driver_Sql#saveMenuAction(): ' . $sql; - Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($msg, 'DEBUG'); $result = $this->_write_db->query($sql, $values); if ($result instanceof PEAR_Error) { throw new Shout_Exception($result); @@ -228,7 +228,7 @@ class Shout_Driver_Sql extends Shout_Driver $sql = sprintf($sql, $this->_params['table']); $args = array($account); $msg = 'SQL query in Shout_Driver_Sql#getDevices(): ' . $sql; - Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($msg, 'DEBUG'); $sth = $this->_db->prepare($sql); $result = $this->_db->execute($sth, $args); if ($result instanceof PEAR_Error) { @@ -318,12 +318,12 @@ class Shout_Driver_Sql extends Shout_Driver $sql = sprintf($sql, $this->_params['table']); $msg = 'SQL query in Shout_Driver_Sql#saveDevice(): ' . $sql; - Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($msg, 'DEBUG'); $sth = $this->_write_db->prepare($sql); $result = $this->_write_db->execute($sth, $args); if ($result instanceof PEAR_Error) { $msg = $result->getMessage() . ': ' . $result->getDebugInfo(); - Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($msg, 'ERR'); throw new Shout_Exception(_("Internal database error. Details have been logged for the administrator.")); } @@ -339,7 +339,7 @@ class Shout_Driver_Sql extends Shout_Driver $values = array($devid); $msg = 'SQL query in Shout_Driver_Sql#deleteDevice(): ' . $sql; - Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($msg, 'DEBUG'); $res = $this->_write_db->query($sql); if ($res instanceof PEAR_Error) { diff --git a/skeleton/lib/Driver/Sql.php b/skeleton/lib/Driver/Sql.php index 71164dfce..9e86cef79 100644 --- a/skeleton/lib/Driver/Sql.php +++ b/skeleton/lib/Driver/Sql.php @@ -86,7 +86,7 @@ class Skeleton_Driver_Sql extends Skeleton_Driver $values = array($this->_params['bar']); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Skeleton_Driver_Sql::retrieve(): %s', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Skeleton_Driver_Sql::retrieve(): %s', $query), 'DEBUG'); /* Execute the query. */ $result = $this->_db->query($query, $values); diff --git a/skoli/lib/Driver/sql.php b/skoli/lib/Driver/sql.php index 4e12f94f3..668ea616f 100644 --- a/skoli/lib/Driver/sql.php +++ b/skoli/lib/Driver/sql.php @@ -152,15 +152,14 @@ class Skoli_Driver_sql extends Skoli_Driver { $values = array($this->_class); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Skoli_Driver_sql::getStudents(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Skoli_Driver_sql::getStudents(): %s', $query), 'DEBUG'); /* Attempt the select query. */ $students = $this->_db->getAll($query, $values, DB_FETCHMODE_ASSOC); /* Return an error immediately if the query failed. */ if (is_a($students, 'PEAR_Error')) { - Horde::logMessage($students, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($students, 'ERR'); return $students; } @@ -188,15 +187,14 @@ class Skoli_Driver_sql extends Skoli_Driver { $values = array($this->_class, $addressid); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Skoli_Driver_sql::addStudents(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Skoli_Driver_sql::addStudents(): %s', $query), 'DEBUG'); /* Attempt the insertion query. */ $result = $this->_write_db->query($query, $values); /* Return an error immediately if the query failed. */ if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } } @@ -218,15 +216,14 @@ class Skoli_Driver_sql extends Skoli_Driver { $values = array($entryid); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Skoli_Driver_sql::getEntry(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Skoli_Driver_sql::getEntry(): %s', $query), 'DEBUG'); /* Attempt the select query. */ $entry = $this->_db->getRow($query, $values, DB_FETCHMODE_ASSOC); /* Return an error immediately if the query failed. */ if (is_a($entry, 'PEAR_Error')) { - Horde::logMessage($entry, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($entry, 'ERR'); return $entry; } else if (!is_array($entry)) { return array(); @@ -237,15 +234,14 @@ class Skoli_Driver_sql extends Skoli_Driver { $values = array($entryid); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Skoli_Driver_sql::getEntry(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Skoli_Driver_sql::getEntry(): %s', $query), 'DEBUG'); /* Attempt the select query. */ $attributes = $this->_db->getAll($query, $values, DB_FETCHMODE_ASSOC); /* Return an error immediately if the query failed. */ if (is_a($attributes, 'PEAR_Error')) { - Horde::logMessage($attributes, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($attributes, 'ERR'); return $attributes; } @@ -315,15 +311,14 @@ class Skoli_Driver_sql extends Skoli_Driver { $values = array_merge($values, $search_values); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Skoli_Driver_sql::getEntries(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Skoli_Driver_sql::getEntries(): %s', $query), 'DEBUG'); /* Attempt the select query. */ $entries = $this->_db->getAll($query, $values, DB_FETCHMODE_ASSOC); /* Return an error immediately if the query failed. */ if (is_a($entries, 'PEAR_Error')) { - Horde::logMessage($entries, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($entries, 'ERR'); return $entries; } } else { @@ -336,15 +331,14 @@ class Skoli_Driver_sql extends Skoli_Driver { } /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Skoli_Driver_sql::getEntries(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Skoli_Driver_sql::getEntries(): %s', $query), 'DEBUG'); /* Attempt the select query. */ $entries = $this->_db->getAll($query, $values, DB_FETCHMODE_ASSOC); /* Return an error immediately if the query failed. */ if (is_a($entries, 'PEAR_Error')) { - Horde::logMessage($entries, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($entries, 'ERR'); return $entries; } } @@ -357,15 +351,14 @@ class Skoli_Driver_sql extends Skoli_Driver { $values = array($entry['object_id']); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Skoli_Driver_sql::getEntries(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Skoli_Driver_sql::getEntries(): %s', $query), 'DEBUG'); /* Attempt the select query. */ $attributes = $this->_db->getAll($query, $values, DB_FETCHMODE_ASSOC); /* Return an error immediately if the query failed. */ if (is_a($attributes, 'PEAR_Error')) { - Horde::logMessage($attributes, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($attributes, 'ERR'); return $attributes; } @@ -393,15 +386,14 @@ class Skoli_Driver_sql extends Skoli_Driver { $values = array($this->_class, $studentid); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Skoli_Driver_sql::lastEntry(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Skoli_Driver_sql::lastEntry(): %s', $query), 'DEBUG'); /* Attempt the select query. */ $lastentry = $this->_db->getRow($query, $values, DB_FETCHMODE_ORDERED); /* Return an error immediately if the query failed. */ if (is_a($lastentry, 'PEAR_Error')) { - Horde::logMessage($lastentry, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($lastentry, 'ERR'); return $lastentry; } @@ -439,15 +431,14 @@ class Skoli_Driver_sql extends Skoli_Driver { $values = array($this->_class, $vars->get('student_id'), $date->datestamp(), $vars->get('object_type'), $entryid); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Skoli_Driver_sql::updateEntry(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Skoli_Driver_sql::updateEntry(): %s', $query), 'DEBUG'); /* Attempt the insertion query. */ $result = $this->_write_db->query($query, $values); /* Return an error immediately if the query failed. */ if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -456,8 +447,7 @@ class Skoli_Driver_sql extends Skoli_Driver { $values = array($entryid); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Skoli_Driver_sql::updateEntry(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Skoli_Driver_sql::updateEntry(): %s', $query), 'DEBUG'); /* Attempt the delete query. */ $result = $this->_write_db->query($query, $values); @@ -473,15 +463,14 @@ class Skoli_Driver_sql extends Skoli_Driver { $values = array($entryid, $attribute, $value); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Skoli_Driver_sql::addEntry(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Skoli_Driver_sql::addEntry(): %s', $query), 'DEBUG'); /* Attempt the insertion query. */ $result = $this->_write_db->query($query, $values); /* Return an error immediately if the query failed. */ if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } } @@ -519,15 +508,14 @@ class Skoli_Driver_sql extends Skoli_Driver { $values = array($entryId, Horde_Auth::getAuth(), $this->generateUID(), $this->_class, $studentid, $date->datestamp(), $vars->get('object_type')); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Skoli_Driver_sql::addEntry(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Skoli_Driver_sql::addEntry(): %s', $query), 'DEBUG'); /* Attempt the insertion query. */ $result = $this->_write_db->query($query, $values); /* Return an error immediately if the query failed. */ if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -538,15 +526,14 @@ class Skoli_Driver_sql extends Skoli_Driver { $values = array($entryId, $attribute, $value); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Skoli_Driver_sql::addEntry(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Skoli_Driver_sql::addEntry(): %s', $query), 'DEBUG'); /* Attempt the insertion query. */ $result = $this->_write_db->query($query, $values); /* Return an error immediately if the query failed. */ if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } } @@ -577,15 +564,14 @@ class Skoli_Driver_sql extends Skoli_Driver { } /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Skoli_Driver_sql::getSubjects(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Skoli_Driver_sql::getSubjects(): %s', $query), 'DEBUG'); /* Attempt the select query. */ $subjects = $this->_db->getAll($query, $values, DB_FETCHMODE_ORDERED); /* Return an error immediately if the query failed. */ if (is_a($subjects, 'PEAR_Error')) { - Horde::logMessage($subjects, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($subjects, 'ERR'); return $subjects; } @@ -609,8 +595,7 @@ class Skoli_Driver_sql extends Skoli_Driver { $values = array($this->_class); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Skoli_Driver_sql::deleteAll(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Skoli_Driver_sql::deleteAll(): %s', $query), 'DEBUG'); /* Attempt the delete query. */ $result = $this->_write_db->query($query, $values); @@ -624,15 +609,14 @@ class Skoli_Driver_sql extends Skoli_Driver { $values = array($this->_class); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Skoli_Driver_sql::deleteAll(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Skoli_Driver_sql::deleteAll(): %s', $query), 'DEBUG'); /* Attempt the select query. */ $entries = $this->_db->getAll($query, $values, DB_FETCHMODE_ASSOC); /* Return an error immediately if the query failed. */ if (is_a($entries, 'PEAR_Error')) { - Horde::logMessage($entries, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($entries, 'ERR'); return $entries; } @@ -662,8 +646,7 @@ class Skoli_Driver_sql extends Skoli_Driver { $values = array($object_id, $this->_class); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Skoli_Driver_sql::deleteEntry(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Skoli_Driver_sql::deleteEntry(): %s', $query), 'DEBUG'); /* Attempt the delete query. */ $result = $this->_write_db->query($query, $values); @@ -677,8 +660,7 @@ class Skoli_Driver_sql extends Skoli_Driver { $values = array($object_id); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('Skoli_Driver_sql::deleteEntry(): %s', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('Skoli_Driver_sql::deleteEntry(): %s', $query), 'DEBUG'); /* Attempt the delete query. */ $result = $this->_write_db->query($query, $values); diff --git a/skoli/lib/Skoli.php b/skoli/lib/Skoli.php index 8096c8083..8c1174d77 100644 --- a/skoli/lib/Skoli.php +++ b/skoli/lib/Skoli.php @@ -138,7 +138,7 @@ class Skoli { $classes = $GLOBALS['skoli_shares']->listShares(Horde_Auth::getAuth(), $permission, $owneronly ? Horde_Auth::getAuth() : null, 0, 0, 'name'); if (is_a($classes, 'PEAR_Error')) { - Horde::logMessage($classes, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($classes, 'ERR'); return array(); } diff --git a/turba/lib/Application.php b/turba/lib/Application.php index 4f84c3679..e9bbe7af7 100644 --- a/turba/lib/Application.php +++ b/turba/lib/Application.php @@ -253,12 +253,12 @@ class Turba_Application extends Horde_Registry_Application // Shares not enabled for this source $driver = Turba_Driver::singleton($source); if (is_a($driver, 'PEAR_Error')) { - Horde::logMessage($driver, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($driver, 'ERR'); $hasError = true; } else { $result = $driver->removeUserData($user); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); } } } @@ -278,7 +278,7 @@ class Turba_Application extends Horde_Registry_Application $driver = Turba_Driver::singleton($config); $result = $driver->removeUserData($user); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); $hasError = true; } } @@ -287,7 +287,7 @@ class Turba_Application extends Horde_Registry_Application /* Get a list of all shares this user has perms to and remove the perms */ $shares = $GLOBALS['turba_shares']->listShares($user); if (is_a($shares, 'PEAR_Error')) { - Horde::logMessage($shares, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($shares, 'ERR'); } foreach ($shares as $share) { $share->removeUser($user); diff --git a/turba/lib/Driver/Facebook.php b/turba/lib/Driver/Facebook.php index dd4bc5e41..b36bdc8e6 100644 --- a/turba/lib/Driver/Facebook.php +++ b/turba/lib/Driver/Facebook.php @@ -123,7 +123,7 @@ class Turba_Driver_Facebook extends Turba_Driver $results = $facebook->fql->run($fql); } catch (Horde_Service_Facebook_Exception $e) { $error = PEAR::raiseError($e->getMessage(), $e->getCode()); - Horde::logMessage($error, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($error, 'ERR'); return $error; } @@ -147,7 +147,7 @@ class Turba_Driver_Facebook extends Turba_Driver $results = $facebook->fql->run($fql); } catch (Horde_Service_Facebook_Exception $e) { $error = PEAR::raiseError($e->getMessage(), $e->getCode()); - Horde::logMessage($error, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($error, 'ERR'); return array(); } $addressbook = array(); diff --git a/turba/lib/Driver/Imsp.php b/turba/lib/Driver/Imsp.php index 4bfc8e1f3..36a4d4a0d 100644 --- a/turba/lib/Driver/Imsp.php +++ b/turba/lib/Driver/Imsp.php @@ -91,7 +91,7 @@ class Turba_Driver_Imsp extends Turba_Driver } } - Horde::logMessage('IMSP Driver initialized for ' . $this->_bookName, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('IMSP Driver initialized for ' . $this->_bookName, 'DEBUG'); $this->_authenticated = true; return true; } @@ -131,7 +131,7 @@ class Turba_Driver_Imsp extends Turba_Driver } Horde::logMessage(sprintf('IMSP returned %s results', - count($results)), __FILE__, __LINE__, PEAR_LOG_DEBUG); + count($results)), 'DEBUG'); return array_values($results); } diff --git a/turba/lib/Driver/Kolab.php b/turba/lib/Driver/Kolab.php index ea0a78e6b..8eac8d8e9 100644 --- a/turba/lib/Driver/Kolab.php +++ b/turba/lib/Driver/Kolab.php @@ -486,7 +486,7 @@ class Turba_Driver_Kolab_Wrapper_Old extends Turba_Driver_Kolab_Wrapper { } if (!is_callable(array($this->_kolab, 'listObjectsInFolder'))) { - Horde::logMessage('The Framework Kolab package must be upgraded', __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage('The Framework Kolab package must be upgraded', 'ERR'); return PEAR::raiseError(_("Unable to search.")); } @@ -620,7 +620,7 @@ class Turba_Driver_Kolab_Wrapper_Old extends Turba_Driver_Kolab_Wrapper { } if ($sourceName != null) { - Horde::logMessage('deleteAll only working for current share. Called for $sourceName', __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage('deleteAll only working for current share. Called for $sourceName', 'ERR'); return PEAR::raiseError(sprintf(_("Cannot delete all address book entries for %s"), $sourceName)); } @@ -819,7 +819,7 @@ class Turba_Driver_Kolab_Wrapper_New extends Turba_Driver_Kolab_Wrapper { } Horde::logMessage(sprintf('Kolab returned %s results', - count($result)), __FILE__, __LINE__, PEAR_LOG_DEBUG); + count($result)), 'DEBUG'); return array_values($result); } @@ -880,8 +880,7 @@ class Turba_Driver_Kolab_Wrapper_New extends Turba_Driver_Kolab_Wrapper { $ids = array(); if (!isset($test['field'])) { - Horde::logMessage('Search field not set. Returning all entries.', - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Search field not set. Returning all entries.', 'DEBUG'); foreach ($entries as $entry) { $ids[] = $entry['uid']; } diff --git a/turba/lib/Driver/Ldap.php b/turba/lib/Driver/Ldap.php index 7216f57e5..ef9142d84 100644 --- a/turba/lib/Driver/Ldap.php +++ b/turba/lib/Driver/Ldap.php @@ -185,8 +185,7 @@ class Turba_Driver_Ldap extends Turba_Driver /* Log the query at a DEBUG log level. */ Horde::logMessage(sprintf('LDAP query by Turba_Driver_ldap::_search(): user = %s, root = %s (%s); filter = "%s"; attributes = "%s"; deref = "%s" ; sizelimit = %d', - Horde_Auth::getAuth(), $this->_params['root'], $this->_params['server'], $filter, implode(', ', $attr), $this->_params['deref'], $sizelimit), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde_Auth::getAuth(), $this->_params['root'], $this->_params['server'], $filter, implode(', ', $attr), $this->_params['deref'], $sizelimit), 'DEBUG'); /* Send the query to the LDAP server and fetch the matching * entries. */ diff --git a/turba/lib/Driver/Sql.php b/turba/lib/Driver/Sql.php index d07893d44..cb9c7a7dc 100644 --- a/turba/lib/Driver/Sql.php +++ b/turba/lib/Driver/Sql.php @@ -102,8 +102,7 @@ class Turba_Driver_Sql extends Turba_Driver $values = array($test); /* Log the query at a DEBUG log level. */ - Horde::logMessage('SQL query by Turba_Driver_sql::count(): ' . $query, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL query by Turba_Driver_sql::count(): ' . $query, 'DEBUG'); /* Run query. */ $count[$test] = $this->_db->getOne($query, $values); @@ -161,13 +160,12 @@ class Turba_Driver_Sql extends Turba_Driver $query = 'SELECT ' . implode(', ', $fields) . ' FROM ' . $this->_params['table'] . $where; /* Log the query at a DEBUG log level. */ - Horde::logMessage('SQL query by Turba_Driver_sql::_search(): ' . $query, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL query by Turba_Driver_sql::_search(): ' . $query, 'DEBUG'); /* Run query. */ $result = $this->_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -175,7 +173,7 @@ class Turba_Driver_Sql extends Turba_Driver $iMax = count($fields); while ($row = $result->fetchRow()) { if (is_a($row, 'PEAR_Error')) { - Horde::logMessage($row, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($row, 'ERR'); return $result; } @@ -234,12 +232,11 @@ class Turba_Driver_Sql extends Turba_Driver . $this->_params['table'] . ' WHERE ' . $where; /* Log the query at a DEBUG log level. */ - Horde::logMessage('SQL query by Turba_Driver_sql::_read(): ' . $query, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL query by Turba_Driver_sql::_read(): ' . $query, 'DEBUG'); $result = $this->_db->getAll($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -296,7 +293,7 @@ class Turba_Driver_Sql extends Turba_Driver $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -318,12 +315,11 @@ class Turba_Driver_Sql extends Turba_Driver $values = array($object_id); /* Log the query at a DEBUG log level. */ - Horde::logMessage('SQL query by Turba_Driver_sql::_delete(): ' . $query, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL query by Turba_Driver_sql::_delete(): ' . $query, 'DEBUG'); $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -350,8 +346,7 @@ class Turba_Driver_Sql extends Turba_Driver /* Need a list of UIDs so we can notify History */ $query = 'SELECT '. $this->map['__uid'] . ' FROM ' . $this->_params['table'] . ' WHERE owner_id = ?'; - Horde::logMessage('SQL query by Turba_Driver_sql::_deleteAll(): ' . $query, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL query by Turba_Driver_sql::_deleteAll(): ' . $query, 'DEBUG'); $ids = $this->_write_db->query($query, $values); if (is_a($ids, 'PEAR_Error')) { return $ids; @@ -359,8 +354,7 @@ class Turba_Driver_Sql extends Turba_Driver /* Do the deletion */ $query = 'DELETE FROM ' . $this->_params['table'] . ' WHERE owner_id = ?'; - Horde::logMessage('SQL query by Turba_Driver_sql::_deleteAll(): ' . $query, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL query by Turba_Driver_sql::_deleteAll(): ' . $query, 'DEBUG'); $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { @@ -417,12 +411,11 @@ class Turba_Driver_Sql extends Turba_Driver $query .= 'WHERE ' . $where; /* Log the query at a DEBUG log level. */ - Horde::logMessage('SQL query by Turba_Driver_sql::_save(): ' . $query, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL query by Turba_Driver_sql::_save(): ' . $query, 'DEBUG'); $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } diff --git a/turba/lib/Forms/AddContact.php b/turba/lib/Forms/AddContact.php index 5dbb1ea07..bf381f129 100644 --- a/turba/lib/Forms/AddContact.php +++ b/turba/lib/Forms/AddContact.php @@ -79,7 +79,7 @@ class Turba_AddContactForm extends Turba_ContactForm { /* Create Contact. */ $key = $driver->add($contact); if (is_a($key, 'PEAR_Error')) { - Horde::logMessage($key, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($key, 'ERR'); } else { // Try 3 times to get the new entry. We retry to allow setups like // LDAP replication to work. @@ -92,7 +92,7 @@ class Turba_AddContactForm extends Turba_ContactForm { } sleep(1); } - Horde::logMessage($ob, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($ob, 'ERR'); } $notification->push(_("There was an error adding the new contact. Contact your system administrator for further help."), 'horde.error'); diff --git a/turba/lib/Forms/EditContact.php b/turba/lib/Forms/EditContact.php index f3d242b66..9830d2952 100644 --- a/turba/lib/Forms/EditContact.php +++ b/turba/lib/Forms/EditContact.php @@ -87,7 +87,7 @@ class Turba_EditContactForm extends Turba_ContactForm { } return true; } else { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); $notification->push(_("There was an error saving the contact. Contact your system administrator for further help."), 'horde.error'); return $result; } diff --git a/turba/lib/Turba.php b/turba/lib/Turba.php index 203e229bb..da991ac5c 100644 --- a/turba/lib/Turba.php +++ b/turba/lib/Turba.php @@ -333,7 +333,7 @@ class Turba { foreach ($in as $sourceId => $source) { $driver = Turba_Driver::singleton($sourceId); if (is_a($driver, 'PEAR_Error')) { - Horde::logMessage(sprintf("Could not instantiate the %s source: %s", $sourceId, $driver->getMessage()), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage(sprintf("Could not instantiate the %s source: %s", $sourceId, $driver->getMessage()), 'ERR'); continue; } @@ -438,7 +438,7 @@ class Turba { 'default' => true, 'name' => Horde_Auth::getAuth()))); if (is_a($share, 'PEAR_Error')) { - Horde::logMessage($share, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($share, 'ERR'); continue; } @@ -514,7 +514,7 @@ class Turba { Horde_Auth::getAuth(), $permission, $owneronly ? Horde_Auth::getAuth() : null); if (is_a($sources, 'PEAR_Error')) { - Horde::logMessage($sources, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($sources, 'ERR'); return array(); } return $sources; diff --git a/turba/lib/View/Contact.php b/turba/lib/View/Contact.php index 0e8fa45a8..7d5d9fe80 100644 --- a/turba/lib/View/Contact.php +++ b/turba/lib/View/Contact.php @@ -84,7 +84,7 @@ class Turba_View_Contact { if (!empty($conf['comments']['allow']) && $registry->hasMethod('forums/doComments')) { $comments = $registry->call('forums/doComments', array('turba', $this->contact->driver->name . '.' . $this->contact->getValue('__key'), 'commentCallback')); if (is_a($comments, 'PEAR_Error')) { - Horde::logMessage($comments, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($comments, 'DEBUG'); $comments = array(); } } diff --git a/turba/view.php b/turba/view.php index 969105bd8..b9bf53d82 100644 --- a/turba/view.php +++ b/turba/view.php @@ -52,7 +52,7 @@ try { try { $data = $vfs->read(TURBA_VFS_PATH . '/' . $object->getValue('__uid'), $filename); } catch (VFS_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); throw new Turba_Exception(sprintf(_("Access denied to %s"), $filename)); } diff --git a/vilma/domains/delete.php b/vilma/domains/delete.php index 592f69ef0..5c3196ca9 100644 --- a/vilma/domains/delete.php +++ b/vilma/domains/delete.php @@ -26,7 +26,7 @@ if ($vars->get('submitbutton') == _("Delete")) { $form->getInfo($vars, $info); $delete = $vilma_driver->deleteDomain($info['domain_id']); if (is_a($delete, 'PEAR_Error')) { - Horde::logMessage($delete, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($delete, 'ERR'); $notification->push(sprintf(_("Error deleting domain. %s."), $delete->getMessage()), 'horde.error'); } else { $notification->push(_("Domain deleted."), 'horde.success'); diff --git a/vilma/domains/edit.php b/vilma/domains/edit.php index e4782c879..5ebc5e790 100644 --- a/vilma/domains/edit.php +++ b/vilma/domains/edit.php @@ -27,7 +27,7 @@ if ($form->validate($vars)) { $info['name'] = Horde_String::lower($info['name']); $domain_id = $vilma_driver->saveDomain($info); if (is_a($domain_id, 'PEAR_Error')) { - Horde::logMessage($domain_id, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($domain_id, 'ERR'); $notification->push(sprintf(_("Error saving domain: %s."), $domain_id->getMessage()), 'horde.error'); } else { $notification->push(_("Domain saved."), 'horde.success'); diff --git a/vilma/lib/Driver.php b/vilma/lib/Driver.php index 60d81588c..3a3d92109 100644 --- a/vilma/lib/Driver.php +++ b/vilma/lib/Driver.php @@ -95,7 +95,7 @@ class Vilma_Driver { */ function getAddressInfo($address, $type = 'all') { - Horde::logMessage("Get Addresses Called for $domain with type $type and key $key", __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage("Get Addresses Called for $domain with type $type and key $key", 'DEBUG'); $domain = Vilma::stripDomain($address); $addresses = $this->getAddresses($domain, $type); foreach($addresses as $addrinfo) { @@ -168,7 +168,7 @@ class Vilma_Driver { */ function saveAlias(&$info) { - Horde::logMessage("saveAlias called with info: " . print_r($info, true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage("saveAlias called with info: " . print_r($info, true), 'DEBUG'); $result = $this->_saveAlias($info); if (is_a($result, 'PEAR_Error')) { return $result; @@ -186,7 +186,7 @@ class Vilma_Driver { */ function deleteAlias(&$info) { - Horde::logMessage("deleteAlias called with info: " . print_r($info, true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage("deleteAlias called with info: " . print_r($info, true), 'DEBUG'); $result = $this->_deleteAlias($info); if (is_a($result, 'PEAR_Error')) { return $result; @@ -205,7 +205,7 @@ class Vilma_Driver { */ function saveForward(&$info) { - Horde::logMessage("saveForward called with info: " . print_r($info, true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage("saveForward called with info: " . print_r($info, true), 'DEBUG'); $result = $this->_saveForward($info); if (is_a($result, 'PEAR_Error')) { return $result; @@ -223,7 +223,7 @@ class Vilma_Driver { */ function deleteForward(&$info) { - Horde::logMessage("deleteForward called with info: " . print_r($info, true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage("deleteForward called with info: " . print_r($info, true), 'DEBUG'); $result = $this->_deleteForwrd($info); if (is_a($result, 'PEAR_Error')) { return $result; diff --git a/vilma/lib/Driver/qmailldap.php b/vilma/lib/Driver/qmailldap.php index 3ff99f28c..da1f0236e 100644 --- a/vilma/lib/Driver/qmailldap.php +++ b/vilma/lib/Driver/qmailldap.php @@ -59,7 +59,7 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { 'domain_max_users, domain_quota FROM vilma_domains ' . 'ORDER BY domain_name'; - Horde::logMessage($sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($sql, 'DEBUG'); return $this->_db->getAll($sql, $values, DB_FETCHMODE_ASSOC); } @@ -73,11 +73,11 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { function getDomain($domain_id) { $sql = 'SELECT domain_id, domain_name, domain_transport, ' . - 'domain_max_users, domain_quota FROM vilma_domains ' . + 'domain_max_users, domain_quota FROM vilma_domains ' . 'WHERE domain_id=? ORDER BY domain_name'; $values = array($domain_id); - Horde::logMessage($sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($sql, 'DEBUG'); return $this->_db->getRow($sql, $values, DB_FETCHMODE_ASSOC); } @@ -95,7 +95,7 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { 'WHERE domain_name=?'; $values = array($domain_name); - Horde::logMessage($sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($sql, 'DEBUG'); return $this->_db->getRow($sql, $values, DB_FETCHMODE_ASSOC); } @@ -114,7 +114,7 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { function getAddresses($domain, $type = 'all', $key = 'user_name', $direction = 0) { - Horde::logMessage("Get Addresses Called for $domain with type $type and key $key", __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage("Get Addresses Called for $domain with type $type and key $key", 'DEBUG'); $addresses = array(); if ($type == 'all' || $type == 'user') { $users = $this->_getUsers($domain); @@ -137,7 +137,7 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { Horde_Array::arraySort($addresses, $key, $direction, true); return $addresses; } - + function getUser($user_id) { $user = $this->getUserStatus($user_id); @@ -149,7 +149,7 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { } else { return PEAR::raiseError(_("Unable to qualify address.")); } - } + } /** * Returns an array of all users, aliases, groups and forwards for this @@ -190,7 +190,7 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { } $filter .= ')'; - Horde::logMessage($filter, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($filter, 'DEBUG'); $res = ldap_search($this->_ldap, $this->_ldapparams['basedn'], $filter); if ($res === false) { return PEAR::raiseError(sprintf(_("Error in LDAP search: %s"), ldap_error($this->LDAP))); @@ -321,7 +321,7 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { } $filter .= ')'; // End filter - Horde::logMessage($filter, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($filter, 'DEBUG'); $res = @ldap_search($this->_ldap, $this->_ldapparams['basedn'], $filter); if ($res === false) { return PEAR::raiseError(sprintf(_("Error searching LDAP: %s"), @@ -365,20 +365,20 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { return $aliases; } - + /** * Returns all available groups and forwards unless otherwise specified. * If a domain name is passed then limit the results to groups or forwards * in that domain. This method should not be called directly, but rather by * way of getAddresses() - * + * * @access private * * @param string $acquire The default behavior is to acquire both * groups and forwards; a value of 'group' * will return only groups and a value of * 'forward' will return only forwards. - * @param string $domain The name of the domain from which to fetch + * @param string $domain The name of the domain from which to fetch * * @return array The available groups and forwards with details */ @@ -414,7 +414,7 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { $domain = '_all'; } $filter .= ')'; // End filter - Horde::logMessage($filter, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($filter, 'DEBUG'); $res = @ldap_search($this->_ldap, $this->_ldapparams['basedn'], $filter); if ($res === false) { return PEAR::raiseError(sprintf(_("Error searching LDAP: %s"), @@ -430,7 +430,7 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { // Can't use foreach because of the array format returned by LDAP driver $i = 0; // Address index $e = 0; // Entry counter - + while ($entry = @$res[$e]) { $targets = array(); $a = 0; // Attribute counter @@ -452,7 +452,7 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { 'targets' => $targets, 'user_name' => $entry[$this->_getAttrByField('user_name')][0], 'user_full_name' => @$entry[$this->_getAttrByField('user_name')][0], - ); + ); // If accountStatus is blank it's the same as active if (!isset($entry[$this->_getAttrByField('user_enabled')][0]) || ($entry[$this->_getAttrByField('user_enabled')][0] == 'active')) { @@ -484,7 +484,7 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { */ function getAddressInfo($address, $type = 'all') { - Horde::logMessage("Get Addresses Called for $address with type $type and key $key", __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage("Get Addresses Called for $address with type $type and key $key", 'DEBUG'); if ($type != 'alias') { return parent::getAddressInfo($address, $type); } else { @@ -497,7 +497,7 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { } $filter .= '(mailAlternateAddress=' . $address . ')'; $filter .= ')'; // End filter - Horde::logMessage($filter, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($filter, 'DEBUG'); $res = @ldap_search($this->_ldap, $this->_ldapparams['basedn'], $filter); if ($res === false) { return PEAR::raiseError(sprintf(_("Error searching LDAP: %s"), @@ -507,11 +507,11 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { if ($res === false) { return PEAR::raiseError(sprintf(_("Error returning LDAP results: %s"), @ldap_error($this->_ldap))); } - + if ($res['count'] !== 1) { return PEAR::raiseError(_("More than one DN returned for this alias. Please contact an administrator to resolve this error.")); } - + return array( 'id' => $res[0]['dn'], 'address' => $address, @@ -547,7 +547,7 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { // that are valid for this system. $values = array($info['name'], $info['transport'], (int)$info['max_users'], (int)$info['quota']); - + if (empty($info['domain_id'])) { $nextid = $this->_db->nextId('vilma_domains'); $sql = 'INSERT INTO vilma_domains (domain_id, domain_name, ' . @@ -560,7 +560,7 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { 'WHERE domain_id=?'; array_push($values, $info['domain_id']); } - Horde::logMessage($sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($sql, 'DEBUG'); return $this->_db->query($sql, $values); } @@ -587,7 +587,7 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { $sql = 'DELETE FROM vilma_domains WHERE domain_id=?'; $values = array((int)$domain_id); - Horde::logMessage($sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($sql, 'DEBUG'); return $this->_db->query($sql, $values); } @@ -596,7 +596,7 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { * * @param string $email_id The id of the account to be searched for. * - * @return Array of data for given email account on success or no + * @return Array of data for given email account on success or no * information found; and for an error a PEAR::Error otherwise. */ function searchForAliases($email_id) { @@ -621,9 +621,9 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { */ $filter .= '(mailAlternateAddress=' . $email_id . ')'; $filter .= ')'; // End filter - + //echo $filter; - Horde::logMessage($filter, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($filter, 'DEBUG'); $res = @ldap_search($this->_ldap, $this->_ldapparams['basedn'], $filter); if ($res === false) { return PEAR::raiseError(sprintf(_("Error searching LDAP: %s"), @@ -634,7 +634,7 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { return PEAR::raiseError(sprintf(_("Error retrieving LDAP results: %s"), @ldap_error($this->_ldap))); } - return $res; + return $res; } /** @@ -642,7 +642,7 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { * * @param string $email_id The id of the account to be searched for. * - * @return Array of data for given email account on success or no + * @return Array of data for given email account on success or no * information found; and for an error a PEAR::Error otherwise. */ function searchForUser($email_id) @@ -655,7 +655,7 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { } $filter .= '(mail=' . $email_id . '))'; - Horde::logMessage($filter, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($filter, 'DEBUG'); $res = @ldap_search($this->_ldap, $this->_ldapparams['basedn'], $filter); if ($res === false) { return PEAR::raiseError(sprintf(_("Error searching LDAP: %s"), @@ -671,7 +671,7 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { } else if($res['count'] !== 1) { return PEAR::raiseError(_("More than one DN returned. Aborting delete operation.")); } - return $res; + return $res; } /** @@ -692,7 +692,7 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { $filter .= '(mail=' . $email_id . ')'; //echo $email_id . '
'; $filter .= ')'; - Horde::logMessage($filter, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($filter, 'DEBUG'); $res = @ldap_search($this->_ldap, $this->_ldapparams['basedn'], $filter); if ($res === false) { return PEAR::raiseError(sprintf(_("Error searching LDAP: %s"), @@ -707,7 +707,7 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { return PEAR::raiseError(_("Unable to acquire handle on DN. Aborting delete operation.")); } else if($res['count'] !== 1) { return PEAR::raiseError(_("More than one DN returned. Aborting delete operation.")); - } + } // We now have one unique DN to delete. $res = @ldap_delete($this->_ldap, $res[0]['dn']); if ($res === false) { @@ -726,7 +726,7 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { */ function _saveAlias($info) { - Horde::logMessage("_saveAlias called with info: " . print_r($info, true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage("_saveAlias called with info: " . print_r($info, true), 'DEBUG'); $address = $info['address']; if (!empty($info['alias'])) { $alias = $info['alias']; @@ -735,13 +735,13 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { $create = true; } // if $alias_address = $info['alias_address']; - + $user_res = $this->searchForUser($address); if (is_a($user_res, 'PEAR_Error') || ($res['count'] === 0) ) { return PEAR::raiseError(_("Error reading address information from backend.")); } // if $user = $user_res[0]; - + // Retrieve the current MAA values if (array_key_exists('mailalternateaddress', $user_res[0])) { $maa = $user['mailalternateaddress']; @@ -749,8 +749,8 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { } else { $maa = array(); } // if - - Horde::logMessage("Resource contains: " . print_r($maa, true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + + Horde::logMessage("Resource contains: " . print_r($maa, true), 'DEBUG'); $update = false; $oldmaa = $maa; @@ -767,7 +767,7 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { // Already exists, throw a notification return PEAR::raiseError(_("That alias already exists!")); } // if - + } else { if ($alias == $alias_address) { /* do nothing */; @@ -783,11 +783,11 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { } // if } } // if - - + + if ($update) { $dn = $user['dn']; - Horde::logMessage("UPDATING: $dn \nOld MAA: " . print_r($oldmaa, true) . "\nNew MAA: " . print_r($maa, true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage("UPDATING: $dn \nOld MAA: " . print_r($oldmaa, true) . "\nNew MAA: " . print_r($maa, true), 'DEBUG'); // return PEAR::raiseError(sprintf(_("Update Code Not Written."), $alias)); if ($this->_ldap) { // bind with appropriate dn to give update access @@ -797,7 +797,7 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { return PEAR::raiseError(_("Unable to bind to the LDAP server. Check authentication credentials.")); } $entry["mailAlternateAddress"] = $maa; - + $res = @ldap_modify($this->_ldap, $dn, $entry); if ($res === false) { return PEAR::raiseError(sprintf(_("Error modifying account: %s"), @ldap_error($this->_ldap))); @@ -806,22 +806,22 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { } // if } // if } // if - + return true; } - + function _deleteAlias($info) { - Horde::logMessage("_deleteAlias called with info: " . print_r($info, true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage("_deleteAlias called with info: " . print_r($info, true), 'DEBUG'); $address = $info['address']; $alias = $info['alias']; - + $user_res = $this->searchForUser($address); if (is_a($user_res, 'PEAR_Error') || ($res['count'] === 0) ) { return PEAR::raiseError(_("Error reading address information from backend.")); } // if $user = $user_res[0]; - + // Retrieve the current MAA values if (array_key_exists('mailalternateaddress', $user_res[0])) { $maa = $user['mailalternateaddress']; @@ -829,8 +829,8 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { } else { $maa = array(); } // if - - Horde::logMessage("Resource contains: " . print_r($maa, true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + + Horde::logMessage("Resource contains: " . print_r($maa, true), 'DEBUG'); $update = false; $oldmaa = $maa; @@ -841,11 +841,11 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { $update = true; } else { /* skip */; - } // if - + } // if + if ($update) { $dn = $user['dn']; - Horde::logMessage("UPDATING: $dn \nOld MAA: " . print_r($oldmaa, true) . "\nNew MAA: " . print_r($maa, true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage("UPDATING: $dn \nOld MAA: " . print_r($oldmaa, true) . "\nNew MAA: " . print_r($maa, true), 'DEBUG'); // return PEAR::raiseError(sprintf(_("Update Code Not Written."), $alias)); if ($this->_ldap) { // bind with appropriate dn to give update access @@ -855,7 +855,7 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { return PEAR::raiseError(_("Unable to bind to the LDAP server. Check authentication credentials.")); } $entry["mailAlternateAddress"] = $maa; - + $res = @ldap_modify($this->_ldap, $dn, $entry); if ($res === false) { return PEAR::raiseError(sprintf(_("Error modifying account: %s"), @ldap_error($this->_ldap))); @@ -864,10 +864,10 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { } // if } // if } // if - + return true; } - + /** * Modifies forward data on the backend. See Driver::saveForward() for parameter info. * @@ -877,7 +877,7 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { */ function _saveForward($info) { - Horde::logMessage("_saveForward called with info: " . print_r($info, true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage("_saveForward called with info: " . print_r($info, true), 'DEBUG'); $address = $info['address']; if (!empty($info['forward'])) { $forward = $info['forward']; @@ -886,13 +886,13 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { $create = true; } // if $forward_address = $info['forward_address']; - + $user_res = $this->searchForUser($address); if (is_a($user_res, 'PEAR_Error') || ($res['count'] === 0) ) { return PEAR::raiseError(_("Error reading address information from backend.")); } // if $user = $user_res[0]; - + // Retrieve the current MAA values if (array_key_exists('mailforwardingaddress', $user_res[0])) { $mfa = $user['mailforwardingaddress']; @@ -900,8 +900,8 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { } else { $mfa = array(); } // if - - Horde::logMessage("Resource contains: " . print_r($mfa, true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + + Horde::logMessage("Resource contains: " . print_r($mfa, true), 'DEBUG'); $update = false; $oldmfa = $mfa; @@ -918,7 +918,7 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { // Already exists, throw a notification return PEAR::raiseError(sprintf(_("That forward, \"%s\", already exists!"), $forward_address)); } // if - + } else { if ($forward == $forward_address) { /* do nothing */; @@ -934,11 +934,11 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { } // if } } // if - - + + if ($update) { $dn = $user['dn']; - Horde::logMessage("UPDATING: $dn \nOld MFA: " . print_r($oldmfa, true) . "\nNew MFA: " . print_r($mfa, true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage("UPDATING: $dn \nOld MFA: " . print_r($oldmfa, true) . "\nNew MFA: " . print_r($mfa, true), 'DEBUG'); // return PEAR::raiseError(sprintf(_("Update Code Not Written."), $alias)); if ($this->_ldap) { // bind with appropriate dn to give update access @@ -948,7 +948,7 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { return PEAR::raiseError(_("Unable to bind to the LDAP server. Check authentication credentials.")); } $entry["mailForwardingAddress"] = $mfa; - + $res = @ldap_modify($this->_ldap, $dn, $entry); if ($res === false) { return PEAR::raiseError(sprintf(_("Error modifying account: %s"), @ldap_error($this->_ldap))); @@ -957,7 +957,7 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { } // if } // if } // if - + return true; } @@ -970,16 +970,16 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { */ function _deleteForward($info) { - Horde::logMessage("_deleteForward called with info: " . print_r($info, true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage("_deleteForward called with info: " . print_r($info, true), 'DEBUG'); $address = $info['address']; $forward = $info['forward']; - + $user_res = $this->searchForUser($address); if (is_a($user_res, 'PEAR_Error') || ($res['count'] === 0) ) { return PEAR::raiseError(_("Error reading address information from backend.")); } // if $user = $user_res[0]; - + // Retrieve the current MFA values if (array_key_exists('mailforwardingaddress', $user_res[0])) { $mfa = $user['mailforwardingaddress']; @@ -987,8 +987,8 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { } else { $mfa = array(); } // if - - Horde::logMessage("Resource contains: " . print_r($mfa, true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + + Horde::logMessage("Resource contains: " . print_r($mfa, true), 'DEBUG'); $update = false; $oldmfa = $mfa; @@ -1000,10 +1000,10 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { } else { /* skip */; } // if - + if ($update) { $dn = $user['dn']; - Horde::logMessage("UPDATING: $dn \nOld MFA: " . print_r($oldmfa, true) . "\nNew MFA: " . print_r($mfa, true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage("UPDATING: $dn \nOld MFA: " . print_r($oldmfa, true) . "\nNew MFA: " . print_r($mfa, true), 'DEBUG'); // return PEAR::raiseError(sprintf(_("Update Code Not Written."), $alias)); if ($this->_ldap) { // bind with appropriate dn to give update access @@ -1013,7 +1013,7 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { return PEAR::raiseError(_("Unable to bind to the LDAP server. Check authentication credentials.")); } $entry["mailForwardingAddress"] = $mfa; - + $res = @ldap_modify($this->_ldap, $dn, $entry); if ($res === false) { return PEAR::raiseError(sprintf(_("Error modifying account: %s"), @ldap_error($this->_ldap))); @@ -1022,10 +1022,10 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { } // if } // if } // if - + return true; } - + /* Sorting function to sort aliases, forwards, and accounts by domain name first, * then by user component. */ @@ -1033,7 +1033,7 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { $a_comp = split("@", $a); $b_comp = split("@", $b); // not finished. - } + } function _saveUser(&$info) { @@ -1053,14 +1053,14 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { return $addrinfo; } $type = $addrinfo['type']; - if($type == 'user') { + if($type == 'user') { //continue, this is a user. } else { //return PEAR::raiseError(_("Unable to save account of type " . $type)); } $user_info = $this->searchForUser($address); - if (is_a($user_info, 'PEAR_Error') || ($res['count'] === 0) ) { + if (is_a($user_info, 'PEAR_Error') || ($res['count'] === 0) ) { return PEAR::raiseError(_("Error reading address information from backend.")); } @@ -1079,7 +1079,7 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { } unset($info['password']); } - + $tmp['dn'] = $addrinfo['id']; foreach ($info as $key => $val) { $attr = $this->_getAttrByField($key); @@ -1115,7 +1115,7 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { } if(isset($objectClassData)) { array_shift($objectClassData); - $entry['objectclass'] = $objectClassData; + $entry['objectclass'] = $objectClassData; } else { $entry['objectclass'] = array(); $entry['objectclass'][] = 'top'; @@ -1184,9 +1184,9 @@ class Vilma_Driver_qmailldap extends Vilma_Driver { } } else { return PEAR::raiseError(_("Unable to connect to LDAP server")); - } + } } - + return PEAR::raiseError(_("Unable to save user information.")); } diff --git a/vilma/lib/Driver/sql.php b/vilma/lib/Driver/sql.php index a7a52ba2e..4913b124c 100644 --- a/vilma/lib/Driver/sql.php +++ b/vilma/lib/Driver/sql.php @@ -156,7 +156,7 @@ class Vilma_Driver_sql extends Vilma_Driver { $binds[0] . ' ORDER BY domain_name'; $values = $binds[1]; - Horde::logMessage($sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($sql, 'DEBUG'); return $this->_db->getAll($sql, $values, DB_FETCHMODE_ASSOC); } @@ -174,7 +174,7 @@ class Vilma_Driver_sql extends Vilma_Driver { ' WHERE ' . $this->_getTableField('domains', 'domain_id') . ' = ?' . $binds[0]; array_unshift($binds[1], (int)$domain_id); - Horde::logMessage($sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($sql, 'DEBUG'); return $this->_db->getRow($sql, $binds[1], DB_FETCHMODE_ASSOC); } @@ -192,7 +192,7 @@ class Vilma_Driver_sql extends Vilma_Driver { ' WHERE ' . $this->_getTableField('domains', 'domain_name') . ' = ?' . $binds[0]; array_unshift($binds[1], $domain_name); - Horde::logMessage($sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($sql, 'DEBUG'); return $this->_db->getRow($sql, $binds[1], DB_FETCHMODE_ASSOC); } @@ -224,7 +224,7 @@ class Vilma_Driver_sql extends Vilma_Driver { $values = $binds[1]; } - Horde::logMessage($sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($sql, 'DEBUG'); return $this->_db->getAll($sql, $values, DB_FETCHMODE_ASSOC); } @@ -243,7 +243,7 @@ class Vilma_Driver_sql extends Vilma_Driver { ' WHERE ' . $this->_getTableField('users', 'user_id') . ' = ?' . $binds[0]; array_unshift($binds[1], (int)$user_id); - Horde::logMessage($sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($sql, 'DEBUG'); return $this->_db->getRow($sql, $binds[1], DB_FETCHMODE_ASSOC); } @@ -273,7 +273,7 @@ class Vilma_Driver_sql extends Vilma_Driver { ' ORDER BY virtual_destination, virtual_email'; $values = array_merge($values, $binds[1]); - Horde::logMessage($sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($sql, 'DEBUG'); return $this->_db->getAll($sql, $values, DB_FETCHMODE_ASSOC); } @@ -292,7 +292,7 @@ class Vilma_Driver_sql extends Vilma_Driver { ' WHERE ' . $this->_getTableField('virtuals', 'virtual_id') . ' = ?' . $binds[0]; array_unshift($binds[1], (int)$virtual_id); - Horde::logMessage($sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($sql, 'DEBUG'); $virtual = $this->_db->getRow($sql, $binds[1], DB_FETCHMODE_ASSOC); $virtual['stripped_email'] = Vilma::stripUser($virtual['virtual_email']); @@ -315,7 +315,7 @@ class Vilma_Driver_sql extends Vilma_Driver { ' WHERE ' . $this->_getTableField('users', 'user_name') . ' LIKE ?' . $binds[0]; array_unshift($binds[1], '%@' . $domain_name); - Horde::logMessage($sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($sql, 'DEBUG'); return $this->_db->getOne($sql, $binds[1]); } @@ -353,7 +353,7 @@ class Vilma_Driver_sql extends Vilma_Driver { $values = $binds[1]; } - Horde::logMessage($sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($sql, 'DEBUG'); return $this->_db->query($sql, $values); } @@ -396,7 +396,7 @@ class Vilma_Driver_sql extends Vilma_Driver { ' WHERE ' . $this->_getTableField('domains', 'domain_id') . ' = ?'; $values = array((int)$domain_id); - Horde::logMessage($sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($sql, 'DEBUG'); return $this->_db->query($sql, $values); } @@ -474,10 +474,10 @@ class Vilma_Driver_sql extends Vilma_Driver { (int)$info['user_id']); } - Horde::logMessage($sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($sql, 'DEBUG'); $result = $this->_db->query($sql); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -503,7 +503,7 @@ class Vilma_Driver_sql extends Vilma_Driver { ' WHERE ' . $this->_getTableField('virtuals', 'virtual_destination') . ' = ?'; $values = array($user['user_name']); - Horde::logMessage($sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($sql, 'DEBUG'); $delete = $this->_db->query($sql, $values); if (is_a($delete, 'PEAR_Error')) { return $delete; @@ -514,7 +514,7 @@ class Vilma_Driver_sql extends Vilma_Driver { ' WHERE ' . $this->_getTableField('users', 'user_id') . ' = ?'; $values = array((int)$user_id); - Horde::logMessage($sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($sql, 'DEBUG'); $result = $this->_db->query($sql, $values); if (is_a($result, 'PEAR_Error')) { return $result; @@ -561,7 +561,7 @@ class Vilma_Driver_sql extends Vilma_Driver { $info['virtual_destination'], $info['virtual_id']); - Horde::logMessage($sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($sql, 'DEBUG'); return $this->_db->query($sql, $values); } @@ -577,7 +577,7 @@ class Vilma_Driver_sql extends Vilma_Driver { ' WHERE ' . $this->_getTableField('virtuals', 'virtual_id') . ' = ?' . $binds[0]; array_unshift($binds[1], $virtual_id); - Horde::logMessage($sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($sql, 'DEBUG'); return $this->_db->query($sql, $binds[1]); } diff --git a/vilma/users/delete.php b/vilma/users/delete.php index e7f7118e3..c45cf421e 100644 --- a/vilma/users/delete.php +++ b/vilma/users/delete.php @@ -114,7 +114,7 @@ if ($vars->get('submitbutton') == _("Delete")) { $deleteInfo['alias'] = $user_id; $delete = $vilma_driver->deleteAlias($deleteInfo); if (is_a($delete, 'PEAR_Error')) { - Horde::logMessage($delete, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($delete, 'ERR'); $notification->push(sprintf(_("Error deleting alias. %s."), $delete->getMessage()), 'horde.error'); $url = Util::addParameter(Horde::applicationUrl('users/index.php'), 'domain_id', $domain['id'], false); header('Location: ' . $url); @@ -134,7 +134,7 @@ if ($vars->get('submitbutton') == _("Delete")) { $deleteInfo['forward'] = $user_id; $delete = $vilma_driver->deleteForward($deleteInfo); if (is_a($delete, 'PEAR_Error')) { - Horde::logMessage($delete, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($delete, 'ERR'); $notification->push(sprintf(_("Error deleting forward. %s."), $delete->getMessage()), 'horde.error'); $url = Horde_Util::addParameter(Horde::applicationUrl('users/index.php'), 'domain_id', $domain['id'], false); header('Location: ' . $url); @@ -152,7 +152,7 @@ if ($vars->get('submitbutton') == _("Delete")) { //$delete = $vilma_driver->deleteUser($info['user_id']); $delete = $vilma_driver->deleteUser($address['address']); if (is_a($delete, 'PEAR_Error')) { - Horde::logMessage($delete, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($delete, 'ERR'); $notification->push(sprintf(_("Error deleting user. %s."), $delete->getMessage()), 'horde.error'); $url = Horde_Util::addParameter(Horde::applicationUrl('users/index.php'), 'domain_id', $domain['id'], false); header('Location: ' . $url); diff --git a/vilma/users/edit.php b/vilma/users/edit.php index fba299cfe..4ce6fd9ef 100644 --- a/vilma/users/edit.php +++ b/vilma/users/edit.php @@ -74,7 +74,7 @@ if ($form->validate($vars)) { $info['user_name'] = Horde_String::lower($info['user_name']) . '@' . $domain; $user_id = $vilma_driver->saveUser($info); if (is_a($user_id, 'PEAR_Error')) { - Horde::logMessage($user_id, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($user_id, 'ERR'); $notification->push(sprintf(_("Error saving user. %s"), $user_id->getMessage()), 'horde.error'); } else { $notification->push(_("User details saved."), 'horde.success'); diff --git a/vilma/users/editAlias.php b/vilma/users/editAlias.php index 0ac2b7c56..e6adccdb3 100644 --- a/vilma/users/editAlias.php +++ b/vilma/users/editAlias.php @@ -25,14 +25,14 @@ $vars = Variables::getDefaultVariables(); /* If the form is submitted, $vars['mode'] will be set. Catch this and process the submission so that the displayed form accurately indicates the result of the transaction. */ if ($vars->exists('mode')) { - Horde::logMessage("Submit Detected: " . print_r(serialize($vars), true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage("Submit Detected: " . print_r(serialize($vars), true), 'DEBUG'); $form = &new EditAliasForm($vars); if ($form->validate($vars)) { $form->getInfo($vars, $info); $alias_id = $vilma_driver->saveAlias($info); if (is_a($alias_id, 'PEAR_Error')) { - Horde::logMessage($user_id, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($user_id, 'ERR'); $notification->push(sprintf(_("Error saving alias. %s"), $alias_id->getMessage()), 'horde.error'); // remove the mode, and rearrange the alias information to clean up the form. $vars->remove('mode'); @@ -54,13 +54,13 @@ if ($vars->exists('mode')) { /* Check if a form is being edited. */ if (!$vars->exists('mode') || $vars->getExists('retry')) { - Horde::logMessage("No-Submit Detected: " . print_r(serialize($vars), true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage("No-Submit Detected: " . print_r(serialize($vars), true), 'DEBUG'); if ($vars->exists("alias")) { $alias = $vars->get("alias"); - Horde::logMessage("Alias Detected: $alias", __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage("Alias Detected: $alias", 'DEBUG'); $addrInfo = $vilma_driver->getAddressInfo($alias,'alias'); - Horde::logMessage("addrInfo contains: " . print_r($addrInfo, true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage("addrInfo contains: " . print_r($addrInfo, true), 'DEBUG'); if (is_a($addrInfo, 'PEAR_Error')) { $notification->push(sprintf(_("Error reading address information from backend: %s"), $addrInfo->getMessage()), 'horde.error'); $url = '/users/index.php'; @@ -68,7 +68,7 @@ if (!$vars->exists('mode') || $vars->getExists('retry')) { exit; } $address = $vilma_driver->getAddressInfo($addrInfo['destination']); - Horde::logMessage("address Info contains: " . print_r($address, true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage("address Info contains: " . print_r($address, true), 'DEBUG'); $vars = new Variables($address); $vars->set('mode', 'edit'); $vars->add('alias_address', $alias); @@ -76,10 +76,10 @@ if (!$vars->exists('mode') || $vars->getExists('retry')) { $vars->add('address', $address['address']); } elseif ($vars->exists("address")) { $tmp_address = $vars->get("address"); - Horde::logMessage("Address Detected: $tmp_address", __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage("Address Detected: $tmp_address", 'DEBUG'); $address = $vilma_driver->getAddressInfo($tmp_address, 'all'); - Horde::logMessage("addrInfo contains: " . print_r($addrInfo, true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage("addrInfo contains: " . print_r($addrInfo, true), 'DEBUG'); $vars = new Variables($address); $vars->set('mode', 'new'); } @@ -90,7 +90,7 @@ if (!$vars->exists('mode') || $vars->getExists('retry')) { $form->getInfo($vars, $info); $alias_id = $vilma_driver->saveAlias($info); if (is_a($alias_id, 'PEAR_Error')) { - Horde::logMessage($user_id, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($user_id, 'ERR'); $notification->push(sprintf(_("Error saving alias. %s"), $alias_id->getMessage()), 'horde.error'); } else { $notification->push(_("Alias saved."), 'horde.success'); diff --git a/vilma/users/editForward.php b/vilma/users/editForward.php index 671871cd8..c8040723a 100644 --- a/vilma/users/editForward.php +++ b/vilma/users/editForward.php @@ -25,14 +25,14 @@ $vars = Variables::getDefaultVariables(); /* If the form is submitted, $vars['mode'] will be set. Catch this and process the submission so that the displayed form accurately indicates the result of the transaction. */ if ($vars->exists('mode')) { - Horde::logMessage("Submit Detected: " . print_r(serialize($vars), true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage("Submit Detected: " . print_r(serialize($vars), true), 'DEBUG'); $form = &new EditForwardForm($vars); if ($form->validate($vars)) { $form->getInfo($vars, $info); $forward_id = $vilma_driver->saveForward($info); if (is_a($forward_id, 'PEAR_Error')) { - Horde::logMessage($user_id, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($user_id, 'ERR'); $notification->push(sprintf(_("Error saving forward. %s"), $forward_id->getMessage()), 'horde.error'); // remove the mode, and rearrange the forward information to clean up the form. $vars->remove('mode'); @@ -51,13 +51,13 @@ if ($vars->exists('mode')) { /* Check if a form is being edited. */ if (!$vars->exists('mode') || $vars->getExists('retry')) { - Horde::logMessage("No-Submit Detected: " . print_r(serialize($vars), true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage("No-Submit Detected: " . print_r(serialize($vars), true), 'DEBUG'); if ($vars->exists("forward")) { $forward = $vars->get("forward"); - Horde::logMessage("Forward Detected: $forward", __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage("Forward Detected: $forward", 'DEBUG'); $addrInfo = $vilma_driver->getAddressInfo($forward,'forward'); - Horde::logMessage("addrInfo contains: " . print_r($addrInfo, true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage("addrInfo contains: " . print_r($addrInfo, true), 'DEBUG'); if (is_a($addrInfo, 'PEAR_Error')) { $notification->push(sprintf(_("Error reading address information from backend: %s"), $addrInfo->getMessage()), 'horde.error'); $url = '/users/index.php'; @@ -65,7 +65,7 @@ if (!$vars->exists('mode') || $vars->getExists('retry')) { exit; } $address = $vilma_driver->getAddressInfo($addrInfo['destination']); - Horde::logMessage("address Info contains: " . print_r($address, true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage("address Info contains: " . print_r($address, true), 'DEBUG'); $vars = new Variables($address); $vars->set('mode', 'edit'); $vars->add('forward_address', $forward); @@ -73,10 +73,10 @@ if (!$vars->exists('mode') || $vars->getExists('retry')) { $vars->add('address', $address['address']); } elseif ($vars->exists("address")) { $tmp_address = $vars->get("address"); - Horde::logMessage("Address Detected: $tmp_address", __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage("Address Detected: $tmp_address", 'DEBUG'); $address = $vilma_driver->getAddressInfo($tmp_address, 'all'); - Horde::logMessage("addrInfo contains: " . print_r($addrInfo, true), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage("addrInfo contains: " . print_r($addrInfo, true), 'DEBUG'); $vars = new Variables($address); $vars->set('mode', 'new'); } @@ -87,7 +87,7 @@ if (!$vars->exists('mode') || $vars->getExists('retry')) { $form->getInfo($vars, $info); $forward_id = $vilma_driver->saveforward($info); if (is_a($forward_id, 'PEAR_Error')) { - Horde::logMessage($user_id, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($user_id, 'ERR'); $notification->push(sprintf(_("Error saving forward. %s"), $forward_id->getMessage()), 'horde.error'); } else { $notification->push(_("forward saved."), 'horde.success'); diff --git a/vilma/virtuals/delete.php b/vilma/virtuals/delete.php index 3bd49a1db..79482bbe4 100644 --- a/vilma/virtuals/delete.php +++ b/vilma/virtuals/delete.php @@ -37,7 +37,7 @@ if ($vars->get('submitbutton') == _("Delete")) { $form->getInfo($vars, $info); $delete = $vilma_driver->deleteVirtual($info['virtual_id']); if (is_a($delete, 'PEAR_Error')) { - Horde::logMessage($delete, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($delete, 'ERR'); $notification->push(sprintf(_("Error deleting virtual email. %s."), $delete->getMessage()), 'horde.error'); } else { $notification->push(_("Virtual email deleted."), 'horde.success'); diff --git a/vilma/virtuals/edit.php b/vilma/virtuals/edit.php index 258d490a5..26e951d41 100644 --- a/vilma/virtuals/edit.php +++ b/vilma/virtuals/edit.php @@ -70,7 +70,7 @@ if ($form->validate($vars)) { } $virtual_id = $vilma_driver->saveVirtual($info, $domain); if (is_a($virtual_id, 'PEAR_Error')) { - Horde::logMessage($virtual_id, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($virtual_id, 'ERR'); $notification->push(sprintf(_("Error saving virtual email. %s."), $virtual_id->getMessage()), 'horde.error'); } else { $notification->push(_("Virtual email saved."), 'horde.success'); diff --git a/whups/lib/Ajax/Imple/ContactAutoCompleter.php b/whups/lib/Ajax/Imple/ContactAutoCompleter.php index 378f18b47..5fe3ae230 100644 --- a/whups/lib/Ajax/Imple/ContactAutoCompleter.php +++ b/whups/lib/Ajax/Imple/ContactAutoCompleter.php @@ -100,7 +100,7 @@ class Whups_Ajax_Imple_ContactAutoCompleter extends Horde_Ajax_Imple_AutoComplet try { $res = $GLOBALS['registry']->call('contacts/search', array($search, $sparams['sources'], $sparams['fields'], false)); } catch (Horde_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); return array(); } diff --git a/whups/lib/Driver.php b/whups/lib/Driver.php index 94a85c71f..43b11a7e8 100644 --- a/whups/lib/Driver.php +++ b/whups/lib/Driver.php @@ -493,9 +493,9 @@ class Whups_Driver { $entry = sprintf('%s Message sent to %s from "%s"', $_SERVER['REMOTE_ADDR'], $to, Horde_Auth::getAuth()); - Horde::logMessage($entry, __FILE__, __LINE__, PEAR_LOG_INFO); + Horde::logMessage($entry, 'INFO'); } catch (Horde_Mime_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); } } } diff --git a/whups/lib/Driver/sql.php b/whups/lib/Driver/sql.php index 5ff72b0d3..bb2cef9d2 100644 --- a/whups/lib/Driver/sql.php +++ b/whups/lib/Driver/sql.php @@ -65,7 +65,7 @@ class Whups_Driver_sql extends Whups_Driver { // Get a new unique id. $new_id = $this->_write_db->nextId('whups_queues'); if (is_a($new_id, 'PEAR_Error')) { - Horde::logMessage($new_id, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($new_id, 'ERR'); return $new_id; } @@ -91,11 +91,10 @@ class Whups_Driver_sql extends Whups_Driver { $email); Horde::logMessage( sprintf('Whups_Driver_sql::addQueue(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -107,7 +106,7 @@ class Whups_Driver_sql extends Whups_Driver { // Get a new unique id. $new_id = $this->_write_db->nextId('whups_types'); if (is_a($new_id, 'PEAR_Error')) { - Horde::logMessage($new_id, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($new_id, 'ERR'); return $new_id; } @@ -120,11 +119,10 @@ class Whups_Driver_sql extends Whups_Driver { $this->_params['charset'])); Horde::logMessage( sprintf('Whups_Driver_sql::addType(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -136,7 +134,7 @@ class Whups_Driver_sql extends Whups_Driver { // Get a new state id. $new_id = $this->_write_db->nextId('whups_states'); if (is_a($new_id, 'PEAR_Error')) { - Horde::logMessage($new_id, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($new_id, 'ERR'); return $new_id; } @@ -152,11 +150,10 @@ class Whups_Driver_sql extends Whups_Driver { $this->_params['charset'])); Horde::logMessage( sprintf('Whups_Driver_sql::addState(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -168,7 +165,7 @@ class Whups_Driver_sql extends Whups_Driver { // Get a new priority id. $new_id = $this->_write_db->nextId('whups_priorities'); if (is_a($new_id, 'PEAR_Error')) { - Horde::logMessage($new_id, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($new_id, 'ERR'); return $new_id; } @@ -182,11 +179,10 @@ class Whups_Driver_sql extends Whups_Driver { $this->_params['charset'])); Horde::logMessage( sprintf('Whups_Driver_sql::addPriority(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -208,7 +204,7 @@ class Whups_Driver_sql extends Whups_Driver { // Get a new version id. $new_id = $this->_write_db->nextId('whups_versions'); if (is_a($new_id, 'PEAR_Error')) { - Horde::logMessage($new_id, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($new_id, 'ERR'); return $new_id; } @@ -223,11 +219,10 @@ class Whups_Driver_sql extends Whups_Driver { (int)$active); Horde::logMessage( sprintf('Whups_Driver_sql::addVersion(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -248,7 +243,7 @@ class Whups_Driver_sql extends Whups_Driver { // Get a new reply id. $new_id = $this->_write_db->nextId('whups_replies'); if (is_a($new_id, 'PEAR_Error')) { - Horde::logMessage($new_id, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($new_id, 'ERR'); return $new_id; } @@ -262,11 +257,10 @@ class Whups_Driver_sql extends Whups_Driver { $this->_params['charset'])); Horde::logMessage( sprintf('Whups_Driver_sql::addReply(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -288,7 +282,7 @@ class Whups_Driver_sql extends Whups_Driver { // Get the new unique ids for this ticket and the initial comment. $ticketId = $this->_write_db->nextId('whups_tickets'); if (is_a($ticketId, 'PEAR_Error')) { - Horde::logMessage($ticketId, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($ticketId, 'ERR'); return $ticketId; } @@ -314,11 +308,10 @@ class Whups_Driver_sql extends Whups_Driver { $version); Horde::logMessage( sprintf('Whups_Driver_sql::addTicket(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -328,11 +321,10 @@ class Whups_Driver_sql extends Whups_Driver { $values = array((string)$requester, $info['user_email']); Horde::logMessage( sprintf('Whups_Driver_sql::addTicket(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } } @@ -341,7 +333,7 @@ class Whups_Driver_sql extends Whups_Driver { $ticketId, $comment, $requester, isset($info['user_email']) ? $info['user_email'] : null); if (is_a($commentId, 'PEAR_Error')) { - Horde::logMessage($commentId, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($commentId, 'ERR'); return $commentId; } @@ -355,7 +347,7 @@ class Whups_Driver_sql extends Whups_Driver { 'comment' => $commentId, 'queue' => $queue)); if (is_a($transaction, 'PEAR_Error')) { - Horde::logMessage($transaction, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($transaction, 'ERR'); return $transaction; } @@ -373,7 +365,7 @@ class Whups_Driver_sql extends Whups_Driver { array('assign' => $owner), $transaction); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } } @@ -384,7 +376,7 @@ class Whups_Driver_sql extends Whups_Driver { $attribute_id, $attribute_value); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } $this->updateLog( @@ -401,7 +393,7 @@ class Whups_Driver_sql extends Whups_Driver { { $id = $this->_write_db->nextId('whups_comments'); if (is_a($id, 'PEAR_Error')) { - Horde::logMessage($id, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($id, 'ERR'); return $id; } @@ -418,7 +410,7 @@ class Whups_Driver_sql extends Whups_Driver { Horde_String::convertCharset($comment, Horde_Nls::getCharset(), $this->_params['charset']), time())); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -428,11 +420,10 @@ class Whups_Driver_sql extends Whups_Driver { $values = array((string)$creator, $creator_email); Horde::logMessage( sprintf('Whups_Driver_sql::addComment(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } } @@ -481,8 +472,7 @@ class Whups_Driver_sql extends Whups_Driver { Horde::logMessage( sprintf('Whups_Driver_sql::updateTicket(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); return $this->_write_db->query($query, $values); } @@ -532,11 +522,10 @@ class Whups_Driver_sql extends Whups_Driver { $values = array($id); Horde::logMessage( sprintf('Whups_Driver_sql::deleteTicket(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } } @@ -565,11 +554,10 @@ class Whups_Driver_sql extends Whups_Driver { . "WHERE $where"; Horde::logMessage( - sprintf('Whups_Driver_sql::executeQuery(): query="%s"', $sql), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + sprintf('Whups_Driver_sql::executeQuery(): query="%s"', $sql), 'DEBUG'); $ids = $this->_db->getAssoc($sql); if (is_a($ids, 'PEAR_Error')) { - Horde::logMessage($ids, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($ids, 'ERR'); $GLOBALS['notification']->push($ids, 'horde.error'); return array(); } @@ -1009,12 +997,11 @@ class Whups_Driver_sql extends Whups_Driver { . 'GROUP BY ' . $groupby; Horde::logMessage( sprintf('Whups_Driver_sql::getTicketsByProperties(): query="%s"', - $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query), 'DEBUG'); $info = $this->_db->getAll($query, null, DB_FETCHMODE_ASSOC); if (is_a($info, 'PEAR_Error')) { - Horde::logMessage($info, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($info, 'ERR'); return $info; } @@ -1077,7 +1064,7 @@ class Whups_Driver_sql extends Whups_Driver { { $result = $this->getTicketsByProperties(array('id' => $ticket)); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } elseif (!isset($result[0])) { return PEAR::raiseError(sprintf(_("Ticket %s was not found."), @@ -1106,12 +1093,11 @@ class Whups_Driver_sql extends Whups_Driver { . 'WHERE ticket_id = ?'; Horde::logMessage( sprintf('Whups_Driver_sql::getTicketState(): query="%s"; values="%s"', - $query, $ticket_id), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, $ticket_id), 'DEBUG'); $state = $this->_db->getRow($query, array($ticket_id), DB_FETCHMODE_ASSOC); if (is_a($state, 'PEAR_Error')) { - Horde::logMessage($state, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($state, 'ERR'); } return $state; } @@ -1125,8 +1111,7 @@ class Whups_Driver_sql extends Whups_Driver { $values = array($guest_id); Horde::logMessage( sprintf('Whups_Driver_sql::getGuestEmail(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $result = $this->_db->getOne($query, $values); if (is_a($result, 'PEAR_Error')) { return $result; @@ -1171,12 +1156,11 @@ class Whups_Driver_sql extends Whups_Driver { $query = "SELECT $fields FROM whups_logs $join WHERE $where " . "ORDER BY whups_logs.transaction_id"; Horde::logMessage(sprintf('Whups_Driver_sql::_getHistory(): query="%s"', - $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query), 'DEBUG'); $history = $this->_db->getAll($query, null, DB_FETCHMODE_ASSOC); if (is_a($history, 'PEAR_Error')) { - Horde::logMessage($history, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($history, 'ERR'); return $history; } @@ -1215,11 +1199,10 @@ class Whups_Driver_sql extends Whups_Driver { . 'GROUP BY q.queue_id, q.queue_slug, q.queue_name, ' . 'q.queue_description ORDER BY q.queue_name'; Horde::logMessage( - sprintf('Whups_Driver_sql::getQueueSummary(): query="%s"', $sql), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + sprintf('Whups_Driver_sql::getQueueSummary(): query="%s"', $sql), 'DEBUG'); $queues = $this->_db->getAll($sql, null, DB_FETCHMODE_ASSOC); if (is_a($queues, 'PEAR_Error')) { - Horde::logMessage($queues, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($queues, 'ERR'); return $queues; } @@ -1240,11 +1223,10 @@ class Whups_Driver_sql extends Whups_Driver { $values = array((int)$queueId); Horde::logMessage( sprintf('Whups_Driver_sql::getQueueInternal(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $queue = $this->_db->getRow($query, $values, DB_FETCHMODE_ASSOC); if (is_a($queue, 'PEAR_Error')) { - Horde::logMessage($queue, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($queue, 'ERR'); return $queue; } elseif (!$queue) { return false; @@ -1270,11 +1252,10 @@ class Whups_Driver_sql extends Whups_Driver { $values = array((string)$slug); Horde::logMessage( sprintf('Whups_Driver_sql::getQueueInternal(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $queue = $this->_db->getAll($query, $values); if (is_a($queue, 'PEAR_Error')) { - Horde::logMessage($queue, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($queue, 'ERR'); return $queue; } elseif (!count($queue)) { return $queue; @@ -1301,11 +1282,10 @@ class Whups_Driver_sql extends Whups_Driver { $query = 'SELECT queue_id, queue_name FROM whups_queues ' . 'ORDER BY queue_name'; Horde::logMessage(sprintf('Whups_Driver_sql::getQueues(): query="%s"', - $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query), 'DEBUG'); $queues = $this->_db->getAssoc($query); if (is_a($queues, 'PEAR_Error')) { - Horde::logMessage($queues, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($queues, 'ERR'); return array(); } @@ -1342,11 +1322,10 @@ class Whups_Driver_sql extends Whups_Driver { $queueId); Horde::logMessage( sprintf('Whups_Driver_sql::updateQueue(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } } @@ -1356,11 +1335,10 @@ class Whups_Driver_sql extends Whups_Driver { $values = array($queueId); Horde::logMessage( sprintf('Whups_Driver_sql::updateQueue(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -1372,11 +1350,10 @@ class Whups_Driver_sql extends Whups_Driver { $values = array($queueId, $typeId, $default == $typeId ? 1 : 0); Horde::logMessage( sprintf('Whups_Driver_sql::updateQueue(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } } @@ -1390,11 +1367,10 @@ class Whups_Driver_sql extends Whups_Driver { $query = 'SELECT type_id FROM whups_types_queues ' . 'WHERE type_default = 1 AND queue_id = ?'; Horde::logMessage( - sprintf('Whups_Driver_sql::setDefaultType(): query="%s"', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + sprintf('Whups_Driver_sql::setDefaultType(): query="%s"', $query), 'DEBUG'); $type = $this->_db->getOne($query, array($queue)); if (is_a($type, 'PEAR_Error')) { - Horde::logMessage($type, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($type, 'ERR'); return null; } return $type; @@ -1413,11 +1389,10 @@ class Whups_Driver_sql extends Whups_Driver { $values = array($queueId); Horde::logMessage( sprintf('Whups_Driver_sql::deleteQueue(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } } @@ -1435,11 +1410,10 @@ class Whups_Driver_sql extends Whups_Driver { // Delete existing associations. $query = 'DELETE FROM whups_types_queues'; Horde::logMessage( - sprintf('Whups_Driver_sql::updateTypesQueues(): query="%s"', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + sprintf('Whups_Driver_sql::updateTypesQueues(): query="%s"', $query), 'DEBUG'); $result = $this->_write_db->query($query); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); $this->_write_db->rollback(); $this->_write_db->autoCommit(true); return $result; @@ -1452,11 +1426,10 @@ class Whups_Driver_sql extends Whups_Driver { $values = array((int)$pair[0], (int)$pair[1]); Horde::logMessage( sprintf('Whups_Driver_sql::updateTypesQueues(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); $this->_write_db->rollback(); $this->_write_db->autoCommit(true); return $result; @@ -1465,7 +1438,7 @@ class Whups_Driver_sql extends Whups_Driver { $result = $this->_write_db->commit(); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); $this->_write_db->rollback(); $this->_write_db->autoCommit(true); return $result; @@ -1481,11 +1454,10 @@ class Whups_Driver_sql extends Whups_Driver { $values = array($queueId); Horde::logMessage( sprintf('Whups_Driver_sql::getQueueUsers(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $users = $this->_db->getAssoc($query, false, $values); if (is_a($users, 'PEAR_Error')) { - Horde::logMessage($users, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($users, 'ERR'); return array(); } @@ -1503,11 +1475,10 @@ class Whups_Driver_sql extends Whups_Driver { $values = array($queueId, $user); Horde::logMessage( sprintf('Whups_Driver_sql::addQueueUser(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } } @@ -1521,8 +1492,7 @@ class Whups_Driver_sql extends Whups_Driver { $values = array($queueId, $userId); Horde::logMessage( sprintf('Whups_Driver_sql::removeQueueUser(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); return $this->_write_db->query($query, $values); } @@ -1536,12 +1506,11 @@ class Whups_Driver_sql extends Whups_Driver { $values = array($typeId); Horde::logMessage( sprintf('Whups_Driver_sql::getType(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $type = $this->_db->getAssoc($query, false, $values); if (is_a($type, 'PEAR_Error')) { - Horde::logMessage($type, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($type, 'ERR'); return $type; } @@ -1560,11 +1529,10 @@ class Whups_Driver_sql extends Whups_Driver { $values = array($queueId); Horde::logMessage( sprintf('Whups_Driver_sql::getTypes(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $types = $this->_db->getAssoc($query, false, $values); if (is_a($types, 'PEAR_Error')) { - Horde::logMessage($types, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($types, 'ERR'); return array(); } @@ -1578,8 +1546,7 @@ class Whups_Driver_sql extends Whups_Driver { $values = array($queueId); Horde::logMessage( sprintf('Whups_Driver_sql::getTypeIds(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); return $this->_db->getAll($query, $values, DB_FETCHMODE_ASSOC); } @@ -1587,11 +1554,10 @@ class Whups_Driver_sql extends Whups_Driver { { $query = 'SELECT type_id, type_name FROM whups_types ORDER BY type_name'; Horde::logMessage(sprintf('Whups_Driver_sql::getAllTypes(): query="%s"', - $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query), 'DEBUG'); $types = $this->_db->getAssoc($query); if (is_a($types, 'PEAR_Error')) { - Horde::logMessage($types, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($types, 'ERR'); return array(); } @@ -1603,12 +1569,11 @@ class Whups_Driver_sql extends Whups_Driver { $query = 'SELECT type_id, type_name, type_description ' . 'FROM whups_types ORDER BY type_id'; Horde::logMessage( - sprintf('Whups_Driver_sql::getAllTypeInfo(): query="%s"', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + sprintf('Whups_Driver_sql::getAllTypeInfo(): query="%s"', $query), 'DEBUG'); $info = $this->_db->getAll($query, null, DB_FETCHMODE_ASSOC); if (is_a($info, 'PEAR_Error')) { - Horde::logMessage($info, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($info, 'ERR'); return $info; } @@ -1621,12 +1586,11 @@ class Whups_Driver_sql extends Whups_Driver { $values = array($type); Horde::logMessage( sprintf('Whups_Driver_sql::getTypeName(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $name = $this->_db->getOne($query, $values); if (is_a($name, 'PEAR_Error')) { - Horde::logMessage($name, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($name, 'ERR'); return $name; } @@ -1644,8 +1608,7 @@ class Whups_Driver_sql extends Whups_Driver { $typeId); Horde::logMessage( sprintf('Whups_Driver_sql::updateType(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); return $this->_write_db->query($query, $values); } @@ -1656,29 +1619,25 @@ class Whups_Driver_sql extends Whups_Driver { $query = 'DELETE FROM whups_states WHERE type_id = ?'; Horde::logMessage( sprintf('Whups_Driver_sql::deleteType(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $this->_write_db->query($query, $values); $query = 'DELETE FROM whups_priorities WHERE type_id = ?'; Horde::logMessage( sprintf('Whups_Driver_sql::deleteType(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $this->_write_db->query($query, $values); $query = 'DELETE FROM whups_attributes_desc WHERE type_id = ?'; Horde::logMessage( sprintf('Whups_Driver_sql::deleteType(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $this->_write_db->query($query, $values); $query = 'DELETE FROM whups_types WHERE type_id = ?'; Horde::logMessage( sprintf('Whups_Driver_sql::deleteType(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); return $this->_write_db->query($query, $values); } @@ -1724,12 +1683,11 @@ class Whups_Driver_sql extends Whups_Driver { $query = "SELECT $fields FROM $from$where ORDER BY $order"; Horde::logMessage(sprintf('Whups_Driver_sql::getStates(): query="%s"', - $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query), 'DEBUG'); $states = $this->_db->getAssoc($query); if (is_a($states, 'PEAR_Error')) { - Horde::logMessage($states, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($states, 'ERR'); return $states; } @@ -1752,11 +1710,10 @@ class Whups_Driver_sql extends Whups_Driver { $values = array($stateId); Horde::logMessage( sprintf('Whups_Driver_sql::getState(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $state = $this->_db->getAssoc($query, false, $values); if (is_a($state, 'PEAR_Error')) { - Horde::logMessage($state, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($state, 'ERR'); return $state; } @@ -1777,12 +1734,11 @@ class Whups_Driver_sql extends Whups_Driver { $values = array($type); Horde::logMessage( sprintf('Whups_Driver_sql::getAllStateInfo(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $info = $this->_db->getAll($query, $values, DB_FETCHMODE_ASSOC); if (is_a($info, 'PEAR_Error')) { - Horde::logMessage($info, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($info, 'ERR'); return $info; } @@ -1802,8 +1758,7 @@ class Whups_Driver_sql extends Whups_Driver { $stateId); Horde::logMessage( sprintf('Whups_Driver_sql::updateState(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); return $this->_write_db->query($query, $values); } @@ -1814,8 +1769,7 @@ class Whups_Driver_sql extends Whups_Driver { $values = array($type); Horde::logMessage( sprintf('Whups_Driver_sql::getDefaultState(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); return $this->_db->getOne($query, $values); } @@ -1825,19 +1779,17 @@ class Whups_Driver_sql extends Whups_Driver { $values = array($type); Horde::logMessage( sprintf('Whups_Driver_sql::setDefaultState(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } $query = 'UPDATE whups_states SET state_default = 1 WHERE state_id = ?'; $values = array($state); Horde::logMessage( sprintf('Whups_Driver_sql::setDefaultState(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); return $this->_write_db->query($query, $values); } @@ -1847,8 +1799,7 @@ class Whups_Driver_sql extends Whups_Driver { $values = array((int)$state_id); Horde::logMessage( sprintf('Whups_Driver_sql::deleteState(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); return $this->_write_db->query($query, $values); } @@ -1869,11 +1820,10 @@ class Whups_Driver_sql extends Whups_Driver { $values = array((int)$queryId); Horde::logMessage( sprintf('Whups_Driver_sql::getQuery(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $query = $this->_db->getRow($query, $values, DB_FETCHMODE_ASSOC); if (is_a($query, 'PEAR_Error')) { - Horde::logMessage($query, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($query, 'ERR'); return $query; } @@ -1910,8 +1860,7 @@ class Whups_Driver_sql extends Whups_Driver { $this->_params['charset']); Horde::logMessage( sprintf('Whups_Driver_sql::saveQuery(): query="%s"; values="%s"', - $q, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $q, implode(',', $values)), 'DEBUG'); return $this->_write_db->query($q, $values); } @@ -1926,8 +1875,7 @@ class Whups_Driver_sql extends Whups_Driver { $values = array((int)$queryId); Horde::logMessage( sprintf('Whups_Driver_sql::deleteQuery(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); return $this->_write_db->query($query, $values); } @@ -1938,8 +1886,7 @@ class Whups_Driver_sql extends Whups_Driver { $values = array((int)$state_id, $category); Horde::logMessage( sprintf('Whups_Driver_sql::isCategory(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); return $this->_db->getOne($query, $values); } @@ -1950,12 +1897,11 @@ class Whups_Driver_sql extends Whups_Driver { $values = array((int)$type); Horde::logMessage( sprintf('Whups_Driver_sql::getAllPriorityInfo(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $info = $this->_db->getAll($query, $values, DB_FETCHMODE_ASSOC); if (is_a($info, 'PEAR_Error')) { - Horde::logMessage($info, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($info, 'ERR'); return $info; } @@ -1979,12 +1925,11 @@ class Whups_Driver_sql extends Whups_Driver { $query = "SELECT $fields FROM $from$where ORDER BY $order"; Horde::logMessage( sprintf('SQL Query by Whups_Driver_sql::getPriorities(): query="%s"', - $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query), 'DEBUG'); $priorities = $this->_db->getAssoc($query); if (is_a($priorities, 'PEAR_Error')) { - Horde::logMessage($priorities, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($priorities, 'ERR'); return $priorities; } @@ -2007,11 +1952,10 @@ class Whups_Driver_sql extends Whups_Driver { $values = array((int)$priorityId); Horde::logMessage( sprintf('Whups_Driver_sql::getPriority(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $priority = $this->_db->getAssoc($query, false, $values); if (is_a($priority, 'PEAR_Error')) { - Horde::logMessage($priority, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($priority, 'ERR'); return $priority; } @@ -2037,8 +1981,7 @@ class Whups_Driver_sql extends Whups_Driver { $priorityId); Horde::logMessage( sprintf('Whups_Driver_sql::updatePriority(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); return $this->_write_db->query($query, $values); } @@ -2049,8 +1992,7 @@ class Whups_Driver_sql extends Whups_Driver { $values = array($type); Horde::logMessage( sprintf('Whups_Driver_sql::getDefaultPriority(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); return $this->_db->getOne($query, $values); } @@ -2061,11 +2003,10 @@ class Whups_Driver_sql extends Whups_Driver { $values = array($type); Horde::logMessage( sprintf('Whups_Driver_sql::setDefaultPriority(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } $query = 'UPDATE whups_priorities SET priority_default = 1 ' @@ -2073,8 +2014,7 @@ class Whups_Driver_sql extends Whups_Driver { $values = array($priority); Horde::logMessage( sprintf('Whups_Driver_sql::setDefaultPriority(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); return $this->_write_db->query($query, $values); } @@ -2084,8 +2024,7 @@ class Whups_Driver_sql extends Whups_Driver { $values = array($priorityId); Horde::logMessage( sprintf('Whups_Driver_sql::deletePriority(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); return $this->_write_db->query($query, $values); } @@ -2097,12 +2036,11 @@ class Whups_Driver_sql extends Whups_Driver { $values = array($queue); Horde::logMessage( sprintf('Whups_Driver_sql::getVersionInfoInternal(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $info = $this->_db->getAll($query, $values, DB_FETCHMODE_ASSOC); if (is_a($info, 'PEAR_Error')) { - Horde::logMessage($info, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($info, 'ERR'); return $info; } @@ -2119,11 +2057,10 @@ class Whups_Driver_sql extends Whups_Driver { $values = array($versionId); Horde::logMessage( sprintf('Whups_Driver_sql::getVersionInternal(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $version = $this->_db->getAssoc($query, false, $values); if (is_a($version, 'PEAR_Error')) { - Horde::logMessage($version, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($version, 'ERR'); return $version; } @@ -2149,8 +2086,7 @@ class Whups_Driver_sql extends Whups_Driver { (int)$versionId); Horde::logMessage( sprintf('Whups_Driver_sql::updateVersion(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); return $this->_write_db->query($query, $values); } @@ -2160,8 +2096,7 @@ class Whups_Driver_sql extends Whups_Driver { $values = array($versionId); Horde::logMessage( sprintf('Whups_Driver_sql::deleteVersion(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); return $this->_write_db->query($query, $values); } @@ -2179,12 +2114,11 @@ class Whups_Driver_sql extends Whups_Driver { $values = array((int)$type); Horde::logMessage( sprintf('Whups_Driver_sql::getReplies(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $info = $this->_db->getAssoc($query, false, $values, DB_FETCHMODE_ASSOC); if (is_a($info, 'PEAR_Error')) { - Horde::logMessage($info, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($info, 'ERR'); return $info; } @@ -2205,11 +2139,10 @@ class Whups_Driver_sql extends Whups_Driver { $values = array((int)$reply_id); Horde::logMessage( sprintf('Whups_Driver_sql::getReply(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $reply = $this->_db->getRow($query, $values, DB_FETCHMODE_ASSOC); if (is_a($reply, 'PEAR_Error')) { - Horde::logMessage($reply, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($reply, 'ERR'); return $reply; } @@ -2234,11 +2167,10 @@ class Whups_Driver_sql extends Whups_Driver { $reply); Horde::logMessage( sprintf('Whups_Driver_sql::updateReply(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); } return $result; } @@ -2254,11 +2186,10 @@ class Whups_Driver_sql extends Whups_Driver { $values = array((int)$reply); Horde::logMessage( sprintf('Whups_Driver_sql::deleteReply(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } return parent::deleteReply($reply); @@ -2271,12 +2202,11 @@ class Whups_Driver_sql extends Whups_Driver { $values = array($ticket, $user); Horde::logMessage( sprintf('Whups_Driver_sql::addListener(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -2290,12 +2220,11 @@ class Whups_Driver_sql extends Whups_Driver { $values = array($ticket, $user); Horde::logMessage( sprintf('Whups_Driver_sql::deleteListener(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -2311,16 +2240,15 @@ class Whups_Driver_sql extends Whups_Driver { $values = array($ticket); Horde::logMessage( sprintf('Whups_Driver_sql::getListeners(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)),' DEBUG'); $users = $this->_db->getCol($query, 0, $values); if (is_a($users, 'PEAR_Error')) { - Horde::logMessage($users, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($users, 'ERR'); return array(); } $tinfo = $this->getTicketDetails($ticket); if (is_a($tinfo, 'PEAR_Error')) { - Horde::logMessage($tinfo, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($tinfo, 'ERR'); return array(); } $requester = $tinfo['user_id_requester']; @@ -2365,7 +2293,7 @@ class Whups_Driver_sql extends Whups_Driver { // FIXME: This assumes that $type_id is a valid type id. $new_id = $this->_write_db->nextId('whups_attributes_desc'); if (is_a($new_id, 'PEAR_Error')) { - Horde::logMessage($new_id, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($new_id, 'ERR'); return $new_id; } @@ -2387,11 +2315,10 @@ class Whups_Driver_sql extends Whups_Driver { Horde::logMessage( sprintf('Whups_Driver_sql::addAttributeDesc(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -2418,8 +2345,7 @@ class Whups_Driver_sql extends Whups_Driver { $attribute_id); Horde::logMessage( sprintf('Whups_Driver_sql::updateAttributeDesc(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); return $this->_write_db->query($query, $values); } @@ -2432,15 +2358,13 @@ class Whups_Driver_sql extends Whups_Driver { $values = array($attribute_id); Horde::logMessage( sprintf('Whups_Driver_sql::deleteAttributeDesc(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $this->_write_db->query($query, $values); $query = 'DELETE FROM whups_attributes WHERE attribute_id = ?'; $values = array($attribute_id); Horde::logMessage( sprintf('Whups_Driver_sql::deleteAttributeDesc(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $this->_write_db->query($query, $values); $this->_write_db->commit(); $this->_write_db->autoCommit(true); @@ -2453,13 +2377,12 @@ class Whups_Driver_sql extends Whups_Driver { $query = 'SELECT attribute_id, attribute_name, attribute_description, ' . 'type_id FROM whups_attributes_desc'; Horde::logMessage( - sprintf('Whups_Driver_sql::getAllAttributes(): query="%s"', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + sprintf('Whups_Driver_sql::getAllAttributes(): query="%s"', $query), 'DEBUG'); $attributes = $this->_db->getAssoc($query, false, array(), DB_FETCHMODE_ASSOC); if (is_a($attributes, 'PEAR_Error')) { - Horde::logMessage($attributes, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($attributes, 'ERR'); return $attributes; } @@ -2478,11 +2401,10 @@ class Whups_Driver_sql extends Whups_Driver { $values = array($attribute_id); Horde::logMessage( sprintf('Whups_Driver_sql::getAttributeDesc(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $attribute = $this->_db->getRow($query, $values, DB_FETCHMODE_ASSOC); if (is_a($attribute, 'PEAR_Error')) { - Horde::logMessage($attribute, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($attribute, 'ERR'); return $attribute; } @@ -2507,12 +2429,11 @@ class Whups_Driver_sql extends Whups_Driver { $values = array($attribute_id); Horde::logMessage( sprintf('Whups_Driver_sql::getAttributeName(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $name = $this->_db->getOne($query, $values); if (is_a($name, 'PEAR_Error')) { - Horde::logMessage($name, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($name, 'ERR'); return $name; } @@ -2538,13 +2459,12 @@ class Whups_Driver_sql extends Whups_Driver { $query = "SELECT $fields FROM $from$where ORDER BY $order"; Horde::logMessage( sprintf('Whups_Driver_sql::getAttributesForType(): query="%s"', - $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query), 'DEBUG'); $attributes = $this->_db->getAssoc($query, false, null, DB_FETCHMODE_ASSOC); if (is_a($attributes, 'PEAR_Error')) { - Horde::logMessage($attributes, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($attributes, 'ERR'); return $attributes; } @@ -2581,12 +2501,11 @@ class Whups_Driver_sql extends Whups_Driver { $values = array((int)$type_id); Horde::logMessage( sprintf('Whups_Driver_sql::getAttributeNamesForType(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $names = $this->_db->getAll($query, $values, DB_FETCHMODE_ASSOC); if (is_a($names, 'PEAR_Error')) { - Horde::logMessage($names, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($names, 'ERR'); return $names; } @@ -2601,12 +2520,11 @@ class Whups_Driver_sql extends Whups_Driver { $values = array((int)$type_id); Horde::logMessage( sprintf('Whups_Driver_sql::getAttributeNamesForType(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $info = $this->_db->getAll($query, $values, DB_FETCHMODE_ASSOC); if (is_a($info, 'PEAR_Error')) { - Horde::logMessage($info, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($info, 'ERR'); return $info; } @@ -2625,8 +2543,7 @@ class Whups_Driver_sql extends Whups_Driver { $values = array($ticket_id, $attribute_id); Horde::logMessage( sprintf('Whups_Driver_sql::_setAttributeValue(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $this->_write_db->query($query, $values); if (!empty($attribute_value)) { @@ -2636,11 +2553,10 @@ class Whups_Driver_sql extends Whups_Driver { $values = array($ticket_id, $attribute_id, $db_attribute_value); Horde::logMessage( sprintf('Whups_Driver_sql::_setAttributeValue(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $inserted = $this->_write_db->query($query, $values); if (is_a($inserted, 'PEAR_Error')) { - Horde::logMessage($inserted, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($inserted, 'ERR'); $this->_write_db->rollback(); $this->_write_db->autoCommit(true); return $inserted; @@ -2664,8 +2580,7 @@ class Whups_Driver_sql extends Whups_Driver { . 'FROM whups_attributes WHERE ticket_id IN (' . str_repeat('?, ', count($ticket_id) - 1) . '?)'; Horde::logMessage( - sprintf('Whups_Driver_sql::getAttributes(): query="%s"', $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + sprintf('Whups_Driver_sql::getAttributes(): query="%s"', $query), 'DEBUG'); $attributes = $this->_db->getAll($query, $ticket_id, DB_FETCHMODE_ASSOC); } else { @@ -2674,14 +2589,13 @@ class Whups_Driver_sql extends Whups_Driver { $values = array((int)$ticket_id); Horde::logMessage( sprintf('Whups_Driver_sql::getTicketAttributes(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $attributes = $this->_db->getAssoc($query, false, $values); } if (is_a($attributes, 'PEAR_Error')) { - Horde::logMessage($attributes, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($attributes, 'ERR'); return $attributes; } @@ -2705,8 +2619,7 @@ class Whups_Driver_sql extends Whups_Driver { . str_repeat('?, ', count($ticket_id) - 1) . '?)'; Horde::logMessage( sprintf('SQL Query by Whups_Driver_sql::getAttributes(): query="%s"', - $query), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query), 'DEBUG'); $attributes = $this->_db->getAll($query, $ticket_id, DB_FETCHMODE_ASSOC); } else { @@ -2717,13 +2630,12 @@ class Whups_Driver_sql extends Whups_Driver { $values = array((int)$ticket_id); Horde::logMessage( sprintf('Whups_Driver_sql::getTicketAttributesWithNames(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $attributes = $this->_db->getAssoc($query, false, $values); } if (is_a($attributes, 'PEAR_Error')) { - Horde::logMessage($attributes, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($attributes, 'ERR'); return $attributes; } @@ -2743,12 +2655,11 @@ class Whups_Driver_sql extends Whups_Driver { $values = array($ticket_id, $ticket_id); Horde::logMessage( sprintf('Whups_Driver_sql::getAllTicketAttributesWithNames(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $attributes = $this->_db->getAll($query, $values, DB_FETCHMODE_ASSOC); if (is_a($attributes, 'PEAR_Error')) { - Horde::logMessage($attributes, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($attributes, 'ERR'); return $attributes; } @@ -2785,8 +2696,7 @@ class Whups_Driver_sql extends Whups_Driver { $values = $ticketId; Horde::logMessage( sprintf('Whups_Driver_sql::getOwners(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); return $this->_db->getAll($query, $values, DB_FETCHMODE_ASSOC); } else { $query = 'SELECT ticket_owner, ticket_owner ' @@ -2794,8 +2704,7 @@ class Whups_Driver_sql extends Whups_Driver { $values = array((int)$ticketId); Horde::logMessage( sprintf('Whups_Driver_sql::getOwners(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); return $this->_db->getAssoc($query, false, $values); } } @@ -2831,11 +2740,10 @@ class Whups_Driver_sql extends Whups_Driver { (int)$value); Horde::logMessage( sprintf('Whups_Driver_sql::updateLog(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } } @@ -2863,11 +2771,10 @@ class Whups_Driver_sql extends Whups_Driver { $values = array((string)$creator, $creator_email); Horde::logMessage( sprintf('Whups_Driver_sql::newTransaction(): query="%s"; values="%s"', - $query, implode(',', $values)), - __FILE__, __LINE__, PEAR_LOG_DEBUG); + $query, implode(',', $values)), 'DEBUG'); $result = $this->_write_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } } diff --git a/whups/lib/Forms/EditTicket.php b/whups/lib/Forms/EditTicket.php index 2c96d5ca5..65860dfea 100644 --- a/whups/lib/Forms/EditTicket.php +++ b/whups/lib/Forms/EditTicket.php @@ -46,7 +46,7 @@ class EditTicketForm extends Horde_Form { $grouped_hook = true; } catch (Horde_Exception_HookNotSet $e) { } catch (Horde_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); } $this->addHidden('', 'id', 'int', true, true); diff --git a/whups/lib/Mail.php b/whups/lib/Mail.php index f7c3dc339..d2ba67843 100644 --- a/whups/lib/Mail.php +++ b/whups/lib/Mail.php @@ -153,8 +153,7 @@ class Whups_Mail { $fp = @fopen($tmp_name, 'wb'); if (!$fp) { Horde::logMessage(sprintf('Cannot open file %s for writing.', - $tmp_name), - __FILE__, __LINE__, PEAR_LOG_ERR); + $tmp_name), 'ERR'); return $ticket; } fwrite($fp, $part->getContents()); diff --git a/whups/lib/Ticket.php b/whups/lib/Ticket.php index e3c8cc464..05da3ea76 100644 --- a/whups/lib/Ticket.php +++ b/whups/lib/Ticket.php @@ -896,7 +896,7 @@ class TicketDetailsForm extends Horde_Form { $grouped_hook = true; } catch (Horde_Exception_HookNotSet $e) { } catch (Horde_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($e, 'ERR'); } foreach ($grouped_fields as $header => $fields) { diff --git a/whups/lib/Whups.php b/whups/lib/Whups.php index fe7496efb..dda1212b6 100644 --- a/whups/lib/Whups.php +++ b/whups/lib/Whups.php @@ -862,7 +862,7 @@ class Whups { global $whups_driver; $owners = $whups_driver->getOwners($ticket); if (is_a($owners, 'PEAR_Error')) { - Horde::logMessage($owners, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($owners, 'ERR'); return $owners->getMessage(); } } diff --git a/whups/ticket/create.php b/whups/ticket/create.php index e87b21e1a..37a8110bd 100644 --- a/whups/ticket/create.php +++ b/whups/ticket/create.php @@ -48,7 +48,7 @@ if ($valid1 && $valid2 && $valid3 && $ticket = Whups_Ticket::newTicket($info, Horde_Auth::getAuth()); if (is_a($ticket, 'PEAR_Error')) { - Horde::logMessage($ticket, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($ticket, 'ERR'); $notification->push(sprintf(_("Adding your ticket failed: %s."), $ticket->getMessage()), 'horde.error'); diff --git a/wicked/lib/Driver/sql.php b/wicked/lib/Driver/sql.php index 65e835b40..8c1e1823a 100644 --- a/wicked/lib/Driver/sql.php +++ b/wicked/lib/Driver/sql.php @@ -64,7 +64,7 @@ class Wicked_Driver_sql extends Wicked_Driver { $pages = $this->_retrieve($this->_params['table'], $where); if (is_a($pages, 'PEAR_Error')) { - Horde::logMessage($pages, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($pages, 'ERR'); return $pages; } @@ -394,8 +394,7 @@ class Wicked_Driver_sql extends Wicked_Driver { $params[] = (int)$minor; } - Horde::logMessage('Wicked_Driver_sql::removeAttachment: ' . $sql, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Wicked_Driver_sql::removeAttachment: ' . $sql, 'DEBUG'); $result = $this->_db->query($sql, $params); if (is_a($result, 'PEAR_Error')) { @@ -410,8 +409,7 @@ class Wicked_Driver_sql extends Wicked_Driver { $sql .= ' AND attachment_majorversion = ? AND attachment_minorversion = ?'; } - Horde::logMessage('Wicked_Driver_sql::removeAttachment: ' . $sql, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Wicked_Driver_sql::removeAttachment: ' . $sql, 'DEBUG'); return $this->_db->query($sql, $params); } @@ -437,8 +435,7 @@ class Wicked_Driver_sql extends Wicked_Driver { ' WHERE page_id = ?'; $params = array($pageId); - Horde::logMessage('Wicked_Driver_sql::removeAllAttachments: ' . $sql, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Wicked_Driver_sql::removeAllAttachments: ' . $sql, 'DEBUG') $result = $this->_db->query($sql, $params); if (is_a($result, 'PEAR_Error')) { @@ -450,8 +447,7 @@ class Wicked_Driver_sql extends Wicked_Driver { $sql = 'DELETE FROM ' . $this->_params['attachmenthistorytable'] . ' WHERE page_id = ?'; - Horde::logMessage('Wicked_Driver_sql::removeAllAttachments: ' . $sql, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Wicked_Driver_sql::removeAllAttachments: ' . $sql, 'DEBUG'); return $this->_db->query($sql, $params); } @@ -475,7 +471,7 @@ class Wicked_Driver_sql extends Wicked_Driver { ' AND attachment_name = ' . $this->_db->quote($file['attachment_name']); $attachments = $this->_retrieve($this->_params['attachmenttable'], $where); if (is_a($attachments, 'PEAR_Error')) { - Horde::logMessage($attachments, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($attachments, 'ERR'); return $attachments; } @@ -501,7 +497,7 @@ class Wicked_Driver_sql extends Wicked_Driver { $this->_db->quote($file['attachment_name'])); $result = $this->_db->query($sql); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -516,7 +512,7 @@ class Wicked_Driver_sql extends Wicked_Driver { $this->_db->quote($this->_convertToDriver($file['attachment_name']))); $result = $this->_db->query($sql); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } } else { @@ -531,7 +527,7 @@ class Wicked_Driver_sql extends Wicked_Driver { $this->_db->quote($this->_convertToDriver($file['attachment_name']))); $result = $this->_db->query($sql); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } } @@ -552,8 +548,7 @@ class Wicked_Driver_sql extends Wicked_Driver { ' SET page_hits = page_hits + 1 WHERE page_name = ?'; $values = array($this->_convertToDriver($pagename)); - Horde::logMessage('Wicked_Driver_sql::logPageView(' . $pagename . '): ' . $query, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Wicked_Driver_sql::logPageView(' . $pagename . '): ' . $query, 'DEBUG'); return $this->_db->query($query, $values); } @@ -583,7 +578,7 @@ class Wicked_Driver_sql extends Wicked_Driver { $page_id = $this->_db->nextId($this->_params['table']); if (is_a($page_id, 'PEAR_Error')) { - Horde::logMessage($page_id, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($page_id, 'ERR'); return $page_id; } @@ -598,15 +593,14 @@ class Wicked_Driver_sql extends Wicked_Driver { time(), $author); - Horde::logMessage('Wicked_Driver_sql::newPage(): ' . $query, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Wicked_Driver_sql::newPage(): ' . $query, 'DEBUG'); /* Attempt the insertion/update query. */ $result = $this->_db->query($query, $values); /* Return an error immediately if the query failed. */ if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -636,12 +630,11 @@ class Wicked_Driver_sql extends Wicked_Driver { ' SET page_name = ? WHERE page_name = ?'; $values = array($this->_convertToDriver($newname), $this->_convertToDriver($pagename)); - Horde::logMessage('Wicked_Driver_sql::renamePage(): ' . $query, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Wicked_Driver_sql::renamePage(): ' . $query, 'DEBUG'); $result = $this->_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -649,12 +642,11 @@ class Wicked_Driver_sql extends Wicked_Driver { ' SET page_name = ? WHERE page_name = ?'; $values = array($this->_convertToDriver($newname), $this->_convertToDriver($pagename)); - Horde::logMessage('Wicked_Driver_sql::renamePage(): ' . $query, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Wicked_Driver_sql::renamePage(): ' . $query, 'DEBUG'); $result = $this->_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -684,16 +676,14 @@ class Wicked_Driver_sql extends Wicked_Driver { $this->_params['table']); $values = array($this->_convertToDriver($pagename)); - Horde::logMessage('Page ' . $pagename . ' saved with user agent ' . $GLOBALS['browser']->getAgentString(), - __FILE__, __LINE__, PEAR_LOG_DEBUG); - Horde::logMessage('Wicked_Driver_sql::updateText(): ' . $query, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Page ' . $pagename . ' saved with user agent ' . $GLOBALS['browser']->getAgentString(), 'DEBUG'); + Horde::logMessage('Wicked_Driver_sql::updateText(): ' . $query, 'DEBUG'); $result = $this->_db->query($query, $values); /* Return an error immediately if the query failed. */ if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -718,15 +708,14 @@ class Wicked_Driver_sql extends Wicked_Driver { time(), $this->_convertToDriver($pagename)); - Horde::logMessage('Wicked_Driver_sql::updateText(): ' . $query, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Wicked_Driver_sql::updateText(): ' . $query, 'DEBUG'); /* Attempt the insertion/update query. */ $result = $this->_db->query($query, $values); /* Return an error immediately if the query failed. */ if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -739,8 +728,7 @@ class Wicked_Driver_sql extends Wicked_Driver { if (!isset($pageNames) || $no_cache) { $query = 'SELECT page_id, page_name FROM ' . $this->_params['table']; - Horde::logMessage('Wicked_Driver_sql::getPages(): ' . $query, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Wicked_Driver_sql::getPages(): ' . $query, 'DEBUG'); $result = $this->_db->getAssoc($query); if (is_a($result, 'PEAR_Error')) { @@ -767,8 +755,7 @@ class Wicked_Driver_sql extends Wicked_Driver { ' WHERE page_name = ? AND page_majorversion = ? AND page_minorversion = ?'; $values = array($this->_convertToDriver($pagename), $major, $minor); - Horde::logMessage('Wicked_Driver_sql::removeVersion(): ' . $query, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Wicked_Driver_sql::removeVersion(): ' . $query, 'DEBUG'); $result = $this->_db->getOne($query, $values); if ($result && !is_a($result, 'PEAR_Error')) { @@ -778,12 +765,11 @@ class Wicked_Driver_sql extends Wicked_Driver { ' WHERE page_name = ? ORDER BY page_majorversion DESC, page_minorversion DESC'; $query = $this->_db->modifyLimitQuery($query, 0, 1, array($this->_convertToDriver($pagename))); - Horde::logMessage('Wicked_Driver_sql::removeVersion(): ' . $query, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Wicked_Driver_sql::removeVersion(): ' . $query, 'DEBUG'); $revision = $this->_db->getRow($query, array($this->_convertToDriver($pagename)), DB_FETCHMODE_ASSOC); if (is_a($revision, 'PEAR_Error')) { - Horde::logMessage($revision, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($revision, 'ERR'); return $revision; } @@ -801,12 +787,11 @@ class Wicked_Driver_sql extends Wicked_Driver { $revision['change_log'], $this->_convertToDriver($pagename)); - Horde::logMessage('Wicked_Driver_sql::removeVersion(): ' . $query, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Wicked_Driver_sql::removeVersion(): ' . $query, 'DEBUG'); $result = $this->_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -816,12 +801,11 @@ class Wicked_Driver_sql extends Wicked_Driver { ' WHERE page_name = ? and page_majorversion = ? and page_minorversion = ?'; $values = array($this->_convertToDriver($pagename), $revision['page_majorversion'], $revision['page_minorversion']); - Horde::logMessage('Wicked_Driver_sql::removeVersion(): ' . $query, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Wicked_Driver_sql::removeVersion(): ' . $query, 'DEBUG'); $result = $this->_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } } else { @@ -830,12 +814,11 @@ class Wicked_Driver_sql extends Wicked_Driver { $query = 'DELETE FROM ' . $this->_params['historytable'] . ' WHERE page_name = ? and page_majorversion = ? and page_minorversion = ?'; - Horde::logMessage('Wicked_Driver_sql::removeVersion(): ' . $query, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Wicked_Driver_sql::removeVersion(): ' . $query, 'DEBUG'); $result = $this->_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } } @@ -853,12 +836,11 @@ class Wicked_Driver_sql extends Wicked_Driver { ' WHERE page_name = ?'; $values = array($this->_convertToDriver($pagename)); - Horde::logMessage('Wicked_Driver_sql::removeAllVersions(): ' . $query, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Wicked_Driver_sql::removeAllVersions(): ' . $query, 'DEBUG'); $result = $this->_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -866,12 +848,11 @@ class Wicked_Driver_sql extends Wicked_Driver { ' WHERE page_name = ?'; $values = array($this->_convertToDriver($pagename)); - Horde::logMessage('Wicked_Driver_sql::removeAllVersions(): ' . $query, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Wicked_Driver_sql::removeAllVersions(): ' . $query, 'DEBUG'); $result = $this->_db->query($query, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } @@ -903,8 +884,7 @@ class Wicked_Driver_sql extends Wicked_Driver { $query = $this->_db->modifyLimitQuery($query, 0, $limit); } - Horde::logMessage('Wicked_Driver_sql::_retrieve(): ' . $query, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('Wicked_Driver_sql::_retrieve(): ' . $query, 'DEBUG'); $result = $this->_db->query($query); if (is_a($result, 'PEAR_Error')) { diff --git a/wicked/lib/Page/AttachedFiles.php b/wicked/lib/Page/AttachedFiles.php index 5d64cba7c..afa1c1dca 100644 --- a/wicked/lib/Page/AttachedFiles.php +++ b/wicked/lib/Page/AttachedFiles.php @@ -288,7 +288,7 @@ class AttachedFiles extends Page { $result = $wicked->attachFile($file, $data); if (is_a($result, 'PEAR_Error')) { $notification->push($result, 'horde.error'); - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } diff --git a/wicked/scripts/wicked.php b/wicked/scripts/wicked.php index d0aa06908..c538c5d1d 100755 --- a/wicked/scripts/wicked.php +++ b/wicked/scripts/wicked.php @@ -22,7 +22,7 @@ $ret = Console_Getopt::getopt(Console_Getopt::readPHPArgv(), 'hu::p::ldg::o::', if (is_a($ret, 'PEAR_Error')) { $error = _("Couldn't read command-line options."); - Horde::logMessage($error, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($error, 'DEBUG'); $cli->fatal($error); } @@ -80,11 +80,11 @@ if (!empty($username) && !empty($password)) { $auth = Horde_Auth::singleton($conf['auth']['driver']); if (!$auth->authenticate($username, array('password' => $password))) { $error = _("Login is incorrect."); - Horde::logMessage($error, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($error, 'ERR'); $cli->message($msg, 'cli.error'); } else { $msg = sprintf(_("Logged in successfully as \"%s\"."), $username); - Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage($msg, 'DEBUG'); $cli->message($msg, 'cli.success'); } } -- 2.11.0