From 0a2a4b30300eb30d307848141e1e5c685f49f8bf Mon Sep 17 00:00:00 2001
From: e107steved <steved@e107.org>
Date: Thu, 5 Apr 2007 19:53:06 +0000
Subject: [PATCH] Bugtracker #3882 - reduce errors/lockups if SourceForge can't
 be contacted

---
 e107_files/shortcode/admin_update.sc       | 29 ++++++++++++++--------
 e107_languages/English/admin/lan_admin.php |  5 ++--
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/e107_files/shortcode/admin_update.sc b/e107_files/shortcode/admin_update.sc
index c1a2a6322..2038e6223 100644
--- a/e107_files/shortcode/admin_update.sc
+++ b/e107_files/shortcode/admin_update.sc
@@ -1,4 +1,4 @@
-// $Id: admin_update.sc,v 1.4 2007-02-12 18:16:57 e107coders Exp $
+// $Id: admin_update.sc,v 1.5 2007-04-05 19:53:00 e107steved Exp $
 
 	global $e107cache,$ns;
 	if (is_readable(e_ADMIN."ver.php"))
@@ -11,9 +11,13 @@
 
     if($cacheData = $e107cache->retrieve("updatecheck",3600, TRUE))
     {
-   		return $ns -> tablerender(LAN_NEWVERSION, $cacheData);
+   	  	return $ns -> tablerender(LAN_NEWVERSION, $cacheData);
     }
 
+	// Don't check for updates if running locally (comment out the next line to allow check - but 
+	// remember it can cause delays/errors if its not possible to access the Internet
+	if ((strpos(e_SELF,'localhost') !== FALSE) || (strpos(e_SELF,'127.0.0.1') !== FALSE)) return '';
+
 	require_once(e_HANDLER."xml_class.php");
 	$xml = new parseXml;
 	require_once(e_HANDLER."magpie_rss.php");
@@ -21,22 +25,25 @@
     $ftext = "";
 	if($rawData = $xml -> getRemoteXmlFile($feed))
 	{
-		$rss = new MagpieRSS( $rawData );
-	}
-
-    list($cur_version,$tag) = explode(" ",$e107info['e107_version']);
-    $c = 0;
-	foreach($rss->items as $val)
-	{
+	  $rss = new MagpieRSS( $rawData );
+      list($cur_version,$tag) = explode(" ",$e107info['e107_version']);
+      $c = 0;
+	  foreach($rss->items as $val)
+	  {
 		$search = array((strstr($val['title'],"(")),"e107","released"," v");
 		$version = trim(str_replace($search,"",$val['title']));
 
 	 	if(version_compare($version,$cur_version)==1)
-	 	{
+		{
         	$ftext = "<a rel='external' href='".$val['link']."' >e107 v".$version."</a><br />\n";
             break;
-	  	}
+		}
 		$c++;
+	  }
+	}
+	else
+	{  // Error getting data
+	  $ftext = ADLAN_154;
 	}
 
 	$e107cache->set("updatecheck", $ftext, TRUE);
diff --git a/e107_languages/English/admin/lan_admin.php b/e107_languages/English/admin/lan_admin.php
index 958370eae..e9569f06b 100644
--- a/e107_languages/English/admin/lan_admin.php
+++ b/e107_languages/English/admin/lan_admin.php
@@ -4,8 +4,8 @@
 |     e107 website system - Language File.
 |
 |     $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_admin.php,v $
-|     $Revision: 1.3 $
-|     $Date: 2007-01-28 21:13:21 $
+|     $Revision: 1.4 $
+|     $Date: 2007-04-05 19:53:06 $
 |     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
@@ -173,6 +173,7 @@ define("ADLAN_151", "Main");
 define("ADLAN_152", "Enter Code");
 
 define("ADLAN_153", "Administration Area");
+define('ADLAN_154', "Error contacting Sourceforge to check for new version");
 
 define('ADLAN_CL_1', 'Settings');
 define('ADLAN_CL_2', 'Users');