remplacement de spip_test_dirs.php3 et ses appels par des appels au script...

remplacement de spip_test_dirs.php3 et ses appels par des appels au script generique spip_action.php

.gitattributes

@@ -316,6 +316,7 @@ ecrire/inc_rubriques_edit.php -text
 ecrire/inc_sites_edit.php -text
 ecrire/inc_sites_tous.php -text
 ecrire/inc_spip_action_purger.php -text
+ecrire/inc_spip_action_test_dirs.php -text
 ecrire/inc_spip_cal.php -text
 ecrire/inc_spip_image.php -text
 ecrire/inc_spip_style.php -text

ecrire/inc_acces.php3

@@ -126,7 +126,7 @@ function ecrire_acces() {
 		ecrire_logins($fichier, $logins);
 		fclose($fichier);
 	} else {
-		redirige_par_entete(generer_url_public("spip_test_dirs"));
+		redirige_par_entete(generer_url_public('spip_action.php'), '?action=test_dirs');
 	}
 
 	$query = "SELECT login, htpass FROM spip_auteurs WHERE statut = '0minirezo'";

ecrire/inc_flock.php3

@@ -150,7 +150,7 @@ function creer_repertoire($base, $subdir) {
 		@unlink("$path/.test");
 	}
 	if ($ok) return "$subdir/";
-	redirige_par_entete(generer_url_public('spip_test_dirs'));
+	redirige_par_entete(generer_url_public('spip_action.php'), '?action=test_dirs');
 }
 
 ?>

ecrire/inc_getdocument.php3

@@ -85,8 +85,7 @@ function deplacer_fichier_upload($source, $dest) {
 		if ($f) {
 			fclose ($f);
 		} else {
-		  redirige_par_entete(generer_url_public('spip_test_dirs'),
-				      "?test_dir=". dirname($dest));
+			redirige_par_entete(generer_url_public('spip_action.php'), "?action=test_dirs&test_dir=". dirname($dest));
 		}
 		@unlink($dest);
 	}

ecrire/inc_install.php

@@ -491,23 +491,26 @@ function install_()
 
 	$menu_langues = menu_langues('var_lang_ecrire');
 	if (!$menu_langues)
-	  redirige_par_entete(generer_url_public("spip_test_dirs"));
+		redirige_par_entete(generer_url_public('spip_action.php'), '?action=test_dirs');
 	else {
 		install_debut_html();
 	
-		echo "<p align='center'><img src='" . _DIR_IMG_PACK . "logo-spip.gif'></p>";
-		
-		echo "<p style='text-align: center; font-family: Verdana,Arial,Sans,sans-serif; font-size: 10px;'>";
-		echo info_copyright();
-		echo "</p>";
-
-		echo "<p>" . _T('install_select_langue');
-
-		echo "<p><div align='center'>".$menu_langues."</div>";
-
-		echo "<p><form action='" . generer_url_public("spip_test_dirs","") . "' method='get'>";
-		echo "<DIV align='$spip_lang_right'><INPUT TYPE='submit' CLASS='fondl'  VALUE='"._T('bouton_suivant')." >>'>";
-		echo "</FORM>";
+		echo "<p align='center'><img src='" . _DIR_IMG_PACK . "logo-spip.gif'></p>",
+		  "<p style='text-align: center; font-family: Verdana,Arial,Sans,sans-serif; font-size: 10px;'>",
+		 info_copyright(),
+		  "</p>",
+		  "<p>" . _T('install_select_langue'),
+		  "<p><div align='center'>",
+		  $menu_langues,
+		  "</div>",
+		  "<p><form action='",
+		  generer_url_public('spip_action.php'),
+		  "'>",
+		  '<input type="hidden" name="action" value="test_dirs" />',
+		  "<div align='$spip_lang_right'><input type='submit' class='fondl'  VALUE='",
+		  _T('bouton_suivant'),
+		  " >>'>",
+		  "</form>";
 		install_fin_html();
 	}
 }

ecrire/inc_meta.php3

@@ -52,7 +52,7 @@ function ecrire_metas() {
 		  echo "<h4 font color=red>",
 		    _T('texte_inc_meta_1', array('fichier' => $file)),
 		    " <a href='",
-		    generer_url_public("spip_test_dirs"),
+		    generer_url_public('spip_action.php', 'action=test_dirs'),
 		    "'>",
 		    _T('texte_inc_meta_2'),
 		    "</a> ",

ecrire/inc_session.php3

@@ -63,7 +63,7 @@ function ajouter_session($auteur, $id_session) {
 		fputs($f, $texte);
  		fclose($f);
 	} else {
-	  redirige_par_entete(generer_url_public('spip_test_dirs'));
+		redirige_par_entete(generer_url_public('spip_action.php'), '?action=test_dirs');
 	}
 }
 

spip_test_dirs.php3 → ecrire/inc_spip_action_test_dirs.php

@@ -34,7 +34,7 @@ function test_ecrire($my_dir) {
 // rajouter celui passer dans l'url ou celui du source (a l'installation)
 //
 
-function spip_test_dirs_dist()
+function spip_action_test_dirs_dist()
 {
   global $test_dir, $test_dirs;
 
@@ -93,7 +93,8 @@ if ($bad_dirs OR $absent_dirs) {
 	}
 
 	$res = "<p>" . $continuer  . $res . aide ("install0") . "</p>" .
-	  "<form action='" . generer_url_public('spip_test_dirs') . "'>" .
+	  "<form action='" . generer_url_public('spip_action.php') . "'>" .
+	   "<input type='hidden' name='action' value='test_dirs' />" .
 	  (!$test_dir ? "" : 
 	   "<input type='hidden' name='test_dir' value='$test_dir' />") .
 	  "<DIV align='right'><input type='submit' class='fondl' value='". 
@@ -108,7 +109,4 @@ if ($bad_dirs OR $absent_dirs) {
 		header("Location: " . _DIR_RESTREINT_ABS);
  }
 }
-
-spip_test_dirs_dist();
-
 ?>