diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php
index 4d12bd8cd3da0bdbb9e8e74f7063f5ddbcae7b2a..ec43147c2fa8d61a3c7f1e83b82b4b012ee6bbde 100644
--- a/htdocs/admin/external_rss.php
+++ b/htdocs/admin/external_rss.php
@@ -24,10 +24,10 @@
*/
/**
- \file htdocs/admin/external_rss.php
- \ingroup external_rss
- \brief Page d'administration/configuration du module ExternalRss
- \version $Revision$
+ \file htdocs/admin/external_rss.php
+ \ingroup external_rss
+ \brief Page d'administration/configuration du module ExternalRss
+ \version $Revision$
*/
require("./pre.inc.php");
@@ -46,94 +46,94 @@ if ($result)
$nbexternalrss = $obj->nb;
}
else {
- dolibarr_print_error($db);
+ dolibarr_print_error($db);
}
if ($_POST["action"] == 'add')
{
- $external_rss_urlrss = "external_rss_urlrss_" . $_POST["norss"];
-
- if(isset($_POST[$external_rss_urlrss])) {
- $external_rss_title = "external_rss_title_" . $_POST["norss"];
- //$external_rss_url = "external_rss_url_" . $_POST["norss"];
-
- $db->begin();
-
- $sql = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name ='EXTERNAL_RSS_TITLE_" . $_POST["norss"] . "'; ";
- $db->query($sql);
-
- $sql = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name ='EXTERNAL_RSS_URLRSS_" . $_POST["norss"] . "'; ";
- $db->query($sql);
-
- $sql1 = "INSERT INTO ".MAIN_DB_PREFIX."const (name,value,visible) VALUES ('EXTERNAL_RSS_TITLE_" . $_POST["norss"] . "','".$_POST[$external_rss_title]."',0) ;";
- $sql2 = "INSERT INTO ".MAIN_DB_PREFIX."const (name,value,visible) VALUES ('EXTERNAL_RSS_URLRSS_" . $_POST["norss"] . "','".$_POST[$external_rss_urlrss]."',0) ;";
-
- if ($db->query($sql1) && $db->query($sql2))
- {
- $db->commit();
- header("Location: external_rss.php");
- }
- else
- {
- $db->rollback();
- dolibarr_print_error($db);
- }
- }
+ $external_rss_urlrss = "external_rss_urlrss_" . $_POST["norss"];
+
+ if(isset($_POST[$external_rss_urlrss])) {
+ $external_rss_title = "external_rss_title_" . $_POST["norss"];
+ //$external_rss_url = "external_rss_url_" . $_POST["norss"];
+
+ $db->begin();
+
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name ='EXTERNAL_RSS_TITLE_" . $_POST["norss"] . "'; ";
+ $db->query($sql);
+
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name ='EXTERNAL_RSS_URLRSS_" . $_POST["norss"] . "'; ";
+ $db->query($sql);
+
+ $sql1 = "INSERT INTO ".MAIN_DB_PREFIX."const (name,value,visible) VALUES ('EXTERNAL_RSS_TITLE_" . $_POST["norss"] . "','".$_POST[$external_rss_title]."',0) ;";
+ $sql2 = "INSERT INTO ".MAIN_DB_PREFIX."const (name,value,visible) VALUES ('EXTERNAL_RSS_URLRSS_" . $_POST["norss"] . "','".$_POST[$external_rss_urlrss]."',0) ;";
+
+ if ($db->query($sql1) && $db->query($sql2))
+ {
+ $db->commit();
+ header("Location: external_rss.php");
+ }
+ else
+ {
+ $db->rollback();
+ dolibarr_print_error($db);
+ }
+ }
}
if ($_POST["delete"])
{
- if(isset($_POST["norss"])) {
- $db->begin();
-
- $sql1 = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = 'EXTERNAL_RSS_URL_" . $_POST["norss"]."'";
- $sql2 = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = 'EXTERNAL_RSS_TITLE_" . $_POST["norss"]."'";
- $sql3 = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = 'EXTERNAL_RSS_URLRSS_" . $_POST["norss"]."'";
-
- $result1 = $db->query($sql1);
- $result2 = $db->query($sql2);
- $result3 = $db->query($sql3);
-
- if ($result1 && $result2 && $result3)
- {
- $db->commit();
- header("Location: external_rss.php");
- }
- else
- {
- $db->rollback();
- dolibarr_print_error($db);
- }
- }
+ if(isset($_POST["norss"])) {
+ $db->begin();
+
+ $sql1 = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = 'EXTERNAL_RSS_URL_" . $_POST["norss"]."'";
+ $sql2 = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = 'EXTERNAL_RSS_TITLE_" . $_POST["norss"]."'";
+ $sql3 = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = 'EXTERNAL_RSS_URLRSS_" . $_POST["norss"]."'";
+
+ $result1 = $db->query($sql1);
+ $result2 = $db->query($sql2);
+ $result3 = $db->query($sql3);
+
+ if ($result1 && $result2 && $result3)
+ {
+ $db->commit();
+ header("Location: external_rss.php");
+ }
+ else
+ {
+ $db->rollback();
+ dolibarr_print_error($db);
+ }
+ }
}
if ($_POST["modify"])
{
- $external_rss_urlrss = "external_rss_urlrss_" . $_POST["norss"];
- if(isset($_POST[$external_rss_urlrss])) {
- $db->begin();
-
- $external_rss_title = "external_rss_title_" . $_POST["norss"];
-
- $sql = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = 'EXTERNAL_RSS_TITLE_" . $_POST["norss"]."';";
- $db->query($sql);
-
- $sql = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = 'EXTERNAL_RSS_URLRSS_" . $_POST["norss"]."';";
- $db->query($sql);
-
- $sql1 = "INSERT INTO ".MAIN_DB_PREFIX."const (name,value,visible) VALUES('" . "EXTERNAL_RSS_TITLE_" . $_POST["norss"] . "','". $_POST[$external_rss_title]."',0) ;";
- $sql2 = "INSERT INTO ".MAIN_DB_PREFIX."const (name,value,visible) VALUES('" . "EXTERNAL_RSS_URLRSS_" . $_POST["norss"] . "','". $_POST[$external_rss_urlrss]."',0)";
-
- if ($db->query($sql1) && $db->query($sql2))
- {
- $db->commit();
- header("Location: external_rss.php");
- }
- else
- {
- $db->rollback();
- dolibarr_print_error($db);
- }
+ $external_rss_urlrss = "external_rss_urlrss_" . $_POST["norss"];
+ if(isset($_POST[$external_rss_urlrss])) {
+ $db->begin();
+
+ $external_rss_title = "external_rss_title_" . $_POST["norss"];
+
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = 'EXTERNAL_RSS_TITLE_" . $_POST["norss"]."';";
+ $db->query($sql);
+
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = 'EXTERNAL_RSS_URLRSS_" . $_POST["norss"]."';";
+ $db->query($sql);
+
+ $sql1 = "INSERT INTO ".MAIN_DB_PREFIX."const (name,value,visible) VALUES('" . "EXTERNAL_RSS_TITLE_" . $_POST["norss"] . "','". $_POST[$external_rss_title]."',0) ;";
+ $sql2 = "INSERT INTO ".MAIN_DB_PREFIX."const (name,value,visible) VALUES('" . "EXTERNAL_RSS_URLRSS_" . $_POST["norss"] . "','". $_POST[$external_rss_urlrss]."',0)";
+
+ if ($db->query($sql1) && $db->query($sql2))
+ {
+ $db->commit();
+ header("Location: external_rss.php");
+ }
+ else
+ {
+ $db->rollback();
+ dolibarr_print_error($db);
+ }
}
}
@@ -144,41 +144,27 @@ if ($_POST["modify"])
llxHeader();
-print_fiche_titre("Configuration des imports de flux RSS", $mesg);
+print_fiche_titre($langs->trans("ExternalRSSSetup"), $mesg);
-?>
+print '<form name="externalrssconfig" action="external_rss.php" method="post">';
-Attention, pour la r�cup�ration des donn�es au format RSS, les urls en https ne marchent pas pour l'instant.
-Exemples:<ul>
- <li>WikiApril / http://wiki.april.org / http://wiki.april.org/RecentChanges?format=rss (et tous les sites phpwiki)</li>
- <li>LinuxFR / http://linuxfr.org / http://www.linuxfr.org/backend.rss</li>
- <li>WikiInterneRycks / ../wiki / ../wiki/RecentChanges?format=rss (ne marche pas, je suis en https et en plus y a un apache_auth)</li>
- <li>LoLix / http://back.fr.lolix.org/ / http://back.fr.lolix.org/jobs.rss.php3</li>
- <li>Parinux / http://parinux.org/ / http://parinux.org/backend.rss</li>
- <li>Docs d'Abul�du / http://docs.abuledu.org / http://docs.abuledu.org/backend.php3 (et tous les sites spip)</li>
- </ul>
-
-<form name="externalrssconfig" action="external_rss.php" method="post">
-
-<table class="border" cellpadding="2" cellspacing="0">
-<tr class="liste_titre">
- <td colspan="2">Syndication d'un nouveau flux RSS</td>
-</tr>
-<tr>
- <td>Titre</td>
- <td><input type="text" name="external_rss_title_<?php echo $nbexternalrss ?>" value="<?php echo @constant("EXTERNAL_RSS_TITLE_" . $nbexternalrss) ?>" size="45"></td>
-</tr>
-<!--
-<tr>
- <td>URL du site</td>
- <td><input type="text" name="external_rss_url_<?php echo $nbexternalrss ?>" value="<?php echo @constant('EXTERNAL_RSS_URL_' . $nbexternalrss) ?>" size="45"></td>
-</tr>
--->
-<tr>
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td colspan="2">'.$langs->trans("NewRSS").'</td>';
+print '<td>'.$langs->trans("Example").'</td>';
+print '</tr>';
+print '<tr class="impair">';
+print '<td width="100">'.$langs->trans("Title").'</td>';
+print '<td><input type="text" name="external_rss_title_'.$nbexternalrss.'" value="'.@constant("EXTERNAL_RSS_TITLE_" . $nbexternalrss).'" size="45"></td>';
+print '<td>April,<br>LinuxFR,<br>Lolix,<br>Parinux</td>';
+print '</tr>';
+?>
+<tr class="pair">
<td>URL du RSS</td>
<td><input type="text" name="external_rss_urlrss_<?php echo $nbexternalrss ?>" value="<?php echo @constant("EXTERNAL_RSS_URLRSS_" . $nbexternalrss) ?>" size="45"></td>
+ <td>http://wiki.april.org/RecentChanges?format=rss,<br>http://www.linuxfr.org/backend.rss,<br>http://back.fr.lolix.org/jobs.rss.php3,<br>http://parinux.org/backend.rss</td>
</tr>
-<tr><td colspan="2">
+<tr><td colspan="3" align="center">
<input type="submit" value="<?php echo $langs->trans("Add") ?>">
<input type="hidden" name="action" value="add">
<input type="hidden" name="norss" value="<?php echo $nbexternalrss ?>">
@@ -189,7 +175,7 @@ Exemples:<ul>
<br>
-<table class="border" cellpadding="3" cellspacing="0">
+<table class="noborder" width="100%">
<?php
@@ -198,22 +184,16 @@ for($i = 0; $i < $nbexternalrss; $i++) {
<form name=\"externalrssconfig\" action=\"external_rss.php\" method=\"post\">
<td colspan=\"2\">Syndication du flux num�ro " . ($i+1) . "</td>
</tr>
-<tr>
- <td>Titre</td>
+<tr class=\"impair\">
+ <td width=\"100\">Titre</td>
<td><input type=\"text\" name=\"external_rss_title_" . $i . "\" value=\"" . @constant("EXTERNAL_RSS_TITLE_" . $i) . "\" size=\"45\"></td>
</tr>
-<!--
-<tr>
- <td>URL du site</td>
- <td><input type=\"text\" name=\"external_rss_url_" . $i . "\" value=\"". @constant("EXTERNAL_RSS_URL_" . $i) . "\" size=\"45\"></td>
-</tr>
--->
-<tr>
+<tr class=\"pair\">
<td>URL du RSS</td>
<td><input type=\"text\" name=\"external_rss_urlrss_" . $i . "\" value=\"" . @constant("EXTERNAL_RSS_URLRSS_" . $i) . "\" size=\"45\"></td>
</tr>
<tr>
-<td colspan=\"2\">
+<td colspan=\"2\" align=\"center\">
<input type=\"submit\" name=\"modify\" value=\"".$langs->trans("Modify")."\">
<input type=\"submit\" name=\"delete\" value=\"".$langs->trans("Delete")."\">
<input type=\"hidden\" name=\"norss\" value=\"$i\">
@@ -231,6 +211,6 @@ for($i = 0; $i < $nbexternalrss; $i++) {
$db->close();
-llxFooter();
+llxFooter('$Date$ - $Revision$');
?>
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 0b31771072e4de33b97bff7bca4320420cea16a0..4190a5b53705bf13c78e7766416f007112de5f86 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -336,4 +336,7 @@ BarcodeSetup=Barcode setup
PaperFormatModule=Print' format module
BarcodeEncodeModule=Barcode' encodage type
##### Prelevements #####
-WithdrawalsSetup=Withdrawal setup
\ No newline at end of file
+WithdrawalsSetup=Withdrawal setup
+##### ExternalRSS #####
+ExternalRSSSetup=External RSS imports setup
+NewRSS=New RSS
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index a8c193881d1e0a86669ed6dcdd1c838adafdd1d7..ebbeb9f7fb5f5035ec97d58ebe1c9c8e59a361ee 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -338,3 +338,6 @@ BarcodeEncodeModule=Types d'encodages des codes barres
BarcodeEncodeModule=Modules d'encodage des codes barres
##### Prelevements #####
WithdrawalsSetup=Configuration du module pr�l�vement
+##### ExternalRSS #####
+ExternalRSSSetup=Configuration des imports de flux RSS
+NewRSS=Syndication d'un nouveau flux RSS