spip / SPIP

ecrire/maj/v011.php

Indentation +6 added lines, -6 removed lines

@@ -16,7 +16,7 @@ 
  * @package SPIP\Core\SQL\Upgrade
  **/
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 /**
@@ -27,9 +27,9 @@ 
  **/
 function maj_v011_dist($version_installee, $version_cible) {
 
-	if (upgrade_vers(1.1, $version_installee, $version_cible)) {
-		sql_query("DROP TABLE spip_petition");
-		sql_query("DROP TABLE spip_signatures_petition");
-		maj_version(1.1);
-	}
+    if (upgrade_vers(1.1, $version_installee, $version_cible)) {
+        sql_query("DROP TABLE spip_petition");
+        sql_query("DROP TABLE spip_signatures_petition");
+        maj_version(1.1);
+    }
 }

ecrire/maj/v010.php

Indentation +26 added lines, -26 removed lines

@@ -17,7 +17,7 @@ 
  **/
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 /**
@@ -28,29 +28,29 @@ 
  **/
 function maj_v010_dist($version_installee, $version_cible) {
 
-	if (upgrade_vers(1.01, $version_installee, $version_cible)) {
-		sql_query("UPDATE spip_forum SET statut='publie' WHERE statut=''");
-		maj_version(1.01);
-	}
-
-	if (upgrade_vers(1.02, $version_installee, $version_cible)) {
-		sql_query("ALTER TABLE spip_forum ADD id_auteur BIGINT DEFAULT '0' NOT NULL");
-		maj_version(1.02);
-	}
-
-	if (upgrade_vers(1.03, $version_installee, $version_cible)) {
-		sql_query("DROP TABLE spip_maj");
-		maj_version(1.03);
-	}
-
-	if (upgrade_vers(1.04, $version_installee, $version_cible)) {
-		sql_query("ALTER TABLE spip_articles ADD accepter_forum VARCHAR(3)");
-		maj_version(1.04);
-	}
-
-	if (upgrade_vers(1.05, $version_installee, $version_cible)) {
-		sql_query("DROP TABLE spip_petition");
-		sql_query("DROP TABLE spip_signatures_petition");
-		maj_version(1.05);
-	}
+    if (upgrade_vers(1.01, $version_installee, $version_cible)) {
+        sql_query("UPDATE spip_forum SET statut='publie' WHERE statut=''");
+        maj_version(1.01);
+    }
+
+    if (upgrade_vers(1.02, $version_installee, $version_cible)) {
+        sql_query("ALTER TABLE spip_forum ADD id_auteur BIGINT DEFAULT '0' NOT NULL");
+        maj_version(1.02);
+    }
+
+    if (upgrade_vers(1.03, $version_installee, $version_cible)) {
+        sql_query("DROP TABLE spip_maj");
+        maj_version(1.03);
+    }
+
+    if (upgrade_vers(1.04, $version_installee, $version_cible)) {
+        sql_query("ALTER TABLE spip_articles ADD accepter_forum VARCHAR(3)");
+        maj_version(1.04);
+    }
+
+    if (upgrade_vers(1.05, $version_installee, $version_cible)) {
+        sql_query("DROP TABLE spip_petition");
+        sql_query("DROP TABLE spip_signatures_petition");
+        maj_version(1.05);
+    }
 }

ecrire/maj/v009.php

Indentation +122 added lines, -122 removed lines

