Author: pierre.andrews@gmail.com
Date: Mon Jul 31 16:32:08 2006
New Revision: 4318
Log:
on passe en post, c'est moins mignon, mais c'est plus correct et le redirect marche apres
Modified:
_plugins_/_contenu_editorial_/FpipR/exec/flickr_bookmarklet_photo.php
_plugins_/_contenu_editorial_/FpipR/inc/flickr_api.php
Modified: _plugins_/_contenu_editorial_/FpipR/exec/flickr_bookmarklet_photo.php
--- _plugins_/_contenu_editorial_/FpipR/exec/flickr_bookmarklet_photo.php (original)
+++ _plugins_/_contenu_editorial_/FpipR/exec/flickr_bookmarklet_photo.php Mon Jul 31 16:32:08 2006
@@ -54,8 +54,12 @@
$rub = substr($rub,3);
$requete = array('WHERE' => "id_auteur='$connect_id_auteur' AND (statut='prop' OR statut='prepa' OR statut='poubelle')".(($rub)?" AND $rub":''), 'ORDER BY' => "date DESC");
}
-
- flickr_afficher_articles(_T('fpipr:choisir_un_article'),$requete,$id,$secret);
+ echo '<form method="post" action="'.generer_action_auteur("flickr_ajouter_documents","article").'">';
+ echo '<input type="hidden" name="type" value="article"/>';
+ echo '<input type="hidden" name="photos[]" value="'."$id@#@$secret".'"/>';
+ flickr_afficher_articles(_T('fpipr:choisir_un_article'),$requete);
+ echo '<button type="submit">'._T('spip:bouton_valider').'</button>';
+ echo '</form>';
echo '</div>';
fin_page();
}
@@ -99,7 +103,7 @@
$tranches = '';
if ($cpt > $nb_aff) {
$nb_aff = (_TRANCHES);
- $tranches = afficher_tranches_requete($cpt, 3, $tmp_var, $javascript, $nb_aff);
+ $tranches = afficher_tranches_requete($cpt, 4, $tmp_var, $javascript, $nb_aff);
}
$res_proch = spip_query("SELECT id_ajax_fonc FROM spip_ajax_fonc WHERE hash=$hash AND id_auteur=$connect_id_auteur ORDER BY id_ajax_fonc DESC LIMIT 1");
@@ -138,8 +142,8 @@
}
spip_free_result($result);
- $largeurs = array(11, '', 100);
- $styles = array('', 'arial2', 'arial1');
+ $largeurs = array(11, '', 100,'');
+ $styles = array('', 'arial2', 'arial1','');
echo afficher_liste($largeurs, $table, $styles);
echo afficher_liste_fin_tableau();
@@ -173,7 +177,7 @@
if (acces_restreint_rubrique($id_rubrique))
$s .= http_img_pack("admin-12.gif", "", "width='12' height='12'", _T('titre_image_admin_article'));
- $s .= "<a href='" . generer_action_auteur("flickr_ajouter_documents","$id_article",generer_url_ecrire('articles',"id_article=$id_article",false,_DIR_RESTREINT_ABS))."&id=$id_article&type=article&photos[]=".urlencode("$id@#@$secret")."'$descriptif$dir_lang style=\"display:block;\">";
+ $s .= "<a href='" .generer_url_ecrire('articles',"id_article=$id_article")."'$descriptif$dir_lang style=\"display:block;\">";
if ($voir_logo) {
$logo_f = charger_fonction('chercher_logo', 'inc');
@@ -191,6 +195,11 @@
// La date
$vals[] = affdate_jourcourt($date);
+ $input .= '<input type="radio" name="id" value="'.$id_article.'"/>';
+ $input .= '<input type="hidden" name="redirect" value="'.generer_url_ecrire('articles',"id_article=$id_article").'"/>';
+
+ $vals[] = $input;
+
return $vals;
}
Modified: _plugins_/_contenu_editorial_/FpipR/inc/flickr_api.php
--- _plugins_/_contenu_editorial_/FpipR/inc/flickr_api.php (original)
+++ _plugins_/_contenu_editorial_/FpipR/inc/flickr_api.php Mon Jul 31 16:32:08 2006
@@ -399,7 +399,7 @@
//======================================================================
function flickr_bookmarklet_info() {
- return '<h3>'._T('fpipr:bookmarklet').'</h3>'._T('fpipr:bookmarklet_info',array('url'=>'javascript:var bookmarkletURL="'.$GLOBALS['meta']['adresse_site'].'/ecrire/'.find_in_path('fpipr_bookmarklet.js').'"; var script=document.createElement("script");script.type="text/javascript";script.src=bookmarkletURL;var head=document.getElementsByTagName("head")[0];head.appendChild(script);fpipr_add_photo("'.generer_url_ecrire('flickr_bookmarklet_photo').'")'));
+ return '<h3>'._T('fpipr:bookmarklet').'</h3>'._T('fpipr:bookmarklet_info',array('url'=>'javascript:var bookmarkletURL="'.$GLOBALS['meta']['adresse_site'].'/'._DIR_RESTREINT_ABS.find_in_path('fpipr_bookmarklet.js').'"; var script=document.createElement("script");script.type="text/javascript";script.src=bookmarkletURL;var head=document.getElementsByTagName("head")[0];head.appendChild(script);fpipr_add_photo("'.generer_url_ecrire('flickr_bookmarklet_photo').'")'));
}
?>