diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php index 4d12bd8cd3d..ec43147c2fa 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 '
'; + +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; ?> - -Attention, pour la récupération des données au format RSS, les urls en https ne marchent pas pour l'instant. -Exemples: - - - -
'.$langs->trans("NewRSS").''.$langs->trans("Example").'
'.$langs->trans("Title").'April,
LinuxFR,
Lolix,
Parinux
- - - - - - - - - + + -
Syndication d'un nouveau flux RSS
Titre" size="45">
URL du RSS " size="45">http://wiki.april.org/RecentChanges?format=rss,
http://www.linuxfr.org/backend.rss,
http://back.fr.lolix.org/jobs.rss.php3,
http://parinux.org/backend.rss
+
"> @@ -189,7 +175,7 @@ Exemples:

    - +
    - - + + - - + -
    Syndication du flux numéro " . ($i+1) . "
    Titre
    Titre
    URL du RSS
    + trans("Modify")."\"> trans("Delete")."\"> @@ -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 0b31771072e..4190a5b5370 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 a8c193881d1..ebbeb9f7fb5 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