From a7da6cf001ec195f1a5b1b4cf564abeeaffe7dbe Mon Sep 17 00:00:00 2001
From: bazooka07 <jpourrez@gmail.com>
Date: Sun, 25 Oct 2015 22:50:40 +0100
Subject: [PATCH 1/6] function rel2abs() dans class.plx.utils.php

---
 core/lib/class.plx.utils.php | 36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/core/lib/class.plx.utils.php b/core/lib/class.plx.utils.php
index d8f652d34..5ae4b5a2b 100644
--- a/core/lib/class.plx.utils.php
+++ b/core/lib/class.plx.utils.php
@@ -669,28 +669,26 @@ public static function httpEncoding() {
 	 * @param	base		url du site qui sera rajoutée devant les liens relatifs
 	 * @param	html		chaine de caractères à convertir
 	 * @return	string		chaine de caractères modifiée
-	 * @author	Stephane F., Amaury Graillat
+	 * @author	Stephane F., Amaury Graillat, J.P. Pourrez
 	 **/
 	public static function rel2abs($base, $html) {
 
-		// on protège les liens de type (href|src)="//" en doublant le caractère =
-		$html = preg_replace('@(href|src)=(["\']\/\/)@i', '\1==\2', $html);
-		// url des plugins
-		$html = preg_replace('@\<([^>]*) (href|src)=(["\'])[\.]/plugins@i', '<$1 $2=$3'.$base.'plugins', $html);
-		// generate server-only replacement for root-relative URLs
-		$server = preg_replace('@^([^:]+)://([^/]+)(/|$).*@', '\1://\2/', $base);
-		// on repare les liens ne commençant que part #
-		$get = plxUtils::getGets();
-		$html = preg_replace('@\<([^>]*) (href|src)=(["\'])#@i', '<\1 \2=\3'.$get.'#', $html);
-		// replace root-relative URLs
-		$html = preg_replace('@\<([^>]*) (href|src)=(["\']).?/@i', '<\1 \2=\3'.$server, $html);
-		// replace base-relative URLs
-		$html = preg_replace('@\<([^>]*) (href|src)=(["\'])([^:"]*|[^:"]*:[^/"][^"]*)(["\'])@i', '<\1 \2=\3'.$base.'\4\5', $html);
-		// unreplace fully qualified URLs with proto: that were wrongly added $base
-		$html = preg_replace('@\<([^>]*) (href|src)=(["\'])'.$base.'([a-zA-Z0-9]*):@i', '<\1 \2=\3\4:', $html);
-		// on rétablit les liens de type (href|src)="//" en remplaçant les caractères == par =
-		$html = preg_replace('@(href|src)==@i', '\1=', $html);
-		return $html;
+		if (substr($base, -1) != '/')
+			$base .= '/';
+		// on protège tous les liens externes au site,
+		// et on transforme tous les liens relatifs en absolus.
+		// on ajoute le hostname si nécessaire
+		$mask = '=<<>>=';
+		$patterns = array('/(href|src)=("|\')([a-z0-9]+):\/\//i', '/(href|src)=("|\')([^\/])/i');
+		$replaces = array('\1'.$mask.'\2\3://', '\1=\2'.$base.'\3');
+		if (preg_match('/^[a-z]+:\/\//i', $base)) {
+			$patterns[] = '/(href|src)=("|\')\/([^\/])/i';
+			$replaces[] = '\1=\2'.$base.'\3';
+		}
+		$result = preg_replace($patterns, $replaces, $html);
+		// on retire la protection des liens externes. Expressions régulières lentes et inutiles !!
+		$result = str_replace($mask, '=', $result);
+		return $result;
 
 	}
 

From 6c5ab44740d7343af59da8cbe251138d38cd0e84 Mon Sep 17 00:00:00 2001
From: bazooka07 <jpourrez@gmail.com>
Date: Wed, 28 Oct 2015 10:13:15 +0100
Subject: [PATCH 2/6] Refonte de la fonction tagList dans
 core/lib/class.plx.show.php

---
 core/lib/class.plx.show.php | 70 +++++++++++++++++++++----------------
 themes/defaut/css/theme.css |  3 +-
 themes/defaut/sidebar.php   |  2 +-
 3 files changed, 43 insertions(+), 32 deletions(-)

diff --git a/core/lib/class.plx.show.php b/core/lib/class.plx.show.php
index 79218e46d..f0f2fda9a 100644
--- a/core/lib/class.plx.show.php
+++ b/core/lib/class.plx.show.php
@@ -1537,14 +1537,14 @@ public function tagFeed($type='rss', $tag='') {
 	 * @param	order	tri des tags (random, alpha, '')
 	 * @return	stdout
 	 * @scope	global
-	 * @author	Stephane F
+	 * @author	Stephane F, Jean-Pierre Pourrez
 	 **/
-	public function tagList($format='<li><a class="#tag_size #tag_status" href="#tag_url" title="#tag_name">#tag_name</a></li>', $max='', $order='') {
+	public function tagList($format='<li><a class="#tag_size #tag_status" href="#tag_url">#tag_name</a></li>', $max='', $order='') {
 		# Hook Plugins
 		if(eval($this->plxMotor->plxPlugins->callHook('plxShowTagList'))) return;
 
 		$datetime = date('YmdHi');
-		$array=array();
+		$buf = array(); // tableau associatif
 		$alphasort=array();
 		# On verifie qu'il y a des tags
 		if($this->plxMotor->aTags) {
@@ -1553,48 +1553,58 @@ public function tagList($format='<li><a class="#tag_size #tag_status" href="#tag
 				if(isset($this->plxMotor->activeArts[$idart]) AND $tag['date']<=$datetime AND $tag['active']) {
 					if($tags = array_map('trim', explode(',', $tag['tags']))) {
 						foreach($tags as $tag) {
-							if($tag!='') {
-								$t = plxUtils::title2url($tag);
-								if(!isset($array['_'.$tag])) {
-									$array['_'.$tag]=array('name'=>$tag,'url'=>$t,'count'=>1);
-								}
+							$name = trim($tag);
+							if ($name != '') {
+								if (! array_key_exists($name, $buf))
+									$buf[$name] = 1;
 								else
-									$array['_'.$tag]['count']++;
-								if(!in_array($t, $alphasort))
-									$alphasort[] = $t; # pour le tri alpha
+									$buf[$name]++;
 							}
 						}
 					}
 				}
 			}
-			# limite sur le nombre de tags à afficher
-			if($max!='') $array=array_slice($array, 0, intval($max), true);
-			# tri des tags
 			switch($order) {
 				case 'alpha':
-					if($alphasort) array_multisort($alphasort, SORT_ASC, $array);
+					// if($alphasort) array_multisort($alphasort, SORT_ASC, $array);
+					ksort($buf);
 					break;
 				case 'random':
-					$arr_elem = array();
-					$keys = array_keys($array);
+					$keys = array_keys($buf);
 					shuffle($keys);
-					foreach ($keys as $key) {
-						$arr_elem[$key] = $array[$key];
-					}
-					$array = $arr_elem;
+					$new = array();
+					foreach ($keys as $k)
+						$new[$k] = $buf[$k];
+					$buf = $new;					
 					break;
+				default : // tri numérique décroissant
+					arsort($buf);
 			}
 		}
+		# limite sur le nombre de tags à afficher
+		if($max!='') // On en prendra bien une tranche
+			$buf = array_slice($buf, 0, intval($max), true);
+		// Par défaut, on remet l'ordre alphabétique dans la tranche
+		if ($order == '')
+			ksort($buf);
+		// On recherche la valeur de count la plus élevée
+		$maxCount = 0;
+		foreach ($buf as $tagname => $count)
+			if ($maxCount < $count)
+				$maxCount = $count;
 		# On affiche la liste
 		$size=0;
-		foreach($array as $tagname => $tag) {
-			$name = str_replace('#tag_id','tag-'.$size++,$format);
-			$name = str_replace('#tag_size','tag-size-'.($tag['count']>10?'max':$tag['count']),$name);
-			$name = str_replace('#tag_url',$this->plxMotor->urlRewrite('?tag/'.$tag['url']),$name);
-			$name = str_replace('#tag_name',plxUtils::strCheck($tag['name']),$name);
-			$name = str_replace('#nb_art',$tag['count'],$name);
-			$name = str_replace('#tag_status',(($this->plxMotor->mode=='tags' AND $this->plxMotor->cible==$tag['url'])?'active':'noactive'), $name);
-			echo $name;
+		$patterns = array('#tag_id', '#tag_size', '#tag_url', '#tag_name', '#nb_art', '#tag_status');
+		foreach($buf as $tagname => $count) {
+			$replaces = array(
+				'tag-'.$size++, // #tag_id
+				'tag-size-'.intval(round($count * 10 / $maxCount, 0)), // #tag_size
+				$this->plxMotor->urlRewrite('?tag/'.plxUtils::title2url($tagname)), // #tag_url
+				plxUtils::strCheck($tagname), // #tag_name
+				$count, // #nb_art
+				(($this->plxMotor->mode=='tags' AND $this->plxMotor->cible==$url)?'active':'noactive') // #tag_status
+			);
+			echo str_replace($patterns, $replaces, $format);
 		}
 	}
 
@@ -1775,4 +1785,4 @@ public function callHook($hookName, $parms=null) {
 	}
 
 }
-?>
\ No newline at end of file
+?>
diff --git a/themes/defaut/css/theme.css b/themes/defaut/css/theme.css
index 83235cff5..8563d7682 100644
--- a/themes/defaut/css/theme.css
+++ b/themes/defaut/css/theme.css
@@ -163,6 +163,7 @@ body {
 .aside ul.tag-list {
 	list-style-type: none;
 	padding-left: 0;
+	text-align: center;
 }
 .aside ul.tag-list li {
 	display: inline-block;
@@ -237,4 +238,4 @@ body {
 	width:100%;
 	background:#fafafa;
 	display:none;
-}
\ No newline at end of file
+}
diff --git a/themes/defaut/sidebar.php b/themes/defaut/sidebar.php
index ccb80b680..35e3fcd96 100644
--- a/themes/defaut/sidebar.php
+++ b/themes/defaut/sidebar.php
@@ -23,7 +23,7 @@
 		</h3>
 
 		<ul class="tag-list">
-			<?php $plxShow->tagList('<li class="tag #tag_size"><a class="#tag_status" href="#tag_url" title="#tag_name">#tag_name</a></li>'); ?>
+			<?php $plxShow->tagList('<li class="tag #tag_size"><a class="#tag_status" href="#tag_url" title="#tag_name">#tag_name</a></li>', 20); ?>
 		</ul>
 
 		<h3>

From 4c2c4dc07c53f99afc8f0b2c3e986f28e6c452bb Mon Sep 17 00:00:00 2001
From: bazooka07 <jpourrez@gmail.com>
Date: Wed, 28 Oct 2015 22:49:59 +0100
Subject: [PATCH 3/6] Correction des mime-type et de la valeur de href dans le
 noeud <atom:link> des flux RSS.

---
 core/lib/class.plx.feed.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/lib/class.plx.feed.php b/core/lib/class.plx.feed.php
index 06c7b7826..756ec63dd 100644
--- a/core/lib/class.plx.feed.php
+++ b/core/lib/class.plx.feed.php
@@ -265,7 +265,7 @@ public function getRssArticles() {
 		}
 
 		# On affiche le flux
-		header('Content-Type: text/xml; charset='.PLX_CHARSET);
+		header('Content-Type: application/rss+xml; charset='.PLX_CHARSET);
 		echo '<?xml version="1.0" encoding="'.PLX_CHARSET.'" ?>'."\n";
 		echo '<rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:atom="http://www.w3.org/2005/Atom">'."\n";
 		echo '<channel>'."\n";
@@ -273,7 +273,7 @@ public function getRssArticles() {
 		echo "\t".'<link>'.$link.'</link>'."\n";
 		echo "\t".'<language>' . $this->aConf['default_lang'] . '</language>'."\n";
 		echo "\t".'<description>'.plxUtils::strCheck($this->aConf['description']).'</description>'."\n";
-		echo '<atom:link xmlns:atom="http://www.w3.org/2005/Atom" rel="self" type="application/rss+xml" href="'.$this->urlRewrite('feed.php?rss').'" />'."\n";
+		echo '<atom:link xmlns:atom="http://www.w3.org/2005/Atom" rel="self" type="application/rss+xml" href="'.$this->urlRewrite('feed.php?'.$this->get).'" />'."\n";
 		$last_updated = plxDate::dateIso2rfc822($last_updated);
 		echo "\t".'<lastBuildDate>'.$last_updated.'</lastBuildDate>'."\n";
 		echo "\t".'<generator>PluXml</generator>'."\n";
@@ -340,7 +340,7 @@ public function getRssComments() {
 		}
 
 		# On affiche le flux
-		header('Content-Type: text/xml; charset='.PLX_CHARSET);
+		header('Content-Type: application/rss+xml; charset='.PLX_CHARSET);
 		echo '<?xml version="1.0" encoding="'.PLX_CHARSET.'" ?>'."\n";
 		echo '<rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:atom="http://www.w3.org/2005/Atom">'."\n";
 		echo '<channel>'."\n";
@@ -405,7 +405,7 @@ public function getAdminComments() {
 		}
 
 		# On affiche le flux
-		header('Content-Type: text/xml; charset='.PLX_CHARSET);
+		header('Content-Type: application/rss+xml; charset='.PLX_CHARSET);
 		echo '<?xml version="1.0" encoding="'.PLX_CHARSET.'" ?>'."\n";
 		echo '<rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:atom="http://www.w3.org/2005/Atom">'."\n";
 		echo '<channel>'."\n";

From a7661efc5667b1ad4c548efb672f08ed5acc76b4 Mon Sep 17 00:00:00 2001
From: bazooka07 <jpourrez@gmail.com>
Date: Mon, 2 Nov 2015 13:49:49 +0100
Subject: [PATCH 4/6] Revert "Correction des mime-type et de la valeur de href
 dans le noeud <atom:link> des flux RSS."

This reverts commit 4c2c4dc07c53f99afc8f0b2c3e986f28e6c452bb.
---
 core/lib/class.plx.feed.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/lib/class.plx.feed.php b/core/lib/class.plx.feed.php
index 756ec63dd..06c7b7826 100644
--- a/core/lib/class.plx.feed.php
+++ b/core/lib/class.plx.feed.php
@@ -265,7 +265,7 @@ public function getRssArticles() {
 		}
 
 		# On affiche le flux
-		header('Content-Type: application/rss+xml; charset='.PLX_CHARSET);
+		header('Content-Type: text/xml; charset='.PLX_CHARSET);
 		echo '<?xml version="1.0" encoding="'.PLX_CHARSET.'" ?>'."\n";
 		echo '<rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:atom="http://www.w3.org/2005/Atom">'."\n";
 		echo '<channel>'."\n";
@@ -273,7 +273,7 @@ public function getRssArticles() {
 		echo "\t".'<link>'.$link.'</link>'."\n";
 		echo "\t".'<language>' . $this->aConf['default_lang'] . '</language>'."\n";
 		echo "\t".'<description>'.plxUtils::strCheck($this->aConf['description']).'</description>'."\n";
-		echo '<atom:link xmlns:atom="http://www.w3.org/2005/Atom" rel="self" type="application/rss+xml" href="'.$this->urlRewrite('feed.php?'.$this->get).'" />'."\n";
+		echo '<atom:link xmlns:atom="http://www.w3.org/2005/Atom" rel="self" type="application/rss+xml" href="'.$this->urlRewrite('feed.php?rss').'" />'."\n";
 		$last_updated = plxDate::dateIso2rfc822($last_updated);
 		echo "\t".'<lastBuildDate>'.$last_updated.'</lastBuildDate>'."\n";
 		echo "\t".'<generator>PluXml</generator>'."\n";
@@ -340,7 +340,7 @@ public function getRssComments() {
 		}
 
 		# On affiche le flux
-		header('Content-Type: application/rss+xml; charset='.PLX_CHARSET);
+		header('Content-Type: text/xml; charset='.PLX_CHARSET);
 		echo '<?xml version="1.0" encoding="'.PLX_CHARSET.'" ?>'."\n";
 		echo '<rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:atom="http://www.w3.org/2005/Atom">'."\n";
 		echo '<channel>'."\n";
@@ -405,7 +405,7 @@ public function getAdminComments() {
 		}
 
 		# On affiche le flux
-		header('Content-Type: application/rss+xml; charset='.PLX_CHARSET);
+		header('Content-Type: text/xml; charset='.PLX_CHARSET);
 		echo '<?xml version="1.0" encoding="'.PLX_CHARSET.'" ?>'."\n";
 		echo '<rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:atom="http://www.w3.org/2005/Atom">'."\n";
 		echo '<channel>'."\n";

From 9f0ea4fd9bcab8d9351c13f103449cabe69955b4 Mon Sep 17 00:00:00 2001
From: bazooka07 <jpourrez@gmail.com>
Date: Mon, 2 Nov 2015 13:50:54 +0100
Subject: [PATCH 5/6] Revert "Refonte de la fonction tagList dans
 core/lib/class.plx.show.php"

This reverts commit 6c5ab44740d7343af59da8cbe251138d38cd0e84.
---
 core/lib/class.plx.show.php | 70 ++++++++++++++++---------------------
 themes/defaut/css/theme.css |  3 +-
 themes/defaut/sidebar.php   |  2 +-
 3 files changed, 32 insertions(+), 43 deletions(-)

diff --git a/core/lib/class.plx.show.php b/core/lib/class.plx.show.php
index f0f2fda9a..79218e46d 100644
--- a/core/lib/class.plx.show.php
+++ b/core/lib/class.plx.show.php
@@ -1537,14 +1537,14 @@ public function tagFeed($type='rss', $tag='') {
 	 * @param	order	tri des tags (random, alpha, '')
 	 * @return	stdout
 	 * @scope	global
-	 * @author	Stephane F, Jean-Pierre Pourrez
+	 * @author	Stephane F
 	 **/
-	public function tagList($format='<li><a class="#tag_size #tag_status" href="#tag_url">#tag_name</a></li>', $max='', $order='') {
+	public function tagList($format='<li><a class="#tag_size #tag_status" href="#tag_url" title="#tag_name">#tag_name</a></li>', $max='', $order='') {
 		# Hook Plugins
 		if(eval($this->plxMotor->plxPlugins->callHook('plxShowTagList'))) return;
 
 		$datetime = date('YmdHi');
-		$buf = array(); // tableau associatif
+		$array=array();
 		$alphasort=array();
 		# On verifie qu'il y a des tags
 		if($this->plxMotor->aTags) {
@@ -1553,58 +1553,48 @@ public function tagList($format='<li><a class="#tag_size #tag_status" href="#tag
 				if(isset($this->plxMotor->activeArts[$idart]) AND $tag['date']<=$datetime AND $tag['active']) {
 					if($tags = array_map('trim', explode(',', $tag['tags']))) {
 						foreach($tags as $tag) {
-							$name = trim($tag);
-							if ($name != '') {
-								if (! array_key_exists($name, $buf))
-									$buf[$name] = 1;
+							if($tag!='') {
+								$t = plxUtils::title2url($tag);
+								if(!isset($array['_'.$tag])) {
+									$array['_'.$tag]=array('name'=>$tag,'url'=>$t,'count'=>1);
+								}
 								else
-									$buf[$name]++;
+									$array['_'.$tag]['count']++;
+								if(!in_array($t, $alphasort))
+									$alphasort[] = $t; # pour le tri alpha
 							}
 						}
 					}
 				}
 			}
+			# limite sur le nombre de tags à afficher
+			if($max!='') $array=array_slice($array, 0, intval($max), true);
+			# tri des tags
 			switch($order) {
 				case 'alpha':
-					// if($alphasort) array_multisort($alphasort, SORT_ASC, $array);
-					ksort($buf);
+					if($alphasort) array_multisort($alphasort, SORT_ASC, $array);
 					break;
 				case 'random':
-					$keys = array_keys($buf);
+					$arr_elem = array();
+					$keys = array_keys($array);
 					shuffle($keys);
-					$new = array();
-					foreach ($keys as $k)
-						$new[$k] = $buf[$k];
-					$buf = $new;					
+					foreach ($keys as $key) {
+						$arr_elem[$key] = $array[$key];
+					}
+					$array = $arr_elem;
 					break;
-				default : // tri numérique décroissant
-					arsort($buf);
 			}
 		}
-		# limite sur le nombre de tags à afficher
-		if($max!='') // On en prendra bien une tranche
-			$buf = array_slice($buf, 0, intval($max), true);
-		// Par défaut, on remet l'ordre alphabétique dans la tranche
-		if ($order == '')
-			ksort($buf);
-		// On recherche la valeur de count la plus élevée
-		$maxCount = 0;
-		foreach ($buf as $tagname => $count)
-			if ($maxCount < $count)
-				$maxCount = $count;
 		# On affiche la liste
 		$size=0;
-		$patterns = array('#tag_id', '#tag_size', '#tag_url', '#tag_name', '#nb_art', '#tag_status');
-		foreach($buf as $tagname => $count) {
-			$replaces = array(
-				'tag-'.$size++, // #tag_id
-				'tag-size-'.intval(round($count * 10 / $maxCount, 0)), // #tag_size
-				$this->plxMotor->urlRewrite('?tag/'.plxUtils::title2url($tagname)), // #tag_url
-				plxUtils::strCheck($tagname), // #tag_name
-				$count, // #nb_art
-				(($this->plxMotor->mode=='tags' AND $this->plxMotor->cible==$url)?'active':'noactive') // #tag_status
-			);
-			echo str_replace($patterns, $replaces, $format);
+		foreach($array as $tagname => $tag) {
+			$name = str_replace('#tag_id','tag-'.$size++,$format);
+			$name = str_replace('#tag_size','tag-size-'.($tag['count']>10?'max':$tag['count']),$name);
+			$name = str_replace('#tag_url',$this->plxMotor->urlRewrite('?tag/'.$tag['url']),$name);
+			$name = str_replace('#tag_name',plxUtils::strCheck($tag['name']),$name);
+			$name = str_replace('#nb_art',$tag['count'],$name);
+			$name = str_replace('#tag_status',(($this->plxMotor->mode=='tags' AND $this->plxMotor->cible==$tag['url'])?'active':'noactive'), $name);
+			echo $name;
 		}
 	}
 
@@ -1785,4 +1775,4 @@ public function callHook($hookName, $parms=null) {
 	}
 
 }
-?>
+?>
\ No newline at end of file
diff --git a/themes/defaut/css/theme.css b/themes/defaut/css/theme.css
index 8563d7682..83235cff5 100644
--- a/themes/defaut/css/theme.css
+++ b/themes/defaut/css/theme.css
@@ -163,7 +163,6 @@ body {
 .aside ul.tag-list {
 	list-style-type: none;
 	padding-left: 0;
-	text-align: center;
 }
 .aside ul.tag-list li {
 	display: inline-block;
@@ -238,4 +237,4 @@ body {
 	width:100%;
 	background:#fafafa;
 	display:none;
-}
+}
\ No newline at end of file
diff --git a/themes/defaut/sidebar.php b/themes/defaut/sidebar.php
index 35e3fcd96..ccb80b680 100644
--- a/themes/defaut/sidebar.php
+++ b/themes/defaut/sidebar.php
@@ -23,7 +23,7 @@
 		</h3>
 
 		<ul class="tag-list">
-			<?php $plxShow->tagList('<li class="tag #tag_size"><a class="#tag_status" href="#tag_url" title="#tag_name">#tag_name</a></li>', 20); ?>
+			<?php $plxShow->tagList('<li class="tag #tag_size"><a class="#tag_status" href="#tag_url" title="#tag_name">#tag_name</a></li>'); ?>
 		</ul>
 
 		<h3>

From 23cdb23ea50d8b3beaa44a7b633203cab4efc215 Mon Sep 17 00:00:00 2001
From: bazooka07 <jpourrez@gmail.com>
Date: Thu, 5 Nov 2015 09:18:30 +0100
Subject: [PATCH 6/6] =?UTF-8?q?correction=20de=20la=20valeur=20de=20href?=
 =?UTF-8?q?=20dans=20le=20link=20inclus=20dans=20l'entete=20de=20la=20page?=
 =?UTF-8?q?=20html,=20pour=20la=20categorie=20ou=20le=20tag=20affich=C3=A9?=
 =?UTF-8?q?=20dans=20la=20page.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 themes/defaut/header.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/themes/defaut/header.php b/themes/defaut/header.php
index f46465223..da7081fb2 100644
--- a/themes/defaut/header.php
+++ b/themes/defaut/header.php
@@ -13,7 +13,21 @@
 	<link rel="stylesheet" href="<?php $plxShow->template(); ?>/css/theme.css" media="screen"/>
 	<?php $plxShow->templateCss() ?>
 	<?php $plxShow->pluginsCss() ?>
+<?php
+	if ($plxShow->plxMotor->mode == 'categorie') { 
+		$categorie = $plxShow->catId();
+		$id = str_pad($categorie, 3, '0', STR_PAD_LEFT); ?>
+	<link rel="alternate" type="application/rss+xml" title="<?php $plxShow->lang('ARTICLES_RSS_FEEDS'); echo ' - '.$plxShow->getlang('CATEGORIES').': '; $plxShow->catName() ?>" href="<?php $plxShow->urlRewrite('feed.php?rss/categorie'.$categorie.'/'.$plxShow->plxMotor->aCats[$id]['url']); ?>" />		
+<?php
+	} else if ($plxShow->plxMotor->mode == 'tags') {
+		$tag = plxUtils::strCheck($plxShow->plxMotor->cible); ?>
+	<link rel="alternate" type="application/rss+xml" title="<?php $plxShow->lang('ARTICLES_RSS_FEEDS'); echo ' - '.$plxShow->getlang('TAGS').' : '; $plxShow->tagName(); ?>" href="<?php $plxShow->urlRewrite('feed.php?rss/tag/'.plxUtils::strCheck($tag)) ?>" />
+<?php
+	} else { ?>
 	<link rel="alternate" type="application/rss+xml" title="<?php $plxShow->lang('ARTICLES_RSS_FEEDS') ?>" href="<?php $plxShow->urlRewrite('feed.php?rss') ?>" />
+<?php
+	}
+?>
 	<link rel="alternate" type="application/rss+xml" title="<?php $plxShow->lang('COMMENTS_RSS_FEEDS') ?>" href="<?php $plxShow->urlRewrite('feed.php?rss/commentaires') ?>" />
 </head>