From e6a28cdee229ca1a72d55dc18ea7a23ef657cfbf Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 22 Oct 2013 22:23:29 +0200
Subject: Ajoute URL dans message FeedException
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Ajoute l'adresse du flux dans la description de l'erreur lorsqu'une exception est générée.
---
 app/models/Feed.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/models/Feed.php b/app/models/Feed.php
index 02a4e6be7..10695d2a7 100644
--- a/app/models/Feed.php
+++ b/app/models/Feed.php
@@ -205,7 +205,7 @@ class Feed extends Model {
 				$feed->init ();
 
 				if ($feed->error ()) {
-					throw new FeedException ($feed->error);
+					throw new FeedException ($feed->error . ' [' . $url . ']');
 				}
 
 				// si on a utilisé l'auto-discover, notre url va avoir changé
-- 
cgit v1.2.3


From d93642d0d2b207f98c49ce738f281a80d7699de2 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Thu, 24 Oct 2013 11:15:57 +0200
Subject: htmlspecialchars pour les logs

---
 app/views/index/logs.phtml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/views/index/logs.phtml b/app/views/index/logs.phtml
index c72a84c86..09f0c4ecd 100644
--- a/app/views/index/logs.phtml
+++ b/app/views/index/logs.phtml
@@ -10,7 +10,7 @@
 		<?php $this->logsPaginator->render ('logs_pagination.phtml', 'page'); ?>
 		
 		<?php foreach ($items as $log) { ?>
-		<div class="log <?php echo $log->level (); ?>"><span class="date"><?php echo date ('d/m/Y - H:i:s', strtotime ($log->date ())); ?></span><?php echo $log->info (); ?></div>
+		<div class="log <?php echo $log->level (); ?>"><span class="date"><?php echo date ('d/m/Y - H:i:s', strtotime ($log->date ())); ?></span><?php echo htmlspecialchars ($log->info (), ENT_NOQUOTES, 'UTF-8'); ?></div>
 		<?php } ?>
 		
 		<?php $this->logsPaginator->render ('logs_pagination.phtml','page'); ?>
@@ -18,4 +18,4 @@
 	<?php } else { ?>
 	<p class="alert alert-warn"><?php echo Translate::t ('logs_empty'); ?></p>
 	<?php } ?>
-</div>
\ No newline at end of file
+</div>
-- 
cgit v1.2.3