spip / SPIP

ecrire/charsets/translitcomplexe.php

Indentation +142 added lines, -142 removed lines

@@ -20,7 +20,7 @@ 
  **/
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 load_charset('translit');
@@ -28,151 +28,151 @@ 
 
 $translit_c = array(
 // vietnamien
-	225 => "a'",
-	224 => 'a`',
-	7843 => 'a?',
-	227 => 'a~',
-	7841 => 'a.',
-	226 => 'a^',
-	7845 => "a^'",
-	7847 => 'a^`',
-	7849 => 'a^?',
-	7851 => 'a^~',
-	7853 => 'a^.',
-	259 => 'a(',
-	7855 => "a('",
-	7857 => 'a(`',
-	7859 => 'a(?',
-	7861 => 'a(~',
-	7863 => 'a(.',
-	193 => "A'",
-	192 => 'A`',
-	7842 => 'A?',
-	195 => 'A~',
-	7840 => 'A.',
-	194 => 'A^',
-	7844 => "A^'",
-	7846 => 'A^`',
-	7848 => 'A^?',
-	7850 => 'A^~',
-	7852 => 'A^.',
-	258 => 'A(',
-	7854 => "A('",
-	7856 => 'A(`',
-	7858 => 'A(?',
-	7860 => 'A(~',
-	7862 => 'A(.',
-	233 => "e'",
-	232 => 'e`',
-	7867 => 'e?',
-	7869 => 'e~',
-	7865 => 'e.',
-	234 => 'e^',
-	7871 => "e^'",
-	7873 => 'e^`',
-	7875 => 'e^?',
-	7877 => 'e^~',
-	7879 => 'e^.',
-	201 => "E'",
-	200 => 'E`',
-	7866 => 'E?',
-	7868 => 'E~',
-	7864 => 'E.',
-	202 => 'E^',
-	7870 => "E^'",
-	7872 => 'E^`',
-	7874 => 'E^?',
-	7876 => 'E^~',
-	7878 => 'E^.',
-	237 => "i'",
-	236 => 'i`',
-	7881 => 'i?',
-	297 => 'i~',
-	7883 => 'i.',
-	205 => "I'",
-	204 => 'I`',
-	7880 => 'I?',
-	296 => 'I~',
-	7882 => 'I.',
-	243 => "o'",
-	242 => 'o`',
-	7887 => 'o?',
-	245 => 'o~',
-	7885 => 'o.',
-	244 => 'o^',
-	7889 => "o^'",
-	7891 => 'o^`',
-	7893 => 'o^?',
-	7895 => 'o^~',
-	7897 => 'o^.',
-	417 => 'o+',
-	7899 => "o+'",
-	7901 => 'o+`',
-	7903 => 'o+?',
-	7905 => 'o+~',
-	7907 => 'o+.',
-	211 => "O'",
-	210 => 'O`',
-	7886 => 'O?',
-	213 => 'O~',
-	7884 => 'O.',
-	212 => 'O^',
-	7888 => "O^'",
-	7890 => 'O^`',
-	7892 => 'O^?',
-	7894 => 'O^~',
-	7896 => 'O^.',
-	416 => 'O+',
-	7898 => "O+'",
-	7900 => 'O+`',
-	7902 => 'O+?',
-	7904 => 'O+~',
-	7906 => 'O+.',
-	250 => "u'",
-	249 => 'u`',
-	7911 => 'u?',
-	361 => 'u~',
-	7909 => 'u.',
-	432 => 'u+',
-	7913 => "u+'",
-	7915 => 'u+`',
-	7917 => 'u+?',
-	7919 => 'u+~',
-	7921 => 'u+.',
-	218 => "U'",
-	217 => 'U`',
-	7910 => 'U?',
-	360 => 'U~',
-	7908 => 'U.',
-	431 => 'U+',
-	7912 => "U+'",
-	7914 => 'U+`',
-	7916 => 'U+?',
-	7918 => 'U+~',
-	7920 => 'U+.',
-	253 => "y'",
-	7923 => 'y`',
-	7927 => 'y?',
-	7929 => 'y~',
-	7925 => 'y.',
-	221 => "Y'",
-	7922 => 'Y`',
-	7926 => 'Y?',
-	7928 => 'Y~',
-	7924 => 'Y.',
-	273 => 'd-',
-	208 => 'D-',
+    225 => "a'",
+    224 => 'a`',
+    7843 => 'a?',
+    227 => 'a~',
+    7841 => 'a.',
+    226 => 'a^',
+    7845 => "a^'",
+    7847 => 'a^`',
+    7849 => 'a^?',
+    7851 => 'a^~',
+    7853 => 'a^.',
+    259 => 'a(',
+    7855 => "a('",
+    7857 => 'a(`',
+    7859 => 'a(?',
+    7861 => 'a(~',
+    7863 => 'a(.',
+    193 => "A'",
+    192 => 'A`',
+    7842 => 'A?',
+    195 => 'A~',
+    7840 => 'A.',
+    194 => 'A^',
+    7844 => "A^'",
+    7846 => 'A^`',
+    7848 => 'A^?',
+    7850 => 'A^~',
+    7852 => 'A^.',
+    258 => 'A(',
+    7854 => "A('",
+    7856 => 'A(`',
+    7858 => 'A(?',
+    7860 => 'A(~',
+    7862 => 'A(.',
+    233 => "e'",
+    232 => 'e`',
+    7867 => 'e?',
+    7869 => 'e~',
+    7865 => 'e.',
+    234 => 'e^',
+    7871 => "e^'",
+    7873 => 'e^`',
+    7875 => 'e^?',
+    7877 => 'e^~',
+    7879 => 'e^.',
+    201 => "E'",
+    200 => 'E`',
+    7866 => 'E?',
+    7868 => 'E~',
+    7864 => 'E.',
+    202 => 'E^',
+    7870 => "E^'",
+    7872 => 'E^`',
+    7874 => 'E^?',
+    7876 => 'E^~',
+    7878 => 'E^.',
+    237 => "i'",
+    236 => 'i`',
+    7881 => 'i?',
+    297 => 'i~',
+    7883 => 'i.',
+    205 => "I'",
+    204 => 'I`',
+    7880 => 'I?',
+    296 => 'I~',
+    7882 => 'I.',
+    243 => "o'",
+    242 => 'o`',
+    7887 => 'o?',
+    245 => 'o~',
+    7885 => 'o.',
+    244 => 'o^',
+    7889 => "o^'",
+    7891 => 'o^`',
+    7893 => 'o^?',
+    7895 => 'o^~',
+    7897 => 'o^.',
+    417 => 'o+',
+    7899 => "o+'",
+    7901 => 'o+`',
+    7903 => 'o+?',
+    7905 => 'o+~',
+    7907 => 'o+.',
+    211 => "O'",
+    210 => 'O`',
+    7886 => 'O?',
+    213 => 'O~',
+    7884 => 'O.',
+    212 => 'O^',
+    7888 => "O^'",
+    7890 => 'O^`',
+    7892 => 'O^?',
+    7894 => 'O^~',
+    7896 => 'O^.',
+    416 => 'O+',
+    7898 => "O+'",
+    7900 => 'O+`',
+    7902 => 'O+?',
+    7904 => 'O+~',
+    7906 => 'O+.',
+    250 => "u'",
+    249 => 'u`',
+    7911 => 'u?',
+    361 => 'u~',
+    7909 => 'u.',
+    432 => 'u+',
+    7913 => "u+'",
+    7915 => 'u+`',
+    7917 => 'u+?',
+    7919 => 'u+~',
+    7921 => 'u+.',
+    218 => "U'",
+    217 => 'U`',
+    7910 => 'U?',
+    360 => 'U~',
+    7908 => 'U.',
+    431 => 'U+',
+    7912 => "U+'",
+    7914 => 'U+`',
+    7916 => 'U+?',
+    7918 => 'U+~',
+    7920 => 'U+.',
+    253 => "y'",
+    7923 => 'y`',
+    7927 => 'y?',
+    7929 => 'y~',
+    7925 => 'y.',
+    221 => "Y'",
+    7922 => 'Y`',
+    7926 => 'Y?',
+    7928 => 'Y~',
+    7924 => 'Y.',
+    273 => 'd-',
+    208 => 'D-',
 
 // allemand
-	228 => 'ae',
-	246 => 'oe',
-	252 => 'ue',
-	196 => 'Ae',
-	214 => 'Oe',
-	220 => 'Ue'
+    228 => 'ae',
+    246 => 'oe',
+    252 => 'ue',
+    196 => 'Ae',
+    214 => 'Oe',
+    220 => 'Ue'
 );
 
 foreach ($translit_c as $u => $t) {
-	$trans[$u] = $t;
+    $trans[$u] = $t;
 }
 $GLOBALS['CHARSET']['translitcomplexe'] = $trans;

