premier passage pour inc_mysql

ecrire/accents.php3

 <?php
 
 include ("inc_version.php3");
-include_ecrire ("inc_connect.php3");
 include_ecrire ("inc_auth.php3");
 include_ecrire ("inc_admin.php3");
 

ecrire/admin_repair.php3

@@ -2,7 +2,7 @@
 
 include ("inc_version.php3");
 
-include_ecrire ("inc_connect.php3");
+
 include_ecrire ("inc_admin.php3");
 include_ecrire ("inc_texte.php3");
 include_ecrire ("inc_presentation.php3");

ecrire/aide_gauche.php3

@@ -2,7 +2,7 @@
 
 include ("inc_version.php3");
 if (file_exists($flag_ecrire ? "inc_connect.php3" : "ecrire/inc_connect.php3")) {
-	include_ecrire ("inc_connect.php3");
+	
 	include_ecrire ("inc_meta.php3");
 	include_ecrire ("inc_session.php3");
 	verifier_visiteur();

ecrire/delete_all.php3

@@ -2,7 +2,7 @@
 
 include ("inc_version.php3");
 
-include_ecrire ("inc_connect.php3");
+
 include_ecrire ("inc_auth.php3");
 include_ecrire ("inc_admin.php3");
 

ecrire/export_all.php3

@@ -2,7 +2,7 @@
 
 include ("inc_version.php3");
 
-include_ecrire ("inc_connect.php3");
+
 include_ecrire ("inc_auth.php3");
 include_ecrire ("inc_export.php3");
 include_ecrire ("inc_admin.php3");

ecrire/import_all.php3

 <?php
 
 include ("inc_version.php3");
-include_ecrire ("inc_connect.php3");
+
 include_ecrire ("inc_auth.php3");
 include_ecrire ("inc_import.php3");
 include_ecrire ("inc_admin.php3");

ecrire/inc.php3

@@ -7,7 +7,6 @@ if (!file_exists("inc_connect.php3")) {
 
 include ("inc_version.php3");
 
-include_ecrire("inc_connect.php3");
 include_ecrire("inc_meta.php3");
 include_ecrire("inc_auth.php3");
 

ecrire/inc_auth.php3

@@ -56,7 +56,8 @@ function auth() {
 	// Si pas MySQL, fini
 	//
 	if (!$GLOBALS['db_ok']) {
-		echo "<P><H4>Attention&nbsp;: un probl&egrave;me technique (serveur MySQL) emp&ecirc;che l'acc&egrave;s &agrave; cette partie du site.\nMerci de votre compr&eacute;hension.</H4><P><P>\n";
+		echo "<P><H4>Attention&nbsp;: un probl&egrave;me technique (serveur MySQL) emp&ecirc;che l'acc&egrave;s &agrave; cette partie du site.\nMerci de votre compr&eacute;hension.</H4><P><P>\n".
+		"<tt>".mysql_errno()." ".mysql_error()."</tt>";
 		return false;
 	}
 

ecrire/inc_mysql.php3

+<?php
+
+//
+// Ce fichier ne sera execute qu'une fois
+if (defined("_ECRIRE_INC_MYSQL")) return;
+define("_ECRIRE_INC_MYSQL", "1");
+
+function query($query) {
+	// return spip_query_profile($query);	// a decommenter pour chronometrer les requetes
+	// return spip_query_debug($query);		// a decommenter pour afficher toutes les erreurs
+	$suite = "";
+	if (eregi('[[:space:]](VALUES|WHERE)[[:space:]].*$', $query, $regs)) {
+		$suite = $regs[0];
+		$query = substr($query, 0, -strlen($suite));
+	}
+	$query = ereg_replace('([[:space:],])spip_', '\1'.$GLOBALS['table_prefix'].'_', $query) . $suite;
+	return mysql_query($query);
+}
+
+function spip_query_profile($query) {
+	static $tt = 0;
+	$suite = "";
+	if (eregi('[[:space:]](VALUES|WHERE)[[:space:]].*$', $query, $regs)) {
+		$suite = $regs[0];
+		$query = substr($query, 0, -strlen($suite));
+	}
+	$query = ereg_replace('([[:space:],])spip_', '\1'.$GLOBALS['table_prefix'].'_', $query) . $suite;
+	$m1 = microtime();
+	$result = mysql_query($query);
+	$m2 = microtime();
+	list($usec, $sec) = explode(" ", $m1);
+	list($usec2, $sec2) = explode(" ", $m2);
+	$dt = $sec2 + $usec2 - $sec - $usec;
+	$tt += $dt;
+	echo "<small>".htmlentities($query);
+	echo " -> <font color='blue'>".sprintf("%3f", $dt)."</font> ($tt)</small><p>\n";
+	return $result;
+}
+
+function spip_query_debug($query) {
+	$suite = "";
+	if (eregi('[[:space:]](VALUES|WHERE)[[:space:]].*$', $query, $regs)) {
+		$suite = $regs[0];
+		$query = substr($query, 0, -strlen($suite));
+	}
+	$query = ereg_replace('([[:space:],])spip_', '\1'.$GLOBALS['table_prefix'].'_', $query) . $suite;
+	$r = mysql_query($query);
+	if ($GLOBALS['connect_statut'] == '0minirezo' AND $s = mysql_error()) {
+		echo "Erreur dans la requ&ecirc;te : ".htmlentities($query)."<br>";
+		echo "&laquo; ".htmlentities($s)." &raquo;<p>";
+	}
+	return $r;
+}
+
+
+?>
\ No newline at end of file

ecrire/inc_session.php3

@@ -182,8 +182,6 @@ function zap_sessions ($id_auteur, $zap) {
 function verifier_php_auth() {
 	global $PHP_AUTH_USER, $PHP_AUTH_PW;
 	if ($PHP_AUTH_USER && $PHP_AUTH_PW) {
-		include_ecrire("inc_connect.php3"); // uniquement si appel depuis espace public
-		if (!$GLOBALS['db_ok']) return;
 		$login = addslashes($PHP_AUTH_USER);
 		$result = spip_query("SELECT * FROM spip_auteurs WHERE login='$login'");
 		$row = mysql_fetch_array($result);

ecrire/inc_version.php3

@@ -32,52 +32,12 @@ error_reporting(E_ALL ^ E_NOTICE);
 
 $table_prefix = "spip";
 
-
-function spip_query_profile($query) {
-	static $tt = 0;
-	$suite = "";
-	if (eregi('[[:space:]](VALUES|WHERE)[[:space:]].*$', $query, $regs)) {
-		$suite = $regs[0];
-		$query = substr($query, 0, -strlen($suite));
-	}
-	$query = ereg_replace('([[:space:],])spip_', '\1'.$GLOBALS['table_prefix'].'_', $query) . $suite;
-	$m1 = microtime();
-	$result = mysql_query($query);
-	$m2 = microtime();
-	list($usec, $sec) = explode(" ", $m1);
-	list($usec2, $sec2) = explode(" ", $m2);
-	$dt = $sec2 + $usec2 - $sec - $usec;
-	$tt += $dt;
-	echo "<small>".htmlentities($query);
-	echo " -> <font color='blue'>".sprintf("%3f", $dt)."</font> ($tt)</small><p>\n";
-	return $result;
-}
-
-function spip_query_debug($query) {
-	$suite = "";
-	if (eregi('[[:space:]](VALUES|WHERE)[[:space:]].*$', $query, $regs)) {
-		$suite = $regs[0];
-		$query = substr($query, 0, -strlen($suite));
-	}
-	$query = ereg_replace('([[:space:],])spip_', '\1'.$GLOBALS['table_prefix'].'_', $query) . $suite;
-	$r = mysql_query($query);
-	if ($GLOBALS['connect_statut'] == '0minirezo' AND $s = mysql_error()) {
-		echo "Erreur dans la requ&ecirc;te : ".htmlentities($query)."<br>";
-		echo "&laquo; ".htmlentities($s)." &raquo;<p>";
-	}
-	return $r;
-}
-
 function spip_query($query) {
-	// return spip_query_profile($query); // a decommenter pour chronometrer les requetes
-	// return spip_query_debug($query); // a decommenter pour afficher toutes les erreurs
-	$suite = "";
-	if (eregi('[[:space:]](VALUES|WHERE)[[:space:]].*$', $query, $regs)) {
-		$suite = $regs[0];
-		$query = substr($query, 0, -strlen($suite));
-	}
-	$query = ereg_replace('([[:space:],])spip_', '\1'.$GLOBALS['table_prefix'].'_', $query) . $suite;
-	return mysql_query($query);
+	include_ecrire("inc_connect.php3");
+	if (!$GLOBALS['db_ok'])
+		return;
+	include_ecrire("inc_mysql.php3");
+	return query($query);
 }
 
 //

ecrire/info.php3

@@ -3,7 +3,7 @@
 if (file_exists("inc_connect.php3")) {
 	include ("inc_version.php3");
 
-	include_ecrire ("inc_connect.php3");
+	
 	include_ecrire ("inc_auth.php3");
 	if ($connect_statut != '0minirezo') exit;
 }

ecrire/unpack.php3

@@ -2,7 +2,7 @@
 
 include ("inc_version.php3");
 
-include_ecrire ("inc_connect.php3");
+
 include_ecrire ("inc_auth.php3");
 include_ecrire ("inc_meta.php3");
 include_ecrire ("inc_admin.php3");

ecrire/upgrade.php3

@@ -2,7 +2,7 @@
 
 include ("inc_version.php3");
 
-include_ecrire ("inc_connect.php3");
+
 include_ecrire ("inc_auth.php3");
 include_ecrire ("inc_admin.php3");
 include_ecrire ("inc_acces.php3");

inc-formulaires.php3

@@ -45,8 +45,7 @@ function erreur($zetexte){
 function formulaire_signature($id_article) {
 	global $val_confirm, $nom_email, $adresse_email, $message, $nom_site, $url_site, $url_page;
 
-	include_ecrire("inc_connect.php3");
-	include_ecrire("inc_texte.php3");
+		include_ecrire("inc_texte.php3");
 	include_ecrire("inc_filtres.php3");
 
 	echo "<a name='sp$id_article'></a>\n";
@@ -297,8 +296,7 @@ function formulaire_inscription($type) {
 	}
 
 	if ($mail_inscription && $nom_inscription) {
-		include_ecrire("inc_connect.php3");
-		$query = "SELECT * FROM spip_auteurs WHERE email='$mail_inscription'";
+				$query = "SELECT * FROM spip_auteurs WHERE email='$mail_inscription'";
 		$result = spip_query($query);
 
 		echo "<div class='reponse_formulaire'>";
@@ -392,7 +390,6 @@ function formulaire_site($la_rubrique) {
 			$url_site = addslashes($url_site);
 			$description_site = addslashes($description_site);
 			
-			include_local ("ecrire/inc_connect.php3");
 			$query = "INSERT INTO spip_syndic (nom_site, url_site, id_rubrique, descriptif, date, date_syndic, statut, syndication) ".
 				"VALUES ('$nom_site', '$url_site', $la_rubrique, '$description_site', NOW(), NOW(), 'prop', 'non')";
 			$result = spip_query($query);

inc-forum.php3

@@ -6,7 +6,6 @@ if (defined("_INC_FORUM")) return;
 define("_INC_FORUM", "1");
 
 
-include_ecrire("inc_connect.php3");
 include_ecrire("inc_meta.php3");
 include_ecrire("inc_admin.php3");
 include_ecrire("inc_acces.php3");

inc-login.php3

@@ -5,7 +5,7 @@
 if (defined("_INC_LOGIN")) return;
 define("_INC_LOGIN", "1");
 
-include_ecrire ("inc_connect.php3");
+
 include_ecrire ("inc_meta.php3");
 include_ecrire ("inc_presentation.php3");
 include_ecrire ("inc_session.php3");

inc-public-global.php3

@@ -31,8 +31,7 @@ function inclure_fichier($fond, $delais, $contexte_inclus = "") {
 	$use_cache = utiliser_cache($chemin_cache, $delais);
 
 	if (!$use_cache) {
-		include_ecrire("inc_connect.php3");
-		include_local("inc-calcul.php3");
+				include_local("inc-calcul.php3");
 		$fond = chercher_squelette($fond, $contexte_inclus['id_rubrique']);
 		$page = calculer_page($fond, $contexte_inclus);
 		if ($page) {
@@ -66,7 +65,6 @@ if ($use_cache AND file_exists("ecrire/inc_meta_cache.php3")) {
 	include_ecrire("inc_meta_cache.php3");
 }
 else {
-	include_ecrire("inc_connect.php3");
 	include_ecrire("inc_meta.php3");
 }
 
@@ -233,7 +231,6 @@ if (lire_meta('activer_moteur') == 'oui') {
 		}
 	}
 	if ($use_cache AND file_exists($fichier_index) AND $size = filesize($fichier_index)) {
-		include_ecrire("inc_connect.php3");
 		if ($db_ok) {
 			include_ecrire("inc_texte.php3");
 			include_ecrire("inc_filtres.php3");
@@ -259,8 +256,7 @@ if (lire_meta('activer_moteur') == 'oui') {
 //
 
 if ($use_cache && file_exists('CACHE/.purge2')) {
-	include_ecrire("inc_connect.php3");
-	if ($db_ok) {
+		if ($db_ok) {
 		unlink('CACHE/.purge2');
 		$query = "SELECT fichier FROM spip_forum_cache WHERE maj < DATE_SUB(NOW(), INTERVAL 14 DAY)";
 		$result = spip_query($query);
@@ -277,7 +273,6 @@ if ($use_cache && file_exists('CACHE/.purge2')) {
 }
 
 if ($use_cache && file_exists('CACHE/.purge')) {
-	include_ecrire("inc_connect.php3");
 	if ($db_ok) {
 		unlink('CACHE/.purge');
 		$f = fopen('CACHE/.purge2', 'w');

inc-stats.php3

@@ -7,7 +7,9 @@ define("_INC_STATS", "1");
 
 function ecrire_stats() {
 	global $id_article, $id_breve, $id_rubrique, $admin_ok;
-
+	include_ecrire("inc_connect.php3");
+	if (!$GLOBALS['db_ok'])
+		return;
 
 	// Essai de fichier de log simplifie
 	$log_ip = $GLOBALS['REMOTE_ADDR'];
@@ -39,38 +41,29 @@ function ecrire_stats() {
 	$last_date = lire_meta("date_statistiques");
 
 	if (lire_meta('calculer_referers_now') == 'oui') {
-		include_ecrire("inc_connect.php3");
-		if ($GLOBALS['db_ok']) {
-			include_ecrire("inc_meta.php3");
-			include_ecrire("inc_statistiques.php3");
-			ecrire_meta('calculer_referers_now', 'non');
-			ecrire_metas();
-			calculer_referers();
-		}
+		include_ecrire("inc_meta.php3");
+		include_ecrire("inc_statistiques.php3");
+		ecrire_meta('calculer_referers_now', 'non');
+		ecrire_metas();
+		calculer_referers();
 	} else if ($date != $last_date) {
-		include_ecrire("inc_connect.php3");
-		if ($GLOBALS['db_ok']) {
-			include_ecrire("inc_meta.php3");
-			include_ecrire("inc_statistiques.php3");
-			ecrire_meta("date_statistiques", $date);
+		include_ecrire("inc_meta.php3");
+		include_ecrire("inc_statistiques.php3");
+		ecrire_meta("date_statistiques", $date);
+		ecrire_metas();
+		calculer_visites($last_date);
+		// poser un message pour le prochain hit
+		if (lire_meta('activer_statistiques_ref') == 'oui') {
+			ecrire_meta('calculer_referers_now','oui');
 			ecrire_metas();
-			calculer_visites($last_date);
-			// poser un message pour le prochain hit
-			if (lire_meta('activer_statistiques_ref') == 'oui') {
-				ecrire_meta('calculer_referers_now','oui');
-				ecrire_metas();
-			}
 		}
 	}
 
 	// Log simple des visites
 	if ($log_type != "autre") {
-		include_ecrire("inc_connect.php3");
-		if ($GLOBALS['db_ok']) {
-			$query = "INSERT DELAYED IGNORE INTO spip_visites_temp (ip, type, id_objet) ".
-				"VALUES ($log_ip, '$log_type', $log_id_num)";
-			spip_query($query);
-		}
+		$query = "INSERT DELAYED IGNORE INTO spip_visites_temp (ip, type, id_objet) ".
+			"VALUES ($log_ip, '$log_type', $log_id_num)";
+		spip_query($query);
 	}
 
 	// Log complexe (referers)
@@ -80,13 +73,10 @@ function ecrire_stats() {
 		$log_referer = $GLOBALS['HTTP_REFERER'];
 		if (eregi($url_site_spip, $log_referer) AND !$GLOBALS['var_recherche']) $log_referer = "";
 		if ($log_referer) {
-			include_ecrire("inc_connect.php3");
-			if ($GLOBALS['db_ok']) {
-				$referer_md5 = '0x'.substr(md5($log_referer), 0, 16);
-				$query = "INSERT DELAYED IGNORE INTO spip_referers_temp (ip, referer, referer_md5, type, id_objet) ".
-					"VALUES ($log_ip, '$log_referer', $referer_md5, '$log_type', $log_id_num)";
-				spip_query($query);
-			}
+			$referer_md5 = '0x'.substr(md5($log_referer), 0, 16);
+			$query = "INSERT DELAYED IGNORE INTO spip_referers_temp (ip, referer, referer_md5, type, id_objet) ".
+				"VALUES ($log_ip, '$log_referer', $referer_md5, '$log_type', $log_id_num)";
+			spip_query($query);
 		}
 	}
 
@@ -94,35 +84,27 @@ function ecrire_stats() {
 	// popularite, mise a jour dix minutes
 	$date_popularite = lire_meta('date_stats_popularite');
 	if ((time() - $date_popularite) > 600) {
-		include_ecrire("inc_connect.php3");
-		if ($GLOBALS['db_ok']) {
-			include_ecrire("inc_statistiques.php3");
-			calculer_popularites();
-		}
+		include_ecrire("inc_statistiques.php3");
+		calculer_popularites();
 	}
 
 
 	// traiter les referers toutes les heures
 	$date_refs = lire_meta('date_stats_referers');
 	if ((time() - $date_refs) > 3600) {
-		include_ecrire("inc_connect.php3");
-		if ($GLOBALS['db_ok']) {
-			include_ecrire("inc_meta.php3");
-			ecrire_meta("date_stats_referers", time());
-			ecrire_meta('calculer_referers_now', 'oui');
-			ecrire_metas();
-		}
+		include_ecrire("inc_meta.php3");
+		ecrire_meta("date_stats_referers", time());
+		ecrire_meta('calculer_referers_now', 'oui');
+		ecrire_metas();
 	}
 	
 }
 
 
 function afficher_raccourci_stats($id_article) {
-	include_ecrire("inc_connect.php3");
-
 	$query = "SELECT visites, popularite FROM spip_articles WHERE id_article=$id_article AND statut='publie'";
 	$result = spip_query($query);
-	if ($row = mysql_fetch_array($result)) {
+	if ($row = @mysql_fetch_array($result)) {
 		$visites = intval($row['visites']);
 		$popmax = lire_meta('popularite_max');
 		settype($popmax, 'double');

spip_cache.php3

@@ -2,7 +2,6 @@
 
 include ("ecrire/inc_version.php3");
 
-include_ecrire("inc_connect.php3");
 include_ecrire("inc_meta.php3");
 include_ecrire("inc_admin.php3");