From: poltawski <poltawski>
Date: Mon, 3 Sep 2007 10:26:44 +0000 (+0000)
Subject: MDL-9851 -  RSS block links previously used to open in new window. Restoring this
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=325744cb14735069b77897fc40a54f8768a07c77;p=moodle.git

MDL-9851 -  RSS block links previously used to open in new window. Restoring this
behaviour. Had to tweak the cleaning to ensure the JS hack for XHTML complaint new
window gets through. Merged from MOODLE_18_STABLE
---

diff --git a/blocks/rss_client/block_rss_client.php b/blocks/rss_client/block_rss_client.php
index 35aa2e9606..aa3d93e74a 100644
--- a/blocks/rss_client/block_rss_client.php
+++ b/blocks/rss_client/block_rss_client.php
@@ -138,7 +138,7 @@
             $numids = count($rssidarray);
             $count = 0;
             foreach ($rssidarray as $rssid) {
-                $output .=  clean_text($this->get_rss_by_id($rssid, $display_description, $shownumentries, ($numids > 1) ? true : false), FORMAT_HTML);
+                $output .=  $this->get_rss_by_id($rssid, $display_description, $shownumentries, ($numids > 1) ? true : false);
                 if ($numids > 1 && $count != $numids -1 && !empty($rssfeedstring)) {
                     $output .= '<hr style="width=:80%" />';
                 }
@@ -205,12 +205,15 @@
             } else {
                 $feedtitle = $this->format_title($rss_record->preferredtitle);
             }
-//            print_object($rss);
+
             if (isset($this->config) &&
                     isset($this->config->block_rss_client_show_channel_image) &&
                         $this->config->block_rss_client_show_channel_image &&
                             isset($rss->image) && isset($rss->image['link']) && isset($rss->image['title']) && isset($rss->image['url']) ) {
-                $returnstring .= "\n".'<div class="image" title="'. $rss->image['title'] .'"><a href="'. $rss->image['link'] .'"><img src="'. $rss->image['url'] .'" alt="'. $rss->image['title'] .'" /></a></div>';
+
+                    $rss->image['title'] = s($rss->image['title']);
+                    $returnstring .= "\n".'<div class="image" title="'. $rss->image['title'] .'"><a href="'. $rss->image['link'] .'"><img src="'. $rss->image['url'] .'" alt="'. $rss->image['title'] .'" /></a></div>';
+
             }
 
             if ($showtitle) {
@@ -243,7 +246,7 @@
 
                 $item['link'] = str_replace('&', '&amp;', $item['link']);
 
-                $returnstring .= '<li><div class="link"><a href="'. $item['link'] .'">'. $item['title'] . "</a></div>\n";
+                $returnstring .= '<li><div class="link"><a href="'. $item['link'] .'" onclick="this.target=\'_blank\'" >'. $item['title'] . "</a></div>\n";
 
                 if ($display_description && !empty($item['description'])) {
                     $item['description'] = break_up_long_words($item['description'], 30);