Author: booz@rezo.net
Date: Wed Jul 19 17:58:21 2006
New Revision: 4092
Log:
nettoyage de l'import des patrons
Modified:
_plugins_/_email_/spip_listes/exec/courrier_edit.php
_plugins_/_email_/spip_listes/exec/import_patron.php
Modified: _plugins_/_email_/spip_listes/exec/courrier_edit.php
--- _plugins_/_email_/spip_listes/exec/courrier_edit.php (original)
+++ _plugins_/_email_/spip_listes/exec/courrier_edit.php Wed Jul 19 17:58:21 2006
@@ -117,7 +117,7 @@
echo "<table><tr><td>";
- echo "<form action='?exec=import_patron&mode=courrier&id_message=$id_message' METHOD='post'>";
+ echo "<form action='".generer_url_ecrire("import_patron","id_message=$id_message")."' METHOD='post'>";
$dir = _DIR_PLUGIN_SPIPLISTES."/patrons/";
// Ouvre un dossier bien connu, et liste tous les fichiers
@@ -166,7 +166,7 @@
//Ecrire dans le formulaire
- echo "<form action='?exec=gerer_courrier&id_message=$id_message' METHOD='post' name='formulaire'>";
+ echo "<form action='".generer_url_ecrire("gerer_courrier","id_message=$id_message")."' METHOD='post' name='formulaire'>";
if ($type == 'nl') $le_type = _T('spiplistes:email_collec');
Modified: _plugins_/_email_/spip_listes/exec/import_patron.php
--- _plugins_/_email_/spip_listes/exec/import_patron.php (original)
+++ _plugins_/_email_/spip_listes/exec/import_patron.php Wed Jul 19 17:58:21 2006
@@ -33,23 +33,13 @@
$nomsite=lire_meta("nom_site");
$urlsite=lire_meta("adresse_site");
- if (!isset($mode)) $mode = $_GET['mode'] ;
-if (!isset($inclure_patron)) $inclure_patron = $_POST['inclure_patron'] ;
-
-if (($inclure_patron == "oui") AND ($mode == "courrier")) {
if (!isset($patron)) $patron = $_POST['patron'] ;
if (!isset($date)) $date = $_POST['date'] ;
- //echo generer_url_public('patron_switch',"patron=$patron&date=$date") ; // bug de fou
-
$texte_patron = recuperer_page(generer_url_public('patron_switch',"patron=$patron&date=$date",true)) ;
-
$titre_patron = _T('spiplistes:lettre_info')." ".$nomsite;
- //chdir('./ecrire/');
- //echo getcwd() . "\n";
-
$titre = addslashes($titre_patron);
$texte = addslashes($texte_patron);
@@ -85,7 +75,4 @@
}
-
-
-}
?>