From dcc58e5b1a46b5c141e4e6165c40f322ea70c2fd Mon Sep 17 00:00:00 2001
From: Jonathan Byrne <jonathan@knowledgetree.com>
Date: Tue, 20 Nov 2007 13:21:36 +0000
Subject: [PATCH] KTC-232 "Error when trying to view RSS Feed"

---
 plugins/rssplugin/loadFeed.inc.php  | 18 ++++++++++++------
 plugins/rssplugin/rss2array.inc.php |  7 +++----
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/plugins/rssplugin/loadFeed.inc.php b/plugins/rssplugin/loadFeed.inc.php
index ce3a04f..0153137 100644
--- a/plugins/rssplugin/loadFeed.inc.php
+++ b/plugins/rssplugin/loadFeed.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * $Id:$
+ * $Id$
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
@@ -49,13 +49,19 @@
  	// If it is a url, it is an external feed
  	$aRSSArray = rss2array($feed);
  }
- 
+ if(count($aRSSArray[errors]) > 0){
+ 	for($i=0;$i<count($aRSSArray[errors]);$i++){
+ 		$response .= $aRSSArray[errors][$i].'<br>';
+ 		echo '<br>'.$response.'<br>';
+ 		return;
+ 	}
+ }
  // Prepare response data to be passed back to page
- $reposonse = "<h3>".$aRSSArray[channel][title]."</h3>" .
+ $response = "<h3>".$aRSSArray[channel][title]."</h3>" .
  		"<div class='outerContainer' id='outerContainer'>" .
  		"<table width='90%'>";
 		for($i=0;$i<count($aRSSArray[items]);$i++){
-			 $reposonse .= "<tr>
+			 $response .= "<tr>
 				<td colspan='2'><strong><a href='".$aRSSArray[items][$i][link]."' target='_blank'>".$aRSSArray[items][$i][title]."</a><strong></td>
 			</tr>
 			<tr>
@@ -63,7 +69,7 @@
 			</tr>
 			<tr><td colspan='2'><br></td></tr>";
 		}
- $reposonse .= "</table></div><br>";
+ $response .= "</table></div><br>";
 	 
- echo  $reposonse;
+ echo  $response;
 ?>
diff --git a/plugins/rssplugin/rss2array.inc.php b/plugins/rssplugin/rss2array.inc.php
index a767a1b..e7fa981 100644
--- a/plugins/rssplugin/rss2array.inc.php
+++ b/plugins/rssplugin/rss2array.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * $Id:$
+ * $Id$
  *
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
@@ -80,8 +80,8 @@
             #
             # open the connection
             #
-
-            if($http = fsockopen($host, $port, $errno, $errstr, 5)){
+			$http = @fsockopen($host, $port, $errno, $errstr, 5);
+            if($http){
 
                 #
                 # make the request
@@ -169,7 +169,6 @@
             #
 
             else {
-
                 $rss2array_globals[errors][] = "Can't connect to $host";
 
             }
--
libgit2 0.21.4