ecrire/charsets/iso-8859-6.php

Indentation +53 added lines, -53 removed lines

@@ -19,7 +19,7 @@ 
  **/
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 load_charset('iso-8859-1');
@@ -27,61 +27,61 @@ 
 $trans = $GLOBALS['CHARSET']['iso-8859-1'];
 
 $mod = array(
-	0xA0 => 0x00A0,
-	0xA4 => 0x00A4,
-	0xAC => 0x060C,
-	0xAD => 0x00AD,
-	0xBB => 0x061B,
-	0xBF => 0x061F,
-	0xC1 => 0x0621,
-	0xC2 => 0x0622,
-	0xC3 => 0x0623,
-	0xC4 => 0x0624,
-	0xC5 => 0x0625,
-	0xC6 => 0x0626,
-	0xC7 => 0x0627,
-	0xC8 => 0x0628,
-	0xC9 => 0x0629,
-	0xCA => 0x062A,
-	0xCB => 0x062B,
-	0xCC => 0x062C,
-	0xCD => 0x062D,
-	0xCE => 0x062E,
-	0xCF => 0x062F,
-	0xD0 => 0x0630,
-	0xD1 => 0x0631,
-	0xD2 => 0x0632,
-	0xD3 => 0x0633,
-	0xD4 => 0x0634,
-	0xD5 => 0x0635,
-	0xD6 => 0x0636,
-	0xD7 => 0x0637,
-	0xD8 => 0x0638,
-	0xD9 => 0x0639,
-	0xDA => 0x063A,
-	0xE0 => 0x0640,
-	0xE1 => 0x0641,
-	0xE2 => 0x0642,
-	0xE3 => 0x0643,
-	0xE4 => 0x0644,
-	0xE5 => 0x0645,
-	0xE6 => 0x0646,
-	0xE7 => 0x0647,
-	0xE8 => 0x0648,
-	0xE9 => 0x0649,
-	0xEA => 0x064A,
-	0xEB => 0x064B,
-	0xEC => 0x064C,
-	0xED => 0x064D,
-	0xEE => 0x064E,
-	0xEF => 0x064F,
-	0xF0 => 0x0650,
-	0xF1 => 0x0651,
-	0xF2 => 0x0652
+    0xA0 => 0x00A0,
+    0xA4 => 0x00A4,
+    0xAC => 0x060C,
+    0xAD => 0x00AD,
+    0xBB => 0x061B,
+    0xBF => 0x061F,
+    0xC1 => 0x0621,
+    0xC2 => 0x0622,
+    0xC3 => 0x0623,
+    0xC4 => 0x0624,
+    0xC5 => 0x0625,
+    0xC6 => 0x0626,
+    0xC7 => 0x0627,
+    0xC8 => 0x0628,
+    0xC9 => 0x0629,
+    0xCA => 0x062A,
+    0xCB => 0x062B,
+    0xCC => 0x062C,
+    0xCD => 0x062D,
+    0xCE => 0x062E,
+    0xCF => 0x062F,
+    0xD0 => 0x0630,
+    0xD1 => 0x0631,
+    0xD2 => 0x0632,
+    0xD3 => 0x0633,
+    0xD4 => 0x0634,
+    0xD5 => 0x0635,
+    0xD6 => 0x0636,
+    0xD7 => 0x0637,
+    0xD8 => 0x0638,
+    0xD9 => 0x0639,
+    0xDA => 0x063A,
+    0xE0 => 0x0640,
+    0xE1 => 0x0641,
+    0xE2 => 0x0642,
+    0xE3 => 0x0643,
+    0xE4 => 0x0644,
+    0xE5 => 0x0645,
+    0xE6 => 0x0646,
+    0xE7 => 0x0647,
+    0xE8 => 0x0648,
+    0xE9 => 0x0649,
+    0xEA => 0x064A,
+    0xEB => 0x064B,
+    0xEC => 0x064C,
+    0xED => 0x064D,
+    0xEE => 0x064E,
+    0xEF => 0x064F,
+    0xF0 => 0x0650,
+    0xF1 => 0x0651,
+    0xF2 => 0x0652
 );
 
 foreach ($mod as $num => $val) {
-	$trans[$num] = $val;
+    $trans[$num] = $val;
 }
 
 $GLOBALS['CHARSET']['iso-8859-6'] = $trans;

ecrire/maj/v018.php

Spacing +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
 				"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'];
+					$discussion .= ",".$row['id'];
 				} else {
 					if ($precedent) {
 						sql_updateq("spip_forum", array("id_thread" => $precedent), "id_forum IN ($discussion)");

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/v019.php

Braces +3 added lines, -1 removed lines

@@ -512,12 +512,14 @@
 	)
 );
 
-if ($GLOBALS['meta']['version_installee'] > 1.950) // 1.950 lisait un bug dans auxiliaires.php corrige a present
+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")
 	);
 }
