From 057a4517c926f9a5dfe93a30c5a5980e2b450ae6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 13 Apr 2020 13:38:57 +0200
Subject: [PATCH] Fix rss

---
 htdocs/admin/external_rss.php | 31 +++++++++++++++----------------
 htdocs/langs/en_US/admin.lang |  2 +-
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php
index 86283c07ff8..cc2edb550a0 100644
--- a/htdocs/admin/external_rss.php
+++ b/htdocs/admin/external_rss.php
@@ -228,9 +228,8 @@ print '</div>';
 
 print '</form>';
 
-print '<br>'.$langs->trans('RssNote');
-print '<br><a href="'.DOL_MAIN_URL_ROOT.'/admin/boxes.php">'.$langs->trans('JumpToBoxes').'<a>';
-
+print '<br><br>';
+print '<span class="opacitymedium">'.$langs->trans('RssNote').'</span> - <a href="'.DOL_MAIN_URL_ROOT.'/admin/boxes.php">'.$langs->trans('JumpToBoxes').'</a>';
 print '<br><br>';
 
 $sql = "SELECT rowid, file, note FROM ".MAIN_DB_PREFIX."boxes_def";
@@ -259,12 +258,12 @@ if ($resql)
 		$result = $rssparser->parser($conf->global->$keyrssurl, 5, 300, $conf->externalrss->dir_temp);
 
 		print "<br>";
-		print '<form name="externalrssconfig" action="'.$_SERVER["PHP_SELF"].'" method="post">';
+		print '<form name="externalrssconfig" action="'.$_SERVER["PHP_SELF"].'" method="post">'."\n";
 
-		print '<table class="noborder centpercent">';
-		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<table class="noborder centpercent">'."\n";
+		print '<input type="hidden" name="token" value="'.newToken().'">'."\n";
 
-		print "<tr class=\"liste_titre\">";
+		print '<tr class="liste_titre">';
 		print "<td>".$langs->trans("RSS")." ".($i + 1)."</td>";
         print '<td class="right">';
         print '<input type="submit" class="button buttongen" name="modify" value="'.$langs->trans("Modify").'">';
@@ -272,19 +271,19 @@ if ($resql)
 		print '<input type="submit" class="button buttongen" name="delete" value="'.$langs->trans("Delete").'">';
 		print '<input type="hidden" name="norss" value="'.$idrss.'">';
 		print '</td>';
-		print "</tr>";
+		print "</tr>"."\n";
 
 
 		print '<tr class="oddeven">';
 		print "<td width=\"100px\">".$langs->trans("Title")."</td>";
 		print "<td><input type=\"text\" class=\"flat minwidth300\" name=\"external_rss_title_".$idrss."\" value=\"".dol_escape_htmltag($conf->global->$keyrsstitle)."\"></td>";
-		print "</tr>";
+		print "</tr>"."\n";
 
 
 		print '<tr class="oddeven">';
 		print "<td>".$langs->trans("URL")."</td>";
 		print "<td><input type=\"text\" class=\"flat minwidth300\" name=\"external_rss_urlrss_".$idrss."\" value=\"".dol_escape_htmltag($conf->global->$keyrssurl)."\"></td>";
-		print "</tr>";
+		print "</tr>"."\n";
 
 
 		print '<tr class="oddeven">';
@@ -302,7 +301,7 @@ if ($resql)
 			print '</div>';
 		}
 		print "</td>";
-		print "</tr>";
+		print "</tr>"."\n";
 
 		// Logo
 	    if ($result > 0 && empty($rss->error))
@@ -316,19 +315,19 @@ if ($resql)
 			if ($imageurl) print '<img height="32" src="'.$imageurl.'">';
 			else print $langs->trans("None");
 			print '</td>';
-			print "</tr>";
+			print "</tr>"."\n";
 		}
 
 		// Active
 		$active = _isInBoxList($idrss, $boxlist) ? 'yes' : 'no';
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans('WidgetEnabled').'</td>';
-		print '<td>'.yesno($active).'</td>';
-		print "</tr>";
+		print '<td>'.yn($active).'</td>';
+		print "</tr>"."\n";
 
-		print '</table>';
+		print '</table>'."\n";
 
-		print "</form>";
+		print "</form>"."\n";
 
 		$i++;
 	}
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 6c9bc75ae48..414a1e10977 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1990,5 +1990,5 @@ EmailTemplate=Template for email
 EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-RssNote=Note: Each RSS feed must be separate activate as a widget to show it for a user.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets