diff --git a/ecrire/articles_tous.php3 b/ecrire/articles_tous.php3
index cf61d4dd3ed34c9ed4f80427b5d08f882f1471aa..cb7bcf2f5fa6c31a141d4ac5e5082a82911319ac 100644
--- a/ecrire/articles_tous.php3
+++ b/ecrire/articles_tous.php3
@@ -10,7 +10,7 @@ function collections_actives()
 	$coll_actives = "";
 	$query = "SELECT DISTINCT id_rubrique FROM spip_articles WHERE statut='publie' OR statut='prepa' OR statut='prop'";
 	for (;;) {
-		$result = mysql_query($query);
+		$result = spip_query($query);
 		unset($rubriques);
 		while ($row = mysql_fetch_array($result)) {
 			$rubriques[] = $row[0];
@@ -110,7 +110,7 @@ function enfants($id_parent, $decalage = 0) {
 	global $couleur_foncee, $couleur_claire;
 
 	$query = "SELECT id_rubrique, titre, statut, date FROM spip_rubriques WHERE id_parent=$id_parent ORDER BY titre";
-	$result = mysql_query($query);
+	$result = spip_query($query);
 
 	while ($row = mysql_fetch_array($result)) {
 		$id_rubrique = $row['id_rubrique'];
diff --git a/ecrire/auteurs.php3 b/ecrire/auteurs.php3
index 3952e8c964b9acff1908195b2ffc30c9e08b148c..4d2cca205686f3afbb537fe2fc2fe1f6a585e1d2 100644
--- a/ecrire/auteurs.php3
+++ b/ecrire/auteurs.php3
@@ -35,7 +35,7 @@ $flag_editable = ($connect_statut == '0minirezo');
 
 function supp_auteur($id_auteur) {
 	$query="UPDATE spip_auteurs SET statut='5poubelle' WHERE id_auteur=$id_auteur";
-	$result=mysql_query($query);
+	$result=spip_query($query);
 }
 
 if ($supp && $flag_editable) {
@@ -242,7 +242,7 @@ else $aff_articles="prop,publie";
 
 
 	 	$query="SELECT auteurs.*, COUNT(articles.id_article) AS compteur FROM spip_auteurs AS auteurs, spip_auteurs_articles AS lien, spip_articles AS articles WHERE auteurs.id_auteur=lien.id_auteur AND lien.id_article=articles.id_article AND FIND_IN_SET(auteurs.statut,'$aff_art')>0 AND FIND_IN_SET(articles.statut,'$aff_articles') GROUP BY auteurs.id_auteur";
-		calculer_auteurs(mysql_query($query));
+		calculer_auteurs(spip_query($query));
 
 
 	if($nombre_auteurs<30) $liste_lettres="tout";
@@ -252,7 +252,7 @@ else $aff_articles="prop,publie";
 			$ze_auteurs=substr($les_auteurs,1,strlen($les_auteurs));
 
 			$query="SELECT *, 0 AS compteur FROM spip_auteurs WHERE FIND_IN_SET(id_auteur,'$ze_auteurs')=0 AND FIND_IN_SET(statut,'$aff_art')>0";
-			calculer_auteurs(mysql_query($query));
+			calculer_auteurs(spip_query($query));
 		}
 
 
diff --git a/ecrire/calendrier.php3 b/ecrire/calendrier.php3
index 09eea2190c4b5e8cffd7bae3c11dc27f24f28f6d..1af1bc0f09ce80ed8ae6ffad6c3835ad1555c7e3 100644
--- a/ecrire/calendrier.php3
+++ b/ecrire/calendrier.php3
@@ -58,7 +58,7 @@ function afficher_mois($jour_today,$mois_today,$annee_today,$nom_mois){
 
 	// articles du jour
 	$query="SELECT * FROM spip_articles WHERE statut='publie' AND date >='$annee_today-$mois_today-0' AND date < DATE_ADD('$annee_today-$mois_today-1', INTERVAL 1 MONTH) ORDER BY date";
-	$result=mysql_query($query);
+	$result=spip_query($query);
 	while($row=mysql_fetch_array($result)){
 		$id_article=$row['id_article'];
 		$titre=typo($row['titre']);
@@ -71,7 +71,7 @@ function afficher_mois($jour_today,$mois_today,$annee_today,$nom_mois){
 
 	// breves du jour
 	$query="SELECT * FROM spip_breves WHERE statut='publie' AND date_heure >='$annee_today-$mois_today-0' AND date_heure < DATE_ADD('$annee_today-$mois_today-1', INTERVAL 1 MONTH) ORDER BY date_heure";
-	$result=mysql_query($query);
+	$result=spip_query($query);
 	while($row=mysql_fetch_array($result)){
 		$id_breve=$row['id_breve'];
 		$titre=typo($row['titre']);
@@ -82,7 +82,7 @@ function afficher_mois($jour_today,$mois_today,$annee_today,$nom_mois){
 	}
 
 	// rendez-vous personnels ou annonces
-	$result_messages=mysql_query("SELECT messages.* FROM spip_messages AS messages, spip_auteurs_messages AS lien WHERE ((lien.id_auteur='$connect_id_auteur' AND lien.id_message=messages.id_message) OR messages.type='affich') AND messages.rv='oui' AND messages.date_heure >='$annee_today-$mois_today-1' AND messages.date_heure <= DATE_ADD('$annee_today-$mois_today-1', INTERVAL 1 MONTH) AND messages.statut='publie' GROUP BY messages.id_message ORDER BY messages.date_heure");
+	$result_messages=spip_query("SELECT messages.* FROM spip_messages AS messages, spip_auteurs_messages AS lien WHERE ((lien.id_auteur='$connect_id_auteur' AND lien.id_message=messages.id_message) OR messages.type='affich') AND messages.rv='oui' AND messages.date_heure >='$annee_today-$mois_today-1' AND messages.date_heure <= DATE_ADD('$annee_today-$mois_today-1', INTERVAL 1 MONTH) AND messages.statut='publie' GROUP BY messages.id_message ORDER BY messages.date_heure");
 	while($row=mysql_fetch_array($result_messages)){
 		$id_message=$row['id_message'];
 		$date_heure=$row["date_heure"];
diff --git a/ecrire/config-contenu.php3 b/ecrire/config-contenu.php3
index 984a67416e3741984524705f2c4734553b4eb4ed..defa5625212fe9b51c91a25d6cfb039ff7d9f5ac 100644
--- a/ecrire/config-contenu.php3
+++ b/ecrire/config-contenu.php3
@@ -47,7 +47,7 @@ if ($changer_config == 'oui') {
 	} else if ($forums_publics_appliquer == 'tous') {
 		$requete_appliquer = "UPDATE spip_articles SET accepter_forum='$accepter_forum'";
 	}
-	if ($requete_appliquer) mysql_query($requete_appliquer);
+	if ($requete_appliquer) spip_query($requete_appliquer);
 
 
 	$adresse_site = ereg_replace("/$", "", $adresse_site);
diff --git a/ecrire/config-fonctions.php3 b/ecrire/config-fonctions.php3
index ccbfcc3aea0420d84b8a81f1d672cb618789749a..87d25e7a80d37dd23a68e3f6308f92b516820e1f 100644
--- a/ecrire/config-fonctions.php3
+++ b/ecrire/config-fonctions.php3
@@ -31,7 +31,7 @@ if ($changer_config == 'oui') {
 	} else if ($forums_publics_appliquer == 'tous') {
 		$requete_appliquer = "UPDATE spip_articles SET accepter_forum='$accepter_forum'";
 	}
-	if ($requete_appliquer) mysql_query($requete_appliquer);
+	if ($requete_appliquer) spip_query($requete_appliquer);
 
 
 	$adresse_site = ereg_replace("/$", "", $adresse_site);
diff --git a/ecrire/configuration.php3 b/ecrire/configuration.php3
index 345a7d05227840b8abd27afe3503dcf012aa6afa..14f25f49584e121d58421ece5444d1890a9b705c 100644
--- a/ecrire/configuration.php3
+++ b/ecrire/configuration.php3
@@ -47,7 +47,7 @@ if ($changer_config == 'oui') {
 	} else if ($forums_publics_appliquer == 'tous') {
 		$requete_appliquer = "UPDATE spip_articles SET accepter_forum='$accepter_forum'";
 	}
-	if ($requete_appliquer) mysql_query($requete_appliquer);
+	if ($requete_appliquer) spip_query($requete_appliquer);
 
 
 	$adresse_site = ereg_replace("/$", "", $adresse_site);
diff --git a/ecrire/forum.php3 b/ecrire/forum.php3
index 1ec06c31f6d7db1ba41a3f27b94310ac92b97425..b693d9baa92151dddcf8ea680ab153036a9c6489 100644
--- a/ecrire/forum.php3
+++ b/ecrire/forum.php3
@@ -61,7 +61,7 @@ echo "<FONT SIZE=2 FACE='Georgia,Garamond,Times,serif'>";
 	if (!$debut) $debut = 0;
 
 	$query_forum = "SELECT COUNT(*) AS cnt FROM spip_forum WHERE statut='privrac' AND id_parent=0";
- 	$result_forum = mysql_query($query_forum);
+ 	$result_forum = spip_query($query_forum);
  	$total = 0;
  	if ($row = mysql_fetch_array($result_forum)) $total = $row['cnt'];
 
@@ -89,7 +89,7 @@ echo "<P align='left'>";
 
 
 $query_forum="SELECT * FROM spip_forum WHERE statut='privrac' AND id_parent=0 ORDER BY date_heure DESC LIMIT $debut,10";
-$result_forum=mysql_query($query_forum);
+$result_forum=spip_query($query_forum);
 
 afficher_forum($result_forum,"forum.php3");
 	
diff --git a/ecrire/forum_admin.php3 b/ecrire/forum_admin.php3
index c3e9faaedaa0d4d1bebc8c734606e539b1f9a5c7..ae32af7aba1c227a45ce0dd9ff2df1f2d9b13d30 100644
--- a/ecrire/forum_admin.php3
+++ b/ecrire/forum_admin.php3
@@ -61,7 +61,7 @@ if ($connect_statut == "0minirezo"){
 	if (!$debut) $debut = 0;
 
 	$query_forum = "SELECT COUNT(*) AS cnt FROM spip_forum WHERE statut='privadm' AND id_parent=0";
- 	$result_forum = mysql_query($query_forum);
+ 	$result_forum = spip_query($query_forum);
  	$total = 0;
  	if ($row = mysql_fetch_array($result_forum)) $total = $row['cnt'];
 
@@ -88,7 +88,7 @@ if ($connect_statut == "0minirezo"){
 
 
 	$query_forum="SELECT * FROM spip_forum WHERE statut='privadm' AND id_parent=0 ORDER BY date_heure DESC LIMIT $debut,10";
-	$result_forum=mysql_query($query_forum);
+	$result_forum=spip_query($query_forum);
 
 	afficher_forum($result_forum,"forum_admin.php3");
 } else {
diff --git a/ecrire/inc.php3 b/ecrire/inc.php3
index 898bdef02fa7111f5cbeb2d941dcb808205ad1fc..468579ec39bd45786ffdacc61dac519c0721701d 100644
--- a/ecrire/inc.php3
+++ b/ecrire/inc.php3
@@ -191,19 +191,19 @@ if (!$adresse_site) {
 
 function tester_rubrique_vide($id_rubrique) {
 	$query = "SELECT id_rubrique FROM spip_rubriques WHERE id_parent='$id_rubrique' LIMIT 0,1";
-	list($n) = mysql_fetch_row(mysql_query($query));
+	list($n) = mysql_fetch_row(spip_query($query));
 	if ($n > 0) return false;
 
 	$query = "SELECT id_article FROM spip_articles WHERE id_rubrique='$id_rubrique' AND (statut='publie' OR statut='prepa' OR statut='prop') LIMIT 0,1";
-	list($n) = mysql_fetch_row(mysql_query($query));
+	list($n) = mysql_fetch_row(spip_query($query));
 	if ($n > 0) return false;
 
 	$query = "SELECT id_breve FROM spip_breves WHERE id_rubrique='$id_rubrique' AND (statut='publie' OR statut='prop') LIMIT 0,1";
-	list($n) = mysql_fetch_row(mysql_query($query));
+	list($n) = mysql_fetch_row(spip_query($query));
 	if ($n > 0) return false;
 
 	$query = "SELECT id_syndic FROM spip_syndic WHERE id_rubrique='$id_rubrique' AND (statut='publie' OR statut='prop') LIMIT 0,1";
-	list($n) = mysql_fetch_row(mysql_query($query));
+	list($n) = mysql_fetch_row(spip_query($query));
 	if ($n > 0) return false;
 
 	return true;
@@ -227,7 +227,7 @@ if ($ajout_forum AND strlen($texte) > 10 AND strlen($titre) > 2) {
 	$nom_site = addslashes($nom_site);
 	$auteur = addslashes($auteur);
 	$query_forum = "INSERT INTO spip_forum (id_parent, id_rubrique, id_article, id_breve, id_message, id_syndic, date_heure, titre, texte, nom_site, url_site, auteur, email_auteur, statut, id_auteur) VALUES ('$forum_id_parent','$forum_id_rubrique','$forum_id_article','$forum_id_breve','$forum_id_message', '$forum_id_syndic', NOW(),\"$titre\",\"$texte\",\"$nom_site\",\"$url_site\",\"$auteur\",\"$email_auteur\",\"$forum_statut\",\"$connect_id_auteur\")";
-	$result_forum = mysql_query($query_forum);
+	$result_forum = spip_query($query_forum);
 }
 
 
@@ -241,7 +241,7 @@ function changer_statut_forum($id_forum, $statut) {
 	if ($connect_statut != '0minirezo' OR !$connect_toutes_rubriques) return;
 
 	$query = "SELECT * FROM spip_forum WHERE id_forum=$id_forum";
-	$result = mysql_query($query);
+	$result = spip_query($query);
  	if ($row = mysql_fetch_array($result)) {
 		$id_parent = $row['id_parent'];
 		$id_rubrique = $row['id_rubrique'];
@@ -259,7 +259,7 @@ function changer_statut_forum($id_forum, $statut) {
 	if ($id_parent) $where[] = "id_forum=$id_parent";
 	if ($where) {
 		$query = "SELECT fichier FROM spip_forum_cache WHERE ".join(' OR ', $where);
-		$result = mysql_query($query);
+		$result = spip_query($query);
 		unset($fichiers);
 		if ($result) while ($row = mysql_fetch_array($result)) {
 			$fichier = $row['fichier'];
@@ -269,11 +269,11 @@ function changer_statut_forum($id_forum, $statut) {
 		if ($fichiers) {
 			$fichiers = join(',', $fichiers);
 			$query = "DELETE FROM spip_forum_cache WHERE fichier IN ($fichiers)";
-			mysql_query($query);
+			spip_query($query);
 		}
 	}
 	$query_forum = "UPDATE spip_forum SET statut='$statut' WHERE id_forum=$id_forum";
-	$result_forum = mysql_query($query_forum);
+	$result_forum = spip_query($query_forum);
 }
 
 if ($supp_forum) changer_statut_forum($supp_forum, 'off');
@@ -286,7 +286,7 @@ if ($valid_forum) changer_statut_forum($valid_forum, 'publie');
 
 function calculer_secteurs() {
 	$query = "SELECT id_rubrique FROM spip_rubriques WHERE id_parent=0";
-	$result = mysql_query($query);
+	$result = spip_query($query);
 
 	while ($row = mysql_fetch_array($result)) $secteurs[] = $row['id_rubrique'];
 	if (!$secteurs) return;
@@ -296,7 +296,7 @@ function calculer_secteurs() {
 		$rubriques_totales = $rubriques;
 		while ($rubriques) {
 			$query = "SELECT id_rubrique FROM spip_rubriques WHERE id_parent IN ($rubriques)";
-			$result = mysql_query($query);
+			$result = spip_query($query);
 
 			unset($rubriques);
 			while ($row = mysql_fetch_array($result)) $rubriques[] = $row['id_rubrique'];
@@ -306,27 +306,27 @@ function calculer_secteurs() {
 			}
 		}
 		$query = "UPDATE spip_articles SET id_secteur=$id_secteur WHERE id_rubrique IN ($rubriques_totales)";
-		$result = mysql_query($query);
+		$result = spip_query($query);
 		$query = "UPDATE spip_breves SET id_rubrique=$id_secteur WHERE id_rubrique IN ($rubriques_totales)";
-		$result = mysql_query($query);
+		$result = spip_query($query);
 		$query = "UPDATE spip_rubriques SET id_secteur=$id_secteur WHERE id_rubrique IN ($rubriques_totales)";
-		$result = mysql_query($query);
+		$result = spip_query($query);
 		$query = "UPDATE spip_syndic SET id_secteur=$id_secteur WHERE id_rubrique IN ($rubriques_totales)";
-		$result = mysql_query($query);
+		$result = spip_query($query);
 	}
 }
 
 
 function calculer_dates_rubriques($id_parent="0", $date_parent="0000-00-00") {
 	$query = "SELECT MAX(date_heure) as date_h FROM spip_breves WHERE id_rubrique = '$id_parent' GROUP BY id_rubrique";
-	$result = mysql_query($query);
+	$result = spip_query($query);
 	while ($row = mysql_fetch_array($result)) {
 		$date_breves = $row['date_h'];
 		if ($date_breves > $date_parent) $date_parent = $date_breves;
 	}
 	
 	$query = "SELECT MAX(date) AS date_h FROM spip_syndic WHERE id_rubrique = '$id_parent' GROUP BY id_rubrique";
-	$result = mysql_query($query);
+	$result = spip_query($query);
 	while ($row = mysql_fetch_array($result)) {
 		$date_syndic = $row['date_h'];
 		if ($date_syndic > $date_parent) $date_parent = $date_syndic;
@@ -340,7 +340,7 @@ function calculer_dates_rubriques($id_parent="0", $date_parent="0000-00-00") {
 	else {
 		$query = "SELECT rubrique.id_rubrique,  MAX(articles.date) AS date_h FROM spip_rubriques AS rubrique, spip_articles AS articles WHERE rubrique.id_parent='$id_parent' AND articles.id_rubrique=rubrique.id_rubrique AND articles.statut = 'publie' AND articles.date < NOW() GROUP BY rubrique.id_rubrique";
 	}
-	$result = mysql_query($query);
+	$result = spip_query($query);
 	
 	while ($row = mysql_fetch_array($result)) {
 		$id_rubrique = $row['id_rubrique'];
@@ -352,7 +352,7 @@ function calculer_dates_rubriques($id_parent="0", $date_parent="0000-00-00") {
 	}
 
 
-	mysql_query("UPDATE spip_rubriques SET date='$date_parent' WHERE id_rubrique='$id_parent'");
+	spip_query("UPDATE spip_rubriques SET date='$date_parent' WHERE id_rubrique='$id_parent'");
 
 	return $date_parent;
 
@@ -370,17 +370,17 @@ function calculer_rubriques_publiques()
 	else {
 		$query = "SELECT DISTINCT id_rubrique FROM spip_articles WHERE statut = 'publie' AND date < NOW()";
 	}
-	$result = mysql_query($query);
+	$result = spip_query($query);
 	while ($row = mysql_fetch_array($result)) {
 		if ($row['id_rubrique']) $rubriques[] = $row['id_rubrique'];
 	}
 	$query = "SELECT DISTINCT id_rubrique FROM spip_breves WHERE statut = 'publie'";
-	$result = mysql_query($query);
+	$result = spip_query($query);
 	while ($row = mysql_fetch_array($result)) {
 		if ($row['id_rubrique']) $rubriques[] = $row['id_rubrique'];
 	}
 	$query = "SELECT DISTINCT id_rubrique FROM spip_syndic WHERE statut = 'publie'";
-	$result = mysql_query($query);
+	$result = spip_query($query);
 	while ($row = mysql_fetch_array($result)) {
 		if ($row['id_rubrique']) $rubriques[] = $row['id_rubrique'];
 	}
@@ -390,16 +390,16 @@ function calculer_rubriques_publiques()
 		if ($rubriques_publiques) $rubriques_publiques .= ",$rubriques";
 		else $rubriques_publiques = $rubriques;
 		$query = "SELECT DISTINCT id_parent FROM spip_rubriques WHERE (id_rubrique IN ($rubriques)) AND (id_parent NOT IN ($rubriques_publiques))";
-		$result = mysql_query($query);
+		$result = spip_query($query);
 		unset($rubriques);
 		while ($row = mysql_fetch_array($result)) {
 			if ($row['id_parent']) $rubriques[] = $row['id_parent'];
 		}
 	}
 	$query = "UPDATE spip_rubriques SET statut='prive' WHERE id_rubrique NOT IN ($rubriques_publiques)";
-	mysql_query($query);
+	spip_query($query);
 	$query = "UPDATE spip_rubriques SET statut='publie' WHERE id_rubrique IN ($rubriques_publiques)";
-	mysql_query($query);
+	spip_query($query);
 }
 
 
@@ -419,7 +419,7 @@ function calculer_rubriques()
 // Supprimer rubrique
 if ($supp_rubrique = intval($supp_rubrique) AND $connect_statut == '0minirezo' AND acces_rubrique($supp_rubrique)) {
 	$query = "DELETE FROM spip_rubriques WHERE id_rubrique=$supp_rubrique";
-	$result = mysql_query($query);
+	$result = spip_query($query);
 
 	calculer_rubriques();
 }
diff --git a/ecrire/inc_presentation.php3 b/ecrire/inc_presentation.php3
index 49d29c4a5e0acf5658b4fd28a7ee20179a8b8f90..15bd5a035d08d3b4d76817382f7897884c4a6f83 100644
--- a/ecrire/inc_presentation.php3
+++ b/ecrire/inc_presentation.php3
@@ -35,7 +35,7 @@ function bouton_imessage($destinataire, $row = '') {
 
 	if ($row != "force") {
 		$login_req = "select login, messagerie from spip_auteurs where id_auteur=$destinataire AND en_ligne>DATE_SUB(NOW(),INTERVAL 15 DAY)";
-		$row = mysql_fetch_array(mysql_query($login_req));
+		$row = mysql_fetch_array(spip_query($login_req));
 		
 		if (($row['login'] == "") OR ($row['messagerie'] == "non")) {
 			return;
@@ -290,7 +290,7 @@ function afficher_liste($largeurs, $table, $styles = '') {
 function afficher_tranches_requete(&$query, $colspan) {
 	$query = trim($query);
 	$query_count = eregi_replace('^(SELECT)[[:space:]].*[[:space:]](FROM)[[:space:]]', '\\1 COUNT(*) \\2 ', $query);
-	list($num_rows) = mysql_fetch_row(mysql_query($query_count));
+	list($num_rows) = mysql_fetch_row(spip_query($query_count));
 	if (!$num_rows) return;
 
 	$nb_aff = 10;
@@ -357,7 +357,7 @@ function afficher_articles($titre_table, $requete, $afficher_visites = false, $a
 	$tranches = afficher_tranches_requete($requete, $afficher_auteurs ? 3 : 2);
 
 	if (strlen($tranches) OR $toujours_afficher) {
-	 	$result = mysql_query($requete);
+	 	$result = spip_query($requete);
 	 	$num_rows = mysql_num_rows($result);
 
 		if ($afficher_cadre) debut_cadre_relief("article-24.gif");
@@ -382,13 +382,13 @@ function afficher_articles($titre_table, $requete, $afficher_visites = false, $a
 			$visites = $row['visites'];
 
 			$query_petition = "SELECT COUNT(*) AS cnt FROM spip_petitions WHERE id_article=$id_article";
-			$row_petition = mysql_fetch_array(mysql_query($query_petition));
+			$row_petition = mysql_fetch_array(spip_query($query_petition));
 			$petition = ($row_petition['cnt'] > 0);
 
 			if ($afficher_auteurs) {
 				$les_auteurs = "";
 			 	$query2 = "SELECT spip_auteurs.id_auteur, nom, messagerie, login, en_ligne FROM spip_auteurs, spip_auteurs_articles AS lien WHERE lien.id_article=$id_article AND spip_auteurs.id_auteur=lien.id_auteur";
-				$result_auteurs = mysql_query($query2);
+				$result_auteurs = spip_query($query2);
 
 				while ($row = mysql_fetch_array($result_auteurs)) {
 					$id_auteur = $row['id_auteur'];
@@ -476,7 +476,7 @@ function afficher_breves($titre_table, $requete) {
 
 		echo $tranches;
 
-	 	$result = mysql_query($requete);
+	 	$result = spip_query($requete);
 		$num_rows = mysql_num_rows($result);
 
 		$table = '';
@@ -544,7 +544,7 @@ function afficher_rubriques($titre_table, $requete) {
 
 		echo $tranches;
 
-	 	$result = mysql_query($requete);
+	 	$result = spip_query($requete);
 		$num_rows = mysql_num_rows($result);
 
 		$table = '';
@@ -719,7 +719,7 @@ function forum($le_forum, $adresse_retour, $controle = "non") {
 	else {
 		$query_forum2 = "SELECT * FROM spip_forum WHERE id_parent='$le_forum' AND statut<>'off' ORDER BY date_heure";
 	}
- 	$result_forum2 = mysql_query($query_forum2);
+ 	$result_forum2 = spip_query($query_forum2);
 	afficher_forum($result_forum2, $adresse_retour, $controle);
 }
 
@@ -1328,7 +1328,7 @@ function debut_page($titre = "", $rubrique = "asuivre", $sous_rubrique = "asuivr
 	echo "<table cellpadding='0' background='' width='750'><tr width='750'><td>";
 		if ($activer_messagerie != 'non' AND $connect_activer_messagerie != 'non') {
 			echo "<font face='arial,helvetica,sans-serif' size=1><b>";
-			$result_messages = mysql_query("SELECT * FROM spip_messages, spip_auteurs_messages AS lien WHERE lien.id_auteur=$connect_id_auteur AND vu='non' AND statut='publie' AND type='normal' AND lien.id_message=spip_messages.id_message");
+			$result_messages = spip_query("SELECT * FROM spip_messages AS messages, spip_auteurs_messages AS lien WHERE lien.id_auteur=$connect_id_auteur AND vu='non' AND statut='publie' AND type='normal' AND lien.id_message=messages.id_message");
 			$total_messages = @mysql_num_rows($result_messages);
 			if ($total_messages == 1) {
 				while($row = @mysql_fetch_array($result_messages)) {
@@ -1337,7 +1337,7 @@ function debut_page($titre = "", $rubrique = "asuivre", $sous_rubrique = "asuivr
 				}
 			}
 			if ($total_messages > 1) echo "<a href='messagerie.php3'><font color='white'>VOUS AVEZ $total_messages NOUVEAUX MESSAGES</font></a>";
-			$result_messages = mysql_query("SELECT messages.* FROM spip_messages AS messages, spip_auteurs_messages AS lien WHERE lien.id_auteur='$connect_id_auteur' AND messages.statut='publie' AND lien.id_message=messages.id_message AND messages.rv='oui' AND messages.date_heure>DATE_SUB(NOW(),INTERVAL 1 DAY) GROUP BY messages.id_message");
+			$result_messages = spip_query("SELECT messages.* FROM spip_messages AS messages, spip_auteurs_messages AS lien WHERE lien.id_auteur='$connect_id_auteur' AND messages.statut='publie' AND lien.id_message=messages.id_message AND messages.rv='oui' AND messages.date_heure>DATE_SUB(NOW(),INTERVAL 1 DAY) GROUP BY messages.id_message");
 			$total_messages = @mysql_num_rows($result_messages);
 			
 			if ($total_messages == 1) {
@@ -1465,8 +1465,8 @@ function debut_gauche() {
 		echo "<font color='#044476' face='verdana,arial,helvetica,sans-serif' size=1><b>&nbsp;NOUVEAU PENSE-B&Ecirc;TE</b></font></a>";
 
 		if ($activer_imessage != "non" AND ($connect_activer_imessage != "non" OR $connect_statut == "0minirezo")) {
-		 	$query2 = "SELECT * FROM spip_auteurs WHERE spip_auteurs.id_auteur!=$connect_id_auteur AND spip_auteurs.imessage!='non' AND spip_auteurs.messagerie!='non' AND spip_auteurs.en_ligne>DATE_SUB(NOW(),INTERVAL 5 MINUTE)";
-			$result_auteurs = mysql_query($query2);
+		 	$query2 = "SELECT * FROM spip_auteurs WHERE id_auteur!=$connect_id_auteur AND imessage!='non' AND messagerie!='non' AND en_ligne>DATE_SUB(NOW(),INTERVAL 5 MINUTE)";
+			$result_auteurs = spip_query($query2);
 
 			if (mysql_num_rows($result_auteurs) > 0) {
 				echo "<font face='verdana,arial,helvetica,sans-serif' size=2>";
@@ -1553,7 +1553,7 @@ function afficher_parents($collection){
 	$parents=ereg_replace("(~+)","\\1~",$parents);
 	if ($collection!=0){	
 		$query2="SELECT * FROM spip_rubriques WHERE id_rubrique=\"$collection\"";
-		$result2=mysql_query($query2);
+		$result2=spip_query($query2);
 
 		while($row=mysql_fetch_array($result2)){
 			$id_rubrique = $row['id_rubrique'];
diff --git a/ecrire/index.php3 b/ecrire/index.php3
index 0e0b4354ff535be94afcf3d8516fdda5c3e092fe..0f247b1a6a405ea65387fa0c34612c1d06f577d3 100644
--- a/ecrire/index.php3
+++ b/ecrire/index.php3
@@ -20,7 +20,7 @@ if($options != 'avancees') {
 function enfant($collection){
 	global $les_enfants;
 	$query2 = "SELECT * FROM spip_rubriques WHERE id_parent=\"$collection\" ORDER BY titre";
-	$result2 = mysql_query($query2);
+	$result2 = spip_query($query2);
 	
 	while($row=mysql_fetch_array($result2)){
 		$id_rubrique=$row['id_rubrique'];
@@ -58,7 +58,7 @@ function enfant($collection){
 
 function sous_enfant($collection2){
 	$query3 = "SELECT * FROM spip_rubriques WHERE id_parent=\"$collection2\" ORDER BY titre";
-	$result3 = mysql_query($query3);
+	$result3 = spip_query($query3);
 
 	if (mysql_num_rows($result3) > 0){
 		$retour = debut_block_invisible("enfants$collection2")."\n\n<FONT SIZE=1><ul style='list-style-image: url(img_pack/rubrique-12.gif)'>";
diff --git a/ecrire/naviguer.php3 b/ecrire/naviguer.php3
index 9bca8b9da6f189d9527e6afa3d0d586773e00159..49db7df8e8d5a701d516a31d6a28c377de1b8124 100644
--- a/ecrire/naviguer.php3
+++ b/ecrire/naviguer.php3
@@ -14,7 +14,7 @@ $flag_mots = lire_meta("articles_mots");
 function enfant($collection){
 	global $les_enfants;
 	$query2 = "SELECT * FROM spip_rubriques WHERE id_parent=\"$collection\" ORDER BY titre";
-	$result2 = mysql_query($query2);
+	$result2 = spip_query($query2);
 	
 	while($row=mysql_fetch_array($result2)){
 		$id_rubrique=$row['id_rubrique'];
@@ -52,7 +52,7 @@ function enfant($collection){
 
 function sous_enfant($collection2){
 	$query3 = "SELECT * FROM spip_rubriques WHERE id_parent=\"$collection2\" ORDER BY titre";
-	$result3 = mysql_query($query3);
+	$result3 = spip_query($query3);
 
 	if (mysql_num_rows($result3) > 0){
 		$retour = debut_block_invisible("enfants$collection2")."\n\n<FONT SIZE=1><ul style='list-style-image: url(img_pack/rubrique-12.gif)'>";
@@ -78,7 +78,7 @@ if ($titre){
 	// si c'est une rubrique-secteur contenant des breves, ne deplacer
 	// que si $confirme_deplace == 'oui'
 	$query = "SELECT COUNT(*) AS cnt FROM spip_breves WHERE id_rubrique=\"$id_rubrique\"";
-	$row = mysql_fetch_array(mysql_query($query));
+	$row = mysql_fetch_array(spip_query($query));
 	if (($row['cnt'] > 0) and !($confirme_deplace == 'oui')) {
 		$id_parent = 0;
 	}
@@ -94,7 +94,7 @@ if ($titre){
 	$descriptif = addslashes($descriptif);
 	$texte = addslashes($texte);
 	$query = "UPDATE spip_rubriques SET $change_parent titre=\"$titre\", descriptif=\"$descriptif\", texte=\"$texte\" WHERE id_rubrique=$id_rubrique";
-	$result = mysql_query($query);
+	$result = spip_query($query);
 	
 	calculer_rubriques();
 
@@ -107,7 +107,7 @@ if ($titre){
 // infos sur cette rubrique
 //
 $query="SELECT * FROM spip_rubriques WHERE id_rubrique='$coll'";
-$result=mysql_query($query);
+$result=spip_query($query);
 
 while($row=mysql_fetch_array($result)){
 	$id_rubrique=$row['id_rubrique'];
diff --git a/ecrire/statistiques.php3 b/ecrire/statistiques.php3
index 55dec469458fae5fb7fea6d9753764cc11b2b800..45a6633a02b714882bb780f5bbb598d00915f1c7 100644
--- a/ecrire/statistiques.php3
+++ b/ecrire/statistiques.php3
@@ -49,14 +49,14 @@ function enfants($id_parent){
 	global $nombre_abs;
 
 	$query = "SELECT id_rubrique FROM spip_rubriques WHERE id_parent=\"$id_parent\"";
-	$result = mysql_query($query);
+	$result = spip_query($query);
 	$nombre = 0;
 
 	while($row = mysql_fetch_array($result)) {
 		$id_rubrique = $row['id_rubrique'];
 
 		$query2 = "SELECT SUM(visites) AS cnt FROM spip_articles WHERE id_rubrique=\"$id_rubrique\"";
-		$result2 = mysql_query($query2);
+		$result2 = spip_query($query2);
 		$visites = 0;
 		if ($row2 = mysql_fetch_array($result2)) {
 			$visites = $row2['cnt'];
@@ -80,7 +80,7 @@ function enfants_aff($id_parent,$decalage) {
 	global $couleur_claire;
 	global $abs_total;
 	$query="SELECT id_rubrique, titre FROM spip_rubriques WHERE id_parent=\"$id_parent\" ORDER BY titre";
-	$result=mysql_query($query);
+	$result=spip_query($query);
 
 	while($row = mysql_fetch_array($result)){
 		$id_rubrique = $row['id_rubrique'];
@@ -135,17 +135,17 @@ function enfants_aff($id_parent,$decalage) {
 
 
 $query = "SELECT count(*) AS cnt FROM spip_articles where statut='publie'";
-$result = mysql_fetch_array(mysql_query($query));
+$result = mysql_fetch_array(spip_query($query));
 $nb_art = $result['cnt'];
 
 if ($nb_art){
 	$cesite = "<LI> $nb_art articles";
 	$query = "SELECT count(*) AS cnt FROM spip_breves where statut='publie'";
-	$result = mysql_fetch_array(mysql_query($query));
+	$result = mysql_fetch_array(spip_query($query));
 	$nb_breves = $result['cnt'];
 	if ($nb_breves) $cesite .= "<LI> $nb_breves br&egrave;ves";
 	$query = "SELECT count(*) AS cnt FROM spip_forum where statut='publie'";
-	$result = mysql_fetch_array(mysql_query($query));
+	$result = mysql_fetch_array(spip_query($query));
 	$nb_forum = $result['cnt'];
 	if ($nb_forum) $cesite .= "<LI> $nb_forum contributions de forum";
 	echo "<P><B>Ce site contient:<UL> $cesite.</UL></B>";
@@ -158,7 +158,7 @@ if ($abs_total<1) $abs_total=1;
 $nombre_vis[0] = 0;
 
 $query = "SELECT id_rubrique FROM spip_rubriques WHERE id_parent=\"0\"";
-$result = mysql_query($query);
+$result = spip_query($query);
 
 while($row = mysql_fetch_array($result)) {
 	$id_rubrique = $row['id_rubrique'];
diff --git a/ecrire/statistiques_recents.php3 b/ecrire/statistiques_recents.php3
index ec37d4923780db050f71b2faa9a53e79157b6c92..5bb77ae156aadf76c1c16aa3d005bbcf4b472a5c 100644
--- a/ecrire/statistiques_recents.php3
+++ b/ecrire/statistiques_recents.php3
@@ -41,7 +41,7 @@ if ($connect_statut != '0minirezo') {
 
 
 $query="SELECT MAX(date) AS cnt FROM spip_articles WHERE statut='publie'";
-$result=mysql_query($query);
+$result=spip_query($query);
 
 if ($row = mysql_fetch_array($result)) {
 	$date = $row['cnt'];
diff --git a/ecrire/statistiques_tous.php3 b/ecrire/statistiques_tous.php3
index 1b30162bd150bd89e8b175409998910b85c42e56..a2dc54ce19e764ab7e3b891b8eaf220d621b6161 100644
--- a/ecrire/statistiques_tous.php3
+++ b/ecrire/statistiques_tous.php3
@@ -40,7 +40,7 @@ if ($connect_statut != '0minirezo') {
 
 
 $query="SELECT MAX(date) AS cnt FROM spip_articles WHERE statut='publie'";
-$result=mysql_query($query);
+$result=spip_query($query);
 
 if ($row = mysql_fetch_array($result)) {
 	$date = $row['cnt'];