From ddc1878ef24328f783ecc37990442ee889073641 Mon Sep 17 00:00:00 2001 From: Ben Klang Date: Mon, 3 May 2010 20:54:12 -0400 Subject: [PATCH] Jonah: Fix Horde::logMessage() calls --- jonah/delivery/html.php | 2 +- jonah/delivery/index.php | 2 +- jonah/delivery/rss.php | 4 +-- jonah/lib/Api.php | 2 +- jonah/lib/Block/news.php | 1 + jonah/lib/Driver/sql.php | 66 ++++++++++++++++++++++++------------------------ jonah/lib/News.php | 6 ++--- jonah/lib/News/sql.php | 64 +++++++++++++++++++++++----------------------- jonah/stories/share.php | 2 +- jonah/stories/view.php | 4 +-- 10 files changed, 77 insertions(+), 76 deletions(-) diff --git a/jonah/delivery/html.php b/jonah/delivery/html.php index 262b2c66f..ed8133c2b 100644 --- a/jonah/delivery/html.php +++ b/jonah/delivery/html.php @@ -38,7 +38,7 @@ if (empty($criteria['channel_format'])) { /* Get requested channel. */ $channel = $news->getChannel($criteria['channel_id']); if (is_a($channel, 'PEAR_Error')) { - Horde::logMessage($channel, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($channel, 'ERR'); $notification->push(_("Invalid channel."), 'horde.error'); $url = Horde::applicationUrl('delivery/index.php', true); header('Location: ' . $url); diff --git a/jonah/delivery/index.php b/jonah/delivery/index.php index 63e5c6c9d..475c5391d 100644 --- a/jonah/delivery/index.php +++ b/jonah/delivery/index.php @@ -61,7 +61,7 @@ foreach ($parts as $part) { } else { // An unknown directive Horde::logMessage("Malformed request URL: " . Horde_Util::getPathInfo(), - __FILE__, __LINE__, PEAR_LOG_WARNING); + 'WARN'); exit; } break; diff --git a/jonah/delivery/rss.php b/jonah/delivery/rss.php index 031cf7f85..8d2f77470 100644 --- a/jonah/delivery/rss.php +++ b/jonah/delivery/rss.php @@ -38,7 +38,7 @@ if (empty($criteria['feed_type'])) { $channel = $news->getChannel($criteria['channel_id']); if (is_a($channel, 'PEAR_Error')) { - Horde::logMessage($channel, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($channel, 'ERR'); header('HTTP/1.0 404 Not Found'); echo ' @@ -58,7 +58,7 @@ if (!empty($criteria['tag_id'])) { $stories = $news->getStories($criteria['channel_id'], 10, 0, false, time()); } if (is_a($stories, 'PEAR_Error')) { - Horde::logMessage($stories, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($stories, 'ERR'); $stories = array(); } diff --git a/jonah/lib/Api.php b/jonah/lib/Api.php index 13bbc5cad..67144bd75 100644 --- a/jonah/lib/Api.php +++ b/jonah/lib/Api.php @@ -72,7 +72,7 @@ class Jonah_Api extends Horde_Registry_Api $news = Jonah_News::factory(); $story = $news->getStory($channel_id, $story_id, $read); if (is_a($story, 'PEAR_Error')) { - Horde::logMessage($story, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($story, 'ERR'); return false; } if (empty($story['story_body_type']) || $story['story_body_type'] == 'text') { diff --git a/jonah/lib/Block/news.php b/jonah/lib/Block/news.php index 085c2e31d..d2bc84452 100644 --- a/jonah/lib/Block/news.php +++ b/jonah/lib/Block/news.php @@ -22,6 +22,7 @@ class Horde_Block_Jonah_news extends Horde_Block { function _params() { + require_once dirname(__FILE__) . '/../../lib/Application.php'; require JONAH_BASE . '/config/templates.php'; $params['source'] = array('name' => _("Feed"), diff --git a/jonah/lib/Driver/sql.php b/jonah/lib/Driver/sql.php index 35c9b2263..11024d177 100644 --- a/jonah/lib/Driver/sql.php +++ b/jonah/lib/Driver/sql.php @@ -78,7 +78,7 @@ class Jonah_Driver_sql extends Jonah_Driver { if (empty($info['channel_id'])) { $info['channel_id'] = $this->_db->nextId('jonah_channels'); if (is_a($info['channel_id'], 'PEAR_Error')) { - Horde::logMessage($info['channel_id'], __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($info['channel_id'], 'ERR'); return $info['channel_id']; } $sql = 'INSERT INTO jonah_channels' . @@ -103,10 +103,10 @@ class Jonah_Driver_sql extends Jonah_Driver { isset($info['channel_page_link']) ? $info['channel_page_link'] : null, isset($info['channel_story_url']) ? $info['channel_story_url'] : null, isset($info['channel_img']) ? $info['channel_img'] : null); - Horde::logMessage('SQL Query by Jonah_Driver_sql::saveChannel(): ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Jonah_Driver_sql::saveChannel(): ' . $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; } @@ -143,10 +143,10 @@ class Jonah_Driver_sql extends Jonah_Driver { $sql = sprintf('SELECT channel_id, channel_name, channel_type, channel_updated FROM jonah_channels %s ORDER BY channel_name', $wsql); - Horde::logMessage('SQL Query by Jonah_Driver_sql::getChannels(): ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Jonah_Driver_sql::getChannels(): ' . $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; } for ($i = 0; $i < count($result); $i++) { @@ -166,10 +166,10 @@ class Jonah_Driver_sql extends Jonah_Driver { $sql = 'SELECT * FROM jonah_channels WHERE channel_id = ' . (int)$channel_id; - Horde::logMessage('SQL Query by Jonah_Driver_sql::_getChannel(): ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Jonah_Driver_sql::_getChannel(): ' . $sql, 'DEBUG'); $result = $this->_db->getRow($sql, DB_FETCHMODE_ASSOC); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } elseif (empty($result)) { return PEAR::raiseError(sprintf(_("Channel id \"%s\" not found."), $channel_id)); @@ -180,10 +180,10 @@ class Jonah_Driver_sql extends Jonah_Driver { $channels = explode(':', $result['channel_url']); if (count($channels)) { $sql = 'SELECT MAX(channel_updated) FROM jonah_channels WHERE channel_id IN (' . implode(',', $channels) . ')'; - Horde::logMessage('SQL Query by Jonah_Driver_sql::_getChannel(): ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Jonah_Driver_sql::_getChannel(): ' . $sql, 'DEBUG'); $updated = $this->_db->getOne($sql); if (is_a($updated, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); } else { $result['channel_updated'] = $updated; $this->_timestampChannel($channel_id, $updated); @@ -205,10 +205,10 @@ class Jonah_Driver_sql extends Jonah_Driver { $sql = sprintf('UPDATE jonah_channels SET channel_updated = %s WHERE channel_id = %s', (int)$timestamp, (int)$channel_id); - Horde::logMessage('SQL Query by Jonah_Driver_sql::_timestampChannel(): ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Jonah_Driver_sql::_timestampChannel(): ' . $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; } @@ -222,10 +222,10 @@ class Jonah_Driver_sql extends Jonah_Driver { } $sql = 'UPDATE jonah_stories SET story_read = story_read + 1 WHERE story_id = ' . (int)$story_id; - Horde::logMessage('SQL Query by Jonah_Driver_sql::_readStory(): ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Jonah_Driver_sql::_readStory(): ' . $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; } @@ -241,10 +241,10 @@ class Jonah_Driver_sql extends Jonah_Driver { $sql = 'DELETE FROM jonah_channels WHERE channel_id = ?'; $values = array($channel_id); - Horde::logMessage('SQL Query by Jonah_Driver_sql::deleteChannel(): ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Jonah_Driver_sql::deleteChannel(): ' . $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; @@ -262,7 +262,7 @@ class Jonah_Driver_sql extends Jonah_Driver { if (empty($info['story_id'])) { $info['story_id'] = $this->_db->nextId('jonah_stories'); if (is_a($info['story_id'], 'PEAR_Error')) { - Horde::logMessage($info['story_id'], __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($info['story_id'], 'ERR'); return $info['story_id']; } $channel = $this->getChannel($info['channel_id']); @@ -298,10 +298,10 @@ class Jonah_Driver_sql extends Jonah_Driver { time(), (int)$info['story_read']); - Horde::logMessage('SQL Query by Jonah_Driver_sql::_saveStory(): ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Jonah_Driver_sql::_saveStory(): ' . $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; } @@ -478,7 +478,7 @@ class Jonah_Driver_sql extends Jonah_Driver { } } - Horde::logMessage('SQL Query by Jonah_Driver_sql::_getStories(): ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Jonah_Driver_sql::_getStories(): ' . $sql, 'DEBUG'); $results = $this->_db->getAll($sql, $values, DB_FETCHMODE_ASSOC); if (is_a($results, 'PEAR_Error')) { return $results; @@ -549,7 +549,7 @@ class Jonah_Driver_sql extends Jonah_Driver { $sql = $this->_db->modifyLimitQuery($sql, (int)$from, (int)$max, $values); } - Horde::logMessage('SQL Query by Jonah_Driver_sql::_legacyGetStories(): ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Jonah_Driver_sql::_legacyGetStories(): ' . $sql, 'DEBUG'); $result = $this->_db->getAll($sql, $values, DB_FETCHMODE_ASSOC); if (is_a($result, 'PEAR_Error')) { return $result; @@ -579,10 +579,10 @@ class Jonah_Driver_sql extends Jonah_Driver { $sql = 'SELECT * FROM jonah_stories WHERE story_id = ?'; $values = array((int)$story_id); - Horde::logMessage('SQL Query by Jonah_Driver_sql::_getStory(): ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Jonah_Driver_sql::_getStory(): ' . $sql, 'DEBUG'); $result = $this->_db->getRow($sql, $values, DB_FETCHMODE_ASSOC); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } elseif (empty($result)) { return PEAR::raiseError(sprintf(_("Story id \"%s\" not found."), $story_id)); @@ -611,10 +611,10 @@ class Jonah_Driver_sql extends Jonah_Driver { ' WHERE channel_id = ? AND story_url = ?'; $values = array((int)$channel_id, $story_url); - Horde::logMessage('SQL Query by Jonah_Driver_sql::_getStoryByUrl(): ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Jonah_Driver_sql::_getStoryByUrl(): ' . $sql, 'DEBUG'); $result = $this->_db->getRow($sql, $values, DB_FETCHMODE_ASSOC); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } elseif (empty($result)) { return PEAR::raiseError(sprintf(_("Story URL \"%s\" not found."), $story_url)); @@ -640,7 +640,7 @@ class Jonah_Driver_sql extends Jonah_Driver { } $sql = 'UPDATE jonah_stories SET story_permalink = ? WHERE story_id = ?'; $values = array($this->getStoryLink($channel, $story), $story['story_id']); - Horde::logMessage('SQL Query by Jonah_Driver_sql::_addPermalink(): ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Jonah_Driver_sql::_addPermalink(): ' . $sql, 'DEBUG'); $result = $this->_db->query($sql, $values); if (!is_a($result, 'PEAR_Error')) { $story['story_permalink'] = $values[0]; @@ -665,10 +665,10 @@ class Jonah_Driver_sql extends Jonah_Driver { ' ORDER BY story_updated DESC'; $values = array((int)$channel_id, time()); - Horde::logMessage('SQL Query by Jonah_Driver_sql::getLatestStoryId(): ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Jonah_Driver_sql::getLatestStoryId(): ' . $sql, 'DEBUG'); $result = $this->_db->getRow($sql, $values, DB_FETCHMODE_ASSOC); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } elseif (empty($result)) { return PEAR::raiseError(sprintf(_("Channel \"%s\" not found."), $channel_id)); @@ -689,10 +689,10 @@ class Jonah_Driver_sql extends Jonah_Driver { ' WHERE channel_id = ? AND story_id = ?'; $values = array((int)$channel_id, (int)$story_id); - Horde::logMessage('SQL Query by Jonah_Driver_sql::deleteStory(): ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Jonah_Driver_sql::deleteStory(): ' . $sql, 'DEBUG'); $result = $this->_db->query($sql, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result->getMessage(), 'ERR'); return $result; } @@ -700,7 +700,7 @@ class Jonah_Driver_sql extends Jonah_Driver { 'WHERE channel_id = ? AND story_id = ?'; $result = $this->_db->query($sql, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result->getMessage(), 'ERR'); return $result; } @@ -750,7 +750,7 @@ class Jonah_Driver_sql extends Jonah_Driver { $query = $this->_db->prepare('INSERT INTO jonah_stories_tags (story_id, channel_id, tag_id) VALUES(?, ?, ?)'); Horde::logMessage('SQL query by Jonah_Driver_sql::writeTags: ' . $sql, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + 'DEBUG'); $this->_db->query($sql); foreach ($tagkeys as $key) { @@ -777,7 +777,7 @@ class Jonah_Driver_sql extends Jonah_Driver { $sql = 'SELECT jonah_tags.tag_id, tag_name FROM jonah_tags INNER JOIN jonah_stories_tags ON jonah_stories_tags.tag_id = jonah_tags.tag_id WHERE jonah_stories_tags.story_id = ?'; Horde::logMessage('SQL query by Jonah_Driver_sql::readTags ' . $sql, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + 'DEBUG'); $tags = $this->_db->getAssoc($sql, false, array($resource_id), false); return $tags; @@ -916,7 +916,7 @@ class Jonah_Driver_sql extends Jonah_Driver { if (count($channel_id) == 1) { $channel = $this->getChannel($channel_id[0]); } - Horde::logMessage('SQL query by Jonah_Driver_sql::searchTags: ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL query by Jonah_Driver_sql::searchTags: ' . $sql, 'DEBUG'); $results = $this->_db->limitQuery($sql, $from, $max); if (is_a($results, 'PEAR_Error')) { return $results; diff --git a/jonah/lib/News.php b/jonah/lib/News.php index 2c6a6f323..412b52e8c 100644 --- a/jonah/lib/News.php +++ b/jonah/lib/News.php @@ -134,7 +134,7 @@ class Jonah_News { { $channel = $this->getChannel($channel_id); if (is_a($channel, 'PEAR_Error')) { - Horde::logMessage($channel, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($channel, 'ERR'); return array(); } @@ -744,7 +744,7 @@ class Jonah_News { { $xml = Jonah::_readURL($url); if (is_a($xml, 'PEAR_Error')) { - Horde::logMessage($xml, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($xml, 'ERR'); return array('timestamp' => $timestamp); } @@ -756,7 +756,7 @@ class Jonah_News { if (isset($GLOBALS['notification'])) { $GLOBALS['notification']->push(sprintf(_("Error parsing external feed from %s: %s"), $url, $parser->error), 'warning'); } else { - Horde::logMessage(sprintf("Error parsing external feed from %s: %s", $url, $parser->error), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage(sprintf("Error parsing external feed from %s: %s", $url, $parser->error), 'ERR'); } } $stories = $parser->structure; diff --git a/jonah/lib/News/sql.php b/jonah/lib/News/sql.php index 0e8dc8381..79b681cf1 100644 --- a/jonah/lib/News/sql.php +++ b/jonah/lib/News/sql.php @@ -77,7 +77,7 @@ class Jonah_News_sql extends Jonah_News { if (empty($info['channel_id'])) { $info['channel_id'] = $this->_db->nextId('jonah_channels'); if (is_a($info['channel_id'], 'PEAR_Error')) { - Horde::logMessage($info['channel_id'], __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($info['channel_id'], 'ERR'); return $info['channel_id']; } $sql = 'INSERT INTO jonah_channels' . @@ -104,10 +104,10 @@ class Jonah_News_sql extends Jonah_News { isset($info['channel_page_link']) ? $info['channel_page_link'] : null, isset($info['channel_story_url']) ? $info['channel_story_url'] : null, isset($info['channel_img']) ? $info['channel_img'] : null); - Horde::logMessage('SQL Query by Jonah_News_sql::saveChannel(): ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Jonah_News_sql::saveChannel(): ' . $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; } @@ -144,10 +144,10 @@ class Jonah_News_sql extends Jonah_News { $sql = sprintf('SELECT channel_id, channel_name, channel_type, channel_updated FROM jonah_channels %s ORDER BY channel_name', $wsql); - Horde::logMessage('SQL Query by Jonah_News_sql::getChannels(): ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Jonah_News_sql::getChannels(): ' . $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; } for ($i = 0; $i < count($result); $i++) { @@ -167,10 +167,10 @@ class Jonah_News_sql extends Jonah_News { $sql = 'SELECT * FROM jonah_channels WHERE channel_id = ' . (int)$channel_id; - Horde::logMessage('SQL Query by Jonah_News_sql::_getChannel(): ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Jonah_News_sql::_getChannel(): ' . $sql, 'DEBUG'); $result = $this->_db->getRow($sql, DB_FETCHMODE_ASSOC); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } elseif (empty($result)) { return PEAR::raiseError(sprintf(_("Channel id \"%s\" not found."), $channel_id)); @@ -181,10 +181,10 @@ class Jonah_News_sql extends Jonah_News { $channels = explode(':', $result['channel_url']); if (count($channels)) { $sql = 'SELECT MAX(channel_updated) FROM jonah_channels WHERE channel_id IN (' . implode(',', $channels) . ')'; - Horde::logMessage('SQL Query by Jonah_News_sql::_getChannel(): ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Jonah_News_sql::_getChannel(): ' . $sql, 'DEBUG'); $updated = $this->_db->getOne($sql); if (is_a($updated, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); } else { $result['channel_updated'] = $updated; $this->_timestampChannel($channel_id, $updated); @@ -206,10 +206,10 @@ class Jonah_News_sql extends Jonah_News { $sql = sprintf('UPDATE jonah_channels SET channel_updated = %s WHERE channel_id = %s', (int)$timestamp, (int)$channel_id); - Horde::logMessage('SQL Query by Jonah_News_sql::_timestampChannel(): ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Jonah_News_sql::_timestampChannel(): ' . $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; } @@ -223,10 +223,10 @@ class Jonah_News_sql extends Jonah_News { } $sql = 'UPDATE jonah_stories SET story_read = story_read + 1 WHERE story_id = ' . (int)$story_id; - Horde::logMessage('SQL Query by Jonah_News_sql::_readStory(): ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Jonah_News_sql::_readStory(): ' . $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; } @@ -242,10 +242,10 @@ class Jonah_News_sql extends Jonah_News { $sql = 'DELETE FROM jonah_channels WHERE channel_id = ?'; $values = array($channel_id); - Horde::logMessage('SQL Query by Jonah_News_sql::deleteChannel(): ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Jonah_News_sql::deleteChannel(): ' . $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; @@ -263,7 +263,7 @@ class Jonah_News_sql extends Jonah_News { if (empty($info['story_id'])) { $info['story_id'] = $this->_db->nextId('jonah_stories'); if (is_a($info['story_id'], 'PEAR_Error')) { - Horde::logMessage($info['story_id'], __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($info['story_id'], 'ERR'); return $info['story_id']; } $channel = $this->getChannel($info['channel_id']); @@ -299,10 +299,10 @@ class Jonah_News_sql extends Jonah_News { time(), (int)$info['story_read']); - Horde::logMessage('SQL Query by Jonah_News_sql::_saveStory(): ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Jonah_News_sql::_saveStory(): ' . $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; } @@ -387,7 +387,7 @@ class Jonah_News_sql extends Jonah_News { $sql = $this->_db->modifyLimitQuery($sql, (int)$from, (int)$max, $values); } - Horde::logMessage('SQL Query by Jonah_News_sql::_getStories(): ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Jonah_News_sql::_getStories(): ' . $sql, 'DEBUG'); $result = $this->_db->getAll($sql, $values, DB_FETCHMODE_ASSOC); if (is_a($result, 'PEAR_Error')) { return $result; @@ -417,10 +417,10 @@ class Jonah_News_sql extends Jonah_News { $sql = 'SELECT * FROM jonah_stories WHERE story_id = ?'; $values = array((int)$story_id); - Horde::logMessage('SQL Query by Jonah_News_sql::_getStory(): ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Jonah_News_sql::_getStory(): ' . $sql, 'DEBUG'); $result = $this->_db->getRow($sql, $values, DB_FETCHMODE_ASSOC); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } elseif (empty($result)) { return PEAR::raiseError(sprintf(_("Story id \"%s\" not found."), $story_id)); @@ -449,10 +449,10 @@ class Jonah_News_sql extends Jonah_News { ' WHERE channel_id = ? AND story_url = ?'; $values = array((int)$channel_id, $story_url); - Horde::logMessage('SQL Query by Jonah_News_sql::_getStoryByUrl(): ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Jonah_News_sql::_getStoryByUrl(): ' . $sql, 'DEBUG'); $result = $this->_db->getRow($sql, $values, DB_FETCHMODE_ASSOC); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } elseif (empty($result)) { return PEAR::raiseError(sprintf(_("Story URL \"%s\" not found."), $story_url)); @@ -478,7 +478,7 @@ class Jonah_News_sql extends Jonah_News { } $sql = 'UPDATE jonah_stories SET story_permalink = ? WHERE story_id = ?'; $values = array($this->getStoryLink($channel, $story), $story['story_id']); - Horde::logMessage('SQL Query by Jonah_News_sql::_addPermalink(): ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Jonah_News_sql::_addPermalink(): ' . $sql, 'DEBUG'); $result = $this->_db->query($sql, $values); if (!is_a($result, 'PEAR_Error')) { $story['story_permalink'] = $values[0]; @@ -503,10 +503,10 @@ class Jonah_News_sql extends Jonah_News { ' ORDER BY story_updated DESC'; $values = array((int)$channel_id, time()); - Horde::logMessage('SQL Query by Jonah_News_sql::getLatestStoryId(): ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Jonah_News_sql::getLatestStoryId(): ' . $sql, 'DEBUG'); $result = $this->_db->getRow($sql, $values, DB_FETCHMODE_ASSOC); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result, 'ERR'); return $result; } elseif (empty($result)) { return PEAR::raiseError(sprintf(_("Channel \"%s\" not found."), $channel_id)); @@ -527,10 +527,10 @@ class Jonah_News_sql extends Jonah_News { ' WHERE channel_id = ? AND story_id = ?'; $values = array((int)$channel_id, (int)$story_id); - Horde::logMessage('SQL Query by Jonah_News_sql::deleteStory(): ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL Query by Jonah_News_sql::deleteStory(): ' . $sql, 'DEBUG'); $result = $this->_db->query($sql, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result->getMessage(), 'ERR'); return $result; } @@ -538,7 +538,7 @@ class Jonah_News_sql extends Jonah_News { 'WHERE channel_id = ? AND story_id = ?'; $result = $this->_db->query($sql, $values); if (is_a($result, 'PEAR_Error')) { - Horde::logMessage($result->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($result->getMessage(), 'ERR'); return $result; } @@ -588,7 +588,7 @@ class Jonah_News_sql extends Jonah_News { $query = $this->_db->prepare('INSERT INTO jonah_stories_tags (story_id, channel_id, tag_id) VALUES(?, ?, ?)'); Horde::logMessage('SQL query by Jonah_News_sql::writeTags: ' . $sql, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + 'DEBUG'); $this->_db->query($sql); foreach ($tagkeys as $key) { @@ -615,7 +615,7 @@ class Jonah_News_sql extends Jonah_News { $sql = 'SELECT jonah_tags.tag_id, tag_name FROM jonah_tags INNER JOIN jonah_stories_tags ON jonah_stories_tags.tag_id = jonah_tags.tag_id WHERE jonah_stories_tags.story_id = ?'; Horde::logMessage('SQL query by Jonah_News_sql::readTags ' . $sql, - __FILE__, __LINE__, PEAR_LOG_DEBUG); + 'DEBUG'); $tags = $this->_db->getAssoc($sql, false, array($resource_id), false); return $tags; @@ -754,7 +754,7 @@ class Jonah_News_sql extends Jonah_News { if (count($channel_id) == 1) { $channel = $this->getChannel($channel_id[0]); } - Horde::logMessage('SQL query by Jonah_News_sql::searchTags: ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage('SQL query by Jonah_News_sql::searchTags: ' . $sql, 'DEBUG'); $results = $this->_db->limitQuery($sql, $from, $max); if (is_a($results, 'PEAR_Error')) { return $results; diff --git a/jonah/stories/share.php b/jonah/stories/share.php index 3ab91edd3..4549f297f 100644 --- a/jonah/stories/share.php +++ b/jonah/stories/share.php @@ -34,7 +34,7 @@ function _mail($story_part, $from, $recipients, $subject, $note) /* Log the pending outbound message. */ Horde::logMessage(sprintf('<%s> is sending "%s" to (%s)', $from, $subject, $recipients), - __FILE__, __LINE__, PEAR_LOG_INFO); + 'INFO'); /* Send the message and return the result. */ return $mail->send(Horde::getMailerConfig()); diff --git a/jonah/stories/view.php b/jonah/stories/view.php index bbdfefe32..74a0ec53c 100644 --- a/jonah/stories/view.php +++ b/jonah/stories/view.php @@ -91,11 +91,11 @@ if ($conf['sharing']['allow']) { if ($conf['comments']['allow']) { if (!$registry->hasMethod('forums/doComments')) { $err = 'User comments are enabled but the forums API is not available.'; - Horde::logMessage($err, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($err, 'ERR'); } else { $comments = $registry->call('forums/doComments', array('jonah', $story_id, 'commentCallback')); if (is_a($comments, 'PEAR_Error')) { - Horde::logMessage($threads, __FILE__, __LINE__, PEAR_LOG_ERR); + Horde::logMessage($threads, 'ERR'); $comments = ''; } $comments = $comments['threads'] . '
' . $comments['comments']; -- 2.11.0