Valider 4ee5c95f rédigé par esj's avatar esj
Parcourir les fichiers

Tâche #209: normalisation des appels à spip_query, sans mettre le bazar dans... 

Tâche #209: normalisation des appels à spip_query, sans mettre le bazar dans la jointure avec les tables de signatures.
parent e1917934

ecrire/inc/mots.php

+1 −2
Numéro de ligne d'origine Numéro de ligne de diff Ligne de diff
@@ -581,7 +581,6 @@ function afficher_groupe_mots($id_groupe) { 
	$select = 'id_mot, titre, ' . creer_objet_multi ("titre", $spip_lang);

	$from = 'spip_mots';

	$where = "id_groupe=$id_groupe" ;

	$order = " ORDER BY multi";



	$cpt = spip_fetch_array(spip_query("SELECT COUNT(*) AS n FROM $from WHERE $where"));
@@ -614,7 +613,7 @@ function afficher_groupe_mots($id_groupe) { 


	echo ereg_replace("\:\:id\_ajax\_fonc\:\:", $id_ajax_fonc, $tranches);



	$result = spip_query("SELECT $select FROM $from WHERE $where $order LIMIT  $deb_aff, $nb_aff");

	$result = spip_query("SELECT $select FROM $from WHERE $where ORDER BY multi LIMIT  $deb_aff, $nb_aff");

	while ($row = spip_fetch_array($result)) {

		

			$vals = '';

ecrire/inc/presentation.php

+9 −20
Numéro de ligne d'origine Numéro de ligne de diff Ligne de diff
@@ -706,13 +706,11 @@ function afficher_articles($titre_table, $requete, $afficher_visites = false, $a 
	$tous_id = array();



	$select = $requete['SELECT'] ? $requete['SELECT'] : '*';

	$from = $requete['FROM'] ? $requete['FROM'] : 'spip_articles AS articles';

	if (!$requete['FROM'])  $requete['FROM'] = 'spip_articles AS articles';

	$where = $requete['WHERE'] ? (' WHERE ' . $requete['WHERE']) : '';

	$order = $requete['ORDER BY'] ? (' ORDER BY ' . $requete['ORDER BY']) : '';

	$group = $requete['GROUP BY'] ? (' GROUP BY ' . $requete['GROUP BY']) : '';

	$limit = $requete['LIMIT'] ? (' LIMIT ' . $requete['LIMIT']) : '';



	$cpt = spip_fetch_array(spip_query("SELECT COUNT(*) AS n FROM $from$where$group"));

	$cpt = spip_fetch_array(spip_query("SELECT COUNT(*) AS n FROM " . $requete['FROM'] . "$where$group"));

	if (! ($obligatoire OR ($cpt = $cpt['n']))) return $tous_id ;

	if ($requete['LIMIT']) $cpt = min($requete['LIMIT'], $cpt);
@@ -768,7 +766,7 @@ function afficher_articles($titre_table, $requete, $afficher_visites = false, $a 
	//echo "<table width='100%' cellpadding='2' cellspacing='0' border='0'>";

	echo afficher_liste_debut_tableau(), str_replace("::id_ajax_fonc::", $id_ajax_fonc, $tranches);



	$result = spip_query("SELECT " . $requete['SELECT'] . " FROM " . $requete['FROM'] . "$where$group$order LIMIT $deb_aff, $nb_aff");

	$result = spip_query("SELECT " . $requete['SELECT'] . " FROM " . $requete['FROM'] . "$where$group " . ($requete['ORDER BY'] ? (' ORDER BY ' . $requete['ORDER BY']) : '') . "LIMIT $deb_aff, $nb_aff");



	while ($row = spip_fetch_array($result)) {

			$vals = '';
@@ -937,14 +935,11 @@ function afficher_articles_trad($titre_table, $requete, $afficher_visites = fals 
	$tous_id = array();



	$select = $requete['SELECT'] ? $requete['SELECT'] : '*';

	$from = $requete['FROM'] ? $requete['FROM'] : 'spip_articles AS articles';

	if (!$requete['FROM']) $requete['FROM']=  'spip_articles AS articles';

	$where = $requete['WHERE'] ? (' WHERE ' . $requete['WHERE']) : '';

	$order = $requete['ORDER BY'] ? (' ORDER BY ' . $requete['ORDER BY']) : '';

	$group = $requete['GROUP BY'] ? (' GROUP BY ' . $requete['GROUP BY']) : '';

	$limit = $requete['LIMIT'] ? (' LIMIT ' . $requete['LIMIT']) : '';



	$cpt = "$from$where$group";

	$cpt = spip_fetch_array(spip_query("SELECT COUNT(*) AS n FROM $cpt"));

	$cpt = spip_fetch_array(spip_query("SELECT COUNT(*) AS n FROM " . $requete['FROM'] . "$where$group"));

	if (! ($obligatoire OR ($cpt = $cpt['n']))) return $tous_id ;

	if ($requete['LIMIT']) $cpt = min($requete['LIMIT'], $cpt);
@@ -990,7 +985,7 @@ function afficher_articles_trad($titre_table, $requete, $afficher_visites = fals 
	//echo "<table width='100%' cellpadding='2' cellspacing='0' border='0'>";

	echo afficher_liste_debut_tableau(), ereg_replace("\:\:id\_ajax\_fonc\:\:", $id_ajax_fonc, $tranches);



	$result = spip_query("SELECT " . $requete['SELECT'] . " FROM " . $requete['FROM'] . "$where$group$order LIMIT $deb_aff, $nb_aff");

	$result = spip_query("SELECT " . $requete['SELECT'] . " FROM " . $requete['FROM'] . "$where$group " . ($requete['ORDER BY'] ? (' ORDER BY ' . $requete['ORDER BY']) : '') . "LIMIT $deb_aff, $nb_aff");



	while ($row = spip_fetch_array($result)) {

			$vals = '';
@@ -1114,9 +1109,7 @@ function afficher_breves($titre_table, $requete, $affrub=false) { 
	$select = $requete['SELECT'] ? $requete['SELECT'] : '*';

	$from = $requete['FROM'];

	$where = $requete['WHERE'] ? (' WHERE ' . $requete['WHERE']) : '';

	$order = $requete['ORDER BY'] ? (' ORDER BY ' . $requete['ORDER BY']) : '';

	$group = $requete['GROUP BY'] ? (' GROUP BY ' . $requete['GROUP BY']) : '';

	$limit = $requete['LIMIT'] ? (' LIMIT ' . $requete['LIMIT']) : '';



	$cpt = "$from$where$group";

	$tmp_var = substr(md5($cpt), 0, 4);
@@ -1145,7 +1138,7 @@ function afficher_breves($titre_table, $requete, $affrub=false) { 
	echo $tranches;





	$result = spip_query("SELECT $select FROM $from$where$group$order LIMIT $deb_aff, $nb_aff");

	$result = spip_query("SELECT $select FROM $from$where$group " . ($requete['ORDER BY'] ? (' ORDER BY ' . $requete['ORDER BY']) : '') . "LIMIT $deb_aff, $nb_aff");



	$table = '';

	$droit = ($connect_statut == '0minirezo' && $options == 'avancees');
@@ -1227,9 +1220,7 @@ function afficher_rubriques($titre_table, $requete) { 
	$select = $requete['SELECT'] ? $requete['SELECT'] : '*';

	$from = $requete['FROM'];

	$where = $requete['WHERE'] ? (' WHERE ' . $requete['WHERE']) : '';

	$order = $requete['ORDER BY'] ? (' ORDER BY ' . $requete['ORDER BY']) : '';

	$group = $requete['GROUP BY'] ? (' GROUP BY ' . $requete['GROUP BY']) : '';

	$limit = $requete['LIMIT'] ? (' LIMIT ' . $requete['LIMIT']) : '';



	$cpt = "$from$where$group";

	$tmp_var = substr(md5($cpt), 0, 4);
@@ -1257,7 +1248,7 @@ function afficher_rubriques($titre_table, $requete) { 


	echo $tranches;



	$result = spip_query("SELECT $select FROM $from$where$group$order LIMIT $deb_aff, $nb_aff");

	$result = spip_query("SELECT $select FROM $from$where$group " . ($requete['ORDER BY'] ? (' ORDER BY ' . $requete['ORDER BY']) : '') . "LIMIT $deb_aff, $nb_aff");



	$table = '';

	while ($row = spip_fetch_array($result)) {
@@ -1359,9 +1350,7 @@ function afficher_auteurs ($titre_table, $requete) { 
	$select = $requete['SELECT'] ? $requete['SELECT'] : '*';

	$from = $requete['FROM'];

	$where = $requete['WHERE'] ? (' WHERE ' . $requete['WHERE']) : '';

	$order = $requete['ORDER BY'] ? (' ORDER BY ' . $requete['ORDER BY']) : '';

	$group = $requete['GROUP BY'] ? (' GROUP BY ' . $requete['GROUP BY']) : '';

	$limit = $requete['LIMIT'] ? (' LIMIT ' . $requete['LIMIT']) : '';



	$cpt = "$from$where$group";

	$tmp_var = substr(md5($cpt), 0, 4);
@@ -1393,7 +1382,7 @@ function afficher_auteurs ($titre_table, $requete) { 


	echo $tranches;



	$result = spip_query("SELECT $select FROM $from$where$group$order LIMIT $deb_aff, $nb_aff");

	$result = spip_query("SELECT $select FROM $from$where$group " . ($requete['ORDER BY'] ? (' ORDER BY ' . $requete['ORDER BY']) : '') . "LIMIT $deb_aff, $nb_aff");



	$table = '';

	while ($row = spip_fetch_array($result)) {

ecrire/inc/sites_voir.php

+2 −5
Numéro de ligne d'origine Numéro de ligne de diff Ligne de diff
@@ -20,7 +20,6 @@ function afficher_sites($titre_table, $requete) { 


	$from = $requete['FROM'];

	$where = $requete['WHERE'] ? (' WHERE ' . $requete['WHERE']) : '';

	$order = $requete['ORDER BY'] ? (' ORDER BY ' . $requete['ORDER BY']) : '';

	$group = $requete['GROUP BY'] ? (' GROUP BY ' . $requete['GROUP BY']) : '';

	$limit = $requete['LIMIT'] ? (' LIMIT ' . $requete['LIMIT']) : '';
@@ -46,7 +45,7 @@ function afficher_sites($titre_table, $requete) { 


	echo $tranches;



	$result = spip_query("SELECT * FROM $from$where$group$order LIMIT $deb_aff, $nb_aff");

	$result = spip_query("SELECT * FROM $from$where$group " . ($requete['ORDER BY'] ? (' ORDER BY ' . $requete['ORDER BY']) : '') . " LIMIT $deb_aff, $nb_aff");



	$ifond = 0;

	$premier = true;
@@ -156,7 +155,6 @@ function afficher_syndic_articles($titre_table, $requete, $id = 0) { 


	$from = $requete['FROM'] ? $requete['FROM'] : 'spip_syndic_articles';

	$where = $requete['WHERE'] ? (' WHERE ' . $requete['WHERE']) : '';

	$order = $requete['ORDER BY'] ? (' ORDER BY ' . $requete['ORDER BY']) : '';

	$group = $requete['GROUP BY'] ? (' GROUP BY ' . $requete['GROUP BY']) : '';

	$limit = $requete['LIMIT'] ? (' LIMIT ' . $requete['LIMIT']) : '';
@@ -187,8 +185,7 @@ function afficher_syndic_articles($titre_table, $requete, $id = 0) { 


	echo $tranches;



	$result = spip_query("SELECT * FROM $from$where$group$order LIMIT $deb_aff, $nb_aff");



	$result = spip_query("SELECT * FROM $from$where$group " . ($requete['ORDER BY'] ? (' ORDER BY ' . $requete['ORDER BY']) : '') . " LIMIT $deb_aff, $nb_aff");

 

	$table = '';

	while ($row = spip_fetch_array($result)) {

Forge communautaire SPIP | Charte d'utilisation | Signaler un problème sur ce site