déplacement d'une belle quantité de inc_*

.gitattributes

@@ -334,21 +334,21 @@ ecrire/img_pack/visiter-48_rtl.png -text
 ecrire/img_pack/warning-24.gif -text
 ecrire/img_pack/warning.gif -text
 ecrire/img_pack/xml.gif -text
-ecrire/inc_agenda.php -text
-ecrire/inc_ajax.php -text
-ecrire/inc_auteur_voir.php -text
-ecrire/inc_boutons.php -text
-ecrire/inc_cookie.php -text
-ecrire/inc_distant.php -text
+ecrire/inc/agenda.php -text
+ecrire/inc/ajax.php -text
+ecrire/inc/auteur_voir.php -text
+ecrire/inc/boutons.php -text
+ecrire/inc/cookie.php -text
+ecrire/inc/distant.php -text
+ecrire/inc/lang_liste.php -text
+ecrire/inc/mini_nav.php -text
+ecrire/inc/minipres.php -text
+ecrire/inc/popularites.php -text
+ecrire/inc/sites_voir.php -text
+ecrire/inc/suivi_versions.php -text
+ecrire/inc/syndic.php -text
 ecrire/inc_headers.php -text
-ecrire/inc_lang_liste.php -text
-ecrire/inc_mini_nav.php -text
-ecrire/inc_minipres.php -text
 ecrire/inc_plugin.php -text
-ecrire/inc_popularites.php -text
-ecrire/inc_sites_voir.php -text
-ecrire/inc_suivi_versions.php -text
-ecrire/inc_syndic.php -text
 ecrire/inc_utils.php -text
 ecrire/lang/ecrire_br.php3 -text
 ecrire/lang/ecrire_cs.php3 -text

ecrire/exec/admin_plugin.php

@@ -85,11 +85,11 @@ function ligne_plug($plug_file,&$plug_actifs,$last_actif = false,$surligne = fal
 		$s = "";
 		if ('O' == $plugok){
 			if ($id_input>0)
-				$s = "<a href='".generer_url_ecrire('admin_plugin',"monter=$plug_file")."'><img src='"._DIR_IMG_PACK."monter-16.png' style='border:0'></a>";
+				$s = "<a href='".generer_url_ecrire('admin_plugin',"monter=".urlencode($plug_file))."'><img src='"._DIR_IMG_PACK."monter-16.png' style='border:0'></a>";
 			$vals[] = $s;
 			$s = "";
 			if (!$last_actif)
-				$s = "<a href='".generer_url_ecrire('admin_plugin',"descendre=$plug_file")."'><img src='"._DIR_IMG_PACK."descendre-16.png' style='border:0'></a>";
+				$s = "<a href='".generer_url_ecrire('admin_plugin',"descendre=".urlencode($plug_file))."'><img src='"._DIR_IMG_PACK."descendre-16.png' style='border:0'></a>";
 		}
 		else{
 			$vals[] = $s;

ecrire/exec/sites.php

@@ -626,7 +626,7 @@ function analyser_site($url) {
 
 		// Cherchons quand meme un backend
 		include_ecrire('inc_distant');
-		include_ecrire('feedfinder');
+		include_spip('inc/feedfinder');
 		$feeds = get_feed_from_url($url, $texte);
 		if (count($feeds)>1) {
 			spip_log("feedfinder.php :\n".join("\n", $feeds));

ecrire/inc_agenda.php → ecrire/inc/agenda.php

@@ -12,7 +12,7 @@
 
 if (!defined("_ECRIRE_INC_VERSION")) return;
 
-include_ecrire("inc_presentation"); // inclut inc_layer
+include_spip("inc/presentation"); // inclut inc_layer
 include_ecrire("inc_texte"); // inclut inc_filtre
 
 charger_generer_url();