From de5b9a168daeef12b6f7bcf6e43b767a2d7f35d8 Mon Sep 17 00:00:00 2001 From: Kjartan Mannes Date: Mon, 22 Apr 2002 09:05:36 +0000 Subject: - bug fixes: * fixed mails not being parsed properly. * tracker now shows user name when you view your own recent comments. * link to submission queue now points to the right place. * fixed jabber module. * theme is now activated when changed. - applied Gerhards coding style patch. --- modules/aggregator.module | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'modules/aggregator.module') diff --git a/modules/aggregator.module b/modules/aggregator.module index d3b79bf7c..c12ee48ed 100644 --- a/modules/aggregator.module +++ b/modules/aggregator.module @@ -98,7 +98,7 @@ function import_get_bundles($attributes = 0) { $i = 0; while ($bundle = db_fetch_object($result)) { $block[$i]["subject"] = $bundle->title; - $block[$i]["content"] = import_bundle_block($bundle->attributes) ."

".lm(t("more"), array("mod" => "import", "op" => "bundle", "id" => $bundle->bid), t("View this bundle's recent news."))."

"; + $block[$i]["content"] = import_bundle_block($bundle->attributes) ."

". lm(t("more"), array("mod" => "import", "op" => "bundle", "id" => $bundle->bid), t("View this bundle's recent news.")) ."

"; $block[$i]["info"] = "$bundle->title bundle"; $i++; @@ -113,7 +113,7 @@ function import_get_feeds($attributes = 0) { $i = 0; while ($feed = db_fetch_object($result)) { $block[$i]["subject"] = $feed->title; - $block[$i]["content"] = import_feed_block($feed) ."

".lm(t("more"), array("mod" => "import", "op" => "feed", "id" => $feed->fid), t("View this feed's recent news."))."

"; + $block[$i]["content"] = import_feed_block($feed) ."

". lm(t("more"), array("mod" => "import", "op" => "feed", "id" => $feed->fid), t("View this feed's recent news.")) ."

"; $block[$i]["info"] = "$feed->title feed"; $i++; @@ -176,7 +176,7 @@ function import_refresh($feed) { $link = strip_tags($link[1]); $description = filter(strtr($description[1], $tt)); - db_query("UPDATE feed SET timestamp = '%s', link = '%s', description = '%s' WHERE fid = '%s'",time(), $link, $description, $feed["fid"]); + db_query("UPDATE feed SET timestamp = '%s', link = '%s', description = '%s' WHERE fid = '%s'", time(), $link, $description, $feed["fid"]); /* ** Extract and process individual items: @@ -349,7 +349,7 @@ function import_view() { $output .= "\n"; $output .= " \n"; while ($feed = db_fetch_object($result)) { - $output .= " \n"; + $output .= " \n"; } $output .= "
titleattributesitemslast updatenext updateoperations
". check_output($feed->title) ."". check_output($feed->attributes) ."". format_plural($feed->items, "item", "items") ."". ($feed->timestamp ? format_interval(time() - $feed->timestamp) ." ago" : "never") ."". ($feed->timestamp ? format_interval($feed->timestamp + $feed->refresh - time()) ." left" : "never") ."".la(t("edit feed"), array("mod" => "import", "type" => "feed", "op" => "edit", "id" => $feed->fid))."" .la(t("remove items"), array("mod" => "import", "type" => "feed", "op" => "remove", "id" => $feed->fid)). "". la(t("update items"), array("mod" => "import", "type" => "feed", "op" => "update", "id" => $feed->fid)). "
". check_output($feed->title) ."". check_output($feed->attributes) ."". format_plural($feed->items, "item", "items") ."". ($feed->timestamp ? format_interval(time() - $feed->timestamp) ." ago" : "never") ."". ($feed->timestamp ? format_interval($feed->timestamp + $feed->refresh - time()) ." left" : "never") ."". la(t("edit feed"), array("mod" => "import", "type" => "feed", "op" => "edit", "id" => $feed->fid)) ."". la(t("remove items"), array("mod" => "import", "type" => "feed", "op" => "remove", "id" => $feed->fid)) ."". la(t("update items"), array("mod" => "import", "type" => "feed", "op" => "update", "id" => $feed->fid)) ."
\n"; @@ -359,7 +359,7 @@ function import_view() { $output .= "\n"; $output .= " \n"; while ($bundle = db_fetch_object($result)) { - $output .= " \n"; + $output .= " \n"; } $output .= "
titleattributesoperations
". check_output($bundle->title) ."". check_output($bundle->attributes) ."".la(t("edit bundle"), array("mod" => "import", "type" => "bundle", "op" => "edit", "id" => $bundle->bid))."
". check_output($bundle->title) ."". check_output($bundle->attributes) ."". la(t("edit bundle"), array("mod" => "import", "type" => "bundle", "op" => "edit", "id" => $bundle->bid)) ."
\n"; @@ -432,7 +432,7 @@ function import_tag() { $output .= "\n"; $output .= " \n"; while ($item = db_fetch_object($result)) { - $output .= " \n"; + $output .= " \n"; } $output .= "
timefeeditem
". format_date($item->timestamp, "custom", "m/d/y") ."
". format_date($item->timestamp, "custom", "H:i") ."		".la(check_output($item->feed), array("mod" => "import", "type" => "feed", "op" => "edit", "id" => $item->fid))."link) ."\">". check_output($item->title) ."". ($item->description ? "
". check_output($item->description, 1) ."" : "") ."
iid]\" value=\"". check_form($item->attributes) ."\" size=\"50\" />
". format_date($item->timestamp, "custom", "m/d/y") ."
". format_date($item->timestamp, "custom", "H:i") ."		". la(check_output($item->feed), array("mod" => "import", "type" => "feed", "op" => "edit", "id" => $item->fid)) ."link) ."\">". check_output($item->title) ."". ($item->description ? "
". check_output($item->description, 1) ."" : "") ."
iid]\" value=\"". check_form($item->attributes) ."\" size=\"50\" />
\n"; $output .= "\n"; @@ -452,7 +452,7 @@ function import_admin() { $links[] = la(t("overview"), array("mod" => "import", "op" => "view")); $links[] = la(t("help"), array("mod" => "import", "op" => "help")); - print "".implode(" | ", $links)."
"; + print "". implode(" | ", $links) ."
"; switch ($op) { case "help": @@ -541,7 +541,7 @@ function import_page_last() { $links[] = lm(t("feed"), array("mod" => "import", "op" => "feed", "id" => $item->fid), t("Read more syndicated news from this feed.")); if ($item->link) { - $output .= "". format_url($item->link, $item->title) ." · ".lm($item->ftitle, array("mod" => "import", "op" => "feed", "id" => $item->fid), t("View more information about this feed."))."". $theme->links($links) ."\n"; + $output .= "". format_url($item->link, $item->title) ." · ". lm($item->ftitle, array("mod" => "import", "op" => "feed", "id" => $item->fid), t("View more information about this feed.")) ."". $theme->links($links) ."\n"; } if ($item->description) { @@ -610,7 +610,7 @@ function import_page_bundle($bid) { $links[] = "link\">". t("visit") .""; if ($item->link) { - $output .= "". format_url($item->link, $item->title) ." · ".lm($item->ftitle, array("mod" => "import", "op" => "feed", "id" => $item->fid), t("View more information about this feed."))."". $theme->links($links) ."\n"; + $output .= "". format_url($item->link, $item->title) ." · ". lm($item->ftitle, array("mod" => "import", "op" => "feed", "id" => $item->fid), t("View more information about this feed.")) ."". $theme->links($links) ."\n"; } if ($item->description) { @@ -638,7 +638,7 @@ function import_page_sources() { $output .= "
". check_output($feed->description, 1) ."

"; } - $output .= lm("image("xml.gif") ."\" width=\"36\" height=\"14\" align=\"right\" border=\"0\" />", array("mod" => "import", "op" => "fd"), t("View the list of syndicated websites in XML format."))."
\n"; + $output .= lm("image("xml.gif") ."\" width=\"36\" height=\"14\" align=\"right\" border=\"0\" />", array("mod" => "import", "op" => "fd"), t("View the list of syndicated websites in XML format.")) ."
\n"; $theme->header(); $theme->box(t("News feeds"), import_page_info()); -- cgit v1.2.3