From 76b652f8eab386ea91436be8d0f8e654aeea01ca Mon Sep 17 00:00:00 2001
From: "cedric@yterium.com" <>
Date: Mon, 9 Apr 2018 14:24:06 +0000
Subject: [PATCH] la methode par defaut est atomrss qui sait syndiquer du Atom
 et du RSS a partir d'un flux http/https (ne melangeons pas le format et le
 protocole)

---
 .gitattributes                   | 2 +-
 genie/syndic.php                 | 2 +-
 inc/syndic.php                   | 2 +-
 syndic/{http.php => atomrss.php} | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename syndic/{http.php => atomrss.php} (99%)

diff --git a/.gitattributes b/.gitattributes
index 6baaf3e..b733153 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -172,4 +172,4 @@ puce_statut/site.php -text
 /sites_fonctions.php -text
 /sites_ieconfig.php -text
 /sites_pipelines.php -text
-syndic/http.php -text
+syndic/atomrss.php -text
diff --git a/genie/syndic.php b/genie/syndic.php
index 30bedf2..39bb29d 100644
--- a/genie/syndic.php
+++ b/genie/syndic.php
@@ -134,7 +134,7 @@ function syndic_a_jour($now_id_syndic) {
 	sql_updateq('spip_syndic', array('syndication' => $statut, 'date_syndic' => date('Y-m-d H:i:s')),
 		"id_syndic=" . intval($now_id_syndic));
 
-	$methode_syndication = 'http';
+	$methode_syndication = 'atomrss';
 	$syndic = charger_fonction($methode_syndication, 'syndic');
 	$items = $syndic($url_syndic);
 
diff --git a/inc/syndic.php b/inc/syndic.php
index 0107b9f..ff9aa9f 100644
--- a/inc/syndic.php
+++ b/inc/syndic.php
@@ -26,5 +26,5 @@ if (!defined("_ECRIRE_INC_VERSION")) {
 // il faut passer par cron() pour avoir un verrou portable
 // Voir un exemple dans action/editer/site
 include_spip('genie/syndic');
-include_spip('syndic/http');
+include_spip('syndic/atomrss');
 
diff --git a/syndic/http.php b/syndic/atomrss.php
similarity index 99%
rename from syndic/http.php
rename to syndic/atomrss.php
index e41d7ee..cfa07f4 100644
--- a/syndic/http.php
+++ b/syndic/atomrss.php
@@ -29,11 +29,11 @@ include_spip('genie/syndic');
 
 
 /**
- * Analyse d'une URL au format RSS/Atom
+ * Analyse d'une URL au format Atom/RSS
  * @param string $url_syndic
  * @return array|string
  */
-function syndic_http_dist($url_syndic) {
+function syndic_atomrss_dist($url_syndic) {
 
 	// Aller chercher les donnees du RSS et les analyser
 	include_spip('inc/distant');