Update of /home/spip-cvs/spip
In directory alan:/tmp/cvs-serv13822
Modified Files:
backend-breves-dist.html backend-dist.html inc-balises.php3
inc-calcul-outils.php3
Log Message:
introduction des balises LOGO_SITE_SPIP*, du filtre extraire_attribut, et retrait des occurrences de IMG dans backend*
Index: backend-dist.html
RCS file: /home/spip-cvs/spip/backend-dist.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- backend-dist.html 4 Jun 2004 23:44:37 -0000 1.24
+++ backend-dist.html 13 Oct 2004 15:32:02 -0000 1.25
@@ -9,7 +9,7 @@
<image>
<title>[(#NOM_SITE_SPIP|texte_backend)]</title>
- <url>#URL_SITE_SPIP/IMG/ruboff0.gif</url>
+ <url>#URL_SITE_SPIP[/(#LOGO_SITE_SPIP||extraire_attribut{src})]</url>
<link>#URL_SITE_SPIP/</link>
<description></description>
</image>
@@ -19,7 +19,7 @@
<title>[(#TITRE|texte_backend)]</title>
<link>#URL_SITE_SPIP/#URL_ARTICLE</link>
<date>#DATE</date>
- <description>[<img src="#URL_SITE_SPIP/IMG/(#LOGO_ARTICLE|fichier)" align="left" hspace="4" vspace="4"> ][(#INTRODUCTION|texte_backend)]</description>
+ <description>[<img src="#URL_SITE_SPIP/(#LOGO_ARTICLE||extraire_attribut{src})" align="left" hspace="4" vspace="4"> ][(#INTRODUCTION|texte_backend)]</description>
<author><BOUCLE_auteurs(AUTEURS){id_article}{", "}>[(#NOM|texte_backend)]</BOUCLE_auteurs></author>
<dc:date>[(#DATE|date_iso)]</dc:date>
<dc:format>text/html</dc:format>
@@ -32,7 +32,7 @@
<title>[(#TITRE|texte_backend)]</title>
<link>#URL_SITE_SPIP/#URL_ARTICLE</link>
<date>#DATE</date>
- <description>[<img src="#URL_SITE_SPIP/IMG/(#LOGO_ARTICLE|fichier)" align="left" hspace="4" vspace="4"> ][(#INTRODUCTION|texte_backend)]</description>
+ <description>[<img src="#URL_SITE_SPIP/(#LOGO_ARTICLE||extraire_attribut{src})" align="left" hspace="4" vspace="4"> ][(#INTRODUCTION|texte_backend)]</description>
<author><BOUCLE_auteurs_t(AUTEURS){id_article}{","}>[(#NOM|texte_backend)]</BOUCLE_auteurs_t></author>
<dc:date>[(#DATE|date_iso)]</dc:date>
<dc:format>text/html</dc:format>
Index: inc-calcul-outils.php3
RCS file: /home/spip-cvs/spip/inc-calcul-outils.php3,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- inc-calcul-outils.php3 7 Oct 2004 06:10:01 -0000 1.16
+++ inc-calcul-outils.php3 13 Oct 2004 15:32:02 -0000 1.17
@@ -38,8 +38,9 @@
'SITE' => 'site'
);
$type = $table_logos[$type];
+ # attention au cas $id = '0' pour LOGO_SITE_SPIP ==> intval
while ($id) {
- $on = cherche_image_nommee($type . $onoff . $id);
+ $on = cherche_image_nommee($type . $onoff . intval($id));
if ($on)
{ if ($ff)
return ("$on[1].$on[2]");
Index: backend-breves-dist.html
RCS file: /home/spip-cvs/spip/backend-breves-dist.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- backend-breves-dist.html 4 Jun 2004 23:44:37 -0000 1.17
+++ backend-breves-dist.html 13 Oct 2004 15:32:02 -0000 1.18
@@ -10,7 +10,7 @@
<image>
<title>[(#NOM_SITE_SPIP|texte_backend)]</title>
- <url>#URL_SITE_SPIP/IMG/ruboff0.gif</url>
+ <url>#URL_SITE_SPIP[/(#LOGO_SITE_SPIP||extraire_attribut{src})]</url>
<link>#URL_SITE_SPIP/</link>
<description></description>
</image>
@@ -20,7 +20,7 @@
<title>[(#TITRE|texte_backend)]</title>
<link>#URL_SITE_SPIP/#URL_BREVE</link>
<date>#DATE</date>
- <description>[<img src="#URL_SITE_SPIP/IMG/(#LOGO_BREVE|fichier)" align="left" hspace="4" vspace="4"> ][(#TEXTE|texte_backend)]</description>
+ <description>[<img src="#URL_SITE_SPIP/(#LOGO_BREVE||extraire_attribut{src})" align="left" hspace="4" vspace="4"> ][(#TEXTE|texte_backend)]</description>
<dc:date>[(#DATE|date_iso)]</dc:date>
<dc:format>text/html</dc:format>
<dc:language>#LANG</dc:language>
Index: inc-balises.php3
RCS file: /home/spip-cvs/spip/inc-balises.php3,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- inc-balises.php3 1 Oct 2004 12:28:24 -0000 1.22
+++ inc-balises.php3 13 Oct 2004 15:32:02 -0000 1.23
@@ -531,17 +531,21 @@
//
function calcul_balise_logo ($p) {
- // analyser la balise LOGO_xxx
- eregi("^LOGO_(([A-Z]+)(_.*)?)", $p->nom_champ, $regs);
- $type_logo = $regs[1]; // ARTICLE_RUBRIQUE
- $type_objet = $regs[2]; // ARTICLE
- $suite_logo = $regs[3]; // _RUBRIQUE
-
- if ($type_objet == 'SITE')
- $_id_objet = champ_sql("id_syndic", $p);
- else
- $_id_objet = champ_sql("id_".strtolower($type_objet), $p);
+ eregi("^LOGO_([A-Z]+)(_.*)?$", $p->nom_champ, $regs);
+ $type_objet = $regs[1];
+ $suite_logo = $regs[2];
+ spip_log($suite_logo);
+ if (ereg("^_SPIP(.*)$", $suite_logo, $regs)) {
+ $type_objet = 'RUBRIQUE';
+ $suite_logo = $regs[1];
+ $_id_objet = "\"'0'\"";
+ } else {
+ if ($type_objet == 'SITE')
+ $_id_objet = champ_sql("id_syndic", $p);
+ else
+ $_id_objet = champ_sql("id_".strtolower($type_objet), $p);
+ }
// analyser les filtres
$flag_fichier = false;
$filtres = '';