@@ -16,7 +16,7 @@ 
  * @package SPIP\Core\SQL\Upgrade
  **/
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 /**
@@ -26,125 +26,125 @@ 
  * @param float $version_cible Version de destination
  **/
 function maj_v009_dist($version_installee, $version_cible) {
-	if (upgrade_vers(0.98, $version_installee, $version_cible)) {
-
-		sql_query("ALTER TABLE spip_articles ADD maj TIMESTAMP");
-		sql_query("ALTER TABLE spip_articles ADD export VARCHAR(10) DEFAULT 'oui'");
-		sql_query("ALTER TABLE spip_articles ADD images TEXT DEFAULT ''");
-		sql_query("ALTER TABLE spip_articles ADD date_redac datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
-		sql_query("ALTER TABLE spip_articles DROP INDEX id_article");
-		sql_query("ALTER TABLE spip_articles ADD INDEX id_rubrique (id_rubrique)");
-		sql_query("ALTER TABLE spip_articles ADD visites INTEGER DEFAULT '0' NOT NULL");
-		sql_query("ALTER TABLE spip_articles ADD referers BLOB NOT NULL");
-
-		sql_query("ALTER TABLE spip_auteurs ADD maj TIMESTAMP");
-		sql_query("ALTER TABLE spip_auteurs ADD pgp BLOB NOT NULL");
-
-		sql_query("ALTER TABLE spip_auteurs_articles ADD INDEX id_auteur (id_auteur), ADD INDEX id_article (id_article)");
-
-		sql_query("ALTER TABLE spip_rubriques ADD maj TIMESTAMP");
-		sql_query("ALTER TABLE spip_rubriques ADD export VARCHAR(10) DEFAULT 'oui', ADD id_import BIGINT DEFAULT '0'");
-
-		sql_query("ALTER TABLE spip_breves ADD maj TIMESTAMP");
-		sql_query("ALTER TABLE spip_breves DROP INDEX id_breve");
-		sql_query("ALTER TABLE spip_breves DROP INDEX id_breve_2");
-		sql_query("ALTER TABLE spip_breves ADD INDEX id_rubrique (id_rubrique)");
-
-		sql_query("ALTER TABLE spip_forum ADD ip VARCHAR(16)");
-		sql_query("ALTER TABLE spip_forum ADD maj TIMESTAMP");
-		sql_query("ALTER TABLE spip_forum DROP INDEX id_forum");
-		sql_query("ALTER TABLE spip_forum ADD INDEX id_parent (id_parent), ADD INDEX id_rubrique (id_rubrique), ADD INDEX id_article(id_article), ADD INDEX id_breve(id_breve)");
-		maj_version(0.98);
-	}
-
-	if (upgrade_vers(0.99, $version_installee, $version_cible)) {
-
-		$result = sql_query("SELECT DISTINCT id_article FROM spip_forum WHERE id_article!=0 AND id_parent=0");
-
-		while ($row = sql_fetch($result)) {
-			unset($forums_article);
-			$id_article = $row['id_article'];
-			$result2 = sql_query("SELECT id_forum FROM spip_forum WHERE id_article=$id_article");
-			for (; ;) {
-				unset($forums);
-				while ($row2 = sql_fetch($result2)) {
-					$forums[] = $row2['id_forum'];
-				}
-				if (!$forums) {
-					break;
-				}
-				$forums = join(',', $forums);
-				$forums_article[] = $forums;
-				$result2 = sql_query("SELECT id_forum FROM spip_forum WHERE id_parent IN ($forums)");
-			}
-			$forums_article = join(',', $forums_article);
-			sql_query("UPDATE spip_forum SET id_article=$id_article WHERE id_forum IN ($forums_article)");
-		}
-
-		$result = sql_query("SELECT DISTINCT id_breve FROM spip_forum WHERE id_breve!=0 AND id_parent=0");
-
-		while ($row = sql_fetch($result)) {
-			unset($forums_breve);
-			$id_breve = $row['id_breve'];
-			$result2 = sql_query("SELECT id_forum FROM spip_forum WHERE id_breve=$id_breve");
-			for (; ;) {
-				unset($forums);
-				while ($row2 = sql_fetch($result2)) {
-					$forums[] = $row2['id_forum'];
-				}
-				if (!$forums) {
-					break;
-				}
-				$forums = join(',', $forums);
-				$forums_breve[] = $forums;
-				$result2 = sql_query("SELECT id_forum FROM spip_forum WHERE id_parent IN ($forums)");
-			}
-			$forums_breve = join(',', $forums_breve);
-			sql_query("UPDATE spip_forum SET id_breve=$id_breve WHERE id_forum IN ($forums_breve)");
-		}
-
-		$result = sql_query("SELECT DISTINCT id_rubrique FROM spip_forum WHERE id_rubrique!=0 AND id_parent=0");
-
-		while ($row = sql_fetch($result)) {
-			unset($forums_rubrique);
-			$id_rubrique = $row['id_rubrique'];
-			$result2 = sql_query("SELECT id_forum FROM spip_forum WHERE id_rubrique=$id_rubrique");
-			for (; ;) {
-
-				unset($forums);
-				while ($row2 = sql_fetch($result2)) {
-					$forums[] = $row2['id_forum'];
-				}
-				if (!$forums) {
-					break;
-				}
-				$forums = join(',', $forums);
-				$forums_rubrique[] = $forums;
-				$result2 = sql_query("SELECT id_forum FROM spip_forum WHERE id_parent IN ($forums)");
-			}
-			$forums_rubrique = join(',', $forums_rubrique);
-			sql_query("UPDATE spip_forum SET id_rubrique=$id_rubrique WHERE id_forum IN ($forums_rubrique)");
-
-		}
-		maj_version(0.99);
-	}
-
-	if (upgrade_vers(0.997, $version_installee, $version_cible)) {
-		sql_query("DROP TABLE spip_index");
-		maj_version(0.997);
-	}
-
-	if (upgrade_vers(0.999, $version_installee, $version_cible)) {
-
-		sql_query("ALTER TABLE spip_auteurs CHANGE pass pass tinyblob NOT NULL");
-		sql_query("ALTER TABLE spip_auteurs ADD htpass tinyblob NOT NULL");
-		$result = sql_query("SELECT id_auteur, pass FROM spip_auteurs WHERE pass!=''");
-
-		while ($r = sql_fetch($result)) {
-			$htpass = generer_htpass($r['pass']);
-			$pass = md5($pass);
-			sql_query("UPDATE spip_auteurs SET pass='$pass', htpass='$htpass' WHERE id_auteur=" . $r['id_auteur']);
-		}
-		maj_version(0.999);
-	}
+    if (upgrade_vers(0.98, $version_installee, $version_cible)) {
+
+        sql_query("ALTER TABLE spip_articles ADD maj TIMESTAMP");
+        sql_query("ALTER TABLE spip_articles ADD export VARCHAR(10) DEFAULT 'oui'");
+        sql_query("ALTER TABLE spip_articles ADD images TEXT DEFAULT ''");
+        sql_query("ALTER TABLE spip_articles ADD date_redac datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
+        sql_query("ALTER TABLE spip_articles DROP INDEX id_article");
+        sql_query("ALTER TABLE spip_articles ADD INDEX id_rubrique (id_rubrique)");
+        sql_query("ALTER TABLE spip_articles ADD visites INTEGER DEFAULT '0' NOT NULL");
+        sql_query("ALTER TABLE spip_articles ADD referers BLOB NOT NULL");
+
+        sql_query("ALTER TABLE spip_auteurs ADD maj TIMESTAMP");
+        sql_query("ALTER TABLE spip_auteurs ADD pgp BLOB NOT NULL");
+
+        sql_query("ALTER TABLE spip_auteurs_articles ADD INDEX id_auteur (id_auteur), ADD INDEX id_article (id_article)");
+
+        sql_query("ALTER TABLE spip_rubriques ADD maj TIMESTAMP");
+        sql_query("ALTER TABLE spip_rubriques ADD export VARCHAR(10) DEFAULT 'oui', ADD id_import BIGINT DEFAULT '0'");
+
+        sql_query("ALTER TABLE spip_breves ADD maj TIMESTAMP");
+        sql_query("ALTER TABLE spip_breves DROP INDEX id_breve");
+        sql_query("ALTER TABLE spip_breves DROP INDEX id_breve_2");
+        sql_query("ALTER TABLE spip_breves ADD INDEX id_rubrique (id_rubrique)");
+
+        sql_query("ALTER TABLE spip_forum ADD ip VARCHAR(16)");
+        sql_query("ALTER TABLE spip_forum ADD maj TIMESTAMP");
+        sql_query("ALTER TABLE spip_forum DROP INDEX id_forum");
+        sql_query("ALTER TABLE spip_forum ADD INDEX id_parent (id_parent), ADD INDEX id_rubrique (id_rubrique), ADD INDEX id_article(id_article), ADD INDEX id_breve(id_breve)");
+        maj_version(0.98);
+    }
+
+    if (upgrade_vers(0.99, $version_installee, $version_cible)) {
+
+        $result = sql_query("SELECT DISTINCT id_article FROM spip_forum WHERE id_article!=0 AND id_parent=0");
+
+        while ($row = sql_fetch($result)) {
+            unset($forums_article);
+            $id_article = $row['id_article'];
+            $result2 = sql_query("SELECT id_forum FROM spip_forum WHERE id_article=$id_article");
+            for (; ;) {
+                unset($forums);
+                while ($row2 = sql_fetch($result2)) {
+                    $forums[] = $row2['id_forum'];
+                }
+                if (!$forums) {
+                    break;
+                }
+                $forums = join(',', $forums);
+                $forums_article[] = $forums;
+                $result2 = sql_query("SELECT id_forum FROM spip_forum WHERE id_parent IN ($forums)");
+            }
+            $forums_article = join(',', $forums_article);
+            sql_query("UPDATE spip_forum SET id_article=$id_article WHERE id_forum IN ($forums_article)");
+        }
+
+        $result = sql_query("SELECT DISTINCT id_breve FROM spip_forum WHERE id_breve!=0 AND id_parent=0");
+
+        while ($row = sql_fetch($result)) {
+            unset($forums_breve);
+            $id_breve = $row['id_breve'];
+            $result2 = sql_query("SELECT id_forum FROM spip_forum WHERE id_breve=$id_breve");
+            for (; ;) {
+                unset($forums);
+                while ($row2 = sql_fetch($result2)) {
+                    $forums[] = $row2['id_forum'];
+                }
+                if (!$forums) {
+                    break;
+                }
+                $forums = join(',', $forums);
+                $forums_breve[] = $forums;
+                $result2 = sql_query("SELECT id_forum FROM spip_forum WHERE id_parent IN ($forums)");
+            }
+            $forums_breve = join(',', $forums_breve);
+            sql_query("UPDATE spip_forum SET id_breve=$id_breve WHERE id_forum IN ($forums_breve)");
+        }
+
+        $result = sql_query("SELECT DISTINCT id_rubrique FROM spip_forum WHERE id_rubrique!=0 AND id_parent=0");
+
+        while ($row = sql_fetch($result)) {
+            unset($forums_rubrique);
+            $id_rubrique = $row['id_rubrique'];
+            $result2 = sql_query("SELECT id_forum FROM spip_forum WHERE id_rubrique=$id_rubrique");
+            for (; ;) {
+
+                unset($forums);
+                while ($row2 = sql_fetch($result2)) {
+                    $forums[] = $row2['id_forum'];
+                }
+                if (!$forums) {
+                    break;
+                }
+                $forums = join(',', $forums);
+                $forums_rubrique[] = $forums;
+                $result2 = sql_query("SELECT id_forum FROM spip_forum WHERE id_parent IN ($forums)");
+            }
+            $forums_rubrique = join(',', $forums_rubrique);
+            sql_query("UPDATE spip_forum SET id_rubrique=$id_rubrique WHERE id_forum IN ($forums_rubrique)");
+
+        }
+        maj_version(0.99);
+    }
+
+    if (upgrade_vers(0.997, $version_installee, $version_cible)) {
+        sql_query("DROP TABLE spip_index");
+        maj_version(0.997);
+    }
+
+    if (upgrade_vers(0.999, $version_installee, $version_cible)) {
+
+        sql_query("ALTER TABLE spip_auteurs CHANGE pass pass tinyblob NOT NULL");
+        sql_query("ALTER TABLE spip_auteurs ADD htpass tinyblob NOT NULL");
+        $result = sql_query("SELECT id_auteur, pass FROM spip_auteurs WHERE pass!=''");
+
+        while ($r = sql_fetch($result)) {
+            $htpass = generer_htpass($r['pass']);
+            $pass = md5($pass);
+            sql_query("UPDATE spip_auteurs SET pass='$pass', htpass='$htpass' WHERE id_auteur=" . $r['id_auteur']);
+        }
+        maj_version(0.999);
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -65,7 +65,7 @@ 
 			unset($forums_article);
 			$id_article = $row['id_article'];
 			$result2 = sql_query("SELECT id_forum FROM spip_forum WHERE id_article=$id_article");
-			for (; ;) {
+			for (;;) {
 				unset($forums);
 				while ($row2 = sql_fetch($result2)) {
 					$forums[] = $row2['id_forum'];
@@ -87,7 +87,7 @@ 
 			unset($forums_breve);
 			$id_breve = $row['id_breve'];
 			$result2 = sql_query("SELECT id_forum FROM spip_forum WHERE id_breve=$id_breve");
-			for (; ;) {
+			for (;;) {
 				unset($forums);
 				while ($row2 = sql_fetch($result2)) {
 					$forums[] = $row2['id_forum'];
@@ -109,7 +109,7 @@ 
 			unset($forums_rubrique);
 			$id_rubrique = $row['id_rubrique'];
 			$result2 = sql_query("SELECT id_forum FROM spip_forum WHERE id_rubrique=$id_rubrique");
-			for (; ;) {
+			for (;;) {
 
 				unset($forums);
 				while ($row2 = sql_fetch($result2)) {
@@ -143,7 +143,7 @@ 
 		while ($r = sql_fetch($result)) {
 			$htpass = generer_htpass($r['pass']);
 			$pass = md5($pass);
-			sql_query("UPDATE spip_auteurs SET pass='$pass', htpass='$htpass' WHERE id_auteur=" . $r['id_auteur']);
+			sql_query("UPDATE spip_auteurs SET pass='$pass', htpass='$htpass' WHERE id_auteur=".$r['id_auteur']);
 		}
 		maj_version(0.999);
 	}

ecrire/maj/v016.php

Indentation +27 added lines, -27 removed lines

@@ -16,7 +16,7 @@ 
  * @package SPIP\Core\SQL\Upgrade
  **/
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 /**
@@ -27,37 +27,37 @@ 
  **/
 function maj_v016_dist($version_installee, $version_cible) {
 
-	if (upgrade_vers(1.600, $version_installee, $version_cible)) {
+    if (upgrade_vers(1.600, $version_installee, $version_cible)) {
 #8/08/07  plus d'indexation dans le core
 #		include_spip('inc/indexation');
 #		purger_index();
 #		creer_liste_indexation();
-		maj_version(1.600);
-	}
+        maj_version(1.600);
+    }
 
-	if (upgrade_vers(1.601, $version_installee, $version_cible)) {
-		sql_query("ALTER TABLE spip_forum ADD INDEX id_syndic (id_syndic)");
-		maj_version(1.601);
-	}
+    if (upgrade_vers(1.601, $version_installee, $version_cible)) {
+        sql_query("ALTER TABLE spip_forum ADD INDEX id_syndic (id_syndic)");
+        maj_version(1.601);
+    }
 
-	if (upgrade_vers(1.603, $version_installee, $version_cible)) {
-		// supprimer les fichiers deplaces
-		spip_unlink('inc_meta_cache.php');
-		spip_unlink('inc_meta_cache.php3');
-		spip_unlink('data/engines-list.ini');
-		maj_version(1.603);
-	}
+    if (upgrade_vers(1.603, $version_installee, $version_cible)) {
+        // supprimer les fichiers deplaces
+        spip_unlink('inc_meta_cache.php');
+        spip_unlink('inc_meta_cache.php3');
+        spip_unlink('data/engines-list.ini');
+        maj_version(1.603);
+    }
 
-	if (upgrade_vers(1.604, $version_installee, $version_cible)) {
-		sql_query("ALTER TABLE spip_auteurs ADD lang VARCHAR(10) DEFAULT '' NOT NULL");
-		$u = sql_query("SELECT * FROM spip_auteurs WHERE prefs LIKE '%spip_lang%'");
-		while ($row = sql_fetch($u)) {
-			$prefs = unserialize($row['prefs']);
-			$l = $prefs['spip_lang'];
-			unset($prefs['spip_lang']);
-			sql_query("UPDATE spip_auteurs SET lang=" . sql_quote($l) . ", prefs='" . sql_quote(serialize($prefs)) . "' WHERE id_auteur=" . $row['id_auteur']);
-		}
-		$u = sql_query("SELECT lang FROM spip_auteurs");
-		maj_version(1.604, $u);
-	}
+    if (upgrade_vers(1.604, $version_installee, $version_cible)) {
+        sql_query("ALTER TABLE spip_auteurs ADD lang VARCHAR(10) DEFAULT '' NOT NULL");
+        $u = sql_query("SELECT * FROM spip_auteurs WHERE prefs LIKE '%spip_lang%'");
+        while ($row = sql_fetch($u)) {
+            $prefs = unserialize($row['prefs']);
+            $l = $prefs['spip_lang'];
+            unset($prefs['spip_lang']);
+            sql_query("UPDATE spip_auteurs SET lang=" . sql_quote($l) . ", prefs='" . sql_quote(serialize($prefs)) . "' WHERE id_auteur=" . $row['id_auteur']);
+        }
+        $u = sql_query("SELECT lang FROM spip_auteurs");
+        maj_version(1.604, $u);
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 			$prefs = unserialize($row['prefs']);
 			$l = $prefs['spip_lang'];
 			unset($prefs['spip_lang']);
-			sql_query("UPDATE spip_auteurs SET lang=" . sql_quote($l) . ", prefs='" . sql_quote(serialize($prefs)) . "' WHERE id_auteur=" . $row['id_auteur']);
+			sql_query("UPDATE spip_auteurs SET lang=".sql_quote($l).", prefs='".sql_quote(serialize($prefs))."' WHERE id_auteur=".$row['id_auteur']);
 		}
 		$u = sql_query("SELECT lang FROM spip_auteurs");
 		maj_version(1.604, $u);

ecrire/maj/v018.php

Indentation +211 added lines, -211 removed lines

@@ -16,7 +16,7 @@ 
  * @package SPIP\Core\SQL\Upgrade
  **/
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 /**
@@ -26,214 +26,214 @@ 
  * @param float $version_cible Version de destination
  **/
 function maj_v018_dist($version_installee, $version_cible) {
-	if (upgrade_vers(1.801, $version_installee, $version_cible)) {
-		sql_query("ALTER TABLE spip_rubriques	ADD statut_tmp VARCHAR(10) NOT NULL,	ADD date_tmp datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
-		include_spip('inc/rubriques');
-		calculer_rubriques();
-		maj_version(1.801);
-	}
-
-	// Nouvelles tables d'invalidation
-	if (upgrade_vers(1.802, $version_installee, $version_cible)) {
-		sql_query("DROP TABLE spip_id_article_caches");
-		sql_query("DROP TABLE spip_id_auteur_caches");
-		sql_query("DROP TABLE spip_id_breve_caches");
-		sql_query("DROP TABLE spip_id_document_caches");
-		sql_query("DROP TABLE spip_id_forum_caches");
-		sql_query("DROP TABLE spip_id_groupe_caches");
-		sql_query("DROP TABLE spip_id_message_caches");
-		sql_query("DROP TABLE spip_id_mot_caches");
-		sql_query("DROP TABLE spip_id_rubrique_caches");
-		sql_query("DROP TABLE spip_id_signature_caches");
-		sql_query("DROP TABLE spip_id_syndic_article_caches");
-		sql_query("DROP TABLE spip_id_syndic_caches");
-		sql_query("DROP TABLE spip_id_type_caches");
-		sql_query("DROP TABLE spip_inclure_caches");
-		maj_version(1.802);
-	}
-	if (upgrade_vers(1.803, $version_installee, $version_cible)) {
-
-		#	27 AOUT 2004 : conservons cette table pour autoriser les retours
-		#	de SPIP 1.8a6 CVS vers 1.7.2
-		#	sql_query("DROP TABLE spip_forum_cache");
-
-		sql_query("DROP TABLE spip_inclure_caches");
-		maj_version(1.803);
-	}
-	if (upgrade_vers(1.804, $version_installee, $version_cible)) {
-		// recreer la table spip_caches
-		sql_query("DROP TABLE spip_caches");
-		creer_base();
-		maj_version(1.804);
-	}
-
-	/**
-	 * Recalculer tous les threads
-	 *
-	 * Fonction du plugin forum recopiee ici pour assurer la montee
-	 * de version dans tous les cas de figure
-	 **/
-	function maj_v018_calculer_threads() {
-		// fixer les id_thread des debuts de discussion
-		sql_update('spip_forum', array('id_thread' => 'id_forum'), "id_parent=0");
-		// reparer les messages qui n'ont pas l'id_secteur de leur parent
-		do {
-			$discussion = "0";
-			$precedent = 0;
-			$r = sql_select("fille.id_forum AS id,	maman.id_thread AS thread", 'spip_forum AS fille, spip_forum AS maman',
-				"fille.id_parent = maman.id_forum AND fille.id_thread <> maman.id_thread", '', "thread");
-			while ($row = sql_fetch($r)) {
-				if ($row['thread'] == $precedent) {
-					$discussion .= "," . $row['id'];
-				} else {
-					if ($precedent) {
-						sql_updateq("spip_forum", array("id_thread" => $precedent), "id_forum IN ($discussion)");
-					}
-					$precedent = $row['thread'];
-					$discussion = $row['id'];
-				}
-			}
-			sql_updateq("spip_forum", array("id_thread" => $precedent), "id_forum IN ($discussion)");
-		} while ($discussion != "0");
-	}
-
-	if (upgrade_vers(1.805, $version_installee, $version_cible)) {
-		sql_query("ALTER TABLE spip_forum ADD id_thread bigint(21) DEFAULT '0' NOT NULL");
-		maj_v018_calculer_threads();
-		maj_version(1.805);
-	}
-
-	// tables d'orthographe
-	#if ($version_installee < 1.806)
-	#	maj_version(1.806);
-
-	// URLs propres (inc_version = 0.12)
-	if (upgrade_vers(1.807, $version_installee, $version_cible)) {
-		foreach (array('articles', 'breves', 'rubriques', 'mots') as $objets) {
-			sql_query("ALTER TABLE spip_$objets ADD url_propre VARCHAR(255) NOT NULL");
-			sql_query("ALTER TABLE spip_$objets ADD INDEX url_propre (url_propre)");
-		}
-		maj_version(1.807);
-	}
-
-	// referers de la veille
-	if (upgrade_vers(1.808, $version_installee, $version_cible)) {
-		sql_query("ALTER TABLE spip_referers ADD visites_veille INT UNSIGNED NOT NULL");
-		maj_version(1.808);
-	}
-
-
-	// corrections diverses
-	if (upgrade_vers(1.809, $version_installee, $version_cible)) {
-		// plus de retour possible vers 1.7.2
-		sql_query("DROP TABLE spip_forum_cache");
-
-		// les requetes ci-dessous ne s'appliqueront que si on est passe
-		// par une certaine version de developpement - oublie de le faire
-		// plus tot, car le code d'alors recreait purement et simplement
-		// cette table
-		sql_query("ALTER TABLE spip_versions DROP chapo");
-		sql_query("ALTER TABLE spip_versions DROP texte");
-		sql_query("ALTER TABLE spip_versions DROP ps");
-		sql_query("ALTER TABLE spip_versions DROP extra");
-		sql_query("ALTER TABLE spip_versions ADD champs text NOT NULL");
-
-		maj_version(1.809);
-	}
-
-	// Annuler les brouillons de forum jamais valides
-	if (upgrade_vers(1.810, $version_installee, $version_cible)) {
-		sql_delete("spip_forum", "statut='redac'");
-		maj_version(1.810);
-	}
-
-	if (upgrade_vers(1.811, $version_installee, $version_cible)) {
-		sql_query("ALTER TABLE spip_syndic ADD extra longblob NULL");
-		maj_version(1.811);
-	}
-
-	if (upgrade_vers(1.812, $version_installee, $version_cible)) {
-		sql_query("ALTER TABLE spip_documents ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
-		maj_version(1.812);
-	}
-
-	// Mise a jour des types MIME
-	if (upgrade_vers(1.813, $version_installee, $version_cible)) {
-		# rien a faire car c'est creer_base() qui s'en charge
-		maj_version(1.813);
-	}
-
-	// URLs propres auteurs
-	if (upgrade_vers(1.814, $version_installee, $version_cible)) {
-		sql_query("ALTER TABLE spip_auteurs ADD url_propre VARCHAR(255) NOT NULL");
-		sql_query("ALTER TABLE spip_auteurs ADD INDEX url_propre (url_propre)");
-		maj_version(1.814);
-	}
-
-	// Mots-cles sur les documents
-	// + liens documents <-> sites et articles syndiques (podcasting)
-	if (upgrade_vers(1.815, $version_installee, $version_cible)) {
-		sql_query("ALTER TABLE spip_documents	ADD distant VARCHAR(3) DEFAULT 'non'");
-		maj_version(1.815);
-	}
-
-	// Indexation des documents (rien a faire sauf reinstaller inc_auxbase)
-	if (upgrade_vers(1.816, $version_installee, $version_cible)) {
-		maj_version(1.816);
-	}
-
-	// Texte et descriptif des groupes de mots-cles
-	if (upgrade_vers(1.817, $version_installee, $version_cible)) {
-		sql_query("ALTER TABLE spip_groupes_mots ADD descriptif text NOT NULL AFTER titre");
-		sql_query("ALTER TABLE spip_groupes_mots ADD COLUMN texte longblob NOT NULL AFTER descriptif");
-		maj_version(1.817);
-	}
-
-	// Conformite des noms de certains champs (0minirezo => minirezo)
-	if (upgrade_vers(1.818, $version_installee, $version_cible)) {
-		sql_query("ALTER TABLE spip_groupes_mots CHANGE COLUMN 0minirezo minirezo char(3) NOT NULL");
-		sql_query("ALTER TABLE spip_groupes_mots CHANGE COLUMN 1comite comite char(3) NOT NULL");
-		sql_query("ALTER TABLE spip_groupes_mots CHANGE COLUMN 6forum forum char(3) NOT NULL");
-		maj_version(1.818);
-	}
-
-	// Options de syndication : miroir + oubli
-	if (upgrade_vers(1.819, $version_installee, $version_cible)) {
-		sql_query("ALTER TABLE spip_syndic ADD miroir VARCHAR(3) DEFAULT 'non'");
-		sql_query("ALTER TABLE spip_syndic ADD oubli VARCHAR(3) DEFAULT 'non'");
-		maj_version(1.819);
-	}
-
-	// Un bug dans les 1.730 (il manquait le "ADD")
-	if (upgrade_vers(1.820, $version_installee, $version_cible)) {
-		sql_query("ALTER TABLE spip_articles ADD INDEX idx (idx)");
-		sql_query("ALTER TABLE spip_auteurs ADD INDEX idx (idx)");
-		sql_query("ALTER TABLE spip_breves ADD INDEX idx (idx)");
-		sql_query("ALTER TABLE spip_mots ADD INDEX idx (idx)");
-		sql_query("ALTER TABLE spip_rubriques ADD INDEX idx (idx)");
-		sql_query("ALTER TABLE spip_syndic ADD INDEX idx (idx)");
-		sql_query("ALTER TABLE spip_forum ADD INDEX idx (idx)");
-		sql_query("ALTER TABLE spip_signatures ADD INDEX idx (idx)");
-		maj_version(1.820);
-	}
-
-	// reindexer les articles (on avait oublie les auteurs)
-	if (upgrade_vers(1.821, $version_installee, $version_cible)) {
-		sql_query("UPDATE spip_articles SET idx='1' WHERE idx='oui'");
-		maj_version(1.821);
-	}
-	// le 'type' des mots doit etre du texte, sinon on depasse en champ multi
-	if (upgrade_vers(1.822, $version_installee, $version_cible)) {
-		sql_query("ALTER TABLE spip_mots DROP INDEX type");
-		sql_query("ALTER TABLE spip_mots CHANGE type type TEXT NOT NULL");
-		maj_version(1.822);
-	}
-	// ajouter une table de fonctions pour ajax
-	if (upgrade_vers(1.825, $version_installee, $version_cible)) {
-		maj_version(1.825);
-	}
-	if (upgrade_vers(1.826, $version_installee, $version_cible)) {
-		sql_query("ALTER TABLE spip_ajax_fonc DROP fonction");
-		maj_version(1.826);
-	}
+    if (upgrade_vers(1.801, $version_installee, $version_cible)) {
+        sql_query("ALTER TABLE spip_rubriques	ADD statut_tmp VARCHAR(10) NOT NULL,	ADD date_tmp datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
+        include_spip('inc/rubriques');
+        calculer_rubriques();
+        maj_version(1.801);
+    }
+
+    // Nouvelles tables d'invalidation
+    if (upgrade_vers(1.802, $version_installee, $version_cible)) {
+        sql_query("DROP TABLE spip_id_article_caches");
+        sql_query("DROP TABLE spip_id_auteur_caches");
+        sql_query("DROP TABLE spip_id_breve_caches");
+        sql_query("DROP TABLE spip_id_document_caches");
+        sql_query("DROP TABLE spip_id_forum_caches");
+        sql_query("DROP TABLE spip_id_groupe_caches");
+        sql_query("DROP TABLE spip_id_message_caches");
+        sql_query("DROP TABLE spip_id_mot_caches");
+        sql_query("DROP TABLE spip_id_rubrique_caches");
+        sql_query("DROP TABLE spip_id_signature_caches");
+        sql_query("DROP TABLE spip_id_syndic_article_caches");
+        sql_query("DROP TABLE spip_id_syndic_caches");
+        sql_query("DROP TABLE spip_id_type_caches");
+        sql_query("DROP TABLE spip_inclure_caches");
+        maj_version(1.802);
+    }
+    if (upgrade_vers(1.803, $version_installee, $version_cible)) {
+
+        #	27 AOUT 2004 : conservons cette table pour autoriser les retours
+        #	de SPIP 1.8a6 CVS vers 1.7.2
+        #	sql_query("DROP TABLE spip_forum_cache");
+
+        sql_query("DROP TABLE spip_inclure_caches");
+        maj_version(1.803);
+    }
+    if (upgrade_vers(1.804, $version_installee, $version_cible)) {
+        // recreer la table spip_caches
+        sql_query("DROP TABLE spip_caches");
+        creer_base();
+        maj_version(1.804);
+    }
+
+    /**
+     * Recalculer tous les threads
+     *
+     * Fonction du plugin forum recopiee ici pour assurer la montee
+     * de version dans tous les cas de figure
+     **/
+    function maj_v018_calculer_threads() {
+        // fixer les id_thread des debuts de discussion
+        sql_update('spip_forum', array('id_thread' => 'id_forum'), "id_parent=0");
+        // reparer les messages qui n'ont pas l'id_secteur de leur parent
+        do {
+            $discussion = "0";
+            $precedent = 0;
+            $r = sql_select("fille.id_forum AS id,	maman.id_thread AS thread", 'spip_forum AS fille, spip_forum AS maman',
+                "fille.id_parent = maman.id_forum AND fille.id_thread <> maman.id_thread", '', "thread");
+            while ($row = sql_fetch($r)) {
+                if ($row['thread'] == $precedent) {
+                    $discussion .= "," . $row['id'];
+                } else {
+                    if ($precedent) {
+                        sql_updateq("spip_forum", array("id_thread" => $precedent), "id_forum IN ($discussion)");
+                    }
+                    $precedent = $row['thread'];
+                    $discussion = $row['id'];
+                }
+            }
+            sql_updateq("spip_forum", array("id_thread" => $precedent), "id_forum IN ($discussion)");
+        } while ($discussion != "0");
+    }
+
+    if (upgrade_vers(1.805, $version_installee, $version_cible)) {
+        sql_query("ALTER TABLE spip_forum ADD id_thread bigint(21) DEFAULT '0' NOT NULL");
+        maj_v018_calculer_threads();
+        maj_version(1.805);
+    }
+
+    // tables d'orthographe
+    #if ($version_installee < 1.806)
+    #	maj_version(1.806);
+
+    // URLs propres (inc_version = 0.12)
+    if (upgrade_vers(1.807, $version_installee, $version_cible)) {
+        foreach (array('articles', 'breves', 'rubriques', 'mots') as $objets) {
+            sql_query("ALTER TABLE spip_$objets ADD url_propre VARCHAR(255) NOT NULL");
+            sql_query("ALTER TABLE spip_$objets ADD INDEX url_propre (url_propre)");
+        }
+        maj_version(1.807);
+    }
+
+    // referers de la veille
+    if (upgrade_vers(1.808, $version_installee, $version_cible)) {
+        sql_query("ALTER TABLE spip_referers ADD visites_veille INT UNSIGNED NOT NULL");
+        maj_version(1.808);
+    }
+
+
+    // corrections diverses
+    if (upgrade_vers(1.809, $version_installee, $version_cible)) {
+        // plus de retour possible vers 1.7.2
+        sql_query("DROP TABLE spip_forum_cache");
+
+        // les requetes ci-dessous ne s'appliqueront que si on est passe
+        // par une certaine version de developpement - oublie de le faire
+        // plus tot, car le code d'alors recreait purement et simplement
+        // cette table
+        sql_query("ALTER TABLE spip_versions DROP chapo");
+        sql_query("ALTER TABLE spip_versions DROP texte");
+        sql_query("ALTER TABLE spip_versions DROP ps");
+        sql_query("ALTER TABLE spip_versions DROP extra");
+        sql_query("ALTER TABLE spip_versions ADD champs text NOT NULL");
+
+        maj_version(1.809);
+    }
+
+    // Annuler les brouillons de forum jamais valides
+    if (upgrade_vers(1.810, $version_installee, $version_cible)) {
+        sql_delete("spip_forum", "statut='redac'");
+        maj_version(1.810);
+    }
+
+    if (upgrade_vers(1.811, $version_installee, $version_cible)) {
+        sql_query("ALTER TABLE spip_syndic ADD extra longblob NULL");
+        maj_version(1.811);
+    }
+
+    if (upgrade_vers(1.812, $version_installee, $version_cible)) {
+        sql_query("ALTER TABLE spip_documents ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
+        maj_version(1.812);
+    }
+
+    // Mise a jour des types MIME
+    if (upgrade_vers(1.813, $version_installee, $version_cible)) {
+        # rien a faire car c'est creer_base() qui s'en charge
+        maj_version(1.813);
+    }
+
+    // URLs propres auteurs
+    if (upgrade_vers(1.814, $version_installee, $version_cible)) {
+        sql_query("ALTER TABLE spip_auteurs ADD url_propre VARCHAR(255) NOT NULL");
+        sql_query("ALTER TABLE spip_auteurs ADD INDEX url_propre (url_propre)");
+        maj_version(1.814);
+    }
+
+    // Mots-cles sur les documents
+    // + liens documents <-> sites et articles syndiques (podcasting)
+    if (upgrade_vers(1.815, $version_installee, $version_cible)) {
+        sql_query("ALTER TABLE spip_documents	ADD distant VARCHAR(3) DEFAULT 'non'");
+        maj_version(1.815);
+    }
+
+    // Indexation des documents (rien a faire sauf reinstaller inc_auxbase)
+    if (upgrade_vers(1.816, $version_installee, $version_cible)) {
+        maj_version(1.816);
+    }
+
+    // Texte et descriptif des groupes de mots-cles
+    if (upgrade_vers(1.817, $version_installee, $version_cible)) {
+        sql_query("ALTER TABLE spip_groupes_mots ADD descriptif text NOT NULL AFTER titre");
+        sql_query("ALTER TABLE spip_groupes_mots ADD COLUMN texte longblob NOT NULL AFTER descriptif");
+        maj_version(1.817);
+    }
+
+    // Conformite des noms de certains champs (0minirezo => minirezo)
+    if (upgrade_vers(1.818, $version_installee, $version_cible)) {
+        sql_query("ALTER TABLE spip_groupes_mots CHANGE COLUMN 0minirezo minirezo char(3) NOT NULL");
+        sql_query("ALTER TABLE spip_groupes_mots CHANGE COLUMN 1comite comite char(3) NOT NULL");
+        sql_query("ALTER TABLE spip_groupes_mots CHANGE COLUMN 6forum forum char(3) NOT NULL");
+        maj_version(1.818);
+    }
+
+    // Options de syndication : miroir + oubli
+    if (upgrade_vers(1.819, $version_installee, $version_cible)) {
+        sql_query("ALTER TABLE spip_syndic ADD miroir VARCHAR(3) DEFAULT 'non'");
+        sql_query("ALTER TABLE spip_syndic ADD oubli VARCHAR(3) DEFAULT 'non'");
+        maj_version(1.819);
+    }
+
+    // Un bug dans les 1.730 (il manquait le "ADD")
+    if (upgrade_vers(1.820, $version_installee, $version_cible)) {
+        sql_query("ALTER TABLE spip_articles ADD INDEX idx (idx)");
+        sql_query("ALTER TABLE spip_auteurs ADD INDEX idx (idx)");
+        sql_query("ALTER TABLE spip_breves ADD INDEX idx (idx)");
+        sql_query("ALTER TABLE spip_mots ADD INDEX idx (idx)");
+        sql_query("ALTER TABLE spip_rubriques ADD INDEX idx (idx)");
+        sql_query("ALTER TABLE spip_syndic ADD INDEX idx (idx)");
+        sql_query("ALTER TABLE spip_forum ADD INDEX idx (idx)");
+        sql_query("ALTER TABLE spip_signatures ADD INDEX idx (idx)");
+        maj_version(1.820);
+    }
+
+    // reindexer les articles (on avait oublie les auteurs)
+    if (upgrade_vers(1.821, $version_installee, $version_cible)) {
+        sql_query("UPDATE spip_articles SET idx='1' WHERE idx='oui'");
+        maj_version(1.821);
+    }
+    // le 'type' des mots doit etre du texte, sinon on depasse en champ multi
+    if (upgrade_vers(1.822, $version_installee, $version_cible)) {
+        sql_query("ALTER TABLE spip_mots DROP INDEX type");
+        sql_query("ALTER TABLE spip_mots CHANGE type type TEXT NOT NULL");
+        maj_version(1.822);
+    }
+    // ajouter une table de fonctions pour ajax
+    if (upgrade_vers(1.825, $version_installee, $version_cible)) {
+        maj_version(1.825);
+    }
+    if (upgrade_vers(1.826, $version_installee, $version_cible)) {
+        sql_query("ALTER TABLE spip_ajax_fonc DROP fonction");
+        maj_version(1.826);
+    }
 }

ecrire/maj/v017.php

Indentation +174 added lines, -174 removed lines

@@ -16,7 +16,7 @@ 
  * @package SPIP\Core\SQL\Upgrade
  **/
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 /**
@@ -26,177 +26,177 @@ 
  * @param float $version_cible Version de destination
  **/
 function maj_v017_dist($version_installee, $version_cible) {
-	if (upgrade_vers(1.702, $version_installee, $version_cible)) {
-		sql_query("ALTER TABLE spip_articles ADD extra longblob NULL");
-		sql_query("ALTER TABLE spip_auteurs ADD extra longblob NULL");
-		sql_query("ALTER TABLE spip_breves ADD extra longblob NULL");
-		sql_query("ALTER TABLE spip_rubriques ADD extra longblob NULL");
-		sql_query("ALTER TABLE spip_mots ADD extra longblob NULL");
-
-		// recuperer les eventuels 'supplement' installes en 1.701
-		if ($version_installee == 1.701) {
-			sql_query("UPDATE spip_articles SET extra = supplement");
-			sql_query("ALTER TABLE spip_articles DROP supplement");
-			sql_query("UPDATE spip_auteurs SET extra = supplement");
-			sql_query("ALTER TABLE spip_auteurs DROP supplement");
-			sql_query("UPDATE spip_breves SET extra = supplement");
-			sql_query("ALTER TABLE spip_breves DROP supplement");
-			sql_query("UPDATE spip_rubriques SET extra = supplement");
-			sql_query("ALTER TABLE spip_rubriques DROP supplement");
-			sql_query("UPDATE spip_mots SET extra = supplement");
-			sql_query("ALTER TABLE spip_mots DROP supplement");
-		}
-
-		$u = sql_query("SELECT extra FROM spip_articles");
-		$u &= sql_query("SELECT extra FROM spip_auteurs");
-		$u &= sql_query("SELECT extra FROM spip_breves");
-		$u &= sql_query("SELECT extra FROM spip_rubriques");
-		$u &= sql_query("SELECT extra FROM spip_mots");
-		maj_version(1.702, $u);
-	}
-
-	if (upgrade_vers(1.703, $version_installee, $version_cible)) {
-		sql_query("ALTER TABLE spip_articles ADD lang VARCHAR(10) DEFAULT '' NOT NULL");
-		sql_query("ALTER TABLE spip_rubriques ADD lang VARCHAR(10) DEFAULT '' NOT NULL");
-		maj_version(1.703);
-	}
-
-	if (upgrade_vers(1.704, $version_installee, $version_cible)) {
-		sql_query("ALTER TABLE spip_articles ADD INDEX lang (lang)");
-		sql_query("ALTER TABLE spip_auteurs ADD INDEX lang (lang)");
-		sql_query("ALTER TABLE spip_rubriques ADD INDEX lang (lang)");
-		maj_version(1.704);
-	}
-
-	if (upgrade_vers(1.705, $version_installee, $version_cible)) {
-		sql_query("ALTER TABLE spip_articles ADD langue_choisie VARCHAR(3) DEFAULT 'non'");
-		sql_query("ALTER TABLE spip_rubriques ADD langue_choisie VARCHAR(3) DEFAULT 'non'");
-		maj_version(1.705);
-	}
-
-	if (upgrade_vers(1.707, $version_installee, $version_cible)) {
-		sql_query("UPDATE spip_articles SET langue_choisie='oui' WHERE MID(lang,1,1) != '.' AND lang != ''");
-		sql_query("UPDATE spip_articles SET lang=MID(lang,2,8) WHERE langue_choisie = 'non'");
-		sql_query("UPDATE spip_rubriques SET langue_choisie='oui' WHERE MID(lang,1,1) != '.' AND lang != ''");
-		sql_query("UPDATE spip_rubriques SET lang=MID(lang,2,8) WHERE langue_choisie = 'non'");
-		maj_version(1.707);
-	}
-
-	if (upgrade_vers(1.708, $version_installee, $version_cible)) {
-		sql_query("ALTER TABLE spip_breves ADD lang VARCHAR(10) DEFAULT '' NOT NULL");
-		sql_query("ALTER TABLE spip_breves ADD langue_choisie VARCHAR(3) DEFAULT 'non'");
-		maj_version(1.708);
-	}
-
-	if (upgrade_vers(1.709, $version_installee, $version_cible)) {
-		sql_query("ALTER TABLE spip_articles ADD id_trad bigint(21) DEFAULT '0' NOT NULL");
-		sql_query("ALTER TABLE spip_articles ADD INDEX id_trad (id_trad)");
-		maj_version(1.709);
-	}
-
-	if (upgrade_vers(1.717, $version_installee, $version_cible)) {
-		sql_query("ALTER TABLE spip_articles ADD INDEX date_modif (date_modif)");
-		maj_version(1.717);
-	}
-
-	if (upgrade_vers(1.718, $version_installee, $version_cible)) {
-		sql_query("ALTER TABLE spip_referers DROP domaine");
-		sql_query("ALTER TABLE spip_referers_articles DROP domaine");
-		sql_query("ALTER TABLE spip_referers_temp DROP domaine");
-		maj_version(1.718);
-	}
-
-	if (upgrade_vers(1.722, $version_installee, $version_cible)) {
-		sql_query("ALTER TABLE spip_articles ADD nom_site tinytext NOT NULL");
-		sql_query("ALTER TABLE spip_articles ADD url_site VARCHAR(255) NOT NULL");
-		sql_query("ALTER TABLE spip_articles ADD INDEX url_site (url_site)");
-		if ($version_installee >= 1.720) {
-			sql_query("UPDATE spip_articles SET url_site=url_ref");
-			sql_query("ALTER TABLE spip_articles DROP INDEX url_ref");
-			sql_query("ALTER TABLE spip_articles DROP url_ref");
-		}
-		maj_version(1.722);
-	}
-
-	if (upgrade_vers(1.723, $version_installee, $version_cible)) {
-		if ($version_installee == 1.722) {
-			sql_query("ALTER TABLE spip_articles MODIFY url_site VARCHAR(255) NOT NULL");
-			sql_query("ALTER TABLE spip_articles DROP INDEX url_site;");
-			sql_query("ALTER TABLE spip_articles ADD INDEX url_site (url_site);");
-		}
-		maj_version(1.723);
-	}
-
-	if (upgrade_vers(1.724, $version_installee, $version_cible)) {
-		sql_query("ALTER TABLE spip_messages ADD date_fin datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
-		maj_version(1.724);
-	}
-
-	if (upgrade_vers(1.726, $version_installee, $version_cible)) {
-		sql_query("ALTER TABLE spip_auteurs ADD low_sec tinytext NOT NULL");
-		maj_version(1.726);
-	}
-
-	if (upgrade_vers(1.727, $version_installee, $version_cible)) {
-		// occitans : oci_xx -> oc_xx
-		sql_query("UPDATE spip_auteurs SET lang=REPLACE(lang,'oci_', 'oc_') WHERE lang LIKE 'oci_%'");
-		sql_query("UPDATE spip_rubriques SET lang=REPLACE(lang,'oci_', 'oc_') WHERE lang LIKE 'oci_%'");
-		sql_query("UPDATE spip_articles SET lang=REPLACE(lang,'oci_', 'oc_') WHERE lang LIKE 'oci_%'");
-		sql_query("UPDATE spip_breves SET lang=REPLACE(lang,'oci_', 'oc_') WHERE lang LIKE 'oci_%'");
-		maj_version(1.727);
-	}
-
-	// Ici version 1.7 officielle
-	if (upgrade_vers(1.728, $version_installee, $version_cible)) {
-		sql_query("ALTER TABLE spip_articles ADD id_version int unsigned DEFAULT '0' NOT NULL");
-		maj_version(1.728);
-	}
-
-	if (upgrade_vers(1.730, $version_installee, $version_cible)) {
-		sql_query("ALTER TABLE spip_articles ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
-		sql_query("ALTER TABLE spip_articles ADD INDEX idx (idx)");
-		sql_query("ALTER TABLE spip_auteurs ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
-		sql_query("ALTER TABLE spip_auteurs ADD INDEX idx (idx)");
-		sql_query("ALTER TABLE spip_breves ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
-		sql_query("ALTER TABLE spip_breves ADD INDEX idx (idx)");
-		sql_query("ALTER TABLE spip_mots ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
-		sql_query("ALTER TABLE spip_mots ADD INDEX idx (idx)");
-		sql_query("ALTER TABLE spip_rubriques ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
-		sql_query("ALTER TABLE spip_rubriques ADD INDEX idx (idx)");
-		sql_query("ALTER TABLE spip_syndic ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
-		sql_query("ALTER TABLE spip_syndic ADD INDEX idx (idx)");
-		sql_query("ALTER TABLE spip_forum ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
-		sql_query("ALTER TABLE spip_forum ADD INDEX idx (idx)");
-		sql_query("ALTER TABLE spip_signatures ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
-		sql_query("ALTER TABLE spip_signatures ADD INDEX idx (idx)");
-		maj_version(1.730);
-	}
-
-	if (upgrade_vers(1.731, $version_installee, $version_cible)) {
-		sql_query("UPDATE spip_articles SET idx='1' where lang IN ('de','vi')");
-		sql_query("UPDATE spip_rubriques SET idx='1' where lang IN ('de','vi')");
-		sql_query("UPDATE spip_breves SET idx='1' where lang IN ('de','vi')");
-		sql_query("UPDATE spip_auteurs SET idx='1' where lang IN ('de','vi')");
-		maj_version(1.731);
-	}
-
-	if (upgrade_vers(1.732, $version_installee,
-		$version_cible)) { // en correction d'un vieux truc qui avait fait sauter le champ inclus sur les bases version 1.415
-		sql_query("ALTER TABLE spip_documents ADD inclus  VARCHAR(3) DEFAULT 'non'");
-		maj_version(1.732);
-	}
-
-	if (upgrade_vers(1.733, $version_installee, $version_cible)) {
-		// sql_query("ALTER TABLE spip_articles ADD id_version int unsigned DEFAULT '0' NOT NULL");
-		sql_query("DROP TABLE spip_versions");
-		sql_query("DROP TABLE spip_versions_fragments");
-		creer_base();
-		maj_version(1.733);
-	}
-
-	#if ($version_installee < 1.734) {
-	#	// integrer nouvelles tables auxiliaires du compilateur ESJ
-	#	creer_base();
-	#	maj_version(1.734);
-	#}
+    if (upgrade_vers(1.702, $version_installee, $version_cible)) {
+        sql_query("ALTER TABLE spip_articles ADD extra longblob NULL");
+        sql_query("ALTER TABLE spip_auteurs ADD extra longblob NULL");
+        sql_query("ALTER TABLE spip_breves ADD extra longblob NULL");
+        sql_query("ALTER TABLE spip_rubriques ADD extra longblob NULL");
+        sql_query("ALTER TABLE spip_mots ADD extra longblob NULL");
+
+        // recuperer les eventuels 'supplement' installes en 1.701
+        if ($version_installee == 1.701) {
+            sql_query("UPDATE spip_articles SET extra = supplement");
+            sql_query("ALTER TABLE spip_articles DROP supplement");
+            sql_query("UPDATE spip_auteurs SET extra = supplement");
+            sql_query("ALTER TABLE spip_auteurs DROP supplement");
+            sql_query("UPDATE spip_breves SET extra = supplement");
+            sql_query("ALTER TABLE spip_breves DROP supplement");
+            sql_query("UPDATE spip_rubriques SET extra = supplement");
+            sql_query("ALTER TABLE spip_rubriques DROP supplement");
+            sql_query("UPDATE spip_mots SET extra = supplement");
+            sql_query("ALTER TABLE spip_mots DROP supplement");
+        }
+
+        $u = sql_query("SELECT extra FROM spip_articles");
+        $u &= sql_query("SELECT extra FROM spip_auteurs");
+        $u &= sql_query("SELECT extra FROM spip_breves");
+        $u &= sql_query("SELECT extra FROM spip_rubriques");
+        $u &= sql_query("SELECT extra FROM spip_mots");
+        maj_version(1.702, $u);
+    }
+
+    if (upgrade_vers(1.703, $version_installee, $version_cible)) {
+        sql_query("ALTER TABLE spip_articles ADD lang VARCHAR(10) DEFAULT '' NOT NULL");
+        sql_query("ALTER TABLE spip_rubriques ADD lang VARCHAR(10) DEFAULT '' NOT NULL");
+        maj_version(1.703);
+    }
+
+    if (upgrade_vers(1.704, $version_installee, $version_cible)) {
+        sql_query("ALTER TABLE spip_articles ADD INDEX lang (lang)");
+        sql_query("ALTER TABLE spip_auteurs ADD INDEX lang (lang)");
+        sql_query("ALTER TABLE spip_rubriques ADD INDEX lang (lang)");
+        maj_version(1.704);
+    }
+
+    if (upgrade_vers(1.705, $version_installee, $version_cible)) {
+        sql_query("ALTER TABLE spip_articles ADD langue_choisie VARCHAR(3) DEFAULT 'non'");
+        sql_query("ALTER TABLE spip_rubriques ADD langue_choisie VARCHAR(3) DEFAULT 'non'");
+        maj_version(1.705);
+    }
+
+    if (upgrade_vers(1.707, $version_installee, $version_cible)) {
+        sql_query("UPDATE spip_articles SET langue_choisie='oui' WHERE MID(lang,1,1) != '.' AND lang != ''");
+        sql_query("UPDATE spip_articles SET lang=MID(lang,2,8) WHERE langue_choisie = 'non'");
+        sql_query("UPDATE spip_rubriques SET langue_choisie='oui' WHERE MID(lang,1,1) != '.' AND lang != ''");
+        sql_query("UPDATE spip_rubriques SET lang=MID(lang,2,8) WHERE langue_choisie = 'non'");
+        maj_version(1.707);
+    }
+
+    if (upgrade_vers(1.708, $version_installee, $version_cible)) {
+        sql_query("ALTER TABLE spip_breves ADD lang VARCHAR(10) DEFAULT '' NOT NULL");
+        sql_query("ALTER TABLE spip_breves ADD langue_choisie VARCHAR(3) DEFAULT 'non'");
+        maj_version(1.708);
+    }
+
+    if (upgrade_vers(1.709, $version_installee, $version_cible)) {
+        sql_query("ALTER TABLE spip_articles ADD id_trad bigint(21) DEFAULT '0' NOT NULL");
+        sql_query("ALTER TABLE spip_articles ADD INDEX id_trad (id_trad)");
+        maj_version(1.709);
+    }
+
+    if (upgrade_vers(1.717, $version_installee, $version_cible)) {
+        sql_query("ALTER TABLE spip_articles ADD INDEX date_modif (date_modif)");
+        maj_version(1.717);
+    }
+
+    if (upgrade_vers(1.718, $version_installee, $version_cible)) {
+        sql_query("ALTER TABLE spip_referers DROP domaine");
+        sql_query("ALTER TABLE spip_referers_articles DROP domaine");
+        sql_query("ALTER TABLE spip_referers_temp DROP domaine");
+        maj_version(1.718);
+    }
+
+    if (upgrade_vers(1.722, $version_installee, $version_cible)) {
+        sql_query("ALTER TABLE spip_articles ADD nom_site tinytext NOT NULL");
+        sql_query("ALTER TABLE spip_articles ADD url_site VARCHAR(255) NOT NULL");
+        sql_query("ALTER TABLE spip_articles ADD INDEX url_site (url_site)");
+        if ($version_installee >= 1.720) {
+            sql_query("UPDATE spip_articles SET url_site=url_ref");
+            sql_query("ALTER TABLE spip_articles DROP INDEX url_ref");
+            sql_query("ALTER TABLE spip_articles DROP url_ref");
+        }
+        maj_version(1.722);
+    }
+
+    if (upgrade_vers(1.723, $version_installee, $version_cible)) {
+        if ($version_installee == 1.722) {
+            sql_query("ALTER TABLE spip_articles MODIFY url_site VARCHAR(255) NOT NULL");
+            sql_query("ALTER TABLE spip_articles DROP INDEX url_site;");
+            sql_query("ALTER TABLE spip_articles ADD INDEX url_site (url_site);");
+        }
+        maj_version(1.723);
+    }
+
+    if (upgrade_vers(1.724, $version_installee, $version_cible)) {
+        sql_query("ALTER TABLE spip_messages ADD date_fin datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
+        maj_version(1.724);
+    }
+
+    if (upgrade_vers(1.726, $version_installee, $version_cible)) {
+        sql_query("ALTER TABLE spip_auteurs ADD low_sec tinytext NOT NULL");
+        maj_version(1.726);
+    }
+
+    if (upgrade_vers(1.727, $version_installee, $version_cible)) {
+        // occitans : oci_xx -> oc_xx
+        sql_query("UPDATE spip_auteurs SET lang=REPLACE(lang,'oci_', 'oc_') WHERE lang LIKE 'oci_%'");
+        sql_query("UPDATE spip_rubriques SET lang=REPLACE(lang,'oci_', 'oc_') WHERE lang LIKE 'oci_%'");
+        sql_query("UPDATE spip_articles SET lang=REPLACE(lang,'oci_', 'oc_') WHERE lang LIKE 'oci_%'");
+        sql_query("UPDATE spip_breves SET lang=REPLACE(lang,'oci_', 'oc_') WHERE lang LIKE 'oci_%'");
+        maj_version(1.727);
+    }
+
+    // Ici version 1.7 officielle
+    if (upgrade_vers(1.728, $version_installee, $version_cible)) {
+        sql_query("ALTER TABLE spip_articles ADD id_version int unsigned DEFAULT '0' NOT NULL");
+        maj_version(1.728);
+    }
+
+    if (upgrade_vers(1.730, $version_installee, $version_cible)) {
+        sql_query("ALTER TABLE spip_articles ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
+        sql_query("ALTER TABLE spip_articles ADD INDEX idx (idx)");
+        sql_query("ALTER TABLE spip_auteurs ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
+        sql_query("ALTER TABLE spip_auteurs ADD INDEX idx (idx)");
+        sql_query("ALTER TABLE spip_breves ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
+        sql_query("ALTER TABLE spip_breves ADD INDEX idx (idx)");
+        sql_query("ALTER TABLE spip_mots ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
+        sql_query("ALTER TABLE spip_mots ADD INDEX idx (idx)");
+        sql_query("ALTER TABLE spip_rubriques ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
+        sql_query("ALTER TABLE spip_rubriques ADD INDEX idx (idx)");
+        sql_query("ALTER TABLE spip_syndic ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
+        sql_query("ALTER TABLE spip_syndic ADD INDEX idx (idx)");
+        sql_query("ALTER TABLE spip_forum ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
+        sql_query("ALTER TABLE spip_forum ADD INDEX idx (idx)");
+        sql_query("ALTER TABLE spip_signatures ADD idx ENUM('', '1', 'non', 'oui', 'idx') DEFAULT '' NOT NULL");
+        sql_query("ALTER TABLE spip_signatures ADD INDEX idx (idx)");
+        maj_version(1.730);
+    }
+
+    if (upgrade_vers(1.731, $version_installee, $version_cible)) {
+        sql_query("UPDATE spip_articles SET idx='1' where lang IN ('de','vi')");
+        sql_query("UPDATE spip_rubriques SET idx='1' where lang IN ('de','vi')");
+        sql_query("UPDATE spip_breves SET idx='1' where lang IN ('de','vi')");
+        sql_query("UPDATE spip_auteurs SET idx='1' where lang IN ('de','vi')");
+        maj_version(1.731);
+    }
+
+    if (upgrade_vers(1.732, $version_installee,
+        $version_cible)) { // en correction d'un vieux truc qui avait fait sauter le champ inclus sur les bases version 1.415
+        sql_query("ALTER TABLE spip_documents ADD inclus  VARCHAR(3) DEFAULT 'non'");
+        maj_version(1.732);
+    }
+
+    if (upgrade_vers(1.733, $version_installee, $version_cible)) {
+        // sql_query("ALTER TABLE spip_articles ADD id_version int unsigned DEFAULT '0' NOT NULL");
+        sql_query("DROP TABLE spip_versions");
+        sql_query("DROP TABLE spip_versions_fragments");
+        creer_base();
+        maj_version(1.733);
+    }
+
+    #if ($version_installee < 1.734) {
+    #	// integrer nouvelles tables auxiliaires du compilateur ESJ
+    #	creer_base();
+    #	maj_version(1.734);
+    #}
 }

ecrire/maj/v019_pre193.php

Indentation +262 added lines, -262 removed lines

@@ -16,7 +16,7 @@ 
  * @package SPIP\Core\SQL\Upgrade
  **/
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 /**
@@ -26,61 +26,61 @@ 
  * @param float $version_cible Version de destination
  **/
 function v019_pre193($version_installee, $version_cible) {
-	// Syndication : ajout de l'option resume=oui/non et de la langue
-	if (upgrade_vers(1.901, $version_installee, $version_cible)) {
-		sql_query("ALTER TABLE spip_syndic ADD `resume` VARCHAR(3) DEFAULT 'oui'");
-		sql_query("ALTER TABLE spip_syndic_articles ADD `lang` VARCHAR(10) DEFAULT '' NOT NULL");
-		maj_version(1.901);
-	}
+    // Syndication : ajout de l'option resume=oui/non et de la langue
+    if (upgrade_vers(1.901, $version_installee, $version_cible)) {
+        sql_query("ALTER TABLE spip_syndic ADD `resume` VARCHAR(3) DEFAULT 'oui'");
+        sql_query("ALTER TABLE spip_syndic_articles ADD `lang` VARCHAR(10) DEFAULT '' NOT NULL");
+        maj_version(1.901);
+    }
 
-	// Syndication : ajout de source, url_source, tags
-	if (upgrade_vers(1.902, $version_installee, $version_cible)) {
-		sql_query("ALTER TABLE spip_syndic_articles ADD `url_source` TINYTEXT DEFAULT '' NOT NULL");
-		sql_query("ALTER TABLE spip_syndic_articles ADD `source` TINYTEXT DEFAULT '' NOT NULL");
-		sql_query("ALTER TABLE spip_syndic_articles ADD `tags` TEXT DEFAULT '' NOT NULL");
-		maj_version(1.902);
-	}
+    // Syndication : ajout de source, url_source, tags
+    if (upgrade_vers(1.902, $version_installee, $version_cible)) {
+        sql_query("ALTER TABLE spip_syndic_articles ADD `url_source` TINYTEXT DEFAULT '' NOT NULL");
+        sql_query("ALTER TABLE spip_syndic_articles ADD `source` TINYTEXT DEFAULT '' NOT NULL");
+        sql_query("ALTER TABLE spip_syndic_articles ADD `tags` TEXT DEFAULT '' NOT NULL");
+        maj_version(1.902);
+    }
 
-	// URLs propres des sites (sait-on jamais)
-	// + oubli des KEY url_propre sur les auteurs si installation neuve
-	if (upgrade_vers(1.903, $version_installee, $version_cible)) {
-		sql_query("ALTER TABLE spip_syndic ADD `url_propre` VARCHAR(255) NOT NULL");
-		sql_query("ALTER TABLE spip_syndic ADD INDEX `url_propre` (`url_propre`)");
-		sql_query("ALTER TABLE spip_auteurs ADD INDEX `url_propre` (`url_propre`)");
-		maj_version(1.903);
-	}
+    // URLs propres des sites (sait-on jamais)
+    // + oubli des KEY url_propre sur les auteurs si installation neuve
+    if (upgrade_vers(1.903, $version_installee, $version_cible)) {
+        sql_query("ALTER TABLE spip_syndic ADD `url_propre` VARCHAR(255) NOT NULL");
+        sql_query("ALTER TABLE spip_syndic ADD INDEX `url_propre` (`url_propre`)");
+        sql_query("ALTER TABLE spip_auteurs ADD INDEX `url_propre` (`url_propre`)");
+        maj_version(1.903);
+    }
 
-	// suppression des anciennes tables temporaires des visites
-	// (maintenant stockees sous forme de fichiers)
-	if (upgrade_vers(1.904, $version_installee, $version_cible)) {
-		sql_query("DROP TABLE IF EXISTS spip_visites_temp");
-		sql_query("DROP TABLE IF EXISTS spip_referers_temp");
-		maj_version(1.904);
-	}
+    // suppression des anciennes tables temporaires des visites
+    // (maintenant stockees sous forme de fichiers)
+    if (upgrade_vers(1.904, $version_installee, $version_cible)) {
+        sql_query("DROP TABLE IF EXISTS spip_visites_temp");
+        sql_query("DROP TABLE IF EXISTS spip_referers_temp");
+        maj_version(1.904);
+    }
 
-	// fusion des 10 tables index en une seule
-	// pour fonctions futures evoluees du moteur de recherche
-	if (upgrade_vers(1.905, $version_installee, $version_cible)) {
-		// agrandir le champ "valeur" de spip_meta pour pouvoir y stocker
-		// des choses plus sympa
-		sql_query("ALTER TABLE spip_meta DROP INDEX `valeur`");
-		sql_query("ALTER TABLE spip_meta CHANGE `valeur` `valeur` TEXT");
-		// table des correspondances table->id_table
-		$liste_tables = array();
-		$liste_tables[1] = 'spip_articles';
-		$liste_tables[2] = 'spip_auteurs';
-		$liste_tables[3] = 'spip_breves';
-		$liste_tables[4] = 'spip_documents';
-		$liste_tables[5] = 'spip_forum';
-		$liste_tables[6] = 'spip_mots';
-		$liste_tables[7] = 'spip_rubriques';
-		$liste_tables[8] = 'spip_signatures';
-		$liste_tables[9] = 'spip_syndic';
+    // fusion des 10 tables index en une seule
+    // pour fonctions futures evoluees du moteur de recherche
+    if (upgrade_vers(1.905, $version_installee, $version_cible)) {
+        // agrandir le champ "valeur" de spip_meta pour pouvoir y stocker
+        // des choses plus sympa
+        sql_query("ALTER TABLE spip_meta DROP INDEX `valeur`");
+        sql_query("ALTER TABLE spip_meta CHANGE `valeur` `valeur` TEXT");
+        // table des correspondances table->id_table
+        $liste_tables = array();
+        $liste_tables[1] = 'spip_articles';
+        $liste_tables[2] = 'spip_auteurs';
+        $liste_tables[3] = 'spip_breves';
+        $liste_tables[4] = 'spip_documents';
+        $liste_tables[5] = 'spip_forum';
+        $liste_tables[6] = 'spip_mots';
+        $liste_tables[7] = 'spip_rubriques';
+        $liste_tables[8] = 'spip_signatures';
+        $liste_tables[9] = 'spip_syndic';
 
-		ecrire_meta('index_table', serialize($liste_tables));
+        ecrire_meta('index_table', serialize($liste_tables));
 
 ## devenu inutile car suppression totale de l'indexation
-		/*
+        /*
 				sql_query("INSERT INTO spip_index (`hash`,`points`,`id_objet`,`id_table`) SELECT `hash`,`points`,`id_article` as id_objet,'1' as id_table FROM spip_index_articles");
 				sql_query("DROP TABLE IF EXISTS spip_index_articles");
 
@@ -108,234 +108,234 @@ 
 				sql_query("INSERT INTO spip_index (`hash`,`points`,`id_objet`,`id_table`) SELECT `hash`,`points`,`id_syndic` as id_objet,'9' as `id_table FROM spip_index_syndic");
 				sql_query("DROP TABLE IF EXISTS spip_index_syndic");
 		*/
-		maj_version(1.905);
-	}
+        maj_version(1.905);
+    }
 
 
-	// cette table est desormais geree par le plugin "podcast_client", on la
-	// supprime si le plugin n'est pas active ; risque inherent a l'utilisation
-	// de versions alpha :-)
-	if (upgrade_vers(1.906, $version_installee, $version_cible)) {
-		if (!@in_array('podcast_client', $GLOBALS['plugins'])) {
-			sql_query("DROP TABLE spip_documents_syndic");
-		}
-		maj_version(1.906);
-	}
-	if (upgrade_vers(1.907, $version_installee, $version_cible)) {
-		sql_query("ALTER TABLE spip_forum ADD INDEX `idx` (`idx`)");
-		maj_version(1.907);
-	}
-	// Oups ! on stockait les tags de syndication sous la forme rel="category"
-	// au lieu de rel="directory" - http://microformats.org/wiki/rel-directory
-	if (upgrade_vers(1.908, $version_installee, $version_cible)) {
-		sql_query("UPDATE spip_syndic_articles SET `tags` = REPLACE(`tags`, 'rel=\"category\">', 'rel=\"directory\">') WHERE `tags` like '%category%'");
-		maj_version(1.908);
-	}
-	if (upgrade_vers(1.909, $version_installee, $version_cible)) {
-		sql_query("ALTER IGNORE TABLE spip_mots_articles ADD PRIMARY KEY (`id_article`, `id_mot`)");
-		sql_query("ALTER IGNORE TABLE spip_mots_breves ADD PRIMARY KEY (`id_breve`, `id_mot`)");
-		sql_query("ALTER IGNORE TABLE spip_mots_rubriques ADD PRIMARY KEY (`id_rubrique`, `id_mot`)");
-		sql_query("ALTER IGNORE TABLE spip_mots_syndic ADD PRIMARY KEY (`id_syndic`, `id_mot`)");
-		sql_query("ALTER IGNORE TABLE spip_mots_documents ADD PRIMARY KEY (`id_document`, `id_mot`)");
-		sql_query("ALTER IGNORE TABLE spip_mots_forum ADD PRIMARY KEY (`id_forum`, `id_mot`)");
-		maj_version(1.909);
-	}
+    // cette table est desormais geree par le plugin "podcast_client", on la
+    // supprime si le plugin n'est pas active ; risque inherent a l'utilisation
+    // de versions alpha :-)
+    if (upgrade_vers(1.906, $version_installee, $version_cible)) {
+        if (!@in_array('podcast_client', $GLOBALS['plugins'])) {
+            sql_query("DROP TABLE spip_documents_syndic");
+        }
+        maj_version(1.906);
+    }
+    if (upgrade_vers(1.907, $version_installee, $version_cible)) {
+        sql_query("ALTER TABLE spip_forum ADD INDEX `idx` (`idx`)");
+        maj_version(1.907);
+    }
+    // Oups ! on stockait les tags de syndication sous la forme rel="category"
+    // au lieu de rel="directory" - http://microformats.org/wiki/rel-directory
+    if (upgrade_vers(1.908, $version_installee, $version_cible)) {
+        sql_query("UPDATE spip_syndic_articles SET `tags` = REPLACE(`tags`, 'rel=\"category\">', 'rel=\"directory\">') WHERE `tags` like '%category%'");
+        maj_version(1.908);
+    }
+    if (upgrade_vers(1.909, $version_installee, $version_cible)) {
+        sql_query("ALTER IGNORE TABLE spip_mots_articles ADD PRIMARY KEY (`id_article`, `id_mot`)");
+        sql_query("ALTER IGNORE TABLE spip_mots_breves ADD PRIMARY KEY (`id_breve`, `id_mot`)");
+        sql_query("ALTER IGNORE TABLE spip_mots_rubriques ADD PRIMARY KEY (`id_rubrique`, `id_mot`)");
+        sql_query("ALTER IGNORE TABLE spip_mots_syndic ADD PRIMARY KEY (`id_syndic`, `id_mot`)");
+        sql_query("ALTER IGNORE TABLE spip_mots_documents ADD PRIMARY KEY (`id_document`, `id_mot`)");
+        sql_query("ALTER IGNORE TABLE spip_mots_forum ADD PRIMARY KEY (`id_forum`, `id_mot`)");
+        maj_version(1.909);
+    }
 
-	if (upgrade_vers(1.910, $version_installee, $version_cible)) {
-		sql_query("ALTER IGNORE TABLE spip_auteurs_articles ADD PRIMARY KEY (`id_auteur`, `id_article`)");
-		sql_query("ALTER IGNORE TABLE spip_auteurs_rubriques ADD PRIMARY KEY (`id_auteur`, `id_rubrique`)");
-		sql_query("ALTER IGNORE TABLE spip_auteurs_messages ADD PRIMARY KEY (`id_auteur`, `id_message`)");
-		maj_version(1.910);
-	}
+    if (upgrade_vers(1.910, $version_installee, $version_cible)) {
+        sql_query("ALTER IGNORE TABLE spip_auteurs_articles ADD PRIMARY KEY (`id_auteur`, `id_article`)");
+        sql_query("ALTER IGNORE TABLE spip_auteurs_rubriques ADD PRIMARY KEY (`id_auteur`, `id_rubrique`)");
+        sql_query("ALTER IGNORE TABLE spip_auteurs_messages ADD PRIMARY KEY (`id_auteur`, `id_message`)");
+        maj_version(1.910);
+    }
 
-	if (upgrade_vers(1.911, $version_installee, $version_cible)) {
+    if (upgrade_vers(1.911, $version_installee, $version_cible)) {
 
-		sql_query("ALTER IGNORE TABLE spip_auteurs_articles DROP INDEX `id_auteur`");
-		sql_query("ALTER IGNORE TABLE spip_auteurs_rubriques DROP INDEX `id_auteur`");
-		sql_query("ALTER IGNORE TABLE spip_auteurs_messages DROP INDEX `id_auteur`");
-		sql_query("ALTER IGNORE TABLE spip_mots_articles DROP INDEX `id_article`");
-		sql_query("ALTER IGNORE TABLE spip_mots_breves DROP INDEX `id_breve`");
-		sql_query("ALTER IGNORE TABLE spip_mots_rubriques DROP INDEX `id_rubrique`");
-		sql_query("ALTER IGNORE TABLE spip_mots_syndic DROP INDEX `id_syndic`");
-		sql_query("ALTER IGNORE TABLE spip_mots_forum DROP INDEX `id_forum`");
-		sql_query("ALTER IGNORE TABLE spip_mots_documents DROP INDEX `id_document`");
+        sql_query("ALTER IGNORE TABLE spip_auteurs_articles DROP INDEX `id_auteur`");
+        sql_query("ALTER IGNORE TABLE spip_auteurs_rubriques DROP INDEX `id_auteur`");
+        sql_query("ALTER IGNORE TABLE spip_auteurs_messages DROP INDEX `id_auteur`");
+        sql_query("ALTER IGNORE TABLE spip_mots_articles DROP INDEX `id_article`");
+        sql_query("ALTER IGNORE TABLE spip_mots_breves DROP INDEX `id_breve`");
+        sql_query("ALTER IGNORE TABLE spip_mots_rubriques DROP INDEX `id_rubrique`");
+        sql_query("ALTER IGNORE TABLE spip_mots_syndic DROP INDEX `id_syndic`");
+        sql_query("ALTER IGNORE TABLE spip_mots_forum DROP INDEX `id_forum`");
+        sql_query("ALTER IGNORE TABLE spip_mots_documents DROP INDEX `id_document`");
 # 18 juillet 2007: table depreciee
 #		sql_query("ALTER IGNORE TABLE spip_caches DROP	INDEX fichier");
-		maj_version(1.911);
-	}
+        maj_version(1.911);
+    }
 
-	// Le logo du site n'est plus le logo par defaut des rubriques
-	// mais pour assurer la compatibilite ascendante, on le duplique
-	if (upgrade_vers(1.912, $version_installee, $version_cible)) {
-		@copy(_DIR_LOGOS . 'rubon0.gif', _DIR_LOGOS . 'siteon0.gif');
-		@copy(_DIR_LOGOS . 'ruboff0.gif', _DIR_LOGOS . 'siteoff0.gif');
-		@copy(_DIR_LOGOS . 'rubon0.jpg', _DIR_LOGOS . 'siteon0.jpg');
-		@copy(_DIR_LOGOS . 'ruboff0.jpg', _DIR_LOGOS . 'siteoff0.jpg');
-		@copy(_DIR_LOGOS . 'rubon0.png', _DIR_LOGOS . 'siteon0.png');
-		@copy(_DIR_LOGOS . 'ruboff0.png', _DIR_LOGOS . 'siteoff0.png');
-		maj_version(1.912);
-	}
+    // Le logo du site n'est plus le logo par defaut des rubriques
+    // mais pour assurer la compatibilite ascendante, on le duplique
+    if (upgrade_vers(1.912, $version_installee, $version_cible)) {
+        @copy(_DIR_LOGOS . 'rubon0.gif', _DIR_LOGOS . 'siteon0.gif');
+        @copy(_DIR_LOGOS . 'ruboff0.gif', _DIR_LOGOS . 'siteoff0.gif');
+        @copy(_DIR_LOGOS . 'rubon0.jpg', _DIR_LOGOS . 'siteon0.jpg');
+        @copy(_DIR_LOGOS . 'ruboff0.jpg', _DIR_LOGOS . 'siteoff0.jpg');
+        @copy(_DIR_LOGOS . 'rubon0.png', _DIR_LOGOS . 'siteon0.png');
+        @copy(_DIR_LOGOS . 'ruboff0.png', _DIR_LOGOS . 'siteoff0.png');
+        maj_version(1.912);
+    }
 
-	// suppression de auteur_modif qui n'est plus utilise nulle part
-	if (upgrade_vers(1.913, $version_installee, $version_cible)) {
-		sql_query("ALTER TABLE spip_articles DROP `auteur_modif`");
-		maj_version(1.913);
-	}
+    // suppression de auteur_modif qui n'est plus utilise nulle part
+    if (upgrade_vers(1.913, $version_installee, $version_cible)) {
+        sql_query("ALTER TABLE spip_articles DROP `auteur_modif`");
+        maj_version(1.913);
+    }
 
-	// Ajout de SVG
-	if (upgrade_vers(1.914, $version_installee, $version_cible)) {
-		sql_query("INSERT IGNORE INTO spip_types_documents (`extension`, `titre`, `inclus`) VALUES ('svg', 'Scalable Vector Graphics', 'embed')");
-		sql_query("UPDATE spip_types_documents SET `mime_type`='image/svg+xml' WHERE `extension`='svg'");
-		maj_version(1.914);
-	}
+    // Ajout de SVG
+    if (upgrade_vers(1.914, $version_installee, $version_cible)) {
+        sql_query("INSERT IGNORE INTO spip_types_documents (`extension`, `titre`, `inclus`) VALUES ('svg', 'Scalable Vector Graphics', 'embed')");
+        sql_query("UPDATE spip_types_documents SET `mime_type`='image/svg+xml' WHERE `extension`='svg'");
+        maj_version(1.914);
+    }
 
-	// Ajout de plein de type mime
-	if (upgrade_vers(1.915, $version_installee, $version_cible)) {
-		maj_version(1.915);
-	}
-	// refaire l'upgrade 1.905 qui a pu foirer en partie a cause de la requete ALTER sur spip_meta
-	if (upgrade_vers(1.916, $version_installee, $version_cible)) {
-		// agrandir le champ "valeur" de spip_meta pour pouvoir y stocker
-		// des choses plus sympa
-		sql_query("ALTER TABLE spip_meta DROP INDEX `valeur`");
-		sql_query("ALTER TABLE spip_meta CHANGE `valeur` `valeur` TEXT");
+    // Ajout de plein de type mime
+    if (upgrade_vers(1.915, $version_installee, $version_cible)) {
+        maj_version(1.915);
+    }
+    // refaire l'upgrade 1.905 qui a pu foirer en partie a cause de la requete ALTER sur spip_meta
+    if (upgrade_vers(1.916, $version_installee, $version_cible)) {
+        // agrandir le champ "valeur" de spip_meta pour pouvoir y stocker
+        // des choses plus sympa
+        sql_query("ALTER TABLE spip_meta DROP INDEX `valeur`");
+        sql_query("ALTER TABLE spip_meta CHANGE `valeur` `valeur` TEXT");
 #8/08/07  plus d'indexation dans le core
-		//include_spip('inc/indexation'); 
-		//update_index_tables();
-		maj_version(1.916);
-	}
-	if (upgrade_vers(1.917, $version_installee, $version_cible)) {
-		sql_query("ALTER TABLE spip_documents DROP `inclus`");
-		maj_version(1.917);
-	}
+        //include_spip('inc/indexation'); 
+        //update_index_tables();
+        maj_version(1.916);
+    }
+    if (upgrade_vers(1.917, $version_installee, $version_cible)) {
+        sql_query("ALTER TABLE spip_documents DROP `inclus`");
+        maj_version(1.917);
+    }
 
-	// Permettre d'enregistrer un numero IP dans les revisions d'articles
-	// a la place de l'id_auteur
-	if (upgrade_vers(1.918, $version_installee, $version_cible)) {
-		sql_query("ALTER TABLE spip_versions CHANGE `id_auteur` `id_auteur` VARCHAR(23)");
-		maj_version(1.918);
-	}
+    // Permettre d'enregistrer un numero IP dans les revisions d'articles
+    // a la place de l'id_auteur
+    if (upgrade_vers(1.918, $version_installee, $version_cible)) {
+        sql_query("ALTER TABLE spip_versions CHANGE `id_auteur` `id_auteur` VARCHAR(23)");
+        maj_version(1.918);
+    }
 
-	if (upgrade_vers(1.919, $version_installee, $version_cible)) {
-		sql_query("ALTER TABLE spip_ajax_fonc DROP `id_auteur`");
-		maj_version('1.919');
-	}
+    if (upgrade_vers(1.919, $version_installee, $version_cible)) {
+        sql_query("ALTER TABLE spip_ajax_fonc DROP `id_auteur`");
+        maj_version('1.919');
+    }
 
-	if (upgrade_vers(1.920, $version_installee, $version_cible)) {
-		sql_query("ALTER IGNORE TABLE spip_documents_articles ADD PRIMARY KEY (`id_article`, `id_document`)");
-		sql_query("ALTER IGNORE TABLE spip_documents_breves ADD PRIMARY KEY (`id_breve`, `id_document`)");
-		sql_query("ALTER IGNORE TABLE spip_documents_rubriques ADD PRIMARY KEY (`id_rubrique`, `id_document`)");
-		sql_query("ALTER IGNORE TABLE spip_documents_articles DROP INDEX `id_article`");
-		sql_query("ALTER IGNORE TABLE spip_documents_breves DROP INDEX `id_breve`");
-		sql_query("ALTER IGNORE TABLE spip_documents_rubriques DROP INDEX `id_rubrique`");
-		maj_version('1.920');
-	}
-	if (upgrade_vers(1.922, $version_installee, $version_cible)) {
-		sql_query("ALTER TABLE spip_meta ADD `impt` ENUM('non', 'oui') DEFAULT 'oui' NOT NULL AFTER `valeur`");
-		$meta_serveur = array(
-			'version_installee',
-			'adresse_site',
-			'alea_ephemere_ancien',
-			'alea_ephemere',
-			'alea_ephemere_date',
-			'langue_site',
-			'langues_proposees',
-			'date_calcul_rubriques',
-			'derniere_modif',
-			'optimiser_table',
-			'drapeau_edition',
-			'creer_preview',
-			'taille_preview',
-			'creer_htpasswd',
-			'creer_htaccess',
-			'gd_formats_read',
-			'gd_formats',
-			'netpbm_formats',
-			'formats_graphiques',
-			'image_process',
-			'plugin_header',
-			'plugin'
-		);
-		foreach ($meta_serveur as $nom) {
-			sql_query("UPDATE spip_meta SET `impt`='non' WHERE `nom`=" . sql_quote($nom));
-		}
-		maj_version('1.922');
-	}
-	if (upgrade_vers(1.923, $version_installee, $version_cible)) {
-		if (isset($GLOBALS['meta']['IMPORT_tables_noimport'])) {
-			$IMPORT_tables_noimport = unserialize($GLOBALS['meta']['IMPORT_tables_noimport']);
-			foreach ($IMPORT_tables_noimport as $key => $table) {
-				if ($table == 'spip_meta') {
-					unset($IMPORT_tables_noimport[$key]);
-				}
-			}
-			ecrire_meta('IMPORT_tables_noimport', serialize($IMPORT_tables_noimport), 'non');
-		}
-		maj_version('1.923');
-	}
+    if (upgrade_vers(1.920, $version_installee, $version_cible)) {
+        sql_query("ALTER IGNORE TABLE spip_documents_articles ADD PRIMARY KEY (`id_article`, `id_document`)");
+        sql_query("ALTER IGNORE TABLE spip_documents_breves ADD PRIMARY KEY (`id_breve`, `id_document`)");
+        sql_query("ALTER IGNORE TABLE spip_documents_rubriques ADD PRIMARY KEY (`id_rubrique`, `id_document`)");
+        sql_query("ALTER IGNORE TABLE spip_documents_articles DROP INDEX `id_article`");
+        sql_query("ALTER IGNORE TABLE spip_documents_breves DROP INDEX `id_breve`");
+        sql_query("ALTER IGNORE TABLE spip_documents_rubriques DROP INDEX `id_rubrique`");
+        maj_version('1.920');
+    }
+    if (upgrade_vers(1.922, $version_installee, $version_cible)) {
+        sql_query("ALTER TABLE spip_meta ADD `impt` ENUM('non', 'oui') DEFAULT 'oui' NOT NULL AFTER `valeur`");
+        $meta_serveur = array(
+            'version_installee',
+            'adresse_site',
+            'alea_ephemere_ancien',
+            'alea_ephemere',
+            'alea_ephemere_date',
+            'langue_site',
+            'langues_proposees',
+            'date_calcul_rubriques',
+            'derniere_modif',
+            'optimiser_table',
+            'drapeau_edition',
+            'creer_preview',
+            'taille_preview',
+            'creer_htpasswd',
+            'creer_htaccess',
+            'gd_formats_read',
+            'gd_formats',
+            'netpbm_formats',
+            'formats_graphiques',
+            'image_process',
+            'plugin_header',
+            'plugin'
+        );
+        foreach ($meta_serveur as $nom) {
+            sql_query("UPDATE spip_meta SET `impt`='non' WHERE `nom`=" . sql_quote($nom));
+        }
+        maj_version('1.922');
+    }
+    if (upgrade_vers(1.923, $version_installee, $version_cible)) {
+        if (isset($GLOBALS['meta']['IMPORT_tables_noimport'])) {
+            $IMPORT_tables_noimport = unserialize($GLOBALS['meta']['IMPORT_tables_noimport']);
+            foreach ($IMPORT_tables_noimport as $key => $table) {
+                if ($table == 'spip_meta') {
+                    unset($IMPORT_tables_noimport[$key]);
+                }
+            }
+            ecrire_meta('IMPORT_tables_noimport', serialize($IMPORT_tables_noimport), 'non');
+        }
+        maj_version('1.923');
+    }
 
-	if (upgrade_vers(1.924, $version_installee, $version_cible)) {
-		sql_query('DROP TABLE spip_ajax_fonc');
-		maj_version('1.924');
-	}
+    if (upgrade_vers(1.924, $version_installee, $version_cible)) {
+        sql_query('DROP TABLE spip_ajax_fonc');
+        maj_version('1.924');
+    }
 
-	if (upgrade_vers(1.925, $version_installee, $version_cible)) {
-		include_spip('inc/flock');
-		/* deplacement des sessions */
-		$f_session = preg_files('data', 'session_');
-		$repertoire = _DIR_SESSIONS;
-		if (!@file_exists($repertoire)) {
-			$repertoire = preg_replace(',' . _DIR_TMP . ',', '', $repertoire);
-			$repertoire = sous_repertoire(_DIR_TMP, $repertoire);
-		}
-		foreach ($f_session as $f) {
-			$d = basename($f);
-			@copy($f, $repertoire . $d);
-		}
-		/* deplacement des visites */
-		$f_visites = preg_files('data/visites');
-		$repertoire = sous_repertoire(_DIR_TMP, 'visites');
-		foreach ($f_visites as $f) {
-			$d = basename($f);
-			@copy($f, $repertoire . $d);
-		}
-		/* deplacement des upload */
-		$auteurs = array();
-		$req = sql_query("SELECT `login` FROM spip_auteurs WHERE `statut` = '0minirezo'");
-		while ($row = sql_fetch($req)) {
-			$auteurs[] = $row['login'];
-		}
-		$f_upload = preg_files('upload', -1, 10000, $auteurs);
-		$repertoire = _DIR_TRANSFERT;
-		if (!@file_exists($repertoire)) {
-			$repertoire = preg_replace(',' . _DIR_TMP . ',', '', $repertoire);
-			$repertoire = sous_repertoire(_DIR_TMP, $repertoire);
-		}
-		foreach ($auteurs as $login) {
-			if (is_dir('upload/' . $login)) {
-				$sous_repertoire = sous_repertoire(_DIR_TRANSFERT, $login);
-			}
-		}
-		foreach ($f_upload as $f) {
-			@copy($f, _DIR_TMP . $f);
-		}
-		/* deplacement des dumps */
-		$f_session = preg_files('data', 'dump');
-		$repertoire = _DIR_DUMP;
-		if (!@file_exists($repertoire)) {
-			$repertoire = preg_replace(',' . _DIR_TMP . ',', '', $repertoire);
-			$repertoire = sous_repertoire(_DIR_TMP, $repertoire);
-		}
-		foreach ($f_session as $f) {
-			$d = basename($f);
-			@copy($f, $repertoire . $d);
-		}
-		maj_version('1.925');
-	}
-	// Ajout de MP4
-	if (upgrade_vers(1.926, $version_installee, $version_cible)) {
-		sql_query("INSERT IGNORE INTO spip_types_documents (`extension`, `titre`, `inclus`) VALUES ('mp4', 'MPEG4', 'embed')");
-		sql_query("UPDATE spip_types_documents SET `mime_type`='application/mp4' WHERE `extension`='mp4'");
-		maj_version('1.926');
-	}
+    if (upgrade_vers(1.925, $version_installee, $version_cible)) {
+        include_spip('inc/flock');
+        /* deplacement des sessions */
+        $f_session = preg_files('data', 'session_');
+        $repertoire = _DIR_SESSIONS;
+        if (!@file_exists($repertoire)) {
+            $repertoire = preg_replace(',' . _DIR_TMP . ',', '', $repertoire);
+            $repertoire = sous_repertoire(_DIR_TMP, $repertoire);
+        }
+        foreach ($f_session as $f) {
+            $d = basename($f);
+            @copy($f, $repertoire . $d);
+        }
+        /* deplacement des visites */
+        $f_visites = preg_files('data/visites');
+        $repertoire = sous_repertoire(_DIR_TMP, 'visites');
+        foreach ($f_visites as $f) {
+            $d = basename($f);
+            @copy($f, $repertoire . $d);
+        }
+        /* deplacement des upload */
+        $auteurs = array();
+        $req = sql_query("SELECT `login` FROM spip_auteurs WHERE `statut` = '0minirezo'");
+        while ($row = sql_fetch($req)) {
+            $auteurs[] = $row['login'];
+        }
+        $f_upload = preg_files('upload', -1, 10000, $auteurs);
+        $repertoire = _DIR_TRANSFERT;
+        if (!@file_exists($repertoire)) {
+            $repertoire = preg_replace(',' . _DIR_TMP . ',', '', $repertoire);
+            $repertoire = sous_repertoire(_DIR_TMP, $repertoire);
+        }
+        foreach ($auteurs as $login) {
+            if (is_dir('upload/' . $login)) {
+                $sous_repertoire = sous_repertoire(_DIR_TRANSFERT, $login);
+            }
+        }
+        foreach ($f_upload as $f) {
+            @copy($f, _DIR_TMP . $f);
+        }
+        /* deplacement des dumps */
+        $f_session = preg_files('data', 'dump');
+        $repertoire = _DIR_DUMP;
+        if (!@file_exists($repertoire)) {
+            $repertoire = preg_replace(',' . _DIR_TMP . ',', '', $repertoire);
+            $repertoire = sous_repertoire(_DIR_TMP, $repertoire);
+        }
+        foreach ($f_session as $f) {
+            $d = basename($f);
+            @copy($f, $repertoire . $d);
+        }
+        maj_version('1.925');
+    }
+    // Ajout de MP4
+    if (upgrade_vers(1.926, $version_installee, $version_cible)) {
+        sql_query("INSERT IGNORE INTO spip_types_documents (`extension`, `titre`, `inclus`) VALUES ('mp4', 'MPEG4', 'embed')");
+        sql_query("UPDATE spip_types_documents SET `mime_type`='application/mp4' WHERE `extension`='mp4'");
+        maj_version('1.926');
+    }
 }

Spacing +15 added lines, -15 removed lines

@@ -167,12 +167,12 @@ 
 	// Le logo du site n'est plus le logo par defaut des rubriques
 	// mais pour assurer la compatibilite ascendante, on le duplique
 	if (upgrade_vers(1.912, $version_installee, $version_cible)) {
-		@copy(_DIR_LOGOS . 'rubon0.gif', _DIR_LOGOS . 'siteon0.gif');
-		@copy(_DIR_LOGOS . 'ruboff0.gif', _DIR_LOGOS . 'siteoff0.gif');
-		@copy(_DIR_LOGOS . 'rubon0.jpg', _DIR_LOGOS . 'siteon0.jpg');
-		@copy(_DIR_LOGOS . 'ruboff0.jpg', _DIR_LOGOS . 'siteoff0.jpg');
-		@copy(_DIR_LOGOS . 'rubon0.png', _DIR_LOGOS . 'siteon0.png');
-		@copy(_DIR_LOGOS . 'ruboff0.png', _DIR_LOGOS . 'siteoff0.png');
+		@copy(_DIR_LOGOS.'rubon0.gif', _DIR_LOGOS.'siteon0.gif');
+		@copy(_DIR_LOGOS.'ruboff0.gif', _DIR_LOGOS.'siteoff0.gif');
+		@copy(_DIR_LOGOS.'rubon0.jpg', _DIR_LOGOS.'siteon0.jpg');
+		@copy(_DIR_LOGOS.'ruboff0.jpg', _DIR_LOGOS.'siteoff0.jpg');
+		@copy(_DIR_LOGOS.'rubon0.png', _DIR_LOGOS.'siteon0.png');
+		@copy(_DIR_LOGOS.'ruboff0.png', _DIR_LOGOS.'siteoff0.png');
 		maj_version(1.912);
 	}
 
@@ -257,7 +257,7 @@ 
 			'plugin'
 		);
 		foreach ($meta_serveur as $nom) {
-			sql_query("UPDATE spip_meta SET `impt`='non' WHERE `nom`=" . sql_quote($nom));
+			sql_query("UPDATE spip_meta SET `impt`='non' WHERE `nom`=".sql_quote($nom));
 		}
 		maj_version('1.922');
 	}
@@ -285,19 +285,19 @@ 
 		$f_session = preg_files('data', 'session_');
 		$repertoire = _DIR_SESSIONS;
 		if (!@file_exists($repertoire)) {
-			$repertoire = preg_replace(',' . _DIR_TMP . ',', '', $repertoire);
+			$repertoire = preg_replace(','._DIR_TMP.',', '', $repertoire);
 			$repertoire = sous_repertoire(_DIR_TMP, $repertoire);
 		}
 		foreach ($f_session as $f) {
 			$d = basename($f);
-			@copy($f, $repertoire . $d);
+			@copy($f, $repertoire.$d);
 		}
 		/* deplacement des visites */
 		$f_visites = preg_files('data/visites');
 		$repertoire = sous_repertoire(_DIR_TMP, 'visites');
 		foreach ($f_visites as $f) {
 			$d = basename($f);
-			@copy($f, $repertoire . $d);
+			@copy($f, $repertoire.$d);
 		}
 		/* deplacement des upload */
 		$auteurs = array();
@@ -308,27 +308,27 @@ 
 		$f_upload = preg_files('upload', -1, 10000, $auteurs);
 		$repertoire = _DIR_TRANSFERT;
 		if (!@file_exists($repertoire)) {
-			$repertoire = preg_replace(',' . _DIR_TMP . ',', '', $repertoire);
+			$repertoire = preg_replace(','._DIR_TMP.',', '', $repertoire);
 			$repertoire = sous_repertoire(_DIR_TMP, $repertoire);
 		}
 		foreach ($auteurs as $login) {
-			if (is_dir('upload/' . $login)) {
+			if (is_dir('upload/'.$login)) {
 				$sous_repertoire = sous_repertoire(_DIR_TRANSFERT, $login);
 			}
 		}
 		foreach ($f_upload as $f) {
-			@copy($f, _DIR_TMP . $f);
+			@copy($f, _DIR_TMP.$f);
 		}
 		/* deplacement des dumps */
 		$f_session = preg_files('data', 'dump');
 		$repertoire = _DIR_DUMP;
 		if (!@file_exists($repertoire)) {
-			$repertoire = preg_replace(',' . _DIR_TMP . ',', '', $repertoire);
+			$repertoire = preg_replace(','._DIR_TMP.',', '', $repertoire);
 			$repertoire = sous_repertoire(_DIR_TMP, $repertoire);
 		}
 		foreach ($f_session as $f) {
 			$d = basename($f);
-			@copy($f, $repertoire . $d);
+			@copy($f, $repertoire.$d);
 		}
 		maj_version('1.925');
 	}

ecrire/maj/v013.php

Indentation +39 added lines, -39 removed lines

@@ -16,7 +16,7 @@ 
  * @package SPIP\Core\SQL\Upgrade
  **/
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 /**
@@ -26,48 +26,48 @@ 
  * @param float $version_cible Version de destination
  **/
 function maj_v013_dist($version_installee, $version_cible) {
-	if (upgrade_vers(1.3, $version_installee, $version_cible)) {
-		// Modifier la syndication (pour liste de sites)
-		sql_query("ALTER TABLE spip_syndic ADD syndication VARCHAR(3) NOT NULL");
-		sql_query("ALTER TABLE spip_syndic ADD statut VARCHAR(10) NOT NULL");
-		sql_query("ALTER TABLE spip_syndic ADD date datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
-		sql_query("UPDATE spip_syndic SET syndication='oui', statut='publie', date=NOW()");
+    if (upgrade_vers(1.3, $version_installee, $version_cible)) {
+        // Modifier la syndication (pour liste de sites)
+        sql_query("ALTER TABLE spip_syndic ADD syndication VARCHAR(3) NOT NULL");
+        sql_query("ALTER TABLE spip_syndic ADD statut VARCHAR(10) NOT NULL");
+        sql_query("ALTER TABLE spip_syndic ADD date datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
+        sql_query("UPDATE spip_syndic SET syndication='oui', statut='publie', date=NOW()");
 
-		// Statut pour articles syndication, pour pouvoir desactiver un article
-		sql_query("ALTER TABLE spip_syndic_articles ADD statut VARCHAR(10) NOT NULL");
-		sql_query("UPDATE spip_syndic_articles SET statut='publie'");
-		maj_version(1.3);
-	}
+        // Statut pour articles syndication, pour pouvoir desactiver un article
+        sql_query("ALTER TABLE spip_syndic_articles ADD statut VARCHAR(10) NOT NULL");
+        sql_query("UPDATE spip_syndic_articles SET statut='publie'");
+        maj_version(1.3);
+    }
 
-	if (upgrade_vers(1.301, $version_installee, $version_cible)) {
-		sql_query("ALTER TABLE spip_forum ADD id_syndic bigint(21) DEFAULT '0' NOT NULL");
-		maj_version(1.301);
-	}
+    if (upgrade_vers(1.301, $version_installee, $version_cible)) {
+        sql_query("ALTER TABLE spip_forum ADD id_syndic bigint(21) DEFAULT '0' NOT NULL");
+        maj_version(1.301);
+    }
 
-	if (upgrade_vers(1.302, $version_installee, $version_cible)) {
-		# sql_query("ALTER TABLE spip_forum_cache DROP PRIMARY KEY");
-		# sql_query("ALTER TABLE spip_forum_cache DROP INDEX fichier");
-		# sql_query("ALTER TABLE spip_forum_cache ADD PRIMARY KEY (fichier, id_forum, id_article, id_rubrique, id_breve, id_syndic)");
-		sql_query("ALTER TABLE spip_forum ADD INDEX id_syndic (id_syndic)");
-		maj_version(1.302);
-	}
+    if (upgrade_vers(1.302, $version_installee, $version_cible)) {
+        # sql_query("ALTER TABLE spip_forum_cache DROP PRIMARY KEY");
+        # sql_query("ALTER TABLE spip_forum_cache DROP INDEX fichier");
+        # sql_query("ALTER TABLE spip_forum_cache ADD PRIMARY KEY (fichier, id_forum, id_article, id_rubrique, id_breve, id_syndic)");
+        sql_query("ALTER TABLE spip_forum ADD INDEX id_syndic (id_syndic)");
+        maj_version(1.302);
+    }
 
-	if (upgrade_vers(1.303, $version_installee, $version_cible)) {
-		sql_query("ALTER TABLE spip_rubriques ADD date datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
-		sql_query("ALTER TABLE spip_syndic ADD date_syndic datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
-		sql_query("UPDATE spip_syndic SET date_syndic=date");
-		maj_version(1.303);
-	}
+    if (upgrade_vers(1.303, $version_installee, $version_cible)) {
+        sql_query("ALTER TABLE spip_rubriques ADD date datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
+        sql_query("ALTER TABLE spip_syndic ADD date_syndic datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
+        sql_query("UPDATE spip_syndic SET date_syndic=date");
+        maj_version(1.303);
+    }
 
-	if (upgrade_vers(1.306, $version_installee, $version_cible)) {
-		sql_query("DROP TABLE spip_index_syndic_articles");
-		sql_query("ALTER TABLE spip_syndic ADD date_index datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
-		sql_query("ALTER TABLE spip_syndic ADD INDEX date_index (date_index)");
-		maj_version(1.306);
-	}
+    if (upgrade_vers(1.306, $version_installee, $version_cible)) {
+        sql_query("DROP TABLE spip_index_syndic_articles");
+        sql_query("ALTER TABLE spip_syndic ADD date_index datetime DEFAULT '0000-00-00 00:00:00' NOT NULL");
+        sql_query("ALTER TABLE spip_syndic ADD INDEX date_index (date_index)");
+        maj_version(1.306);
+    }
 
-	if (upgrade_vers(1.307, $version_installee, $version_cible)) {
-		sql_query("ALTER TABLE spip_syndic_articles ADD descriptif blob NOT NULL");
-		maj_version(1.307);
-	}
+    if (upgrade_vers(1.307, $version_installee, $version_cible)) {
+        sql_query("ALTER TABLE spip_syndic_articles ADD descriptif blob NOT NULL");
+        maj_version(1.307);
+    }
 }

ecrire/maj/v019.php

Indentation +371 added lines, -371 removed lines

@@ -22,47 +22,47 @@ 
  * @package SPIP\Core\SQL\Upgrade
  **/
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 
 // FLV est incrustable, la MAJ precedente l'avait oublie
 $GLOBALS['maj'][1931] = array(
-	array('sql_query', "UPDATE spip_types_documents SET `inclus`='embed' WHERE `extension`='flv'")
+    array('sql_query', "UPDATE spip_types_documents SET `inclus`='embed' WHERE `extension`='flv'")
 );
 
 // Ajout de spip_forum.date_thread, et on essaie de le remplir
 // a coup de table temporaire (est-ce autorise partout... sinon
 // tant pis, ca ne marchera que pour les forums recemment modifies)
 $GLOBALS['maj'][1932] = array(
-	array('sql_alter', "TABLE spip_forum ADD `date_thread` datetime DEFAULT '0000-00-00 00:00:00' NOT NULL"),
-	array('sql_alter', "TABLE spip_forum ADD INDEX `date_thread` (`date_thread`)"),
-
-	array('sql_query', "DROP TABLE IF EXISTS spip_tmp"),
-	array(
-		'sql_query',
-		"CREATE TABLE spip_tmp SELECT `id_thread`,MAX(`date_heure`) AS dt FROM spip_forum GROUP BY `id_thread`"
-	),
-	array('sql_alter', "TABLE spip_tmp ADD INDEX `p` (`id_thread`)"),
-	array('sql_query', "UPDATE spip_forum AS F JOIN spip_tmp AS T ON F.id_thread=T.id_thread SET F.date_thread=T.dt"),
-	array('sql_query', "DROP TABLE spip_tmp"),
+    array('sql_alter', "TABLE spip_forum ADD `date_thread` datetime DEFAULT '0000-00-00 00:00:00' NOT NULL"),
+    array('sql_alter', "TABLE spip_forum ADD INDEX `date_thread` (`date_thread`)"),
+
+    array('sql_query', "DROP TABLE IF EXISTS spip_tmp"),
+    array(
+        'sql_query',
+        "CREATE TABLE spip_tmp SELECT `id_thread`,MAX(`date_heure`) AS dt FROM spip_forum GROUP BY `id_thread`"
+    ),
+    array('sql_alter', "TABLE spip_tmp ADD INDEX `p` (`id_thread`)"),
+    array('sql_query', "UPDATE spip_forum AS F JOIN spip_tmp AS T ON F.id_thread=T.id_thread SET F.date_thread=T.dt"),
+    array('sql_query', "DROP TABLE spip_tmp"),
 );
 
 /**
  * Mise à jour 1_934 : Retrait de `_DIR_IMG` dans le champ fichier de la table des doc
  **/
 function maj_1_934() {
-	// attention, en cas de mutualisation _DIR_IMG contient quelque chose comme sites/urldusite/IMG/
-	// essayons en ne prenant que le dernier segment
-	$dir_img = basename(_DIR_IMG) . '/';
-	$res = sql_query("SELECT fichier FROM spip_documents WHERE fichier LIKE " . sql_quote($dir_img . '%') . " LIMIT 0,1");
-	if (!$row = sql_fetch($res)) {
-		// sinon on essaye avec le chemin complet
-		// il faut donc verifier qu'on a bien le bon nom de repertoire
-		$dir_img = substr(_DIR_IMG, strlen(_DIR_RACINE));
-	}
-	$n = strlen($dir_img) + 1;
-	sql_query("UPDATE spip_documents SET `fichier`=substring(fichier,$n) WHERE `fichier` LIKE " . sql_quote($dir_img . '%'));
+    // attention, en cas de mutualisation _DIR_IMG contient quelque chose comme sites/urldusite/IMG/
+    // essayons en ne prenant que le dernier segment
+    $dir_img = basename(_DIR_IMG) . '/';
+    $res = sql_query("SELECT fichier FROM spip_documents WHERE fichier LIKE " . sql_quote($dir_img . '%') . " LIMIT 0,1");
+    if (!$row = sql_fetch($res)) {
+        // sinon on essaye avec le chemin complet
+        // il faut donc verifier qu'on a bien le bon nom de repertoire
+        $dir_img = substr(_DIR_IMG, strlen(_DIR_RACINE));
+    }
+    $n = strlen($dir_img) + 1;
+    sql_query("UPDATE spip_documents SET `fichier`=substring(fichier,$n) WHERE `fichier` LIKE " . sql_quote($dir_img . '%'));
 }
 
 $GLOBALS['maj'][1934] = array(array('maj_1_934'));
@@ -71,32 +71,32 @@ 
  * Mise à jour 1_935 : calcul du nouveau champ 'vu' sur les associations documents_xx
  **/
 function maj_1_935() {
-	include_spip('inc/texte');
-	foreach (array(
-		         'article' => 'id_article',
-		         'rubrique' => 'id_rubrique',
-		         'breve' => 'id_breve'
-	         ) as $type => $id_table_objet) {
-		$table_objet = "$type" . "s";
-		$chapo = $type == 'article' ? ",a.chapo" : "";
-		$res = sql_query("SELECT a.$id_table_objet,a.texte $chapo FROM spip_documents_$table_objet AS d JOIN spip_$table_objet AS a ON a.$id_table_objet=d.$id_table_objet GROUP BY $id_table_objet");
-		while ($row = sql_fetch($res)) {
-			$GLOBALS['doublons_documents_inclus'] = array();
-			traiter_modeles(($chapo ? $row['chapo'] : "") . $row['texte'], true); // detecter les doublons
-			if (count($GLOBALS['doublons_documents_inclus'])) {
-				$id = $row[$id_table_objet];
-				$liste = "(" . implode(",$id,'oui'),(", $GLOBALS['doublons_documents_inclus']) . ",$id,'oui')";
-				sql_query("REPLACE INTO spip_documents_$table_objet (`id_document`,`$id_table_objet`,`vu`) VALUES $liste");
-			}
-		}
-	}
+    include_spip('inc/texte');
+    foreach (array(
+                    'article' => 'id_article',
+                    'rubrique' => 'id_rubrique',
+                    'breve' => 'id_breve'
+                ) as $type => $id_table_objet) {
+        $table_objet = "$type" . "s";
+        $chapo = $type == 'article' ? ",a.chapo" : "";
+        $res = sql_query("SELECT a.$id_table_objet,a.texte $chapo FROM spip_documents_$table_objet AS d JOIN spip_$table_objet AS a ON a.$id_table_objet=d.$id_table_objet GROUP BY $id_table_objet");
+        while ($row = sql_fetch($res)) {
+            $GLOBALS['doublons_documents_inclus'] = array();
+            traiter_modeles(($chapo ? $row['chapo'] : "") . $row['texte'], true); // detecter les doublons
+            if (count($GLOBALS['doublons_documents_inclus'])) {
+                $id = $row[$id_table_objet];
+                $liste = "(" . implode(",$id,'oui'),(", $GLOBALS['doublons_documents_inclus']) . ",$id,'oui')";
+                sql_query("REPLACE INTO spip_documents_$table_objet (`id_document`,`$id_table_objet`,`vu`) VALUES $liste");
+            }
+        }
+    }
 }
 
 $GLOBALS['maj'][1935] = array(
-	array('sql_alter', "TABLE spip_documents_articles ADD `vu` ENUM('non', 'oui') DEFAULT 'non' NOT NULL"),
-	array('sql_alter', "TABLE spip_documents_rubriques ADD `vu` ENUM('non', 'oui') DEFAULT 'non' NOT NULL"),
-	array('sql_alter', "TABLE spip_documents_breves ADD `vu` ENUM('non', 'oui') DEFAULT 'non' NOT NULL"),
-	array('maj_1_935')
+    array('sql_alter', "TABLE spip_documents_articles ADD `vu` ENUM('non', 'oui') DEFAULT 'non' NOT NULL"),
+    array('sql_alter', "TABLE spip_documents_rubriques ADD `vu` ENUM('non', 'oui') DEFAULT 'non' NOT NULL"),
+    array('sql_alter', "TABLE spip_documents_breves ADD `vu` ENUM('non', 'oui') DEFAULT 'non' NOT NULL"),
+    array('maj_1_935')
 );
 
 
@@ -108,273 +108,273 @@ 
  * @param string $type Type de champ de destination, par exemple `LONGTEXT`
  **/
 function convertir_un_champ_blob_en_text($table, $champ, $type) {
-	// precaution : definir le charset par defaut de la table, car c'est lui qui prevaut
-	// et il faut qu'il corresponde au charset de la connexion qui est celui
-	// dans lequel on a ecrit le champ en blob
-	if ($charset = sql_getfetsel('@@character_set_connection')) {
-		sql_alter("TABLE $table DEFAULT CHARACTER SET " . $charset);
-	}
-	$res = sql_query("SHOW FULL COLUMNS FROM $table LIKE '$champ'");
-	if ($row = sql_fetch($res)) {
-		if (strtolower($row['Type']) != strtolower($type)) {
-			$default = $row['Default'] ? (" DEFAULT " . sql_quote($row['Default'])) : "";
-			$notnull = ($row['Null'] == 'YES') ? "" : " NOT NULL";
-			sql_alter("TABLE $table CHANGE $champ $champ $type $default $notnull");
-		}
-	}
+    // precaution : definir le charset par defaut de la table, car c'est lui qui prevaut
+    // et il faut qu'il corresponde au charset de la connexion qui est celui
+    // dans lequel on a ecrit le champ en blob
+    if ($charset = sql_getfetsel('@@character_set_connection')) {
+        sql_alter("TABLE $table DEFAULT CHARACTER SET " . $charset);
+    }
+    $res = sql_query("SHOW FULL COLUMNS FROM $table LIKE '$champ'");
+    if ($row = sql_fetch($res)) {
+        if (strtolower($row['Type']) != strtolower($type)) {
+            $default = $row['Default'] ? (" DEFAULT " . sql_quote($row['Default'])) : "";
+            $notnull = ($row['Null'] == 'YES') ? "" : " NOT NULL";
+            sql_alter("TABLE $table CHANGE $champ $champ $type $default $notnull");
+        }
+    }
 }
 
 $GLOBALS['maj'][1937] = array(
-	// convertir les champs blob des tables spip en champs texte
-	array('convertir_un_champ_blob_en_text', "spip_articles", "texte", "LONGTEXT"),
-	array('convertir_un_champ_blob_en_text', "spip_articles", "extra", "LONGTEXT"),
-	array('convertir_un_champ_blob_en_text', "spip_auteurs", "extra", "LONGTEXT"),
-	array('convertir_un_champ_blob_en_text', "spip_breves", "texte", "LONGTEXT"),
-	array('convertir_un_champ_blob_en_text', "spip_breves", "extra", "LONGTEXT"),
-	array('convertir_un_champ_blob_en_text', "spip_messages", "texte", "LONGTEXT"),
-	array('convertir_un_champ_blob_en_text', "spip_mots", "texte", "LONGTEXT"),
-	array('convertir_un_champ_blob_en_text', "spip_mots", "extra", "LONGTEXT"),
-	array('convertir_un_champ_blob_en_text', "spip_groupes_mots", "texte", "LONGTEXT"),
-	array('convertir_un_champ_blob_en_text', "spip_rubriques", "texte", "LONGTEXT"),
-	array('convertir_un_champ_blob_en_text', "spip_rubriques", "extra", "LONGTEXT"),
-	array('convertir_un_champ_blob_en_text', "spip_syndic", "nom_site", "LONGTEXT"),
-	array('convertir_un_champ_blob_en_text', "spip_syndic", "descriptif", "TEXT"),
-	array('convertir_un_champ_blob_en_text', "spip_syndic", "extra", "LONGTEXT"),
-	array('convertir_un_champ_blob_en_text', "spip_syndic_articles", "descriptif", "LONGTEXT"),
-	array('convertir_un_champ_blob_en_text', "spip_petitions", "texte", "LONGTEXT"),
-	array('convertir_un_champ_blob_en_text', "spip_ortho_cache", "suggest", "TEXT"),
+    // convertir les champs blob des tables spip en champs texte
+    array('convertir_un_champ_blob_en_text', "spip_articles", "texte", "LONGTEXT"),
+    array('convertir_un_champ_blob_en_text', "spip_articles", "extra", "LONGTEXT"),
+    array('convertir_un_champ_blob_en_text', "spip_auteurs", "extra", "LONGTEXT"),
+    array('convertir_un_champ_blob_en_text', "spip_breves", "texte", "LONGTEXT"),
+    array('convertir_un_champ_blob_en_text', "spip_breves", "extra", "LONGTEXT"),
+    array('convertir_un_champ_blob_en_text', "spip_messages", "texte", "LONGTEXT"),
+    array('convertir_un_champ_blob_en_text', "spip_mots", "texte", "LONGTEXT"),
+    array('convertir_un_champ_blob_en_text', "spip_mots", "extra", "LONGTEXT"),
+    array('convertir_un_champ_blob_en_text', "spip_groupes_mots", "texte", "LONGTEXT"),
+    array('convertir_un_champ_blob_en_text', "spip_rubriques", "texte", "LONGTEXT"),
+    array('convertir_un_champ_blob_en_text', "spip_rubriques", "extra", "LONGTEXT"),
+    array('convertir_un_champ_blob_en_text', "spip_syndic", "nom_site", "LONGTEXT"),
+    array('convertir_un_champ_blob_en_text', "spip_syndic", "descriptif", "TEXT"),
+    array('convertir_un_champ_blob_en_text', "spip_syndic", "extra", "LONGTEXT"),
+    array('convertir_un_champ_blob_en_text', "spip_syndic_articles", "descriptif", "LONGTEXT"),
+    array('convertir_un_champ_blob_en_text', "spip_petitions", "texte", "LONGTEXT"),
+    array('convertir_un_champ_blob_en_text', "spip_ortho_cache", "suggest", "TEXT"),
 );
 
 /**
  * Mise à jour 1_938 : suppression des id_type de documents, remplacés par extension
  **/
 function maj_1_938() {
-	$res = sql_select('extension', 'spip_documents', "extension='' OR extension is NULL");
-	if ($n = sql_count($res)) {
-		$repli = false;
-		// verifier que la colonne id_type est toujours la (update post 1.938)
-		$desc = sql_showtable('spip_documents');
-		if (!$desc or !isset($desc['field']['id_type'])) {
-			$repli = true;
-		}
-
-		$s = sql_select('extension' . ($repli ? '' : ',id_type'), 'spip_types_documents');
-		while ($t = sql_fetch($s)) {
-			if (isset($t['id_type'])) {
-				sql_query("UPDATE spip_documents	SET `extension`=" . sql_quote($t['extension']) . " WHERE `id_type`=" . sql_quote($t['id_type']));
-			} else {
-				sql_query("UPDATE spip_documents	SET `extension`=" . sql_quote($t['extension']) . " WHERE fichier LIKE " . sql_quote("%." . $t['extension']));
-			}
-		}
-		$res = sql_select('extension', 'spip_documents', "extension='' OR extension is NULL");
-		if ($n = sql_count($res)) {
-			spip_log("Table spip_documents : Colonne extension incomplete : $n lignes vides");
-		}
-	}
+    $res = sql_select('extension', 'spip_documents', "extension='' OR extension is NULL");
+    if ($n = sql_count($res)) {
+        $repli = false;
+        // verifier que la colonne id_type est toujours la (update post 1.938)
+        $desc = sql_showtable('spip_documents');
+        if (!$desc or !isset($desc['field']['id_type'])) {
+            $repli = true;
+        }
+
+        $s = sql_select('extension' . ($repli ? '' : ',id_type'), 'spip_types_documents');
+        while ($t = sql_fetch($s)) {
+            if (isset($t['id_type'])) {
+                sql_query("UPDATE spip_documents	SET `extension`=" . sql_quote($t['extension']) . " WHERE `id_type`=" . sql_quote($t['id_type']));
+            } else {
+                sql_query("UPDATE spip_documents	SET `extension`=" . sql_quote($t['extension']) . " WHERE fichier LIKE " . sql_quote("%." . $t['extension']));
+            }
+        }
+        $res = sql_select('extension', 'spip_documents', "extension='' OR extension is NULL");
+        if ($n = sql_count($res)) {
+            spip_log("Table spip_documents : Colonne extension incomplete : $n lignes vides");
+        }
+    }
 }
 
 $GLOBALS['maj'][1938] = array(
-	// Des champs NULL a l'installation
-	// Ajouter un champ extension aux spip_documents, et le
-	// remplir avec les valeurs ad hoc
-	array('sql_alter', "TABLE spip_documents ADD `extension` VARCHAR(10) DEFAULT ''  NOT NULL "),
-	array('sql_alter', "TABLE spip_documents ADD INDEX `extension` (`extension`)"),
-	array('maj_1_938'),
-
-	array('sql_alter', "TABLE spip_documents DROP INDEX `id_type`, DROP `id_type`"),
-	## supprimer l'autoincrement avant de supprimer la PRIMARY KEY
-	array('sql_alter', "TABLE spip_types_documents CHANGE `id_type` `id_type` BIGINT( 21 ) NOT NULL "),
-	array('sql_alter', "TABLE spip_types_documents DROP PRIMARY KEY"),
-	array('sql_alter', "TABLE spip_types_documents DROP `id_type`"),
-	array('sql_alter', "TABLE spip_types_documents DROP INDEX `extension`"),
-
-	## recreer la PRIMARY KEY sur spip_types_documents.extension
-	array('sql_alter', "TABLE spip_types_documents ADD PRIMARY KEY (`extension`)"),
+    // Des champs NULL a l'installation
+    // Ajouter un champ extension aux spip_documents, et le
+    // remplir avec les valeurs ad hoc
+    array('sql_alter', "TABLE spip_documents ADD `extension` VARCHAR(10) DEFAULT ''  NOT NULL "),
+    array('sql_alter', "TABLE spip_documents ADD INDEX `extension` (`extension`)"),
+    array('maj_1_938'),
+
+    array('sql_alter', "TABLE spip_documents DROP INDEX `id_type`, DROP `id_type`"),
+    ## supprimer l'autoincrement avant de supprimer la PRIMARY KEY
+    array('sql_alter', "TABLE spip_types_documents CHANGE `id_type` `id_type` BIGINT( 21 ) NOT NULL "),
+    array('sql_alter', "TABLE spip_types_documents DROP PRIMARY KEY"),
+    array('sql_alter', "TABLE spip_types_documents DROP `id_type`"),
+    array('sql_alter', "TABLE spip_types_documents DROP INDEX `extension`"),
+
+    ## recreer la PRIMARY KEY sur spip_types_documents.extension
+    array('sql_alter', "TABLE spip_types_documents ADD PRIMARY KEY (`extension`)"),
 );
 
 $GLOBALS['maj'][1939] = array(
-	array('sql_alter', "TABLE spip_visites CHANGE `visites` `visites` INT UNSIGNED DEFAULT '0' NOT NULL"),
-	array('sql_alter', "TABLE spip_visites_articles CHANGE `visites` `visites` INT UNSIGNED DEFAULT '0' NOT NULL"),
-	array('sql_alter', "TABLE spip_referers CHANGE `visites` `visites` INT UNSIGNED DEFAULT '0' NOT NULL"),
-	array('sql_alter', "TABLE spip_referers CHANGE `visites_jour` `visites_jour` INT UNSIGNED DEFAULT '0' NOT NULL"),
-	array('sql_alter', "TABLE spip_referers CHANGE `visites_veille` `visites_veille` INT UNSIGNED DEFAULT '0' NOT NULL"),
-	array('sql_alter', "TABLE spip_referers_articles CHANGE `visites` `visites` INT UNSIGNED DEFAULT '0' NOT NULL")
+    array('sql_alter', "TABLE spip_visites CHANGE `visites` `visites` INT UNSIGNED DEFAULT '0' NOT NULL"),
+    array('sql_alter', "TABLE spip_visites_articles CHANGE `visites` `visites` INT UNSIGNED DEFAULT '0' NOT NULL"),
+    array('sql_alter', "TABLE spip_referers CHANGE `visites` `visites` INT UNSIGNED DEFAULT '0' NOT NULL"),
+    array('sql_alter', "TABLE spip_referers CHANGE `visites_jour` `visites_jour` INT UNSIGNED DEFAULT '0' NOT NULL"),
+    array('sql_alter', "TABLE spip_referers CHANGE `visites_veille` `visites_veille` INT UNSIGNED DEFAULT '0' NOT NULL"),
+    array('sql_alter', "TABLE spip_referers_articles CHANGE `visites` `visites` INT UNSIGNED DEFAULT '0' NOT NULL")
 );
 
 $GLOBALS['maj'][1940] = array(
-	array('sql_query', "DROP TABLE spip_caches"),
+    array('sql_query', "DROP TABLE spip_caches"),
 );
 
 
 $GLOBALS['maj'][1941] = array(
-	array('sql_query', "UPDATE spip_meta SET `valeur` = '' WHERE `nom`='preview' AND `valeur`='non' "),
-	array(
-		'sql_query',
-		"UPDATE spip_meta SET `valeur` = ',0minirezo,1comite,' WHERE `nom`='preview' AND `valeur`='1comite' "
-	),
-	array('sql_query', "UPDATE spip_meta SET `valeur` = ',0minirezo,' WHERE `nom`='preview' AND `valeur`='oui' "),
+    array('sql_query', "UPDATE spip_meta SET `valeur` = '' WHERE `nom`='preview' AND `valeur`='non' "),
+    array(
+        'sql_query',
+        "UPDATE spip_meta SET `valeur` = ',0minirezo,1comite,' WHERE `nom`='preview' AND `valeur`='1comite' "
+    ),
+    array('sql_query', "UPDATE spip_meta SET `valeur` = ',0minirezo,' WHERE `nom`='preview' AND `valeur`='oui' "),
 );
 
 $GLOBALS['maj'][1942] = array(
-	array('sql_alter', "TABLE spip_auteurs CHANGE `statut` `statut` varchar(255)  DEFAULT '0' NOT NULL"),
-	array('sql_alter', "TABLE spip_breves CHANGE `statut` `statut` varchar(6)  DEFAULT '0' NOT NULL"),
-	array('sql_alter', "TABLE spip_messages CHANGE `statut` `statut` varchar(6)  DEFAULT '0' NOT NULL"),
-	array('sql_alter', "TABLE spip_rubriques CHANGE `statut` `statut` varchar(10) DEFAULT '0' NOT NULL"),
-	array('sql_alter', "TABLE spip_rubriques CHANGE `statut_tmp` `statut_tmp` varchar(10) DEFAULT '0' NOT NULL"),
-	array('sql_alter', "TABLE spip_syndic CHANGE `statut` `statut` varchar(10) DEFAULT '0' NOT NULL"),
-	array('sql_alter', "TABLE spip_syndic_articles CHANGE `statut` `statut` varchar(10) DEFAULT '0' NOT NULL"),
-	array('sql_alter', "TABLE spip_forum CHANGE `statut` `statut` varchar(8) DEFAULT '0' NOT NULL"),
-	array('sql_alter', "TABLE spip_signatures CHANGE `statut` `statut` varchar(10) DEFAULT '0' NOT NULL")
+    array('sql_alter', "TABLE spip_auteurs CHANGE `statut` `statut` varchar(255)  DEFAULT '0' NOT NULL"),
+    array('sql_alter', "TABLE spip_breves CHANGE `statut` `statut` varchar(6)  DEFAULT '0' NOT NULL"),
+    array('sql_alter', "TABLE spip_messages CHANGE `statut` `statut` varchar(6)  DEFAULT '0' NOT NULL"),
+    array('sql_alter', "TABLE spip_rubriques CHANGE `statut` `statut` varchar(10) DEFAULT '0' NOT NULL"),
+    array('sql_alter', "TABLE spip_rubriques CHANGE `statut_tmp` `statut_tmp` varchar(10) DEFAULT '0' NOT NULL"),
+    array('sql_alter', "TABLE spip_syndic CHANGE `statut` `statut` varchar(10) DEFAULT '0' NOT NULL"),
+    array('sql_alter', "TABLE spip_syndic_articles CHANGE `statut` `statut` varchar(10) DEFAULT '0' NOT NULL"),
+    array('sql_alter', "TABLE spip_forum CHANGE `statut` `statut` varchar(8) DEFAULT '0' NOT NULL"),
+    array('sql_alter', "TABLE spip_signatures CHANGE `statut` `statut` varchar(10) DEFAULT '0' NOT NULL")
 );
 
 
 // suppression de l'indexation dans la version standard
 $GLOBALS['maj'][1943] = array(
-	array('sql_alter', "TABLE spip_articles DROP KEY `idx`"),
-	array('sql_alter', "TABLE spip_articles DROP `idx`"),
-	array('sql_alter', "TABLE spip_auteurs DROP KEY `idx`"),
-	array('sql_alter', "TABLE spip_auteurs DROP `idx`"),
-	array('sql_alter', "TABLE spip_breves DROP KEY `idx`"),
-	array('sql_alter', "TABLE spip_breves DROP `idx`"),
-	array('sql_alter', "TABLE spip_mots DROP KEY `idx`"),
-	array('sql_alter', "TABLE spip_mots DROP `idx`"),
-	array('sql_alter', "TABLE spip_rubriques DROP KEY `idx`"),
-	array('sql_alter', "TABLE spip_rubriques DROP `idx`"),
+    array('sql_alter', "TABLE spip_articles DROP KEY `idx`"),
+    array('sql_alter', "TABLE spip_articles DROP `idx`"),
+    array('sql_alter', "TABLE spip_auteurs DROP KEY `idx`"),
+    array('sql_alter', "TABLE spip_auteurs DROP `idx`"),
+    array('sql_alter', "TABLE spip_breves DROP KEY `idx`"),
+    array('sql_alter', "TABLE spip_breves DROP `idx`"),
+    array('sql_alter', "TABLE spip_mots DROP KEY `idx`"),
+    array('sql_alter', "TABLE spip_mots DROP `idx`"),
+    array('sql_alter', "TABLE spip_rubriques DROP KEY `idx`"),
+    array('sql_alter', "TABLE spip_rubriques DROP `idx`"),
 #	array('sql_alter', "TABLE spip_documents DROP KEY `idx`"),
-	array('sql_alter', "TABLE spip_documents DROP `idx`"),
-	array('sql_alter', "TABLE spip_syndic DROP KEY `idx`"),
-	array('sql_alter', "TABLE spip_syndic DROP `idx`"),
-	array('sql_alter', "TABLE spip_forum DROP KEY `idx`"),
-	array('sql_alter', "TABLE spip_forum DROP `idx`"),
-	array('sql_alter', "TABLE spip_signatures DROP KEY `idx`"),
-	array('sql_alter', "TABLE spip_signatures DROP `idx`"),
-
-	array('sql_query', "DROP TABLE spip_index"),
-	array('sql_query', "DROP TABLE spip_index_dico"),
+    array('sql_alter', "TABLE spip_documents DROP `idx`"),
+    array('sql_alter', "TABLE spip_syndic DROP KEY `idx`"),
+    array('sql_alter', "TABLE spip_syndic DROP `idx`"),
+    array('sql_alter', "TABLE spip_forum DROP KEY `idx`"),
+    array('sql_alter', "TABLE spip_forum DROP `idx`"),
+    array('sql_alter', "TABLE spip_signatures DROP KEY `idx`"),
+    array('sql_alter', "TABLE spip_signatures DROP `idx`"),
+
+    array('sql_query', "DROP TABLE spip_index"),
+    array('sql_query', "DROP TABLE spip_index_dico"),
 );
 
 $GLOBALS['maj'][1944] = array(
-	array('sql_alter', "TABLE spip_documents CHANGE `taille` `taille` integer"),
-	array('sql_alter', "TABLE spip_documents CHANGE `largeur` `largeur` integer"),
-	array('sql_alter', "TABLE spip_documents CHANGE `hauteur` `hauteur` integer")
+    array('sql_alter', "TABLE spip_documents CHANGE `taille` `taille` integer"),
+    array('sql_alter', "TABLE spip_documents CHANGE `largeur` `largeur` integer"),
+    array('sql_alter', "TABLE spip_documents CHANGE `hauteur` `hauteur` integer")
 );
 
 $GLOBALS['maj'][1945] = array(
-	array('sql_alter', "TABLE spip_petitions CHANGE `email_unique` `email_unique` CHAR (3) DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_petitions CHANGE `site_obli` `site_obli` CHAR (3) DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_petitions CHANGE `site_unique` `site_unique` CHAR (3) DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_petitions CHANGE `message` `message` CHAR (3) DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_petitions CHANGE `texte` `texte` LONGTEXT DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_articles CHANGE `surtitre` `surtitre` text DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_articles CHANGE `titre` `titre` text DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_articles CHANGE `soustitre` `soustitre` text DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_articles CHANGE `descriptif` `descriptif` text DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_articles CHANGE `chapo` `chapo` mediumtext DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_articles CHANGE `texte` `texte` longtext DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_articles CHANGE `ps` `ps` mediumtext DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_articles CHANGE `accepter_forum` `accepter_forum` CHAR(3) DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_articles CHANGE `nom_site` `nom_site` tinytext DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_articles CHANGE `url_site` `url_site` VARCHAR(255) DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_articles CHANGE `url_propre` `url_propre` VARCHAR(255) DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_auteurs CHANGE `nom` `nom` text DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_auteurs CHANGE `bio` `bio` text DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_auteurs CHANGE `email` `email` tinytext DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_auteurs CHANGE `nom_site` `nom_site` tinytext DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_auteurs CHANGE `url_site` `url_site` text DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_auteurs CHANGE `pass` `pass` tinytext DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_auteurs CHANGE `low_sec` `low_sec` tinytext DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_auteurs CHANGE `pgp` `pgp` TEXT DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_auteurs CHANGE `htpass` `htpass` tinytext DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_breves CHANGE `titre` `titre` text DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_breves CHANGE `texte` `texte` longtext DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_breves CHANGE `lien_titre` `lien_titre` text DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_breves CHANGE `lien_url` `lien_url` text DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_messages CHANGE `titre` `titre` text DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_messages CHANGE `texte` `texte` longtext DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_messages CHANGE `type` `type` varchar(6) DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_messages CHANGE `rv` `rv` varchar(3) DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_mots CHANGE `titre` `titre` text DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_mots CHANGE `descriptif` `descriptif` text DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_mots CHANGE `texte` `texte` longtext DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_mots CHANGE `type` `type` text DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_mots CHANGE `url_propre` `url_propre` VARCHAR(255) DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_groupes_mots CHANGE `titre` `titre` text DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_groupes_mots CHANGE `descriptif` `descriptif` text DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_groupes_mots CHANGE `texte` `texte` longtext DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_groupes_mots CHANGE `unseul` `unseul` varchar(3) DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_groupes_mots CHANGE `obligatoire` `obligatoire` varchar(3) DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_groupes_mots CHANGE `articles` `articles` varchar(3) DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_groupes_mots CHANGE `breves` `breves` varchar(3) DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_groupes_mots CHANGE `rubriques` `rubriques` varchar(3) DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_groupes_mots CHANGE `syndic` `syndic` varchar(3) DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_groupes_mots CHANGE `minirezo` `minirezo` varchar(3) DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_groupes_mots CHANGE `comite` `comite` varchar(3) DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_groupes_mots CHANGE `forum` `forum` varchar(3) DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_rubriques CHANGE `titre` `titre` text DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_rubriques CHANGE `descriptif` `descriptif` text DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_rubriques CHANGE `texte` `texte` longtext DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_rubriques CHANGE `url_propre` `url_propre` VARCHAR(255) DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_documents CHANGE `extension` `extension` VARCHAR(10) DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_documents CHANGE `titre` `titre` text DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_documents CHANGE `date` `date` datetime DEFAULT '0000-00-00 00:00:00' NOT NULL"),
-	array('sql_alter', "TABLE spip_documents CHANGE `descriptif` `descriptif` text DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_documents CHANGE `fichier` `fichier` varchar(255) DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_types_documents CHANGE `extension` `extension` varchar(10) DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_types_documents CHANGE `titre` `titre` text DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_types_documents CHANGE `descriptif` `descriptif` text DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_types_documents CHANGE `mime_type` `mime_type` varchar(100) DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_syndic CHANGE `nom_site` `nom_site` text DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_syndic CHANGE `url_site` `url_site` text DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_syndic CHANGE `url_syndic` `url_syndic` text DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_syndic CHANGE `descriptif` `descriptif` text DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_syndic CHANGE `url_propre` `url_propre` VARCHAR(255) DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_syndic CHANGE `syndication` `syndication` VARCHAR(3) DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_syndic_articles CHANGE `titre` `titre` text DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_syndic_articles CHANGE `url` `url` VARCHAR(255) DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_syndic_articles CHANGE `lesauteurs` `lesauteurs` text DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_syndic_articles CHANGE `descriptif` `descriptif` text DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_forum CHANGE `titre` `titre` text DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_forum CHANGE `texte` `texte` mediumtext DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_forum CHANGE `auteur` `auteur` text DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_forum CHANGE `email_auteur` `email_auteur` text DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_forum CHANGE `nom_site` `nom_site` text DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_forum CHANGE `url_site` `url_site` text DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_forum CHANGE `ip` `ip` varchar(16) DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_signatures CHANGE `nom_email` `nom_email` text DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_signatures CHANGE `ad_email` `ad_email` text DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_signatures CHANGE `nom_site` `nom_site` text DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_signatures CHANGE `url_site` `url_site` text DEFAULT '' NOT NULL"),
-	array('sql_alter', "TABLE spip_signatures CHANGE `message` `message` mediumtext DEFAULT '' NOT NULL")
+    array('sql_alter', "TABLE spip_petitions CHANGE `email_unique` `email_unique` CHAR (3) DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_petitions CHANGE `site_obli` `site_obli` CHAR (3) DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_petitions CHANGE `site_unique` `site_unique` CHAR (3) DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_petitions CHANGE `message` `message` CHAR (3) DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_petitions CHANGE `texte` `texte` LONGTEXT DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_articles CHANGE `surtitre` `surtitre` text DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_articles CHANGE `titre` `titre` text DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_articles CHANGE `soustitre` `soustitre` text DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_articles CHANGE `descriptif` `descriptif` text DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_articles CHANGE `chapo` `chapo` mediumtext DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_articles CHANGE `texte` `texte` longtext DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_articles CHANGE `ps` `ps` mediumtext DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_articles CHANGE `accepter_forum` `accepter_forum` CHAR(3) DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_articles CHANGE `nom_site` `nom_site` tinytext DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_articles CHANGE `url_site` `url_site` VARCHAR(255) DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_articles CHANGE `url_propre` `url_propre` VARCHAR(255) DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_auteurs CHANGE `nom` `nom` text DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_auteurs CHANGE `bio` `bio` text DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_auteurs CHANGE `email` `email` tinytext DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_auteurs CHANGE `nom_site` `nom_site` tinytext DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_auteurs CHANGE `url_site` `url_site` text DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_auteurs CHANGE `pass` `pass` tinytext DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_auteurs CHANGE `low_sec` `low_sec` tinytext DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_auteurs CHANGE `pgp` `pgp` TEXT DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_auteurs CHANGE `htpass` `htpass` tinytext DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_breves CHANGE `titre` `titre` text DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_breves CHANGE `texte` `texte` longtext DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_breves CHANGE `lien_titre` `lien_titre` text DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_breves CHANGE `lien_url` `lien_url` text DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_messages CHANGE `titre` `titre` text DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_messages CHANGE `texte` `texte` longtext DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_messages CHANGE `type` `type` varchar(6) DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_messages CHANGE `rv` `rv` varchar(3) DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_mots CHANGE `titre` `titre` text DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_mots CHANGE `descriptif` `descriptif` text DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_mots CHANGE `texte` `texte` longtext DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_mots CHANGE `type` `type` text DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_mots CHANGE `url_propre` `url_propre` VARCHAR(255) DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_groupes_mots CHANGE `titre` `titre` text DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_groupes_mots CHANGE `descriptif` `descriptif` text DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_groupes_mots CHANGE `texte` `texte` longtext DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_groupes_mots CHANGE `unseul` `unseul` varchar(3) DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_groupes_mots CHANGE `obligatoire` `obligatoire` varchar(3) DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_groupes_mots CHANGE `articles` `articles` varchar(3) DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_groupes_mots CHANGE `breves` `breves` varchar(3) DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_groupes_mots CHANGE `rubriques` `rubriques` varchar(3) DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_groupes_mots CHANGE `syndic` `syndic` varchar(3) DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_groupes_mots CHANGE `minirezo` `minirezo` varchar(3) DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_groupes_mots CHANGE `comite` `comite` varchar(3) DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_groupes_mots CHANGE `forum` `forum` varchar(3) DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_rubriques CHANGE `titre` `titre` text DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_rubriques CHANGE `descriptif` `descriptif` text DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_rubriques CHANGE `texte` `texte` longtext DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_rubriques CHANGE `url_propre` `url_propre` VARCHAR(255) DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_documents CHANGE `extension` `extension` VARCHAR(10) DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_documents CHANGE `titre` `titre` text DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_documents CHANGE `date` `date` datetime DEFAULT '0000-00-00 00:00:00' NOT NULL"),
+    array('sql_alter', "TABLE spip_documents CHANGE `descriptif` `descriptif` text DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_documents CHANGE `fichier` `fichier` varchar(255) DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_types_documents CHANGE `extension` `extension` varchar(10) DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_types_documents CHANGE `titre` `titre` text DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_types_documents CHANGE `descriptif` `descriptif` text DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_types_documents CHANGE `mime_type` `mime_type` varchar(100) DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_syndic CHANGE `nom_site` `nom_site` text DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_syndic CHANGE `url_site` `url_site` text DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_syndic CHANGE `url_syndic` `url_syndic` text DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_syndic CHANGE `descriptif` `descriptif` text DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_syndic CHANGE `url_propre` `url_propre` VARCHAR(255) DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_syndic CHANGE `syndication` `syndication` VARCHAR(3) DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_syndic_articles CHANGE `titre` `titre` text DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_syndic_articles CHANGE `url` `url` VARCHAR(255) DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_syndic_articles CHANGE `lesauteurs` `lesauteurs` text DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_syndic_articles CHANGE `descriptif` `descriptif` text DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_forum CHANGE `titre` `titre` text DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_forum CHANGE `texte` `texte` mediumtext DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_forum CHANGE `auteur` `auteur` text DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_forum CHANGE `email_auteur` `email_auteur` text DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_forum CHANGE `nom_site` `nom_site` text DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_forum CHANGE `url_site` `url_site` text DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_forum CHANGE `ip` `ip` varchar(16) DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_signatures CHANGE `nom_email` `nom_email` text DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_signatures CHANGE `ad_email` `ad_email` text DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_signatures CHANGE `nom_site` `nom_site` text DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_signatures CHANGE `url_site` `url_site` text DEFAULT '' NOT NULL"),
+    array('sql_alter', "TABLE spip_signatures CHANGE `message` `message` mediumtext DEFAULT '' NOT NULL")
 );
 
 
 $GLOBALS['maj'][1946] = array(
-	array('sql_alter', "TABLE spip_forum DROP INDEX `id_parent`"),
-	array('sql_alter', "TABLE spip_forum DROP INDEX `id_article`"),
-	array('sql_alter', "TABLE spip_forum DROP INDEX `id_breve`"),
-	array('sql_alter', "TABLE spip_forum DROP INDEX `id_syndic`"),
-	array('sql_alter', "TABLE spip_forum DROP INDEX `id_rubrique`"),
-	array('sql_alter', "TABLE spip_forum DROP INDEX `date_thread`"),
-	array('sql_alter', "TABLE spip_forum DROP INDEX `statut`"),
-	array(
-		'sql_alter',
-		"TABLE spip_forum ADD INDEX `optimal` (`statut`,`id_parent`,`id_article`,`date_heure`,`id_breve`,`id_syndic`,`id_rubrique`)"
-	)
+    array('sql_alter', "TABLE spip_forum DROP INDEX `id_parent`"),
+    array('sql_alter', "TABLE spip_forum DROP INDEX `id_article`"),
+    array('sql_alter', "TABLE spip_forum DROP INDEX `id_breve`"),
+    array('sql_alter', "TABLE spip_forum DROP INDEX `id_syndic`"),
+    array('sql_alter', "TABLE spip_forum DROP INDEX `id_rubrique`"),
+    array('sql_alter', "TABLE spip_forum DROP INDEX `date_thread`"),
+    array('sql_alter', "TABLE spip_forum DROP INDEX `statut`"),
+    array(
+        'sql_alter',
+        "TABLE spip_forum ADD INDEX `optimal` (`statut`,`id_parent`,`id_article`,`date_heure`,`id_breve`,`id_syndic`,`id_rubrique`)"
+    )
 );
 
 
 $GLOBALS['maj'][1947] = array(
 
-	array('sql_alter', "TABLE spip_articles DROP INDEX `url_site`"),
-	array('sql_alter', "TABLE spip_articles DROP INDEX `date_modif`"),
-	array('sql_alter', "TABLE spip_auteurs  DROP INDEX `lang`")
+    array('sql_alter', "TABLE spip_articles DROP INDEX `url_site`"),
+    array('sql_alter', "TABLE spip_articles DROP INDEX `date_modif`"),
+    array('sql_alter', "TABLE spip_auteurs  DROP INDEX `lang`")
 );
 
 // mauvaise manip
 $GLOBALS['maj'][1949] = array(
 
-	array('sql_alter', "TABLE spip_versions DROP INDEX `date`"),
-	array('sql_alter', "TABLE spip_versions DROP INDEX `id_auteur`")
+    array('sql_alter', "TABLE spip_versions DROP INDEX `date`"),
+    array('sql_alter', "TABLE spip_versions DROP INDEX `id_auteur`")
 );
 
 /**
@@ -383,47 +383,47 @@ 
  * @param float $installee Numéro de version actuellement installée
  **/
 function maj_1_950($installee) {
-	// oubli de gerer le prefixe lors l'introduction de l'abstraction
-	// => Relancer les MAJ concernees si la version dont on part les avait fait
-	if ($installee >= 1.946) {
-		serie_alter('950a', $GLOBALS['maj'][1946]);
-	}
-	if ($installee >= 1.947) {
-		serie_alter('950b', $GLOBALS['maj'][1947]);
-	}
-	if ($installee >= 1.949) {
-		@serie_alter('950c', $GLOBALS['maj'][1949]);
-	}
-	global $tables_auxiliaires;
-	include_spip('base/auxiliaires');
-	$v = $tables_auxiliaires[$k = 'spip_urls'];
-	sql_create($k, $v['field'], $v['key'], false, false);
-
-
-	foreach (array(
-		         'article' => 'id_article',
-		         'rubrique' => 'id_rubrique',
-		         'breve' => 'id_breve',
-		         'auteur' => 'id_auteur',
-		         'mot' => 'id_mot',
-		         'syndic' => 'id_syndic'
-	         ) as $type => $id_objet) {
-		$table = ($type == 'syndic') ? $type : ($type . "s");
-		$date = ($type == 'breve') ? 'date_heure' :
-			(($type == 'auteur') ? 'maj' :
-				(($type == 'mot') ? 'maj' : 'date'));
-		$q = @sql_select("url_propre AS url, $id_objet AS id_objet, '$type' AS type, $date as date", "spip_$table",
-			"url_propre<>''");
-		if (!$q) {
-			return;
-		} // anormal, mais ne pas boucler en erreur
-		while ($r = sql_fetch($q)) {
-			sql_replace('spip_urls', $r);
-		}
-		spip_log("table $table : " . sql_count($q) . " urls propres copiees");
-		sql_alter("TABLE spip_$table DROP INDEX `url_propre`");
-		sql_alter("TABLE spip_$table DROP `url_propre`");
-	}
+    // oubli de gerer le prefixe lors l'introduction de l'abstraction
+    // => Relancer les MAJ concernees si la version dont on part les avait fait
+    if ($installee >= 1.946) {
+        serie_alter('950a', $GLOBALS['maj'][1946]);
+    }
+    if ($installee >= 1.947) {
+        serie_alter('950b', $GLOBALS['maj'][1947]);
+    }
+    if ($installee >= 1.949) {
+        @serie_alter('950c', $GLOBALS['maj'][1949]);
+    }
+    global $tables_auxiliaires;
+    include_spip('base/auxiliaires');
+    $v = $tables_auxiliaires[$k = 'spip_urls'];
+    sql_create($k, $v['field'], $v['key'], false, false);
+
+
+    foreach (array(
+                    'article' => 'id_article',
+                    'rubrique' => 'id_rubrique',
+                    'breve' => 'id_breve',
+                    'auteur' => 'id_auteur',
+                    'mot' => 'id_mot',
+                    'syndic' => 'id_syndic'
+                ) as $type => $id_objet) {
+        $table = ($type == 'syndic') ? $type : ($type . "s");
+        $date = ($type == 'breve') ? 'date_heure' :
+            (($type == 'auteur') ? 'maj' :
+                (($type == 'mot') ? 'maj' : 'date'));
+        $q = @sql_select("url_propre AS url, $id_objet AS id_objet, '$type' AS type, $date as date", "spip_$table",
+            "url_propre<>''");
+        if (!$q) {
+            return;
+        } // anormal, mais ne pas boucler en erreur
+        while ($r = sql_fetch($q)) {
+            sql_replace('spip_urls', $r);
+        }
+        spip_log("table $table : " . sql_count($q) . " urls propres copiees");
+        sql_alter("TABLE spip_$table DROP INDEX `url_propre`");
+        sql_alter("TABLE spip_$table DROP `url_propre`");
+    }
 }
 
 // Donner a la fonction ci-dessus le numero de version installee
@@ -436,7 +436,7 @@ 
 
 $GLOBALS['maj'][1951] = array(
 
-	array('sql_alter', "TABLE spip_versions CHANGE `id_version` `id_version` bigint(21) DEFAULT 0 NOT NULL")
+    array('sql_alter', "TABLE spip_versions CHANGE `id_version` `id_version` bigint(21) DEFAULT 0 NOT NULL")
 );
 
 
@@ -448,25 +448,25 @@ 
  **/
 function maj_1_952() {
 
-	$ok = sql_alter("TABLE spip_documents CHANGE `mode` `mode` enum('vignette','image','document') DEFAULT NULL");
+    $ok = sql_alter("TABLE spip_documents CHANGE `mode` `mode` enum('vignette','image','document') DEFAULT NULL");
 
-	if ($ok) {
+    if ($ok) {
 
-		$s = sql_select("v.id_document as id_document",
-			"spip_documents as d join spip_documents as v ON d.id_vignette=v.id_document");
+        $s = sql_select("v.id_document as id_document",
+            "spip_documents as d join spip_documents as v ON d.id_vignette=v.id_document");
 
-		$vignettes = array();
-		while ($t = sql_fetch($s)) {
-			$vignettes[] = intval($t['id_document']);
-		}
+        $vignettes = array();
+        while ($t = sql_fetch($s)) {
+            $vignettes[] = intval($t['id_document']);
+        }
 
-		$ok &= sql_query("UPDATE spip_documents SET `mode`='image' WHERE `mode`='vignette'");
-		$ok &= sql_query("UPDATE spip_documents SET `mode`='vignette' WHERE `mode`='image' AND " . sql_in('id_document',
-				$vignettes));
-	}
-	if (!$ok) {
-		die('echec sur maj_1_952()');
-	}
+        $ok &= sql_query("UPDATE spip_documents SET `mode`='image' WHERE `mode`='vignette'");
+        $ok &= sql_query("UPDATE spip_documents SET `mode`='vignette' WHERE `mode`='image' AND " . sql_in('id_document',
+                $vignettes));
+    }
+    if (!$ok) {
+        die('echec sur maj_1_952()');
+    }
 }
 
 $GLOBALS['maj'][1952] = array(array('maj_1_952'));
@@ -475,48 +475,48 @@ 
 
 $GLOBALS['maj'][1954] = array(
 
-	//pas de psd en <img>
-	array('sql_query', "UPDATE spip_types_documents SET `inclus`='non' WHERE `extension`='psd'"),
-	//ajout csv
-	array('sql_query', "INSERT IGNORE INTO spip_types_documents (`extension`, `titre`) VALUES ('csv', 'CSV')"),
-	array('sql_query', "UPDATE spip_types_documents SET `mime_type`='text/csv' WHERE `extension`='csv'"),
-	//ajout mkv
-	array(
-		'sql_query',
-		"INSERT IGNORE INTO spip_types_documents (`extension`, `titre`, `inclus`) VALUES ('mkv', 'Matroska Video', 'embed')"
-	),
-	array('sql_query', "UPDATE spip_types_documents SET `mime_type`='video/x-mkv' WHERE `extension`='mkv'"),
-	//ajout mka
-	array(
-		'sql_query',
-		"INSERT IGNORE INTO spip_types_documents (`extension`, `titre`, `inclus`) VALUES ('mka', 'Matroska Audio', 'embed')"
-	),
-	array('sql_query', "UPDATE spip_types_documents SET `mime_type`='audio/x-mka' WHERE `extension`='mka'"),
-	//ajout kml
-	array(
-		'sql_query',
-		"INSERT IGNORE INTO spip_types_documents (`extension`, `titre`) VALUES ('kml', 'Keyhole Markup Language')"
-	),
-	array(
-		'sql_query',
-		"UPDATE spip_types_documents SET `mime_type`='application/vnd.google-earth.kml+xml' WHERE `extension`='kml'"
-	),
-	//ajout kmz
-	array(
-		'sql_query',
-		"INSERT IGNORE INTO spip_types_documents (`extension`, `titre`) VALUES ('kmz', 'Google Earth Placemark File')"
-	),
-	array(
-		'sql_query',
-		"UPDATE spip_types_documents SET `mime_type`='application/vnd.google-earth.kmz' WHERE `extension`='kmz'"
-	)
+    //pas de psd en <img>
+    array('sql_query', "UPDATE spip_types_documents SET `inclus`='non' WHERE `extension`='psd'"),
+    //ajout csv
+    array('sql_query', "INSERT IGNORE INTO spip_types_documents (`extension`, `titre`) VALUES ('csv', 'CSV')"),
+    array('sql_query', "UPDATE spip_types_documents SET `mime_type`='text/csv' WHERE `extension`='csv'"),
+    //ajout mkv
+    array(
+        'sql_query',
+        "INSERT IGNORE INTO spip_types_documents (`extension`, `titre`, `inclus`) VALUES ('mkv', 'Matroska Video', 'embed')"
+    ),
+    array('sql_query', "UPDATE spip_types_documents SET `mime_type`='video/x-mkv' WHERE `extension`='mkv'"),
+    //ajout mka
+    array(
+        'sql_query',
+        "INSERT IGNORE INTO spip_types_documents (`extension`, `titre`, `inclus`) VALUES ('mka', 'Matroska Audio', 'embed')"
+    ),
+    array('sql_query', "UPDATE spip_types_documents SET `mime_type`='audio/x-mka' WHERE `extension`='mka'"),
+    //ajout kml
+    array(
+        'sql_query',
+        "INSERT IGNORE INTO spip_types_documents (`extension`, `titre`) VALUES ('kml', 'Keyhole Markup Language')"
+    ),
+    array(
+        'sql_query',
+        "UPDATE spip_types_documents SET `mime_type`='application/vnd.google-earth.kml+xml' WHERE `extension`='kml'"
+    ),
+    //ajout kmz
+    array(
+        'sql_query',
+        "INSERT IGNORE INTO spip_types_documents (`extension`, `titre`) VALUES ('kmz', 'Google Earth Placemark File')"
+    ),
+    array(
+        'sql_query',
+        "UPDATE spip_types_documents SET `mime_type`='application/vnd.google-earth.kmz' WHERE `extension`='kmz'"
+    )
 );
 
 if ($GLOBALS['meta']['version_installee'] > 1.950) // 1.950 lisait un bug dans auxiliaires.php corrige a present
 {
-	$GLOBALS['maj'][1955] = array(
-		array('sql_alter', "TABLE spip_urls CHANGE `maj` date DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL")
-	);
+    $GLOBALS['maj'][1955] = array(
+        array('sql_alter', "TABLE spip_urls CHANGE `maj` date DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL")
+    );
 }
 
 // la mise a jour vers 1.938 contient une erreur
@@ -525,16 +525,16 @@ 
 $GLOBALS['maj'][1938] = array(
 
 # creer un champ plus informatif, et son index
-	array('sql_alter', "TABLE spip_documents ADD `extension` VARCHAR(10) DEFAULT ''  NOT NULL "),
+    array('sql_alter', "TABLE spip_documents ADD `extension` VARCHAR(10) DEFAULT ''  NOT NULL "),
 # recopier l'ancien champ dans le nouveau
-	array('maj_1_938'),
+    array('maj_1_938'),
 # supprimer l'ancien champ et son index
-	array('sql_alter', "TABLE spip_documents DROP INDEX `id_type`, DROP `id_type`"),
-	## supprimer l'autoincrement avant de supprimer la PRIMARY KEY
-	array('sql_alter', "TABLE spip_types_documents CHANGE `id_type` `id_type` BIGINT( 21 ) NOT NULL "),
+    array('sql_alter', "TABLE spip_documents DROP INDEX `id_type`, DROP `id_type`"),
+    ## supprimer l'autoincrement avant de supprimer la PRIMARY KEY
+    array('sql_alter', "TABLE spip_types_documents CHANGE `id_type` `id_type` BIGINT( 21 ) NOT NULL "),
 # le champ id_type devient superflu
-	array('sql_alter', "TABLE spip_types_documents DROP `id_type`"),
-	array('sql_alter', "TABLE spip_types_documents ADD PRIMARY KEY (`extension`)")
+    array('sql_alter', "TABLE spip_types_documents DROP `id_type`"),
+    array('sql_alter', "TABLE spip_types_documents ADD PRIMARY KEY (`extension`)")
 );
 
 
@@ -542,14 +542,14 @@ 
 // http://trac.rezo.net/trac/spip/changeset/10482
 
 $GLOBALS['maj'][1957] = array(
-	array('sql_alter', "TABLE spip_mots CHANGE `id_groupe` `id_groupe` bigint(21) DEFAULT 0 NOT NULL"),
-	array(
-		'sql_alter',
-		"TABLE spip_documents CHANGE `mode` `mode` ENUM('vignette', 'image', 'document') DEFAULT 'document' NOT NULL"
-	)
+    array('sql_alter', "TABLE spip_mots CHANGE `id_groupe` `id_groupe` bigint(21) DEFAULT 0 NOT NULL"),
+    array(
+        'sql_alter',
+        "TABLE spip_documents CHANGE `mode` `mode` ENUM('vignette', 'image', 'document') DEFAULT 'document' NOT NULL"
+    )
 );
 
 // Ce champ est inutile et provoque une erreur a l'insertion qui l'oublie
 $GLOBALS['maj'][1958] = array(
-	array('sql_alter', "TABLE spip_referers_articles DROP date")
+    array('sql_alter', "TABLE spip_referers_articles DROP date")
 );

Spacing +15 added lines, -17 removed lines

@@ -54,15 +54,15 @@ 
 function maj_1_934() {
 	// attention, en cas de mutualisation _DIR_IMG contient quelque chose comme sites/urldusite/IMG/
 	// essayons en ne prenant que le dernier segment
-	$dir_img = basename(_DIR_IMG) . '/';
-	$res = sql_query("SELECT fichier FROM spip_documents WHERE fichier LIKE " . sql_quote($dir_img . '%') . " LIMIT 0,1");
+	$dir_img = basename(_DIR_IMG).'/';
+	$res = sql_query("SELECT fichier FROM spip_documents WHERE fichier LIKE ".sql_quote($dir_img.'%')." LIMIT 0,1");
 	if (!$row = sql_fetch($res)) {
 		// sinon on essaye avec le chemin complet
 		// il faut donc verifier qu'on a bien le bon nom de repertoire
 		$dir_img = substr(_DIR_IMG, strlen(_DIR_RACINE));
 	}
 	$n = strlen($dir_img) + 1;
-	sql_query("UPDATE spip_documents SET `fichier`=substring(fichier,$n) WHERE `fichier` LIKE " . sql_quote($dir_img . '%'));
+	sql_query("UPDATE spip_documents SET `fichier`=substring(fichier,$n) WHERE `fichier` LIKE ".sql_quote($dir_img.'%'));
 }
 
 $GLOBALS['maj'][1934] = array(array('maj_1_934'));
@@ -77,15 +77,15 @@ 
 		         'rubrique' => 'id_rubrique',
 		         'breve' => 'id_breve'
 	         ) as $type => $id_table_objet) {
-		$table_objet = "$type" . "s";
+		$table_objet = "$type"."s";
 		$chapo = $type == 'article' ? ",a.chapo" : "";
 		$res = sql_query("SELECT a.$id_table_objet,a.texte $chapo FROM spip_documents_$table_objet AS d JOIN spip_$table_objet AS a ON a.$id_table_objet=d.$id_table_objet GROUP BY $id_table_objet");
 		while ($row = sql_fetch($res)) {
 			$GLOBALS['doublons_documents_inclus'] = array();
-			traiter_modeles(($chapo ? $row['chapo'] : "") . $row['texte'], true); // detecter les doublons
+			traiter_modeles(($chapo ? $row['chapo'] : "").$row['texte'], true); // detecter les doublons
 			if (count($GLOBALS['doublons_documents_inclus'])) {
 				$id = $row[$id_table_objet];
-				$liste = "(" . implode(",$id,'oui'),(", $GLOBALS['doublons_documents_inclus']) . ",$id,'oui')";
+				$liste = "(".implode(",$id,'oui'),(", $GLOBALS['doublons_documents_inclus']).",$id,'oui')";
 				sql_query("REPLACE INTO spip_documents_$table_objet (`id_document`,`$id_table_objet`,`vu`) VALUES $liste");
 			}
 		}
@@ -112,12 +112,12 @@ 
 	// et il faut qu'il corresponde au charset de la connexion qui est celui
 	// dans lequel on a ecrit le champ en blob
 	if ($charset = sql_getfetsel('@@character_set_connection')) {
-		sql_alter("TABLE $table DEFAULT CHARACTER SET " . $charset);
+		sql_alter("TABLE $table DEFAULT CHARACTER SET ".$charset);
 	}
 	$res = sql_query("SHOW FULL COLUMNS FROM $table LIKE '$champ'");
 	if ($row = sql_fetch($res)) {
 		if (strtolower($row['Type']) != strtolower($type)) {
-			$default = $row['Default'] ? (" DEFAULT " . sql_quote($row['Default'])) : "";
+			$default = $row['Default'] ? (" DEFAULT ".sql_quote($row['Default'])) : "";
 			$notnull = ($row['Null'] == 'YES') ? "" : " NOT NULL";
 			sql_alter("TABLE $table CHANGE $champ $champ $type $default $notnull");
 		}
@@ -158,12 +158,12 @@ 
 			$repli = true;
 		}
 
-		$s = sql_select('extension' . ($repli ? '' : ',id_type'), 'spip_types_documents');
+		$s = sql_select('extension'.($repli ? '' : ',id_type'), 'spip_types_documents');
 		while ($t = sql_fetch($s)) {
 			if (isset($t['id_type'])) {
-				sql_query("UPDATE spip_documents	SET `extension`=" . sql_quote($t['extension']) . " WHERE `id_type`=" . sql_quote($t['id_type']));
+				sql_query("UPDATE spip_documents	SET `extension`=".sql_quote($t['extension'])." WHERE `id_type`=".sql_quote($t['id_type']));
 			} else {
-				sql_query("UPDATE spip_documents	SET `extension`=" . sql_quote($t['extension']) . " WHERE fichier LIKE " . sql_quote("%." . $t['extension']));
+				sql_query("UPDATE spip_documents	SET `extension`=".sql_quote($t['extension'])." WHERE fichier LIKE ".sql_quote("%.".$t['extension']));
 			}
 		}
 		$res = sql_select('extension', 'spip_documents', "extension='' OR extension is NULL");
@@ -408,10 +408,8 @@ 
 		         'mot' => 'id_mot',
 		         'syndic' => 'id_syndic'
 	         ) as $type => $id_objet) {
-		$table = ($type == 'syndic') ? $type : ($type . "s");
-		$date = ($type == 'breve') ? 'date_heure' :
-			(($type == 'auteur') ? 'maj' :
-				(($type == 'mot') ? 'maj' : 'date'));
+		$table = ($type == 'syndic') ? $type : ($type."s");
+		$date = ($type == 'breve') ? 'date_heure' : (($type == 'auteur') ? 'maj' : (($type == 'mot') ? 'maj' : 'date'));
 		$q = @sql_select("url_propre AS url, $id_objet AS id_objet, '$type' AS type, $date as date", "spip_$table",
 			"url_propre<>''");
 		if (!$q) {
@@ -420,7 +418,7 @@ 
 		while ($r = sql_fetch($q)) {
 			sql_replace('spip_urls', $r);
 		}
-		spip_log("table $table : " . sql_count($q) . " urls propres copiees");
+		spip_log("table $table : ".sql_count($q)." urls propres copiees");
 		sql_alter("TABLE spip_$table DROP INDEX `url_propre`");
 		sql_alter("TABLE spip_$table DROP `url_propre`");
 	}
@@ -461,7 +459,7 @@ 
 		}
 
 		$ok &= sql_query("UPDATE spip_documents SET `mode`='image' WHERE `mode`='vignette'");
-		$ok &= sql_query("UPDATE spip_documents SET `mode`='vignette' WHERE `mode`='image' AND " . sql_in('id_document',
+		$ok &= sql_query("UPDATE spip_documents SET `mode`='vignette' WHERE `mode`='image' AND ".sql_in('id_document',
 				$vignettes));
 	}
 	if (!$ok) {