+}
 
 // la mise a jour vers 1.938 contient une erreur
 // il faut supprimer l'autoincrement avant de supprimer la PRIMARY KEY

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) {

ecrire/maj/v015.php

Indentation +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
  * @package SPIP\Core\SQL\Upgrade
  **/
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 /**

ecrire/req/sqlite3.php

Indentation +8 added lines, -8 removed lines

@@ -11,7 +11,7 @@ 
 \***************************************************************************/
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 
@@ -22,19 +22,19 @@ 
 
 // http://code.spip.net/@req_sqlite3_dist
 function req_sqlite3_dist($addr, $port, $login, $pass, $db = '', $prefixe = '') {
-	return req_sqlite_dist($addr, $port, $login, $pass, $db, $prefixe, $sqlite_version = 3);
+    return req_sqlite_dist($addr, $port, $login, $pass, $db, $prefixe, $sqlite_version = 3);
 }
 
 
 // http://code.spip.net/@spip_sqlite3_constantes
 function spip_sqlite3_constantes() {
-	if (!defined('SPIP_SQLITE3_ASSOC')) {
-		define('SPIP_SQLITE3_ASSOC', PDO::FETCH_ASSOC);
-		define('SPIP_SQLITE3_NUM', PDO::FETCH_NUM);
-		define('SPIP_SQLITE3_BOTH', PDO::FETCH_BOTH);
-	}
+    if (!defined('SPIP_SQLITE3_ASSOC')) {
+        define('SPIP_SQLITE3_ASSOC', PDO::FETCH_ASSOC);
+        define('SPIP_SQLITE3_NUM', PDO::FETCH_NUM);
+        define('SPIP_SQLITE3_BOTH', PDO::FETCH_BOTH);
+    }
 }
 
 function spip_versions_sqlite3() {
-	return _sqlite_charger_version(3) ? 3 : false;
+    return _sqlite_charger_version(3) ? 3 : false;
 }

ecrire/req/sqlite_fonctions.php

Spacing +3 added lines, -3 removed lines

@@ -258,7 +258,7 @@ 
 
 // http://code.spip.net/@_sqlite_func_preg_replace
 function _sqlite_func_preg_replace($quoi, $cherche, $remplace) {
-	$return = preg_replace('%' . $cherche . '%', $remplace, $quoi);
+	$return = preg_replace('%'.$cherche.'%', $remplace, $quoi);
 
 	#spip_log("preg_replace : $quoi, $cherche, $remplace, $return",'sqlite.'._LOG_DEBUG);
 	return $return;
@@ -314,7 +314,7 @@ 
 		return false;
 	}
 	$u = isset($GLOBALS['meta']['pcre_u']) ? $GLOBALS['meta']['pcre_u'] : 'u';
-	$return = preg_match('%' . $cherche . '%imsS' . $u, $quoi);
+	$return = preg_match('%'.$cherche.'%imsS'.$u, $quoi);
 
 	#spip_log("regexp_replace : $quoi, $cherche, $remplace, $return",'sqlite.'._LOG_DEBUG);
 	return $return;
@@ -335,7 +335,7 @@ 
  */
 function _sqlite_func_to_days($d) {
 	static $offset = 719528; // nb de jour entre 0000-00-00 et timestamp 0=1970-01-01
-	$result = $offset + (int)ceil(_sqlite_func_unix_timestamp($d) / (24 * 3600));
+	$result = $offset + (int) ceil(_sqlite_func_unix_timestamp($d) / (24 * 3600));
 
 	#spip_log("Passage avec TO_DAYS : $d, $result",'sqlite.'._LOG_DEBUG);
 	return $result;

Doc Comments +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
  * @link http://www.sqlite.org/lang_corefunc.html Liste des fonctions natives
  * @link http://sqlite.org/changes.html Liste des évolutions
  * 
- * @param PDO|resource $sqlite Représente la connexion Sqlite
+ * @param PDO $sqlite Représente la connexion Sqlite
  * @return false|void
  */
 function _sqlite_init_functions(&$sqlite) {

Indentation +205 added lines, -205 removed lines

@@ -17,7 +17,7 @@ 
  */
  
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 /**
@@ -38,94 +38,94 @@ 
  */
 function _sqlite_init_functions(&$sqlite) {
 
-	if (!$sqlite) {
-		return false;
-	}
+    if (!$sqlite) {
+        return false;
+    }
 
 
-	$fonctions = array(
-		// A
-		'ACOS'  => array('acos', 1),
-		'ASIN'  => array('asin', 1),
-		'ATAN'  => array('atan', 1), // mysql accepte 2 params comme atan2… hum ?
-		'ATAN2' => array('atan2', 2),
+    $fonctions = array(
+        // A
+        'ACOS'  => array('acos', 1),
+        'ASIN'  => array('asin', 1),
+        'ATAN'  => array('atan', 1), // mysql accepte 2 params comme atan2… hum ?
+        'ATAN2' => array('atan2', 2),
 
-		// C
-		'CEIL'   => array('_sqlite_func_ceil', 1),
-		'CONCAT' => array('_sqlite_func_concat', -1),
-		'COS'    => array('cos', 1),
+        // C
+        'CEIL'   => array('_sqlite_func_ceil', 1),
+        'CONCAT' => array('_sqlite_func_concat', -1),
+        'COS'    => array('cos', 1),
 
-		// D
-		'DATE_FORMAT' => array('_sqlite_func_strftime', 2),
-		'DAYOFMONTH'  => array('_sqlite_func_dayofmonth', 1),
-		'DEGREES'     => array('rad2deg', 1),
+        // D
+        'DATE_FORMAT' => array('_sqlite_func_strftime', 2),
+        'DAYOFMONTH'  => array('_sqlite_func_dayofmonth', 1),
+        'DEGREES'     => array('rad2deg', 1),
 
-		// E
-		'EXTRAIRE_MULTI' => array('_sqlite_func_extraire_multi', 2), // specifique a SPIP/sql_multi()
-		'EXP'            => array('exp', 1),
+        // E
+        'EXTRAIRE_MULTI' => array('_sqlite_func_extraire_multi', 2), // specifique a SPIP/sql_multi()
+        'EXP'            => array('exp', 1),
 
-		// F
-		'FIND_IN_SET' => array('_sqlite_func_find_in_set', 2),
-		'FLOOR'       => array('_sqlite_func_floor', 1),
+        // F
+        'FIND_IN_SET' => array('_sqlite_func_find_in_set', 2),
+        'FLOOR'       => array('_sqlite_func_floor', 1),
 
-		// I
-		'IF'     => array('_sqlite_func_if', 3),
-		'INSERT' => array('_sqlite_func_insert', 4),
-		'INSTR'  => array('_sqlite_func_instr', 2),
+        // I
+        'IF'     => array('_sqlite_func_if', 3),
+        'INSERT' => array('_sqlite_func_insert', 4),
+        'INSTR'  => array('_sqlite_func_instr', 2),
 
-		// L
-		'LEAST'  => array('_sqlite_func_least', 3),
-		'_LEFT'  => array('_sqlite_func_left', 2),
+        // L
+        'LEAST'  => array('_sqlite_func_least', 3),
+        '_LEFT'  => array('_sqlite_func_left', 2),
 #		'LENGTH' => array('strlen', 1), // present v1.0.4
 #		'LOWER'  => array('strtolower', 1), // present v2.4
 #		'LTRIM'  => array('ltrim', 1), // present
 
-		// N
-		'NOW' => array('_sqlite_func_now', 0),
+        // N
+        'NOW' => array('_sqlite_func_now', 0),
 
-		// M
-		'MD5'   => array('md5', 1),
-		'MONTH' => array('_sqlite_func_month', 1),
+        // M
+        'MD5'   => array('md5', 1),
+        'MONTH' => array('_sqlite_func_month', 1),
 
-		// P
-		'PREG_REPLACE' => array('_sqlite_func_preg_replace', 3),
+        // P
+        'PREG_REPLACE' => array('_sqlite_func_preg_replace', 3),
 
-		// R
-		'RADIANS' => array('deg2rad', 1),
-		'RAND'    => array('_sqlite_func_rand', 0), // sinon random() v2.4
-		'REGEXP'  => array('_sqlite_func_regexp_match', 2), // critere REGEXP supporte a partir de v3.3.2
-		'RIGHT'   => array('_sqlite_func_right', 2),
+        // R
+        'RADIANS' => array('deg2rad', 1),
+        'RAND'    => array('_sqlite_func_rand', 0), // sinon random() v2.4
+        'REGEXP'  => array('_sqlite_func_regexp_match', 2), // critere REGEXP supporte a partir de v3.3.2
+        'RIGHT'   => array('_sqlite_func_right', 2),
 #		'RTRIM'   => array('rtrim', 1), // present
 
-		// S
-		'SETTYPE'   => array('settype', 2), // CAST present en v3.2.3
-		'SIN'       => array('sin', 1),
-		'SQRT'      => array('sqrt', 1),
-		'SUBSTRING' => array('_sqlite_func_substring' /*, 3*/), // peut etre appelee avec 2 ou 3 arguments, index base 1 et non 0
+        // S
+        'SETTYPE'   => array('settype', 2), // CAST present en v3.2.3
+        'SIN'       => array('sin', 1),
+        'SQRT'      => array('sqrt', 1),
+        'SUBSTRING' => array('_sqlite_func_substring' /*, 3*/), // peut etre appelee avec 2 ou 3 arguments, index base 1 et non 0
 
-		// T
-		'TAN'           => array('tan', 1),
-		'TIMESTAMPDIFF' => array('_sqlite_timestampdiff'    /*, 3*/),
-		'TO_DAYS'       => array('_sqlite_func_to_days', 1),
+        // T
+        'TAN'           => array('tan', 1),
+        'TIMESTAMPDIFF' => array('_sqlite_timestampdiff'    /*, 3*/),
+        'TO_DAYS'       => array('_sqlite_func_to_days', 1),
 #		'TRIM'          => array('trim', 1), // present
 
-		// U
-		'UNIX_TIMESTAMP' => array('_sqlite_func_unix_timestamp', 1),
+        // U
+        'UNIX_TIMESTAMP' => array('_sqlite_func_unix_timestamp', 1),
 #		'UPPER'          => array('strtoupper', 1), // present v2.4
 
-		// V
-		'VIDE' => array('_sqlite_func_vide', 0), // du vide pour SELECT 0 as x ... ORDER BY x -> ORDER BY vide()
+        // V
+        'VIDE' => array('_sqlite_func_vide', 0), // du vide pour SELECT 0 as x ... ORDER BY x -> ORDER BY vide()
 
-		// Y
-		'YEAR' => array('_sqlite_func_year', 1)
-	);
+        // Y
+        'YEAR' => array('_sqlite_func_year', 1)
+    );
 
 
-	foreach ($fonctions as $f => $r) {
-		_sqlite_add_function($sqlite, $f, $r);
-	}
+    foreach ($fonctions as $f => $r) {
+        _sqlite_add_function($sqlite, $f, $r);
+    }
 
-	#spip_log('functions sqlite chargees ','sqlite.'._LOG_DEBUG);
+    #spip_log('functions sqlite chargees ','sqlite.'._LOG_DEBUG);
 }
 
 
@@ -146,9 +146,9 @@ 
  * 
 **/
 function _sqlite_add_function(&$sqlite, &$f, &$r) {
-	isset($r[1])
-		? $sqlite->sqliteCreateFunction($f, $r[0], $r[1])
-		: $sqlite->sqliteCreateFunction($f, $r[0]);
+    isset($r[1])
+        ? $sqlite->sqliteCreateFunction($f, $r[0], $r[1])
+        : $sqlite->sqliteCreateFunction($f, $r[0]);
 }
 
 //
@@ -157,43 +157,43 @@ 
 //
 
 function _sqlite_func_ceil($a) {
-	return ceil($a);
+    return ceil($a);
 }
 
 // http://code.spip.net/@_sqlite_func_concat
 function _sqlite_func_concat() {
-	$args = func_get_args();
+    $args = func_get_args();
 
-	return join('', $args);
+    return join('', $args);
 }
 
 
 // http://code.spip.net/@_sqlite_func_dayofmonth
 function _sqlite_func_dayofmonth($d) {
-	return _sqlite_func_date("d", $d);
+    return _sqlite_func_date("d", $d);
 }
 
 
 // http://code.spip.net/@_sqlite_func_find_in_set
 function _sqlite_func_find_in_set($num, $set) {
-	$rank = 0;
-	foreach (explode(",", $set) as $v) {
-		if ($v == $num) {
-			return (++$rank);
-		}
-		$rank++;
-	}
-
-	return 0;
+    $rank = 0;
+    foreach (explode(",", $set) as $v) {
+        if ($v == $num) {
+            return (++$rank);
+        }
+        $rank++;
+    }
+
+    return 0;
 }
 
 function _sqlite_func_floor($a) {
-	return floor($a);
+    return floor($a);
 }
 
 // http://code.spip.net/@_sqlite_func_if
 function _sqlite_func_if($bool, $oui, $non) {
-	return ($bool) ? $oui : $non;
+    return ($bool) ? $oui : $non;
 }
 
 
@@ -204,59 +204,59 @@ 
  */
 // http://code.spip.net/@_sqlite_func_insert
 function _sqlite_func_insert($s, $index, $longueur, $chaine) {
-	return
-		substr($s, 0, $index)
-		. $chaine
-		. substr(substr($s, $index), $longueur);
+    return
+        substr($s, 0, $index)
+        . $chaine
+        . substr(substr($s, $index), $longueur);
 }
 
 
 // http://code.spip.net/@_sqlite_func_instr
 function _sqlite_func_instr($s, $search) {
-	return strpos($s, $search);
+    return strpos($s, $search);
 }
 
 
 // http://code.spip.net/@_sqlite_func_least
 function _sqlite_func_least() {
-	$arg_list = func_get_args();
-	$least = min($arg_list);
+    $arg_list = func_get_args();
+    $least = min($arg_list);
 
-	#spip_log("Passage avec LEAST : $least",'sqlite.'._LOG_DEBUG);
-	return $least;
+    #spip_log("Passage avec LEAST : $least",'sqlite.'._LOG_DEBUG);
+    return $least;
 }
 
 
 // http://code.spip.net/@_sqlite_func_left
 function _sqlite_func_left($s, $lenght) {
-	return substr($s, $lenght);
+    return substr($s, $lenght);
 }
 
 
 // http://code.spip.net/@_sqlite_func_now
 function _sqlite_func_now() {
-	static $now = null;
-	if (is_null($now)) {
-		$now = date("Y-m-d H:i:s");
-	}
+    static $now = null;
+    if (is_null($now)) {
+        $now = date("Y-m-d H:i:s");
+    }
 
-	#spip_log("Passage avec NOW : $now",'sqlite.'._LOG_DEBUG);
-	return $now;
+    #spip_log("Passage avec NOW : $now",'sqlite.'._LOG_DEBUG);
+    return $now;
 }
 
 
 // http://code.spip.net/@_sqlite_func_month
 function _sqlite_func_month($d) {
-	return _sqlite_func_date("m", $d);
+    return _sqlite_func_date("m", $d);
 }
 
 
 // http://code.spip.net/@_sqlite_func_preg_replace
 function _sqlite_func_preg_replace($quoi, $cherche, $remplace) {
-	$return = preg_replace('%' . $cherche . '%', $remplace, $quoi);
+    $return = preg_replace('%' . $cherche . '%', $remplace, $quoi);
 
-	#spip_log("preg_replace : $quoi, $cherche, $remplace, $return",'sqlite.'._LOG_DEBUG);
-	return $return;
+    #spip_log("preg_replace : $quoi, $cherche, $remplace, $return",'sqlite.'._LOG_DEBUG);
+    return $return;
 }
 
 /**
@@ -267,57 +267,57 @@ 
  * @return string, l'extrait trouve.
  **/
 function _sqlite_func_extraire_multi($quoi, $lang) {
-	if (!defined('_EXTRAIRE_MULTI')) {
-		include_spip('inc/filtres');
-	}
-	if (!function_exists('approcher_langue')) {
-		include_spip('inc/lang');
-	}
-	if (preg_match_all(_EXTRAIRE_MULTI, $quoi, $regs, PREG_SET_ORDER)) {
-		foreach ($regs as $reg) {
-			// chercher la version de la langue courante
-			$trads = extraire_trads($reg[1]);
-			if ($l = approcher_langue($trads, $lang)) {
-				$trad = $trads[$l];
-			} else {
-				$trad = reset($trads);
-			}
-			$quoi = str_replace($reg[0], $trad, $quoi);
-		}
-	}
-
-	return $quoi;
+    if (!defined('_EXTRAIRE_MULTI')) {
+        include_spip('inc/filtres');
+    }
+    if (!function_exists('approcher_langue')) {
+        include_spip('inc/lang');
+    }
+    if (preg_match_all(_EXTRAIRE_MULTI, $quoi, $regs, PREG_SET_ORDER)) {
+        foreach ($regs as $reg) {
+            // chercher la version de la langue courante
+            $trads = extraire_trads($reg[1]);
+            if ($l = approcher_langue($trads, $lang)) {
+                $trad = $trads[$l];
+            } else {
+                $trad = reset($trads);
+            }
+            $quoi = str_replace($reg[0], $trad, $quoi);
+        }
+    }
+
+    return $quoi;
 }
 
 
 // http://code.spip.net/@_sqlite_func_rand
 function _sqlite_func_rand() {
-	return rand();
+    return rand();
 }
 
 
 // http://code.spip.net/@_sqlite_func_right
 function _sqlite_func_right($s, $length) {
-	return substr($s, 0 - $length);
+    return substr($s, 0 - $length);
 }
 
 
 // http://code.spip.net/@_sqlite_func_regexp_match
 function _sqlite_func_regexp_match($cherche, $quoi) {
-	// optimiser un cas tres courant avec les requetes en base
-	if (!$quoi and !strlen($quoi)) {
-		return false;
-	}
-	$u = isset($GLOBALS['meta']['pcre_u']) ? $GLOBALS['meta']['pcre_u'] : 'u';
-	$return = preg_match('%' . $cherche . '%imsS' . $u, $quoi);
-
-	#spip_log("regexp_replace : $quoi, $cherche, $remplace, $return",'sqlite.'._LOG_DEBUG);
-	return $return;
+    // optimiser un cas tres courant avec les requetes en base
+    if (!$quoi and !strlen($quoi)) {
+        return false;
+    }
+    $u = isset($GLOBALS['meta']['pcre_u']) ? $GLOBALS['meta']['pcre_u'] : 'u';
+    $return = preg_match('%' . $cherche . '%imsS' . $u, $quoi);
+
+    #spip_log("regexp_replace : $quoi, $cherche, $remplace, $return",'sqlite.'._LOG_DEBUG);
+    return $return;
 }
 
 // http://code.spip.net/@_sqlite_func_strftime
 function _sqlite_func_strftime($date, $conv) {
-	return strftime($conv, is_int($date) ? $date : strtotime($date));
+    return strftime($conv, is_int($date) ? $date : strtotime($date));
 }
 
 /**
@@ -329,21 +329,21 @@ 
  * @return int
  */
 function _sqlite_func_to_days($d) {
-	static $offset = 719528; // nb de jour entre 0000-00-00 et timestamp 0=1970-01-01
-	$result = $offset + (int)ceil(_sqlite_func_unix_timestamp($d) / (24 * 3600));
+    static $offset = 719528; // nb de jour entre 0000-00-00 et timestamp 0=1970-01-01
+    $result = $offset + (int)ceil(_sqlite_func_unix_timestamp($d) / (24 * 3600));
 
-	#spip_log("Passage avec TO_DAYS : $d, $result",'sqlite.'._LOG_DEBUG);
-	return $result;
+    #spip_log("Passage avec TO_DAYS : $d, $result",'sqlite.'._LOG_DEBUG);
+    return $result;
 }
 
 function _sqlite_func_substring($string, $start, $len = null) {
-	// SQL compte a partir de 1, php a partir de 0
-	$start = ($start > 0) ? $start - 1 : $start;
-	if (is_null($len)) {
-		return substr($string, $start);
-	} else {
-		return substr($string, $start, $len);
-	}
+    // SQL compte a partir de 1, php a partir de 0
+    $start = ($start > 0) ? $start - 1 : $start;
+    if (is_null($len)) {
+        return substr($string, $start);
+    } else {
+        return substr($string, $start, $len);
+    }
 }
 
 /**
@@ -357,61 +357,61 @@ 
  * @return int
  */
 function _sqlite_timestampdiff($unit, $date1, $date2) {
-	$d1 = date_create($date1);
-	$d2 = date_create($date2);
-	$diff = date_diff($d1, $d2);
-	$inv = $diff->invert ? -1 : 1;
-	switch ($unit) {
-		case "YEAR":
-			return $inv * $diff->y;
-		case "QUARTER":
-			return $inv * (4 * $diff->y + intval(floor($diff->m / 3)));
-		case "MONTH":
-			return $inv * (12 * $diff->y + $diff->m);
-		case "WEEK":
-			return $inv * intval(floor($diff->days / 7));
-		case "DAY":
-			#var_dump($inv*$diff->days);
-			return $inv * $diff->days;
-		case "HOUR":
-			return $inv * (24 * $diff->days + $diff->h);
-		case "MINUTE":
-			return $inv * ((24 * $diff->days + $diff->h) * 60 + $diff->i);
-		case "SECOND":
-			return $inv * (((24 * $diff->days + $diff->h) * 60 + $diff->i) * 60 + $diff->s);
-		case "MICROSECOND":
-			return $inv * (((24 * $diff->days + $diff->h) * 60 + $diff->i) * 60 + $diff->s) * 1000000;
-	}
-
-	return 0;
+    $d1 = date_create($date1);
+    $d2 = date_create($date2);
+    $diff = date_diff($d1, $d2);
+    $inv = $diff->invert ? -1 : 1;
+    switch ($unit) {
+        case "YEAR":
+            return $inv * $diff->y;
+        case "QUARTER":
+            return $inv * (4 * $diff->y + intval(floor($diff->m / 3)));
+        case "MONTH":
+            return $inv * (12 * $diff->y + $diff->m);
+        case "WEEK":
+            return $inv * intval(floor($diff->days / 7));
+        case "DAY":
+            #var_dump($inv*$diff->days);
+            return $inv * $diff->days;
+        case "HOUR":
+            return $inv * (24 * $diff->days + $diff->h);
+        case "MINUTE":
+            return $inv * ((24 * $diff->days + $diff->h) * 60 + $diff->i);
+        case "SECOND":
+            return $inv * (((24 * $diff->days + $diff->h) * 60 + $diff->i) * 60 + $diff->s);
+        case "MICROSECOND":
+            return $inv * (((24 * $diff->days + $diff->h) * 60 + $diff->i) * 60 + $diff->s) * 1000000;
+    }
+
+    return 0;
 }
 
 // http://code.spip.net/@_sqlite_func_unix_timestamp
 function _sqlite_func_unix_timestamp($d) {
-	static $mem = array();
-	static $n = 0;
-	if (isset($mem[$d])) {
-		return $mem[$d];
-	}
-	if ($n++ > 100) {
-		$mem = array();
-		$n = 0;
-	}
-
-	//2005-12-02 20:53:53
-	#spip_log("Passage avec UNIX_TIMESTAMP : $d",'sqlite.'._LOG_DEBUG);
-	if (!$d) {
-		return $mem[$d] = mktime();
-	}
-
-	// une pile plus grosse n'accelere pas le calcul
-	return $mem[$d] = strtotime($d);
+    static $mem = array();
+    static $n = 0;
+    if (isset($mem[$d])) {
+        return $mem[$d];
+    }
+    if ($n++ > 100) {
+        $mem = array();
+        $n = 0;
+    }
+
+    //2005-12-02 20:53:53
+    #spip_log("Passage avec UNIX_TIMESTAMP : $d",'sqlite.'._LOG_DEBUG);
+    if (!$d) {
+        return $mem[$d] = mktime();
+    }
+
+    // une pile plus grosse n'accelere pas le calcul
+    return $mem[$d] = strtotime($d);
 }
 
 
 // http://code.spip.net/@_sqlite_func_year
 function _sqlite_func_year($d) {
-	return _sqlite_func_date("Y", $d);
+    return _sqlite_func_date("Y", $d);
 }
 
 /**
@@ -425,23 +425,23 @@ 
  * @return int
  */
 function _sqlite_func_date($quoi, $d) {
-	static $mem = array();
-	static $n = 0;
-	if (isset($mem[$d])) {
-		return $mem[$d][$quoi];
-	}
-	if ($n++ > 100) {
-		$mem = array();
-		$n = 0;
-	}
-
-	$dec = date("Y-m-d", _sqlite_func_unix_timestamp($d));
-	$mem[$d] = array("Y" => substr($dec, 0, 4), "m" => substr($dec, 5, 2), "d" => substr($dec, 8, 2));
-
-	return $mem[$d][$quoi];
+    static $mem = array();
+    static $n = 0;
+    if (isset($mem[$d])) {
+        return $mem[$d][$quoi];
+    }
+    if ($n++ > 100) {
+        $mem = array();
+        $n = 0;
+    }
+
+    $dec = date("Y-m-d", _sqlite_func_unix_timestamp($d));
+    $mem[$d] = array("Y" => substr($dec, 0, 4), "m" => substr($dec, 5, 2), "d" => substr($dec, 8, 2));
+
+    return $mem[$d][$quoi];
 }
 
 // http://code.spip.net/@_sqlite_func_vide
 function _sqlite_func_vide() {
-	return;
+    return;
 }

ecrire/lang/public_ro.php

Indentation +109 added lines, -109 removed lines

@@ -4,117 +4,117 @@
 // ** ne pas modifier le fichier **
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 $GLOBALS[$GLOBALS['idx_lang']] = array(
 
-	// A
-	'accueil_site' => 'Prima pagină', # MODIF
-	'article' => 'Articol',
-	'articles' => 'Articole',
-	'articles_auteur' => 'Articole de acelaşi autor',
-	'articles_populaires' => 'Cele mai populare articole',
-	'articles_rubrique' => 'Articolele acestei rubrici',
-	'aucun_article' => 'Nu există nici un articol la această adresă',
-	'aucun_auteur' => 'Nu există nici un autor la această adresă',
-	'aucun_site' => 'Nu există nici un site la această adresă',
-	'aucune_breve' => 'Nu există nici o ştire la această adresă',
-	'aucune_rubrique' => 'Nu există nici o rubrică la această adresă',
-	'auteur' => 'Autor',
-	'autres' => 'Altele',
-	'autres_breves' => 'Alte ştiri',
-	'autres_groupes_mots_clefs' => 'Alte grupuri de cuvinte-cheie',
-	'autres_sites' => 'Alte site-uri',
-
-	// B
-	'bonjour' => 'Bună ziua',
-
-	// C
-	'commenter_site' => 'Comentaţi acest site',
-	'copie_document_impossible' => 'Imposibil de copiat documentul',
-
-	// D
-	'date' => 'Data',
-	'dernier_ajout' => 'Ultima adăugare',
-	'dernieres_breves' => 'Ultimele ştiri',
-	'derniers_articles' => 'Ultimele articole',
-	'derniers_commentaires' => 'Ultimele comentarii',
-	'derniers_messages_forum' => 'Ultimele mesaje publicate în forum-uri',
-
-	// E
-	'edition_mode_texte' => 'Editare în mod text a',
-	'en_reponse' => 'Răspuns la :',
-	'en_resume' => 'Pe scurt',
-	'envoyer_message' => 'Trimiteţi un mesaj',
-	'espace_prive' => 'Secţiunea protejată',
-
-	// F
-	'formats_acceptes' => 'Formate acceptate : @formats@.',
-
-	// H
-	'hierarchie_site' => 'Ierarhia site-ului',
-
-	// J
-	'jours' => 'zile',
-
-	// L
-	'lien_connecter' => 'Conectare',
-
-	// M
-	'meme_auteur' => 'De acelaşi autor',
-	'meme_rubrique' => 'În aceaşi rubrică',
-	'memes_auteurs' => 'De aceaşi autori',
-	'message' => 'Mesaj',
-	'messages_forum' => 'Mesajele forum-ului', # MODIF
-	'messages_recents' => 'Cele mai recente mesaje de forum',
-	'mots_clef' => 'Cuvânt-cheie',
-	'mots_clefs' => 'Cuvinte-cheie',
-	'mots_clefs_meme_groupe' => 'Cuvinte-cheie în acelaşi grup',
-
-	// N
-	'navigation' => 'Navigare',
-	'nom' => 'Nume',
-	'nouveautes' => 'Noutăţi',
-	'nouveautes_web' => 'Noutăţi pe Web',
-	'nouveaux_articles' => 'Articole noi',
-	'nouvelles_breves' => 'Ştiri noi',
-
-	// P
-	'page_precedente' => 'pagina anterioară',
-	'page_suivante' => 'pagina următoare',
-	'par_auteur' => 'de ',
-	'participer_site' => 'Puteţi deveni o parte activă a acestui site şi puteţi să vă scrieţi propriile articole înregistrându-vă cu ajutorul formularului de mai jos. Veţi primi în scurt timp un email conţinând un cod de acces la secţiunea protejată a acestui site.',
-	'plan_site' => 'Harta site-ului',
-	'popularite' => 'Popularitate',
-	'poster_message' => 'Trimiteţi un mesaj',
-	'proposer_site' => 'Puteţi propune un site de adăugat în această rubrică :',
-
-	// R
-	'repondre_article' => 'Răspundeţi la acest articol',
-	'repondre_breve' => 'Răspundeţi la acestă ştire',
-	'resultats_recherche' => 'Rezultatele căutarii',
-	'retour_debut_forums' => 'Înapoi la începutul forum-urilor',
-	'rubrique' => 'Rubrică',
-	'rubriques' => 'Rubrici',
-
-	// S
-	'signatures_petition' => 'Semnături',
-	'site_realise_avec_spip' => 'Site realizat cu SPIP',
-	'sites_web' => 'Site-uri Web',
-	'sous_rubriques' => 'Sub-rubrici',
-	'spam' => 'Spam',
-	'suite' => 'continuă',
-	'sur_web' => 'Pe Web',
-	'syndiquer_rubrique' => 'Sindicalizaţi această rubrică',
-	'syndiquer_site' => 'Sindicalizaţi întregul site',
-
-	// T
-	'texte_lettre_information' => 'Iată scrisoarea de informaţii a site-ului',
-	'texte_lettre_information_2' => 'Această scrisoare conţine lista noutatilor publicate de la',
-
-	// V
-	'ver_imprimer' => 'Versiunea imprimabilă',
-	'voir_en_ligne' => 'Vedeţi în direct',
-	'voir_squelette' => 'vedeţi scheletul acestei pagini'
+    // A
+    'accueil_site' => 'Prima pagină', # MODIF
+    'article' => 'Articol',
+    'articles' => 'Articole',
+    'articles_auteur' => 'Articole de acelaşi autor',
+    'articles_populaires' => 'Cele mai populare articole',
+    'articles_rubrique' => 'Articolele acestei rubrici',
+    'aucun_article' => 'Nu există nici un articol la această adresă',
+    'aucun_auteur' => 'Nu există nici un autor la această adresă',
+    'aucun_site' => 'Nu există nici un site la această adresă',
+    'aucune_breve' => 'Nu există nici o ştire la această adresă',
+    'aucune_rubrique' => 'Nu există nici o rubrică la această adresă',
+    'auteur' => 'Autor',
+    'autres' => 'Altele',
+    'autres_breves' => 'Alte ştiri',
+    'autres_groupes_mots_clefs' => 'Alte grupuri de cuvinte-cheie',
+    'autres_sites' => 'Alte site-uri',
+
+    // B
+    'bonjour' => 'Bună ziua',
+
+    // C
+    'commenter_site' => 'Comentaţi acest site',
+    'copie_document_impossible' => 'Imposibil de copiat documentul',
+
+    // D
+    'date' => 'Data',
+    'dernier_ajout' => 'Ultima adăugare',
+    'dernieres_breves' => 'Ultimele ştiri',
+    'derniers_articles' => 'Ultimele articole',
+    'derniers_commentaires' => 'Ultimele comentarii',
+    'derniers_messages_forum' => 'Ultimele mesaje publicate în forum-uri',
+
+    // E
+    'edition_mode_texte' => 'Editare în mod text a',
+    'en_reponse' => 'Răspuns la :',
+    'en_resume' => 'Pe scurt',
+    'envoyer_message' => 'Trimiteţi un mesaj',
+    'espace_prive' => 'Secţiunea protejată',
+
+    // F
+    'formats_acceptes' => 'Formate acceptate : @formats@.',
+
+    // H
+    'hierarchie_site' => 'Ierarhia site-ului',
+
+    // J
+    'jours' => 'zile',
+
+    // L
+    'lien_connecter' => 'Conectare',
+
+    // M
+    'meme_auteur' => 'De acelaşi autor',
+    'meme_rubrique' => 'În aceaşi rubrică',
+    'memes_auteurs' => 'De aceaşi autori',
+    'message' => 'Mesaj',
+    'messages_forum' => 'Mesajele forum-ului', # MODIF
+    'messages_recents' => 'Cele mai recente mesaje de forum',
+    'mots_clef' => 'Cuvânt-cheie',
+    'mots_clefs' => 'Cuvinte-cheie',
+    'mots_clefs_meme_groupe' => 'Cuvinte-cheie în acelaşi grup',
+
+    // N
+    'navigation' => 'Navigare',
+    'nom' => 'Nume',
+    'nouveautes' => 'Noutăţi',
+    'nouveautes_web' => 'Noutăţi pe Web',
+    'nouveaux_articles' => 'Articole noi',
+    'nouvelles_breves' => 'Ştiri noi',
+
+    // P
+    'page_precedente' => 'pagina anterioară',
+    'page_suivante' => 'pagina următoare',
+    'par_auteur' => 'de ',
+    'participer_site' => 'Puteţi deveni o parte activă a acestui site şi puteţi să vă scrieţi propriile articole înregistrându-vă cu ajutorul formularului de mai jos. Veţi primi în scurt timp un email conţinând un cod de acces la secţiunea protejată a acestui site.',
+    'plan_site' => 'Harta site-ului',
+    'popularite' => 'Popularitate',
+    'poster_message' => 'Trimiteţi un mesaj',
+    'proposer_site' => 'Puteţi propune un site de adăugat în această rubrică :',
+
+    // R
+    'repondre_article' => 'Răspundeţi la acest articol',
+    'repondre_breve' => 'Răspundeţi la acestă ştire',
+    'resultats_recherche' => 'Rezultatele căutarii',
+    'retour_debut_forums' => 'Înapoi la începutul forum-urilor',
+    'rubrique' => 'Rubrică',
+    'rubriques' => 'Rubrici',
+
+    // S
+    'signatures_petition' => 'Semnături',
+    'site_realise_avec_spip' => 'Site realizat cu SPIP',
+    'sites_web' => 'Site-uri Web',
+    'sous_rubriques' => 'Sub-rubrici',
+    'spam' => 'Spam',
+    'suite' => 'continuă',
+    'sur_web' => 'Pe Web',
+    'syndiquer_rubrique' => 'Sindicalizaţi această rubrică',
+    'syndiquer_site' => 'Sindicalizaţi întregul site',
+
+    // T
+    'texte_lettre_information' => 'Iată scrisoarea de informaţii a site-ului',
+    'texte_lettre_information_2' => 'Această scrisoare conţine lista noutatilor publicate de la',
+
+    // V
+    'ver_imprimer' => 'Versiunea imprimabilă',
+    'voir_en_ligne' => 'Vedeţi în direct',
+    'voir_squelette' => 'vedeţi scheletul acestei pagini'
 );

ecrire/lang/public_ay.php

Indentation +97 added lines, -97 removed lines

@@ -4,105 +4,105 @@
 // ** ne pas modifier le fichier **
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 $GLOBALS[$GLOBALS['idx_lang']] = array(
 
-	// A
-	'accueil_site' => 'Uñnaq qamawita', # MODIF
-	'articles' => 'Qillqatanaka',
-	'articles_auteur' => 'Qillqirin aka qillqatanakapa',
-	'articles_populaires' => 'Uñt’at qillqatanaka',
-	'articles_rubrique' => 'Aka t’aqat qillqatanaka',
-	'aucun_article' => 'Aka utxawinx, ni kuna qillqatas utjkiti',
-	'aucun_auteur' => 'Aka utxawinx janiw qillqirix utjkiti',
-	'aucun_site' => 'Aka utxawinx ni kuna qamawins utjkiti',
-	'aucune_breve' => 'Aka utxawinx ni kuna jisk’aptatas utjkiti',
-	'aucune_rubrique' => 'Aka utxawinx ni kuna t’aqas utjkiti',
-	'autres_breves' => 'Yaqha jisk’aptatanaka',
-	'autres_groupes_mots_clefs' => 'Imt’aw arunakata yaqha tamanaka',
-	'autres_sites' => 'Yaqha qamawinaka',
-
-	// B
-	'bonjour' => 'Kamisaki',
-
-	// C
-	'commenter_site' => 'Aka qamawxat aruskipt’aña',
-
-	// D
-	'date' => 'Uru',
-	'dernier_ajout' => 'Qhipha jichhapxtawi',
-	'dernieres_breves' => 'Qhipa jisk’aptatanaka',
-	'derniers_articles' => 'Qhiphankir qillqatanaka',
-	'derniers_commentaires' => 'Qhipha aruskipt’awinaka',
-	'derniers_messages_forum' => 'Qhipha yatiyawinak aruskipawinakan yatiyata',
-
-	// E
-	'edition_mode_texte' => 'Sawutjama lurawi',
-	'en_reponse' => 'Ukar jaysayaña',
-	'en_resume' => 'Jisk’aptasina',
-	'envoyer_message' => 'Ma yatiyaw apayaña',
-	'espace_prive' => 'Ch’usawx jark’ata',
-
-	// H
-	'hierarchie_site' => 'Qamawita kamachiñawi',
-
-	// J
-	'jours' => 'Urunaka',
-
-	// M
-	'meme_auteur' => 'Pachpa qillqirita',
-	'meme_rubrique' => 'Pachpa t’aqana',
-	'memes_auteurs' => 'Pachpa qillqirinakata',
-	'message' => 'Yatiyawi',
-	'messages_forum' => 'Aruskipawit yatiyawinaka', # MODIF
-	'messages_recents' => 'Amuyt’awit jichhak amuyt’awinaka',
-	'mots_clefs' => 'Imt’at arunaka',
-	'mots_clefs_meme_groupe' => 'Pachpa taman imt’at arunaka',
-
-	// N
-	'navigation' => 'Tuyuriwi',
-	'nom' => 'Suti',
-	'nouveautes' => 'Machaq yatiyawinaka',
-	'nouveautes_web' => 'Web ukan machaq yatiyawinaka',
-	'nouveaux_articles' => 'Machaq qillqatanaka',
-	'nouvelles_breves' => 'Machaq jisk’aptatanaka',
-
-	// P
-	'page_precedente' => 'Nayrir laphi uñnaqa',
-	'page_suivante' => 'Jutir laphi uñnaqa',
-	'par_auteur' => 'Lurata',
-	'participer_site' => 'Kunanaks lurasmaw aka jakawi qamawin ukhamarak qillqatanak lurasma akjaru qillqasisina.Ukat mäkiw mä correo electrónico qatuqata mantaw imt’atanakamampi',
-	'plan_site' => 'Qamawt irpiri',
-	'popularite' => 'Juk’amp uñjata',
-	'poster_message' => 'Ma yatiyawi qillqaña',
-	'proposer_site' => 'Aka t’aqan uskuñatakix ma qamaw amuyt’am:',
-
-	// R
-	'repondre_article' => 'Aka qillqat amuykipaña',
-	'repondre_breve' => 'Aka jisk’aptata amuykipaña',
-	'resultats_recherche' => 'Thaqhata uñstayi',
-	'retour_debut_forums' => 'Aruskipawi qalltar kutiña',
-	'rubrique' => 'T’aqa',
-	'rubriques' => 'T’aqanaka',
-
-	// S
-	'signatures_petition' => 'Firmas',
-	'site_realise_avec_spip' => 'Qamaw SPIP ukamp lurata',
-	'sites_web' => 'web qamawinaka',
-	'sous_rubriques' => 'Jutir t’aqa',
-	'suite' => 'Sarantaskakiña',
-	'sur_web' => 'Web ukata',
-	'syndiquer_rubrique' => 'Aka t’aqa apxasiña',
-	'syndiquer_site' => 't’aqat qamaw apxasiña',
-
-	// T
-	'texte_lettre_information' => 'Akax jisk’a qillqat yatiyawin qamawipawa',
-	'texte_lettre_information_2' => 'Aka jisk’a qillqatxa qillqatanak ukhamaraki jisk’aptat yatiyatanak jisk’ayi', # MODIF
-
-	// V
-	'ver_imprimer' => 'Uñjat liq’suñataki',
-	'voir_en_ligne' => 'Naktata uñjaña',
-	'voir_squelette' => 'Aka laphi uñnaqan ch’aka ch’aka uñjaña'
+    // A
+    'accueil_site' => 'Uñnaq qamawita', # MODIF
+    'articles' => 'Qillqatanaka',
+    'articles_auteur' => 'Qillqirin aka qillqatanakapa',
+    'articles_populaires' => 'Uñt’at qillqatanaka',
+    'articles_rubrique' => 'Aka t’aqat qillqatanaka',
+    'aucun_article' => 'Aka utxawinx, ni kuna qillqatas utjkiti',
+    'aucun_auteur' => 'Aka utxawinx janiw qillqirix utjkiti',
+    'aucun_site' => 'Aka utxawinx ni kuna qamawins utjkiti',
+    'aucune_breve' => 'Aka utxawinx ni kuna jisk’aptatas utjkiti',
+    'aucune_rubrique' => 'Aka utxawinx ni kuna t’aqas utjkiti',
+    'autres_breves' => 'Yaqha jisk’aptatanaka',
+    'autres_groupes_mots_clefs' => 'Imt’aw arunakata yaqha tamanaka',
+    'autres_sites' => 'Yaqha qamawinaka',
+
+    // B
+    'bonjour' => 'Kamisaki',
+
+    // C
+    'commenter_site' => 'Aka qamawxat aruskipt’aña',
+
+    // D
+    'date' => 'Uru',
+    'dernier_ajout' => 'Qhipha jichhapxtawi',
+    'dernieres_breves' => 'Qhipa jisk’aptatanaka',
+    'derniers_articles' => 'Qhiphankir qillqatanaka',
+    'derniers_commentaires' => 'Qhipha aruskipt’awinaka',
+    'derniers_messages_forum' => 'Qhipha yatiyawinak aruskipawinakan yatiyata',
+
+    // E
+    'edition_mode_texte' => 'Sawutjama lurawi',
+    'en_reponse' => 'Ukar jaysayaña',
+    'en_resume' => 'Jisk’aptasina',
+    'envoyer_message' => 'Ma yatiyaw apayaña',
+    'espace_prive' => 'Ch’usawx jark’ata',
+
+    // H
+    'hierarchie_site' => 'Qamawita kamachiñawi',
+
+    // J
+    'jours' => 'Urunaka',
+
+    // M
+    'meme_auteur' => 'Pachpa qillqirita',
+    'meme_rubrique' => 'Pachpa t’aqana',
+    'memes_auteurs' => 'Pachpa qillqirinakata',
+    'message' => 'Yatiyawi',
+    'messages_forum' => 'Aruskipawit yatiyawinaka', # MODIF
+    'messages_recents' => 'Amuyt’awit jichhak amuyt’awinaka',
+    'mots_clefs' => 'Imt’at arunaka',
+    'mots_clefs_meme_groupe' => 'Pachpa taman imt’at arunaka',
+
+    // N
+    'navigation' => 'Tuyuriwi',
+    'nom' => 'Suti',
+    'nouveautes' => 'Machaq yatiyawinaka',
+    'nouveautes_web' => 'Web ukan machaq yatiyawinaka',
+    'nouveaux_articles' => 'Machaq qillqatanaka',
+    'nouvelles_breves' => 'Machaq jisk’aptatanaka',
+
+    // P
+    'page_precedente' => 'Nayrir laphi uñnaqa',
+    'page_suivante' => 'Jutir laphi uñnaqa',
+    'par_auteur' => 'Lurata',
+    'participer_site' => 'Kunanaks lurasmaw aka jakawi qamawin ukhamarak qillqatanak lurasma akjaru qillqasisina.Ukat mäkiw mä correo electrónico qatuqata mantaw imt’atanakamampi',
+    'plan_site' => 'Qamawt irpiri',
+    'popularite' => 'Juk’amp uñjata',
+    'poster_message' => 'Ma yatiyawi qillqaña',
+    'proposer_site' => 'Aka t’aqan uskuñatakix ma qamaw amuyt’am:',
+
+    // R
+    'repondre_article' => 'Aka qillqat amuykipaña',
+    'repondre_breve' => 'Aka jisk’aptata amuykipaña',
+    'resultats_recherche' => 'Thaqhata uñstayi',
+    'retour_debut_forums' => 'Aruskipawi qalltar kutiña',
+    'rubrique' => 'T’aqa',
+    'rubriques' => 'T’aqanaka',
+
+    // S
+    'signatures_petition' => 'Firmas',
+    'site_realise_avec_spip' => 'Qamaw SPIP ukamp lurata',
+    'sites_web' => 'web qamawinaka',
+    'sous_rubriques' => 'Jutir t’aqa',
+    'suite' => 'Sarantaskakiña',
+    'sur_web' => 'Web ukata',
+    'syndiquer_rubrique' => 'Aka t’aqa apxasiña',
+    'syndiquer_site' => 't’aqat qamaw apxasiña',
+
+    // T
+    'texte_lettre_information' => 'Akax jisk’a qillqat yatiyawin qamawipawa',
+    'texte_lettre_information_2' => 'Aka jisk’a qillqatxa qillqatanak ukhamaraki jisk’aptat yatiyatanak jisk’ayi', # MODIF
+
+    // V
+    'ver_imprimer' => 'Uñjat liq’suñataki',
+    'voir_en_ligne' => 'Naktata uñjaña',
+    'voir_squelette' => 'Aka laphi uñnaqan ch’aka ch’aka uñjaña'
 );