WebSVN – Applications.papyrus – Diff – /trunk/papyrus/applettes/syndication/syndication.php

 		$string_arguments = "";
 	//+----------------------------------------------------------------------------------------------------------------+
 	// Gestion des arguments
 	$balise = $tab_applette_arguments[0];
     $tab_arguments = $tab_applette_arguments;
 	unset($tab_arguments[0]);
     foreach($tab_arguments as $argument) {
     	if ($argument != '') {
 	    		$string_arguments .= $argument;
 	    	$tab_parametres = explode('=', $argument, 2);
 		return $contenu_cache;
+	}
 	//
 	//+----------------------------------------------------------------------------------------------------------------+
     // Gestion des erreurs de paramétrage
 	if (!isset($options['url'])) {
 		$GLOBALS['_SYNDICATION_']['erreurs'][] = sprintf(SYND_LG_ERREUR_URL, $balise);
+	}
 	if (!isset($options['titre'])) {
 		$options['titre'] = '';
 	} else {
 		if (file_exists(SYND_CHEMIN_SQUELETTE.$options['template'])) {
 			$options['template'] = SYND_CHEMIN_SQUELETTE.$options['template'];
+		}
+	}
     //+----------------------------------------------------------------------------------------------------------------+
     // Recuperation des donnees
     if (count($GLOBALS['_SYNDICATION_']['erreurs']) == 0) {
 		$tab_url = array_map('trim', explode(',', $options['url']));
         foreach ($tab_url as $cle => $url) {
 			if ($url != '') {
 				$aso_site = array();
 				// Liste des encodages acceptés pour les flux
 				$encodages = 'UTF-8, ISO-8859-1, ISO-8859-15';
 				try {
+					$xml = file_get_contents($url);
-					$feed = new XML_Feed_Parser(file_get_contents($url));
+					$feed = new XML_Feed_Parser($xml);
 				} catch (XML_Feed_Parser_Exception $e) {
+					creer_cache('erreur', $xml, 604800);
 					return('Le flux RSS est invalide : ' . $e->getMessage());
+				}
 				if ($options['template'] != '' && !file_exists($options['template'])) {
 				if ( $options['titre'] == '' ) {
 					$aso_site['titre'] = mb_convert_encoding($feed->title, 'HTML-ENTITIES', $encodages);
 				} else if ( $options['titre'] != '0' ) {
 					$aso_site['titre'] = $options['titre'];
+				}
 				//Gestion de l'ID
 				if ( $options['id'] != '' ) {
 					$aso_site['id'] = $options['id'];
+				}
 				//Gestion du lien vers la suite
 				if ( $options['voirsuite'] != '' ) {
 					$aso_site['voirsuite'] = $options['voirsuite'];
+				}
 				// Gestion de l'url du site
 				$aso_site['url'] = htmlentities($feed->link);
 				// Ouverture du lien dans une nouvelle fenetre
 				// Gestion des pages syndiquees
 				$i = 0;
 			    $nb_item = $feed->numberEntries;
 				foreach ($feed as $item) {
 					if ($options['nb'] != 0 && $nb_item >= $options['nb'] && $i >= $options['nb']) {
 						break;
+					}
 					$i++;
 					$aso_page = array();
 					$aso_page['site'] = $aso_site;
 					$aso_page['url'] = htmlentities($item->link);
 					$aso_page['titre'] = mb_convert_encoding($item->title, 'HTML-ENTITIES', $encodages);
 					$aso_page['description'] = mb_convert_encoding($item->description, 'HTML-ENTITIES', $encodages);
 					/* Extraction de l'image si incluse dans description */
 					$image = "";
 					$description = $aso_page['description'];
 					$taille = $options['tailledesc'];
 					if (!(strpos($description, '<img') === false))	{
 						$pos_debut = strpos($description, '<img');
 						$pos_fin_image = strpos($description, '>', $posimage) + 1;
 						$image = substr($description, $pos_debut, ($pos_fin_image - $pos_debut));
 						$description = substr_replace($description,' ', $pos_debut,  ($pos_fin_image - $pos_debut));
+					}
 					$aso_page['image'] = $image;
 					$aso_page['description_sans_image'] = $description;
 					if ($taille != null)	{
 						//Attention : si on coupe simplement, on peut couper une balise en plein milieu.
 						//On va donc vérifier
 						//1. recherche de tags simples <i> ou <b>
 						$description = html_entity_decode($description);
 						$description = strip_tags($description, "<i><b>");
 						//Va-ton couper un mot ?
 						if ($description[$taille] != ' ' && $description[$taille+1] != ' ' && $description[$taille-1] != ' ')	{
   								$strpos = strpos($description, ' ', $taille);
   								if ($strpos === true)	{
   									$taille = $strpos;
   								}
+  						}
 						$description = substr($description, 0, $taille);
 						$description.='(...)';
 						$pattern = '#<([ib])[ ]*[a-z]*>(.*?)</\1>#i';
 						//1. remplacer toutes le	s balises fermées
 						$chaine = preg_replace($pattern, '$2', $description);
 						$nb_occurences_i = substr_count($chaine, '<i');
 						for ($occurences = 0; $occurences < $nb_occurences_i; $occurences++)	{
 							$description .= "</i>";
+						}
 						$nb_occurences_b = substr_count($chaine, '<b');
 						for ($occurences = 0; $occurences < $nb_occurences_b; $occurences++)	{
 							$description .= "</b>";
+						}
+					}
 					$aso_page['description_light'] = $description;
 					//Greg : ajout GUID
 					$aso_page['guid'] = mb_convert_encoding($item->model->getElementsByTagName('guid')->item(0)->nodeValue, 'HTML-ENTITIES', $encodages);
 					$aso_page['category'] = mb_convert_encoding($item->model->getElementsByTagName('category')->item(0)->nodeValue, 'HTML-ENTITIES', $encodages);
 					$aso_page['author'] = mb_convert_encoding($item->author, 'HTML-ENTITIES', $encodages);
 					$aso_page['date'] = $item->pubDate;

Subversion Repositories Applications.papyrus

(root)/trunk/papyrus/applettes/syndication/syndication.php – Rev 2081 → 2083