Update of /home/spip-cvs/spip/ecrire
In directory alan:/tmp/cvs-serv27889/ecrire
Modified Files:
inc_logos.php3 index.php3
Log Message:
possibilité de déballages simultanés de zip, et encore moins de IMG
Index: index.php3
RCS file: /home/spip-cvs/spip/ecrire/index.php3,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -d -r1.118 -r1.119
--- index.php3 25 Sep 2004 17:25:47 -0000 1.118
+++ index.php3 2 Oct 2004 19:25:09 -0000 1.119
@@ -2,7 +2,6 @@
include ("inc.php3");
include_ecrire ("inc_calendrier.php");
-define('_DIR_IMG', ($GLOBALS['flag_ecrire'] ? "../" : "")."IMG/");
if ($HTTP_REFERER && !strpos($HTTP_REFERER, '/ecrire/')) $bonjour = 'oui';
@@ -52,15 +51,10 @@
if ($spip_display != 1) {
include_ecrire("inc_logos.php3");
- $logo = get_image("rubon0");
+ $logo = decrire_logo("rubon0");
if ($logo) {
- $fichier = $logo[0];
- $taille = $logo[1];
$fid = $logo[2];
- if ($taille) {
- $taille_html = " WIDTH=$taille[2] HEIGHT=$taille[3] ";
- }
- echo "<div style='text-align:center; margin-bottom: 5px;'><a href='naviguer.php3'><img src='" . _DIR_IMG . "$fichier$fid' $taille_html border='0' alt='' /></a></div>";
+ echo "<div style='text-align:center; margin-bottom: 5px;'><a href='naviguer.php3'>$fid</a></div>";
}
}
echo "<div class='verdana1'>";
Index: inc_logos.php3
RCS file: /home/spip-cvs/spip/ecrire/inc_logos.php3,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- inc_logos.php3 1 Oct 2004 07:20:35 -0000 1.34
+++ inc_logos.php3 2 Oct 2004 19:25:08 -0000 1.35
@@ -58,14 +58,13 @@
echo "<p>";
debut_cadre_relief("image-24.gif");
echo "<center><font size='2' FACE='Verdana,Arial,Sans,sans-serif'>";
-
- $logo_ok = get_image($logo);
- $survol_ok = (!$logo_ok ? '' : get_image($survol));
- afficher_logo($logo, $texteon, $logo_ok);
-
- if ($logo_ok OR $survol_ok) {
- echo "<br><br>";
- afficher_logo($survol, $texteoff, $survol_ok);
+ $desc = decrire_logo($logo);
+ afficher_logo($logo, $texteon, $desc);
+
+ if ($desc) {
+ echo "<br /><br />";
+ $desc = decrire_logo($survol);
+ afficher_logo($survol, $texteoff, $desc);
}
echo "</font></center>";
@@ -74,23 +73,30 @@
}
}
+function decrire_logo($racine) {
+ $logo = get_image($racine);
+ if ($logo) {
+ $taille = $logo[1];
+ if ($taille) {
+ list($x, $y, $w, $h) = $taille;
+ $logo[1] = "$x x $y "._T('info_pixels');
+ $taille = " width='$w' height='$h'";
+ }
+ $logo[2] = "<img src='" .
+ _DIR_IMG . $logo[0] . $logo[2] .
+ "'$taille alt='' />";
+ }
+ return $logo;
+}
+
function afficher_logo($racine, $titre, $logo) {
global $id_article, $coll, $id_breve, $id_auteur, $id_mot, $id_syndic, $connect_id_auteur;
global $couleur_foncee, $couleur_claire;
global $clean_link;
include_ecrire('inc_admin.php3');
-
+
$redirect = $clean_link->getUrl();
- if ($logo) {
- $fichier = $logo[0];
- $taille = $logo[1];
- $fid = $logo[2];
- if ($taille) {
- $taille_html = " WIDTH=$taille[2] HEIGHT=$taille[3] ";
- $taille_txt = "$taille[0] x $taille[1] "._T('info_pixels');
- }
- }
echo "<b>";
echo bouton_block_invisible(md5($titre));
@@ -98,14 +104,14 @@
echo "</b>";
echo "<font size=1>";
- if ($fichier) {
+ if ($logo) {
+ list($fichier, $taille, $img) = $logo;
$hash = calculer_action_auteur("supp_image $fichier");
- echo "<p><center><img src='" . _DIR_IMG . "$fichier$fid' $taille_html alt='' />";
-
+ echo "<p><center>$img";
echo debut_block_invisible(md5($titre));
- echo "$taille_txt\n";
- echo "<br />[<A HREF='../spip_image.php3?";
+ echo $taille;
+ echo "\n<br />[<a href='../spip_image.php3?";
$elements = array('id_article', 'id_breve', 'id_syndic', 'coll', 'id_mot', 'id_auteur');
while (list(,$element) = each ($elements)) {
if ($$element) {