R34364 - /branches/1.8/news_admin/inc/class.news_admin_import.inc.php

Old eGW-svn
1

Author: ralfbecker
New Revision: 34364

URL: http://www.egroupware.org/viewvc/egroupware?rev=34364&view=rev
Log:
Stop “unsupported encoding” warning in import

Modified:
branches/1.8/news_admin/inc/class.news_admin_import.inc.php

Modified: branches/1.8/news_admin/inc/class.news_admin_import.inc.php
URL: http://www.egroupware.org/viewvc/egroupware/branches/1.8/news_admin/inc/class.news_admin_import.inc.php?rev=34364&r1=34363&r2=34364&view=diff

— branches/1.8/news_admin/inc/class.news_admin_import.inc.php (original)
+++ branches/1.8/news_admin/inc/class.news_admin_import.inc.php Thu Mar 24 07:40:47 2011
@@ -5,9 +5,9 @@

    • @version $Id$
    • @version $Id$
      */

require_once(EGW_INCLUDE_ROOT.’/news_admin/inc/class.bonews.inc.php’);
@@ -46,14 +46,17 @@
* Read the feed of the given URL
*
* @param string $url

    • @return
    • @return XML_Feed_Parser|boolean false on error
      */
      function read($url)
      {
      $parts = parse_url($url);
      if (!in_array($parts[‘scheme’],array(‘http’,‘https’,‘ftp’))) return false; // security!
  •   $feed_xml = file_get_contents($url,false);

  •   if (!($feed_xml = file_get_contents($url,false)))

  •   {

  •   	return false;

  •   }

  // if the xml-file specifes an encoding, convert it to our own encoding
  if (preg_match('/\<\?xml.*encoding="([^"]+)"/i',$feed_xml,$matches) && $matches[1])

@@ -61,11 +64,15 @@
$feed_xml = preg_replace(’/(<?xml.*encoding=")([^"]+)"/i’,’$1’.$GLOBALS[‘egw’]->translation->charset().’"’,$feed_xml);
$feed_xml = $GLOBALS[‘egw’]->translation->convert($feed_xml,$matches[1]);
}

  •   // stop "unsupported encoding" warnings

  •   error_reporting(($level = error_reporting()) & !E_WARNING);
  try {
      $parser = new XML_Feed_Parser($feed_xml);
  } catch (XML_Feed_Parser_Exception $e) {

  •       return false;

  •       $parser = false;
  }

  •   error_reporting($level);

  •   return $parser;
    }

Enable your software for Intel® Active Management Technology to meet the
growing manageability and security demands of your customers. Businesses
are taking advantage of Intel® vPro ™ technology - will your software
be a part of the solution? Download the Intel® Manageability Checker
today! http://p.sf.net/sfu/intel-dev2devmar

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs