Skip to content
Extraits de code Groupes Projets
Valider aaf03a64 rédigé par esj's avatar esj
Parcourir les fichiers

Tâche #209: normalisation des appels de spip_query

parent 6f76c5fc
Branches
Étiquettes
Aucune requête de fusion associée trouvée
Masquer les modifications d'espaces
En ligne Côte à côte
ecrire/base/upgrade.php
+ 40
− 54
Voir le fichier @ aaf03a64
......@@ -98,64 +98,60 @@ function maj_base() {
if ($version_installee < 0.99) {
$query = "SELECT DISTINCT id_article FROM spip_forum WHERE id_article!=0 AND id_parent=0";
$result = spip_query($query);
$result = spip_query("SELECT DISTINCT id_article FROM spip_forum WHERE id_article!=0 AND id_parent=0");
while ($row = spip_fetch_array($result)) {
unset($forums_article);
$id_article = $row['id_article'];
$query2 = "SELECT id_forum FROM spip_forum WHERE id_article=$id_article";
$result2 = spip_query("SELECT id_forum FROM spip_forum WHERE id_article=$id_article");
for (;;) {
$result2 = spip_query($query2);
unset($forums);
while ($row2 = spip_fetch_array($result2)) $forums[] = $row2['id_forum'];
if (!$forums) break;
$forums = join(',', $forums);
$forums_article[] = $forums;
$query2 = "SELECT id_forum FROM spip_forum WHERE id_parent IN ($forums)";
$result2 = spip_query("SELECT id_forum FROM spip_forum WHERE id_parent IN ($forums)");
}
$forums_article = join(',', $forums_article);
$query3 = "UPDATE spip_forum SET id_article=$id_article WHERE id_forum IN ($forums_article)";
spip_query($query3);
spip_query("UPDATE spip_forum SET id_article=$id_article WHERE id_forum IN ($forums_article)");
}
$query = "SELECT DISTINCT id_breve FROM spip_forum WHERE id_breve!=0 AND id_parent=0";
$result = spip_query($query);
$result = spip_query("SELECT DISTINCT id_breve FROM spip_forum WHERE id_breve!=0 AND id_parent=0");
while ($row = spip_fetch_array($result)) {
unset($forums_breve);
$id_breve = $row['id_breve'];
$query2 = "SELECT id_forum FROM spip_forum WHERE id_breve=$id_breve";
$result2 = spip_query("SELECT id_forum FROM spip_forum WHERE id_breve=$id_breve");
for (;;) {
$result2 = spip_query($query2);
unset($forums);
while ($row2 = spip_fetch_array($result2)) $forums[] = $row2['id_forum'];
if (!$forums) break;
$forums = join(',', $forums);
$forums_breve[] = $forums;
$query2 = "SELECT id_forum FROM spip_forum WHERE id_parent IN ($forums)";
$result2 = spip_query("SELECT id_forum FROM spip_forum WHERE id_parent IN ($forums)");
}
$forums_breve = join(',', $forums_breve);
$query3 = "UPDATE spip_forum SET id_breve=$id_breve WHERE id_forum IN ($forums_breve)";
spip_query($query3);
spip_query("UPDATE spip_forum SET id_breve=$id_breve WHERE id_forum IN ($forums_breve)");
}
$query = "SELECT DISTINCT id_rubrique FROM spip_forum WHERE id_rubrique!=0 AND id_parent=0";
$result = spip_query($query);
$result = spip_query("SELECT DISTINCT id_rubrique FROM spip_forum WHERE id_rubrique!=0 AND id_parent=0");
while ($row = spip_fetch_array($result)) {
unset($forums_rubrique);
$id_rubrique = $row['id_rubrique'];
$query2 = "SELECT id_forum FROM spip_forum WHERE id_rubrique=$id_rubrique";
$result2 = spip_query("SELECT id_forum FROM spip_forum WHERE id_rubrique=$id_rubrique");
for (;;) {
$result2 = spip_query($query2);
unset($forums);
while ($row2 = spip_fetch_array($result2)) $forums[] = $row2['id_forum'];
if (!$forums) break;
$forums = join(',', $forums);
$forums_rubrique[] = $forums;
$query2 = "SELECT id_forum FROM spip_forum WHERE id_parent IN ($forums)";
$result2 = spip_query("SELECT id_forum FROM spip_forum WHERE id_parent IN ($forums)");
}
$forums_rubrique = join(',', $forums_rubrique);
$query3 = "UPDATE spip_forum SET id_rubrique=$id_rubrique WHERE id_forum IN ($forums_rubrique)";
spip_query($query3);
spip_query("UPDATE spip_forum SET id_rubrique=$id_rubrique WHERE id_forum IN ($forums_rubrique)");
}
maj_version (0.99);
}
......@@ -169,8 +165,8 @@ function maj_base() {
global $htsalt;
spip_query("ALTER TABLE spip_auteurs CHANGE pass pass tinyblob NOT NULL");
spip_query("ALTER TABLE spip_auteurs ADD htpass tinyblob NOT NULL");
$query = "SELECT id_auteur, pass FROM spip_auteurs WHERE pass!=''";
$result = spip_query($query);
$result = spip_query("SELECT id_auteur, pass FROM spip_auteurs WHERE pass!=''");
while (list($id_auteur, $pass) = spip_fetch_array($result)) {
$htpass = generer_htpass($pass);
$pass = md5($pass);
......@@ -346,8 +342,8 @@ function maj_base() {
if ($version_installee < 1.408) {
// Images articles passent dans spip_documents
$query = "SELECT id_article, images FROM spip_articles WHERE LENGTH(images) > 0";
$result = spip_query($query);
$result = spip_query("SELECT id_article, images FROM spip_articles WHERE LENGTH(images) > 0");
$types = array('jpg' => 1, 'png' => 2, 'gif' => 3);
......@@ -384,10 +380,10 @@ function maj_base() {
$replace_descriptif = ereg_replace('_orig_', 'descriptif', $replace);
$replace_texte = ereg_replace('_orig_', 'texte', $replace);
$replace_ps = ereg_replace('_orig_', 'ps', $replace);
$query = "UPDATE spip_articles ".
spip_query("UPDATE spip_articles ".
"SET chapo=$replace_chapo, descriptif=$replace_descriptif, texte=$replace_texte, ps=$replace_ps ".
"WHERE id_article=$id_article";
spip_query($query);
"WHERE id_article=$id_article");
}
spip_query("ALTER TABLE spip_articles DROP images");
maj_version (1.408);
......@@ -398,10 +394,10 @@ function maj_base() {
// -> non, prio (priori), pos (posteriori), abo (abonnement)
include_spip('inc/meta');
$accepter_forum = substr($GLOBALS['meta']["forums_publics"],0,3) ;
$query = "ALTER TABLE spip_articles CHANGE accepter_forum accepter_forum CHAR(3) NOT NULL";
$result = spip_query($query);
$query = "UPDATE spip_articles SET accepter_forum='$accepter_forum' WHERE accepter_forum != 'non'";
$result = spip_query($query);
$result = spip_query("ALTER TABLE spip_articles CHANGE accepter_forum accepter_forum CHAR(3) NOT NULL");
$result = spip_query("UPDATE spip_articles SET accepter_forum='$accepter_forum' WHERE accepter_forum != 'non'");
maj_version (1.414);
}
......@@ -418,8 +414,8 @@ function maj_base() {
}
if ($version_installee < 1.418) {
$query = "SELECT * FROM spip_auteurs WHERE statut = '0minirezo' AND email != '' ORDER BY id_auteur LIMIT 1";
$result = spip_query($query);
$result = spip_query("SELECT * FROM spip_auteurs WHERE statut = '0minirezo' AND email != '' ORDER BY id_auteur LIMIT 1");
if ($webmaster = spip_fetch_array($result)) {
include_spip('inc/meta');
ecrire_meta('email_webmaster', $webmaster['email']);
......@@ -429,41 +425,32 @@ function maj_base() {
}
if ($version_installee < 1.419) {
$query = "ALTER TABLE spip_auteurs ADD alea_actuel TINYTEXT DEFAULT ''";
spip_query($query);
$query = "ALTER TABLE spip_auteurs ADD alea_futur TINYTEXT DEFAULT ''";
spip_query($query);
$query = "UPDATE spip_auteurs SET alea_futur = FLOOR(32000*RAND())";
spip_query($query);
spip_query("ALTER TABLE spip_auteurs ADD alea_actuel TINYTEXT DEFAULT ''");
spip_query("ALTER TABLE spip_auteurs ADD alea_futur TINYTEXT DEFAULT ''");
spip_query("UPDATE spip_auteurs SET alea_futur = FLOOR(32000*RAND())");
maj_version (1.419);
}
if ($version_installee < 1.420) {
$query = "UPDATE spip_auteurs SET alea_actuel='' WHERE statut='nouveau'";
spip_query($query);
spip_query("UPDATE spip_auteurs SET alea_actuel='' WHERE statut='nouveau'");
maj_version (1.420);
}
if ($version_installee < 1.421) {
$query = "ALTER TABLE spip_articles ADD auteur_modif bigint(21) DEFAULT '0' NOT NULL";
spip_query($query);
$query = "ALTER TABLE spip_articles ADD date_modif datetime DEFAULT '0000-00-00 00:00:00' NOT NULL";
spip_query($query);
spip_query("ALTER TABLE spip_articles ADD auteur_modif bigint(21) DEFAULT '0' NOT NULL");
pip_query("ALTER TABLE spip_articles ADD date_modif datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
maj_version (1.421);
}
if ($version_installee < 1.432) {
spip_query("ALTER TABLE spip_articles DROP referers");
$query = "ALTER TABLE spip_articles ADD referers INTEGER DEFAULT '0' NOT NULL";
spip_query($query);
$query = "ALTER TABLE spip_articles ADD popularite INTEGER DEFAULT '0' NOT NULL";
spip_query($query);
spip_query("ALTER TABLE spip_articles ADD referers INTEGER DEFAULT '0' NOT NULL");
spip_query("ALTER TABLE spip_articles ADD popularite INTEGER DEFAULT '0' NOT NULL");
maj_version (1.432);
}
if ($version_installee < 1.436) {
$query = "ALTER TABLE spip_documents ADD date datetime DEFAULT '0000-00-00 00:00:00' NOT NULL";
spip_query($query);
spip_query("ALTER TABLE spip_documents ADD date datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
maj_version (1.436);
}
......@@ -500,8 +487,7 @@ function maj_base() {
}
if ($version_installee < 1.442) {
$query = "ALTER TABLE spip_auteurs ADD prefs TINYTEXT NOT NULL";
spip_query($query);
spip_query("ALTER TABLE spip_auteurs ADD prefs TINYTEXT NOT NULL");
maj_version (1.442);
}
......
ecrire/exec/articles_versions.php
+ 1
− 1
Voir le fichier @ aaf03a64
......@@ -67,7 +67,7 @@ $textes = recuperer_version($id_article, $id_version);
$id_diff = intval($id_diff);
if (!$id_diff) {
$diff_auto = true;
$row = spip_fetch_array("SELECT id_version FROM spip_versions WHERE id_article=$id_article AND id_version<$id_version ORDER BY id_version DESC LIMIT 1");
$row = spip_fetch_array(spip_query("SELECT id_version FROM spip_versions WHERE id_article=$id_article AND id_version<$id_version ORDER BY id_version DESC LIMIT 1"));
if ($row) $id_diff = $row['id_version'];
}
......
ecrire/inc/revisions.php
+ 24
− 49
Voir le fichier @ aaf03a64
......@@ -45,16 +45,14 @@ function replace_fragment($id_article, $version_min, $version_max, $id_fragment,
function exec_replace_fragments($replaces) {
if (count($replaces)) {
$query = "REPLACE spip_versions_fragments (id_article, version_min, version_max, id_fragment, compress, fragment) ".
"VALUES ".join(", ", $replaces);
spip_query($query);
spip_query("REPLACE spip_versions_fragments (id_article, version_min, version_max, id_fragment, compress, fragment) VALUES ".join(", ", $replaces));
}
}
function exec_delete_fragments($id_article, $deletes) {
if (count($deletes)) {
$query = "DELETE FROM spip_versions_fragments WHERE id_article=$id_article AND ((".
join(") OR (", $deletes)."))";
spip_query($query);
spip_query("DELETE FROM spip_versions_fragments WHERE id_article=$id_article AND ((". join(") OR (", $deletes)."))");
}
}
......@@ -69,10 +67,8 @@ function ajouter_fragments($id_article, $id_version, $fragments) {
foreach ($fragments as $id_fragment => $texte) {
$nouveau = true;
// Recuperer la version la plus recente
$query = "SELECT compress, fragment, version_min, version_max FROM spip_versions_fragments ".
"WHERE id_article=$id_article AND id_fragment=$id_fragment AND version_min<=$id_version ".
"ORDER BY version_min DESC LIMIT 0,1";
$result = spip_query($query);
$result = spip_query("SELECT compress, fragment, version_min, version_max FROM spip_versions_fragments WHERE id_article=$id_article AND id_fragment=$id_fragment AND version_min<=$id_version ORDER BY version_min DESC LIMIT 0,1");
if ($row = spip_fetch_array($result)) {
$fragment = $row['fragment'];
$version_min = $row['version_min'];
......@@ -119,14 +115,11 @@ function supprimer_fragments($id_article, $version_debut, $version_fin) {
$deletes = array();
// D'abord, vider les fragments inutiles
$query = "DELETE FROM spip_versions_fragments WHERE id_article=$id_article ".
"AND version_min>=$version_debut AND version_max<=$version_fin";
spip_query($query);
spip_query("DELETE FROM spip_versions_fragments WHERE id_article=$id_article AND version_min>=$version_debut AND version_max<=$version_fin");
// Fragments chevauchant l'ensemble de l'intervalle, s'ils existent
$query = "SELECT id_fragment, compress, fragment, version_min, version_max FROM spip_versions_fragments ".
"WHERE id_article=$id_article AND version_min<$version_debut AND version_max>$version_fin";
$result = spip_query($query);
$result = spip_query("SELECT id_fragment, compress, fragment, version_min, version_max FROM spip_versions_fragments WHERE id_article=$id_article AND version_min<$version_debut AND version_max>$version_fin");
while ($row = spip_fetch_array($result)) {
$id_fragment = $row['id_fragment'];
......@@ -147,10 +140,7 @@ function supprimer_fragments($id_article, $version_debut, $version_fin) {
}
// Fragments chevauchant le debut de l'intervalle, s'ils existent
$query = "SELECT id_fragment, compress, fragment, version_min, version_max FROM spip_versions_fragments ".
"WHERE id_article=$id_article AND version_min<$version_debut ".
"AND version_max>=$version_debut AND version_max<=$version_fin";
$result = spip_query($query);
$result = spip_query("SELECT id_fragment, compress, fragment, version_min, version_max FROM spip_versions_fragments WHERE id_article=$id_article AND version_min<$version_debut AND version_max>=$version_debut AND version_max<=$version_fin");
$deb_fragment = array();
while ($row = spip_fetch_array($result)) {
......@@ -172,10 +162,7 @@ function supprimer_fragments($id_article, $version_debut, $version_fin) {
}
// Fragments chevauchant la fin de l'intervalle, s'ils existent
$query = "SELECT id_fragment, compress, fragment, version_min, version_max FROM spip_versions_fragments ".
"WHERE id_article=$id_article AND version_max>$version_fin ".
"AND version_min>=$version_debut AND version_min<=$version_fin";
$result = spip_query($query);
$result = spip_query("SELECT id_fragment, compress, fragment, version_min, version_max FROM spip_versions_fragments WHERE id_article=$id_article AND version_max>$version_fin AND version_min>=$version_debut AND version_min<=$version_fin");
while ($row = spip_fetch_array($result)) {
$id_fragment = $row['id_fragment'];
......@@ -239,9 +226,7 @@ function recuperer_fragments($id_article, $id_version) {
if ($id_version == 0) return array();
$query = "SELECT id_fragment, version_min, compress, fragment FROM spip_versions_fragments ".
"WHERE id_article=$id_article AND version_min<=$id_version AND version_max>=$id_version";
$result = spip_query($query);
$result = spip_query("SELECT id_fragment, version_min, compress, fragment FROM spip_versions_fragments WHERE id_article=$id_article AND version_min<=$id_version AND version_max>=$id_version");
while ($row = spip_fetch_array($result)) {
$id_fragment = $row['id_fragment'];
......@@ -340,9 +325,7 @@ function apparier_paras($src, $dest, $flou = true) {
// Recuperer les champs d'une version donnee
//
function recuperer_version($id_article, $id_version) {
$query = "SELECT champs FROM spip_versions ".
"WHERE id_article=$id_article AND id_version=$id_version";
$result = spip_query($query);
$result = spip_query("SELECT champs FROM spip_versions WHERE id_article=$id_article AND id_version=$id_version");
if (!($row = spip_fetch_array($result))) return false;
......@@ -360,9 +343,8 @@ function recuperer_version($id_article, $id_version) {
}
function supprimer_versions($id_article, $version_min, $version_max) {
$query = "DELETE FROM spip_versions WHERE id_article=$id_article ".
"AND id_version>=$version_min AND id_version<=$version_max";
spip_query($query);
spip_query("DELETE FROM spip_versions WHERE id_article=$id_article AND id_version>=$version_min AND id_version<=$version_max");
supprimer_fragments($id_article, $version_min, $version_max);
}
......@@ -376,10 +358,8 @@ function ajouter_version($id_article, $champs, $titre_version = "", $id_auteur)
spip_get_lock($lock, 10);
// Examiner la derniere version
$query = "SELECT id_version, (id_auteur=$id_auteur AND date > DATE_SUB(NOW(), INTERVAL 1 HOUR) AND permanent!='oui') AS flag ".
"FROM spip_versions WHERE id_article=$id_article ".
"ORDER BY id_version DESC LIMIT 0,1";
$result = spip_query($query);
$result = spip_query("SELECT id_version, (id_auteur=$id_auteur AND date > DATE_SUB(NOW(), INTERVAL 1 HOUR) AND permanent!='oui') AS flag FROM spip_versions WHERE id_article=$id_article ORDER BY id_version DESC LIMIT 0,1");
if ($row = spip_fetch_array($result)) {
$nouveau = !$row['flag'];
$id_version = $row['id_version'];
......@@ -390,9 +370,8 @@ function ajouter_version($id_article, $champs, $titre_version = "", $id_auteur)
$nouveau = true;
$id_version_new = 1;
}
$query = "SELECT id_fragment FROM spip_versions_fragments ".
"WHERE id_article=$id_article ORDER BY id_fragment DESC LIMIT 0,1";
$result = spip_query($query);
$result = spip_query("SELECT id_fragment FROM spip_versions_fragments WHERE id_article=$id_article ORDER BY id_fragment DESC LIMIT 0,1");
if ($row = spip_fetch_array($result))
$id_fragment_next = $row['id_fragment'] + 1;
else
......@@ -436,18 +415,14 @@ function ajouter_version($id_article, $champs, $titre_version = "", $id_auteur)
$permanent = empty($titre_version) ? 'non' : 'oui';
$titre_version = addslashes($titre_version);
if ($nouveau) {
$query = "INSERT spip_versions (id_article, id_version, titre_version, permanent, date, id_auteur, champs) ".
"VALUES ($id_article, $id_version_new, '$titre_version', '$permanent', NOW(), '$id_auteur', '$codes')";
spip_query($query);
spip_query("INSERT spip_versions (id_article, id_version, titre_version, permanent, date, id_auteur, champs) VALUES ($id_article, $id_version_new, '$titre_version', '$permanent', NOW(), '$id_auteur', '$codes')");
}
else {
$query = "UPDATE spip_versions SET date=NOW(), id_auteur=$id_auteur, champs='$codes', ".
"permanent='$permanent', titre_version='$titre_version' ".
"WHERE id_article=$id_article AND id_version=$id_version";
spip_query($query);
spip_query("UPDATE spip_versions SET date=NOW(), id_auteur=$id_auteur, champs='$codes', permanent='$permanent', titre_version='$titre_version' WHERE id_article=$id_article AND id_version=$id_version");
}
$query = "UPDATE spip_articles SET id_version=$id_version_new WHERE id_article=$id_article";
spip_query($query);
spip_query("UPDATE spip_articles SET id_version=$id_version_new WHERE id_article=$id_article");
spip_release_lock($lock);
......
0% ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter

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