Author: pierre.basson@gmail.com
Date: Tue May 30 03:58:44 2006
New Revision: 3419
Log:
correction pour nouvelle façon de gérer les logos
Modified:
_plugins_/_email_/spip-lettres/exec/lettres_visualisation.php
_plugins_/_email_/spip-lettres/inc/lettres_balises.php
_plugins_/_email_/spip-lettres/public/composer.php
Modified: _plugins_/_email_/spip-lettres/exec/lettres_visualisation.php
--- _plugins_/_email_/spip-lettres/exec/lettres_visualisation.php (original)
+++ _plugins_/_email_/spip-lettres/exec/lettres_visualisation.php Tue May 30 03:58:44 2006
@@ -203,7 +203,19 @@
debut_gauche();
lettres_afficher_numero_lettre($id_lettre, true);
- afficher_boite_logo('let', 'id_lettre', $id_lettre, _T('lettres:logo_lettre'), _T('logo_survol'), 'lettres_visualisation');
+
+ global $table_logos;
+
+ $table_logos = array( // cf public/composer.php
+ 'id_article' => 'art',
+ 'id_auteur' => 'aut',
+ 'id_breve' => 'breve',
+ 'id_mot' => 'mot',
+ 'id_syndic'=> 'site',
+ 'id_rubrique' => 'rub',
+ 'id_lettre' => 'let'
+ );
+ afficher_boite_logo('id_lettre', $id_lettre, _T('lettres:logo_lettre'), _T('logo_survol'), 'lettres_visualisation');
lettres_afficher_statistiques_lettre_publiee($titre, $id_lettre);
debut_raccourcis();
Modified: _plugins_/_email_/spip-lettres/inc/lettres_balises.php
(empty)
Modified: _plugins_/_email_/spip-lettres/public/composer.php
--- _plugins_/_email_/spip-lettres/public/composer.php (original)
+++ _plugins_/_email_/spip-lettres/public/composer.php Tue May 30 03:58:44 2006
@@ -119,13 +119,13 @@
}
if ($artoff)
- $mouseover = " onmouseover=\"this.src='$artoff'\" "
+ $artoff = " onmouseover=\"this.src='$artoff'\" "
."onmouseout=\"this.src='$arton'\"";
$milieu = "<img src=\"$arton\" alt=\"\""
. ($align ? " align=\"$align\"" : '')
. $taille
- . $mouseover
+ . $artoff
. ' style="border-width: 0px;" class="spip_logos" />';
return (!$lien ? $milieu :
@@ -512,7 +512,7 @@
function spip_optim_select ($select = array(), $from = array(),
$where = array(), $join=array(),
$groupby = '', $orderby = array(), $limit = '',
- $sousrequete = '', $cpt = '',
+ $sousrequete = '', $having = array(),
$table = '', $id = '', $serveur='') {
// retirer les criteres vides:
@@ -528,6 +528,12 @@
}
}
+ foreach($having as $k => $v) {
+ if ((!$v) OR ($v==1) OR ($v=='0=0')) {
+ unset($having[$k]);
+ }
+ }
+
// Installer les jointures.
// Retirer celles seulement utiles aux criteres finalement absents mais
// parcourir de la plus recente a la moins recente pour pouvoir eliminer Ln
@@ -545,7 +551,7 @@
return spip_abstract_select($select, $from, $where,
$groupby, array_filter($orderby), $limit,
- $sousrequete, $cpt,
+ $sousrequete, $having,
$table, $id, $serveur);
}