redécoupage des fichiers graphiques et externes (css) de manière à bien...

redécoupage des fichiers graphiques et externes (css) de manière à bien préciser ce qui est accédé par http et ce qui est accédé par php

Car en effet si on place le répertoire _DIR_IMG_PACK dans un répertoire "applicatif" (cas d'un hébergement mutualisé), il faut que les tests de file_exists() aillent regarder au bon endroit. C'est pas simple...

Au passage, une balise #EVAL qui ne sert qu'à faire #EVAL{_DIR_IMG_PACK}, mais qui peut faire beaucoup plus (#EVAL{6*7} par exemple :)

On supprime aussi article.php3 etc

.gitattributes

 * text=auto !eol
-IMG/icones/ai-dist.png -text
-IMG/icones/aiff-dist.png -text
-IMG/icones/asf-dist.png -text
-IMG/icones/avi-dist.png -text
-IMG/icones/bmp-dist.png -text
-IMG/icones/bz2-dist.png -text
-IMG/icones/css-dist.png -text
-IMG/icones/deb-dist.png -text
-IMG/icones/defaut-dist.png -text
-IMG/icones/doc-dist.png -text
-IMG/icones/dvi-dist.png -text
-IMG/icones/eps-dist.png -text
-IMG/icones/gif-dist.png -text
-IMG/icones/gz-dist.png -text
-IMG/icones/html-dist.png -text
-IMG/icones/jpg-dist.png -text
-IMG/icones/mid-dist.png -text
-IMG/icones/mov-dist.png -text
-IMG/icones/mp3-dist.png -text
-IMG/icones/mpg-dist.png -text
-IMG/icones/ogg-dist.png -text
-IMG/icones/pdf-dist.png -text
-IMG/icones/pgn-dist.gif svneol=native#unset
-IMG/icones/png-dist.png -text
-IMG/icones/ppt-dist.png -text
-IMG/icones/ps-dist.png -text
-IMG/icones/psd-dist.png -text
-IMG/icones/qt-dist.png -text
-IMG/icones/ra-dist.png -text
-IMG/icones/ram-dist.png -text
-IMG/icones/rm-dist.png -text
-IMG/icones/rpm-dist.png -text
-IMG/icones/rtf-dist.png -text
-IMG/icones/sdd-dist.png -text
-IMG/icones/sdw-dist.png -text
-IMG/icones/sit-dist.png -text
-IMG/icones/sxc-dist.png -text
-IMG/icones/sxi-dist.png -text
-IMG/icones/sxw-dist.png -text
-IMG/icones/tex-dist.png -text
-IMG/icones/tgz-dist.png -text
-IMG/icones/tif-dist.png -text
-IMG/icones/torrent-dist.png -text
-IMG/icones/txt-dist.png -text
-IMG/icones/wav-dist.png -text
-IMG/icones/xcf-dist.png -text
-IMG/icones/xls-dist.png -text
-IMG/icones/xml-dist.png -text
-IMG/icones/zip-dist.png -text
-IMG/icones_barre/agrave-maj.png -text
-IMG/icones_barre/blanc.png -text
-IMG/icones_barre/eacute-maj.png -text
-IMG/icones_barre/espace.png -text
-IMG/icones_barre/euro.png -text
-IMG/icones_barre/gras.png -text
-IMG/icones_barre/guillemets-de.png -text
-IMG/icones_barre/guillemets-simples.png -text
-IMG/icones_barre/guillemets-uniques-de.png -text
-IMG/icones_barre/guillemets-uniques.png -text
-IMG/icones_barre/guillemets.png -text
-IMG/icones_barre/intertitre.png -text
-IMG/icones_barre/italique.png -text
-IMG/icones_barre/lien.png -text
-IMG/icones_barre/notes.png -text
-IMG/icones_barre/oelig-maj.png -text
-IMG/icones_barre/oelig.png -text
-IMG/icones_barre/quote.png -text
 IMG/logo_spip.jpg -text
-IMG/test.gif -text
-IMG/test.jpg -text
-IMG/test.png -text
-IMG/test_image.jpg -text
 dist/style.html -text
 ecrire/charsets/cp1251.php -text
 ecrire/charsets/cp1256.php -text
@@ -217,6 +146,73 @@ ecrire/img_pack/heures-am.png -text
 ecrire/img_pack/heures-pm.png -text
 ecrire/img_pack/heures-tout.png -text
 ecrire/img_pack/historique-24.gif -text
+ecrire/img_pack/icones/ai-dist.png -text
+ecrire/img_pack/icones/aiff-dist.png -text
+ecrire/img_pack/icones/asf-dist.png -text
+ecrire/img_pack/icones/avi-dist.png -text
+ecrire/img_pack/icones/bmp-dist.png -text
+ecrire/img_pack/icones/bz2-dist.png -text
+ecrire/img_pack/icones/css-dist.png -text
+ecrire/img_pack/icones/deb-dist.png -text
+ecrire/img_pack/icones/defaut-dist.png -text
+ecrire/img_pack/icones/doc-dist.png -text
+ecrire/img_pack/icones/dvi-dist.png -text
+ecrire/img_pack/icones/eps-dist.png -text
+ecrire/img_pack/icones/gif-dist.png -text
+ecrire/img_pack/icones/gz-dist.png -text
+ecrire/img_pack/icones/html-dist.png -text
+ecrire/img_pack/icones/jpg-dist.png -text
+ecrire/img_pack/icones/mid-dist.png -text
+ecrire/img_pack/icones/mov-dist.png -text
+ecrire/img_pack/icones/mp3-dist.png -text
+ecrire/img_pack/icones/mpg-dist.png -text
+ecrire/img_pack/icones/ogg-dist.png -text
+ecrire/img_pack/icones/pdf-dist.png -text
+ecrire/img_pack/icones/pgn-dist.png -text
+ecrire/img_pack/icones/png-dist.png -text
+ecrire/img_pack/icones/ppt-dist.png -text
+ecrire/img_pack/icones/ps-dist.png -text
+ecrire/img_pack/icones/psd-dist.png -text
+ecrire/img_pack/icones/qt-dist.png -text
+ecrire/img_pack/icones/ra-dist.png -text
+ecrire/img_pack/icones/ram-dist.png -text
+ecrire/img_pack/icones/rm-dist.png -text
+ecrire/img_pack/icones/rpm-dist.png -text
+ecrire/img_pack/icones/rtf-dist.png -text
+ecrire/img_pack/icones/sdd-dist.png -text
+ecrire/img_pack/icones/sdw-dist.png -text
+ecrire/img_pack/icones/sit-dist.png -text
+ecrire/img_pack/icones/sxc-dist.png -text
+ecrire/img_pack/icones/sxi-dist.png -text
+ecrire/img_pack/icones/sxw-dist.png -text
+ecrire/img_pack/icones/tex-dist.png -text
+ecrire/img_pack/icones/tgz-dist.png -text
+ecrire/img_pack/icones/tif-dist.png -text
+ecrire/img_pack/icones/torrent-dist.png -text
+ecrire/img_pack/icones/txt-dist.png -text
+ecrire/img_pack/icones/wav-dist.png -text
+ecrire/img_pack/icones/xcf-dist.png -text
+ecrire/img_pack/icones/xls-dist.png -text
+ecrire/img_pack/icones/xml-dist.png -text
+ecrire/img_pack/icones/zip-dist.png -text
+ecrire/img_pack/icones_barre/agrave-maj.png -text
+ecrire/img_pack/icones_barre/blanc.png -text
+ecrire/img_pack/icones_barre/eacute-maj.png -text
+ecrire/img_pack/icones_barre/espace.png -text
+ecrire/img_pack/icones_barre/euro.png -text
+ecrire/img_pack/icones_barre/gras.png -text
+ecrire/img_pack/icones_barre/guillemets-de.png -text
+ecrire/img_pack/icones_barre/guillemets-simples.png -text
+ecrire/img_pack/icones_barre/guillemets-uniques-de.png -text
+ecrire/img_pack/icones_barre/guillemets-uniques.png -text
+ecrire/img_pack/icones_barre/guillemets.png -text
+ecrire/img_pack/icones_barre/intertitre.png -text
+ecrire/img_pack/icones_barre/italique.png -text
+ecrire/img_pack/icones_barre/lien.png -text
+ecrire/img_pack/icones_barre/notes.png -text
+ecrire/img_pack/icones_barre/oelig-maj.png -text
+ecrire/img_pack/icones_barre/oelig.png -text
+ecrire/img_pack/icones_barre/quote.png -text
 ecrire/img_pack/image-24.gif -text
 ecrire/img_pack/interface-display-comp.png -text
 ecrire/img_pack/interface-display.png -text
@@ -265,6 +261,8 @@ ecrire/img_pack/puce-rouge.gif -text
 ecrire/img_pack/puce-verte-anim.gif -text
 ecrire/img_pack/puce-verte-breve.gif -text
 ecrire/img_pack/puce-verte.gif -text
+ecrire/img_pack/puce.gif -text
+ecrire/img_pack/puce_rtl.gif -text
 ecrire/img_pack/racine-24.gif -text
 ecrire/img_pack/racine-site-12.gif -text
 ecrire/img_pack/racine-site-24.gif -text
@@ -306,6 +304,10 @@ ecrire/img_pack/suivi-forum-24.gif -text
 ecrire/img_pack/suivi-petition-24.gif -text
 ecrire/img_pack/supprimer.gif -text
 ecrire/img_pack/synchro-24.gif -text
+ecrire/img_pack/test.gif -text
+ecrire/img_pack/test.jpg -text
+ecrire/img_pack/test.png -text
+ecrire/img_pack/test_image.jpg -text
 ecrire/img_pack/tirets-separation.gif -text
 ecrire/img_pack/tourner-180.gif -text
 ecrire/img_pack/tourner-droite.gif -text
@@ -336,7 +338,6 @@ ecrire/inc_cookie.php -text
 ecrire/inc_distant.php -text
 ecrire/inc_headers.php -text
 ecrire/inc_lang_liste.php -text
-ecrire/inc_magicquotes.php -text
 ecrire/inc_mini_nav.php -text
 ecrire/inc_minipres.php -text
 ecrire/inc_plugin.php -text
@@ -358,9 +359,6 @@ ecrire/lang/spip_ru.php3 -text
 ecrire/polices/dustismo-license.txt -text svneol=unset#application/octet-stream
 ecrire/polices/dustismo.ttf -text
 ecrire/polices/dustismo_bold.ttf -text
-ecrire/puce.gif -text
-ecrire/puce_rtl.gif -text
-ecrire/rien.gif -text
 ecrire/safehtml/classes/HTMLSax3.php -text
 ecrire/safehtml/classes/HTMLSax3/Decorators.php -text
 ecrire/safehtml/classes/HTMLSax3/States.php -text
@@ -368,6 +366,7 @@ ecrire/safehtml/classes/safehtml.php -text
 ecrire/safehtml/license.txt -text
 ecrire/safehtml/readme-SPIP.txt -text
 ecrire/safehtml/readme.txt -text
+/inc-urls-page.php3 -text
 /inc-urls-propres-qs.php3 -text
 /puce.gif -text
 /puce_rtl.gif -text

article.php3

-<?php
-
-$fond = "article";
-$delais = 24 * 3600;
-
-include ("inc-public.php3");
-
-?>

auteur.php3

-<?php
-$fond = "auteur";
-$delais = 24 * 3600;
-
-include ("inc-public.php3");
-
-?>

breve.php3

-<?php
-$fond = "breve";
-$delais = 12 * 3600;
-
-include ("inc-public.php3");
-
-
-?>

dist/style.html

@@ -38,7 +38,7 @@ td {
 	border: 1px solid ##ENV{couleur_claire,edf3fe}; 
 	background-position: center bottom; 
 	float: none;
-	behavior: url(win_width.htc);
+	behavior: url(#EVAL{_DIR_IMG_PACK}win_width.htc);
  	font-size: 12px;
 	font-family: Verdana,Arial,Sans,sans-serif; 
 }
@@ -49,7 +49,7 @@ td {
 	background-color: white; 
 	border: 1px solid ##ENV{couleur_claire,edf3fe}; 
 	background-position: center bottom; float: none; 
-	behavior: url(win_width.htc);
+	behavior: url(#EVAL{_DIR_IMG_PACK}win_width.htc);
  	font-size: 12px;
 	font-family: Verdana,Arial,Sans,sans-serif; 
 }
@@ -116,7 +116,7 @@ select.fondl {
 	width: 11px;
 	padding: 0px;
 	margin: 0px;
-	background: url(#ENV{dir}tirets-separation.gif);
+	background: url(#EVAL{_DIR_IMG_PACK}tirets-separation.gif);
 	background-position: 5px 0px;
 }
 .bandeau_couleur {
@@ -169,7 +169,7 @@ a.bandeau_rub {
 	border-bottom: 1px solid #cccccc;
 	background-repeat: no-repeat;
 	background-position: [(#ENV{ltr}|choixsiegal{left,1,99})%] center;
-	background-image: url(#ENV{dir}rubrique-12.gif);
+	background-image: url(#EVAL{_DIR_IMG_PACK}rubrique-12.gif);
 }
 a.bandeau_rub:hover {
 	background-color: white;
@@ -190,7 +190,7 @@ div.bandeau_rub {
 }
 
 div.brt {
-	background: url(#ENV{dir}triangle-droite[(#ENV{ltr}|choixsiegal{left,'',_rtl})].gif) [(#ENV{ltr}|choixsiegal{left,right,left})] center no-repeat;
+	background: url(#EVAL{_DIR_IMG_PACK}triangle-droite[(#ENV{ltr}|choixsiegal{left,'',_rtl})].gif) [(#ENV{ltr}|choixsiegal{left,right,left})] center no-repeat;
 }
 div.pos_r {
 	position: relative;
@@ -198,7 +198,7 @@ div.pos_r {
 
 option.selec_rub {
 	background-position: [(#ENV{ltr}|choixsiegal{left,left,right})] center;
-	background-image: url(#ENV{dir}rubrique-12.gif);
+	background-image: url(#EVAL{_DIR_IMG_PACK}rubrique-12.gif);
 	background-repeat: no-repeat;
 	padding-[(#ENV{ltr}|choixsiegal{left,left,right})]: 16px;
 }
@@ -232,7 +232,7 @@ a.icone26 img {
 	background-color: ##ENV{couleur_foncee,3874b0};
 }
 a.icone26:hover img {
-	background: url(#ENV{dir}fond-gris-anim.gif);
+	background: url(#EVAL{_DIR_IMG_PACK}fond-gris-anim.gif);
 }
 
 
@@ -354,7 +354,7 @@ a.icone26:hover img {
 	margin: 4px;
 	padding: 0px;
 	border: 0px;
-	background: url(#ENV{dir}fond-gris-anim.gif);
+	background: url(#EVAL{_DIR_IMG_PACK}fond-gris-anim.gif);
 }
 
 
@@ -379,7 +379,7 @@ a.icone26:hover img {
 	display: inline;
 	padding: 3px;
 	background-color: #e4e4e4;
-	background: url(#ENV{dir}fond-gris-anim.gif);
+	background: url(#EVAL{_DIR_IMG_PACK}fond-gris-anim.gif);
 	border: 1px solid ##ENV{couleur_foncee,3874b0};
 	-moz-border-radius: 5px;
 }
@@ -486,7 +486,7 @@ a.cellule-h div.cell-i {
 a.cellule-h:hover div.cell-i {
 	padding: 0px;
 	border: 1px solid ##ENV{couleur_foncee,3874b0};
-	background: url(#ENV{dir}fond-gris-anim.gif);
+	background: url(#EVAL{_DIR_IMG_PACK}fond-gris-anim.gif);
 	-moz-border-radius: 5px;
 	margin: 0px;
 	margin-[(#ENV{ltr}|choixsiegal{left,right,left})]: 3px;
@@ -529,7 +529,7 @@ a.cellule-h-texte {
 }
 .danger a.cellule-h-texte {
 	border: 1px dashed black;
-	background: url(#ENV{dir}rayures-sup.gif);
+	background: url(#EVAL{_DIR_IMG_PACK}rayures-sup.gif);
 }
 a.cellule-h-texte:hover {
 	text-decoration: none;
@@ -623,10 +623,10 @@ div.onglet_off {
 
 
 .reliefblanc {
-	 background-image: url(#ENV{dir}barre-blanc.gif);
+	 background-image: url(#EVAL{_DIR_IMG_PACK}barre-blanc.gif);
 }
 .reliefgris { 
-	 background-image: url(#ENV{dir}barre-noir.gif);
+	 background-image: url(#EVAL{_DIR_IMG_PACK}barre-noir.gif);
 }
 .iconeoff {
 	padding: 3px; margin: 1px; border: 1px dashed #aaaaaa; background-color: #f0f0f0;
@@ -635,7 +635,7 @@ div.onglet_off {
 	cursor: pointer; padding: 3px; margin: 1px;  border-right: solid 1px white; border-bottom: solid 1px white; border-left: solid 1px #666666; border-top: solid 1px #666666; background-color: #eeeeee;
 }
 .iconedanger { padding: 3px; margin: 1px; border: 1px dashed black;
-	background: url(#ENV{dir}rayures-sup.gif);
+	background: url(#EVAL{_DIR_IMG_PACK}rayures-sup.gif);
 }
 
 /* Raccourcis pour les polices (utile pour les tableaux) */
@@ -714,7 +714,7 @@ a.ortho-dico:hover {
 	z-index: 0;
 }
 .suggest-actif .detail ul, .suggest-inactif .detail ul {
-	 list-style-image: url(#ENV{dir}puce.gif);
+	 list-style-image: url(#EVAL{_DIR_IMG_PACK}puce.gif);
 	background: #f3f2f3;
 	margin: 0px;
 	padding: 0px;
@@ -1007,19 +1007,19 @@ a.bouton_rotation:hover img {
 	text-decoration: none;
 }
 .plan-articles .publie {
-	 background-image: url(#ENV{dir}puce-verte.gif);
+	 background-image: url(#EVAL{_DIR_IMG_PACK}puce-verte.gif);
 }
 .plan-articles .prepa {
-	 background-image: url(#ENV{dir}puce-blanche.gif);
+	 background-image: url(#EVAL{_DIR_IMG_PACK}puce-blanche.gif);
 }
 .plan-articles .prop {
-	 background-image: url(#ENV{dir}puce-orange.gif);
+	 background-image: url(#EVAL{_DIR_IMG_PACK}puce-orange.gif);
 }
 .plan-articles .refuse {
-	 background-image: url(#ENV{dir}puce-rouge.gif);
+	 background-image: url(#EVAL{_DIR_IMG_PACK}puce-rouge.gif);
 }
 .plan-articles .poubelle {
-	 background-image: url(#ENV{dir}puce-poubelle.gif);
+	 background-image: url(#EVAL{_DIR_IMG_PACK}puce-poubelle.gif);
 }
 
 a.foncee, a.foncee:hover, a.claire, a.claire:hover, span.creer, span.lang_base {
@@ -1069,7 +1069,7 @@ div.liste {
 }
 
 a.liste-mot {
-	background: url(#ENV{dir}petite-cle.gif) [(#ENV{ltr}|choixsiegal{left,left,right})] center no-repeat; 
+	background: url(#EVAL{_DIR_IMG_PACK}petite-cle.gif) [(#ENV{ltr}|choixsiegal{left,left,right})] center no-repeat; 
 	padding-[(#ENV{ltr}|choixsiegal{left,left,right})]: 30px;
 }
 
@@ -1140,7 +1140,7 @@ div.brouteur_rubrique {
 	border-bottom: 1px solid ##ENV{couleur_foncee,3874b0};
 	border-left: 1px solid ##ENV{couleur_foncee,3874b0};
 	border-right: 1px solid ##ENV{couleur_foncee,3874b0};
-	background: url(#ENV{dir}triangle-droite[(#ENV{ltr}|choixsiegal{left,'',_rtl})].gif)[(#ENV{ltr}|choixsiegal{left,right,left})] center no-repeat;
+	background: url(#EVAL{_DIR_IMG_PACK}triangle-droite[(#ENV{ltr}|choixsiegal{left,'',_rtl})].gif)[(#ENV{ltr}|choixsiegal{left,right,left})] center no-repeat;
 	background-color: white;
 }
 
@@ -1152,7 +1152,7 @@ div.brouteur_rubrique_on {
 	border-bottom: 1px solid ##ENV{couleur_foncee,3874b0};
 	border-left: 1px solid ##ENV{couleur_foncee,3874b0};
 	border-right: 1px solid ##ENV{couleur_foncee,3874b0};
-	background: url(#ENV{dir}triangle-droite[(#ENV{ltr}|choixsiegal{left,'',_rtl})].gif) [(#ENV{ltr}|choixsiegal{left,right,left})] center no-repeat;
+	background: url(#EVAL{_DIR_IMG_PACK}triangle-droite[(#ENV{ltr}|choixsiegal{left,'',_rtl})].gif) [(#ENV{ltr}|choixsiegal{left,right,left})] center no-repeat;
 	background-color: #e0e0e0;
 }
 
@@ -1205,7 +1205,7 @@ a.spip_in {
 	border-bottom: 1px dashed;
 }
 a.spip_out {
-	background: url(#ENV{dir}spip_out.gif)[(#ENV{ltr}|choixsiegal{left,right,left})] center no-repeat;
+	background: url(#EVAL{_DIR_IMG_PACK}spip_out.gif)[(#ENV{ltr}|choixsiegal{left,right,left})] center no-repeat;
 	padding-[(#ENV{ltr}|choixsiegal{left,right,left})]: 10px;
 	border-bottom: 1px solid;
 }
@@ -1231,7 +1231,7 @@ a.spip_glossaire:hover {
 	margin-top: 10px;
 	padding: 5px;
 	border: 1px solid #666666;
-	behavior: url(win_width.htc);
+	behavior: url(#EVAL{_DIR_IMG_PACK}win_width.htc);
 }
 blockquote.spip {
 	margin-[(#ENV{ltr}|choixsiegal{left,left,right})]: 40px;
@@ -1297,7 +1297,7 @@ a.triangle_block:hover {
 }
 
 .fond-agenda {
-	background: url(#ENV{dir}fond-agenda.gif) [(#ENV{ltr}|choixsiegal{left,right,left})] center no-repeat;
+	background: url(#EVAL{_DIR_IMG_PACK}fond-agenda.gif) [(#ENV{ltr}|choixsiegal{left,right,left})] center no-repeat;
 	float: [(#ENV{ltr}|choixsiegal{left,left,right})]; 
 	margin-[(#ENV{ltr}|choixsiegal{left,right,left})]: 3px;
 	padding-[(#ENV{ltr}|choixsiegal{left,right,left})]: 4px;
@@ -1320,10 +1320,10 @@ a.triangle_block:hover {
 
 div.petite-rubrique {
 	background: [(#ENV{ltr}|choixsiegal{left,1,99})%] no-repeat;
-	background-image: url(#ENV{dir}rubrique-12.gif);
+	background-image: url(#EVAL{_DIR_IMG_PACK}rubrique-12.gif);
 	padding-[(#ENV{ltr}|choixsiegal{left,left,right})]: 15px;
 }
 div.rub-ouverte {
 	padding-[(#ENV{ltr}|choixsiegal{left,right,left})]: 10px;
-	background: url(#ENV{dir}triangle-droite[(#ENV{ltr}|choixsiegal{left,'',_rtl})].gif) [(#ENV{ltr}|choixsiegal{left,right,left})] center no-repeat;
+	background: url(#EVAL{_DIR_IMG_PACK}triangle-droite[(#ENV{ltr}|choixsiegal{left,'',_rtl})].gif) [(#ENV{ltr}|choixsiegal{left,right,left})] center no-repeat;
 }

ecrire/exec_brouteur_frame.php

@@ -219,7 +219,7 @@ echo "</body></html>";
 function frame_background_image($f)
 {
 	return "background-image: url(" . 
-		generer_url_ecrire(_DIR_IMG_PACK . $f) .
+		_DIR_IMG_PACK . $f .
 		")";
 }
 ?>

ecrire/exec_sites.php

@@ -25,6 +25,7 @@ function sites_dist()
 {
 global 
   $analyser_site,
+  $ajouter_lien,
   $annee,
   $champs_extra,
   $cherche_mot,
@@ -51,6 +52,7 @@ global
   $spip_lang_left,
   $spip_lang_right,
   $supp_mot,
+  $supprimer_lien,
   $syndication,
   $syndication_old,
   $url,
@@ -67,12 +69,14 @@ $id_syndic = intval($id_syndic);
 $flag_administrable = ($connect_statut == '0minirezo' AND acces_rubrique($id_rubrique));
 
 
-if ($flag_administrable && !_DIR_RESTREINT) {
-		if ($supprimer_lien = intval($GLOBALS["supprimer_lien"]))
-			spip_query("UPDATE spip_syndic_articles SET statut='refuse' WHERE id_syndic_article='$supprimer_lien'");
-		if ($ajouter_lien = intval($GLOBALS["ajouter_lien"]))
-			spip_query("UPDATE spip_syndic_articles SET statut='publie' WHERE id_syndic_article='$ajouter_lien'");
- }
+	if ($flag_administrable) {
+		if ($supprimer_lien = intval($supprimer_lien))
+			spip_query("UPDATE spip_syndic_articles SET statut='refuse'
+			WHERE id_syndic_article='$supprimer_lien'");
+		if ($ajouter_lien = intval($ajouter_lien))
+			spip_query("UPDATE spip_syndic_articles SET statut='publie'
+			WHERE id_syndic_article='$ajouter_lien'");
+	}
 
 if ($new == 'oui') {
 	$flag_editable = ($flag_administrable OR ($GLOBALS['meta']["proposer_sites"] > 0));

ecrire/exec_sites_tous.php

@@ -19,19 +19,19 @@ function sites_tous_dist()
 {
   global $connect_statut, $supp_syndic, $options;
 
-  if ($connect_statut == '0minirezo') {
-	if ($supp_syndic)
-		spip_query("DELETE FROM spip_syndic WHERE id_syndic=".intval($supp_syndic));
+	if ($connect_statut == '0minirezo') {
+		if ($supp_syndic)
+			spip_query("DELETE FROM spip_syndic WHERE
+			id_syndic=".intval($supp_syndic));
 
-   // Moderation manuelle des liens
-
-	if (!_DIR_RESTREINT) {
+		// Moderation manuelle des liens
 		if ($supprimer_lien = intval($GLOBALS["supprimer_lien"]))
-			spip_query("UPDATE spip_syndic_articles SET statut='refuse' WHERE id_syndic_article='$supprimer_lien'");
+			spip_query("UPDATE spip_syndic_articles SET statut='refuse'
+			WHERE id_syndic_article='$supprimer_lien'");
 		if ($ajouter_lien = intval($GLOBALS["ajouter_lien"]))
-			spip_query("UPDATE spip_syndic_articles SET statut='publie' WHERE id_syndic_article='$ajouter_lien'");
+			spip_query("UPDATE spip_syndic_articles SET statut='publie'
+			WHERE id_syndic_article='$ajouter_lien'");
 	}
-  }
 
 debut_page(_T('titre_page_sites_tous'),"documents","sites");
 debut_gauche();

ecrire/exec_spip_action_tester.php

@@ -27,7 +27,7 @@ function spip_action_tester_dist() {
 			} else {
 				# Attention GD sait lire le gif mais pas forcement l'ecrire
 				if (function_exists('ImageCreateFromGIF')) {
-					$srcImage = @ImageCreateFromGIF(_DIR_IMG . "test.gif");
+					$srcImage = @ImageCreateFromGIF(_ROOT_IMG_PACK."test.gif");
 					if ($srcImage) {
 						$gd_formats_read_gif = ",gif";
 						ImageDestroy( $srcImage );
@@ -48,21 +48,21 @@ function spip_action_tester_dist() {
 		
 			$gd_formats = Array();
 			if (function_exists('ImageCreateFromJPEG')) {
-				$srcImage = @ImageCreateFromJPEG(_DIR_IMG . "test.jpg");
+				$srcImage = @ImageCreateFromJPEG(_ROOT_IMG_PACK."test.jpg");
 				if ($srcImage) {
 					$gd_formats[] = "jpg";
 					ImageDestroy( $srcImage );
 				}
 			}
 			if (function_exists('ImageCreateFromGIF')) {
-				$srcImage = @ImageCreateFromGIF(_DIR_IMG . "test.gif");
+				$srcImage = @ImageCreateFromGIF(_ROOT_IMG_PACK."test.gif");
 				if ($srcImage) {
 					$gd_formats[] = "gif";
 					ImageDestroy( $srcImage );
 				}
 			}
 			if (function_exists('ImageCreateFromPNG')) {
-				$srcImage = @ImageCreateFromPNG(_DIR_IMG . "test.png");
+				$srcImage = @ImageCreateFromPNG(_ROOT_IMG_PACK."test.png");
 				if ($srcImage) {
 					$gd_formats[] = "png";
 					ImageDestroy( $srcImage );
@@ -86,7 +86,7 @@ function spip_action_tester_dist() {
 		$pnmtojpeg_command = str_replace("pnmscale",
 			"pnmtojpeg", $pnmscale_command);
 
-		$vignette = _DIR_IMG . "test.jpg";
+		$vignette = _ROOT_IMG_PACK."test.jpg";
 		$dest = _DIR_IMG . "test-jpg.jpg";
 		$commande = "$jpegtopnm_command $vignette | $pnmscale_command -width 10 | $pnmtojpeg_command > $dest";
 		spip_log($commande);
@@ -96,7 +96,7 @@ function spip_action_tester_dist() {
 		}
 		$giftopnm_command = ereg_replace("pnmscale", "giftopnm", $pnmscale_command);
 		$pnmtojpeg_command = ereg_replace("pnmscale", "pnmtojpeg", $pnmscale_command);
-		$vignette = _DIR_IMG . "test.gif";
+		$vignette = _ROOT_IMG_PACK."test.gif";
 		$dest = _DIR_IMG . "test-gif.jpg";
 		$commande = "$giftopnm_command $vignette | $pnmscale_command -width 10 | $pnmtojpeg_command > $dest";
 		spip_log($commande);
@@ -106,7 +106,7 @@ function spip_action_tester_dist() {
 		}
 
 		$pngtopnm_command = ereg_replace("pnmscale", "pngtopnm", $pnmscale_command);
-		$vignette = _DIR_IMG . "test.png";
+		$vignette = _ROOT_IMG_PACK."test.png";
 		$dest = _DIR_IMG . "test-gif.jpg";
 		$commande = "$pngtopnm_command $vignette | $pnmscale_command -width 10 | $pnmtojpeg_command > $dest";
 		spip_log($commande);
@@ -129,8 +129,10 @@ function spip_action_tester_dist() {
 		include_ecrire('inc_logos');
 		//$taille_preview = $GLOBALS['meta']["taille_preview"];
 		if ($taille_preview < 10) $taille_preview = 150;
-		if ($preview = creer_vignette(_DIR_IMG . 'test_image.jpg', $taille_preview, $taille_preview, 'jpg', '', "test_$arg", $arg, true))
-
+		if ($preview = creer_vignette(
+		_ROOT_IMG_PACK.'test_image.jpg',
+		$taille_preview, $taille_preview, 'jpg', '', "test_$arg", $arg, true)
+		AND ($preview['width'] * $preview['height'] > 0))
 			redirige_par_entete($preview['fichier']);
 	}