lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Correction de bugs dans magpierss qui ne renvoie pas d'erreurs si echec cration socket. Je fix et marque dans source magpierss par "LDR FIX BUG".

Browse Source
This commit is contained in:
Laurent Destailleur 2005-04-30 17:12:29 +00:00
parent 3bc5a9ff8f
commit d3337f36f0
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/includes/magpierss/rss_fetch.inc
View File

@ -94,7 +94,7 @@ function fetch_rss ($url) {
error("fetch_rss called without a url"); error("fetch_rss called without a url");
return false; return false;
} }
// if cache is disabled // if cache is disabled
if ( !MAGPIE_CACHE_ON ) { if ( !MAGPIE_CACHE_ON ) {
// fetch file, and parse it // fetch file, and parse it
@ -158,7 +158,7 @@ function fetch_rss ($url) {
} }
$resp = _fetch_remote_file( $url, $request_headers ); $resp = _fetch_remote_file( $url, $request_headers );
if (isset($resp) and $resp) { if (isset($resp) and $resp) {
if ($resp->status == '304' ) { if ($resp->status == '304' ) {
// we have the most current copy // we have the most current copy
@ -185,12 +185,18 @@ function fetch_rss ($url) {
if ( $resp->error ) { if ( $resp->error ) {
# compensate for Snoopy's annoying habbit to tacking # compensate for Snoopy's annoying habbit to tacking
# on '\n' # on '\n'
$http_error = substr($resp->error, 0, -2);
// LDR FIX BUG
$http_error = eregi_replace("\n","",$resp->error);
$errormsg .= "(HTTP Error: $http_error)"; $errormsg .= "(HTTP Error: $http_error)";
} }
else { else {
$errormsg .= "(HTTP Response: " . $resp->response_code .')'; $errormsg .= "(HTTP Response: " . $resp->response_code .')';
} }
// LDR FIX BUG Si echec recup http mais cache bien lu, on stock erreur dans object rss
if ($rss) $rss->ERROR=$errormsg;
} }
} }
else { else {
@ -206,7 +212,7 @@ function fetch_rss ($url) {
} }
return $rss; return $rss;
} }
// else we totally failed // else we totally failed
error( $errormsg ); error( $errormsg );
@ -268,7 +274,7 @@ function _fetch_remote_file ($url, $headers = "" ) {
if (is_array($headers) ) { if (is_array($headers) ) {
$client->rawheaders = $headers; $client->rawheaders = $headers;
} }
@$client->fetch($url); @$client->fetch($url);
return $client; return $client;