spip / SPIP

ecrire/charsets/iso-8859-9.php

Indentation +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
  **/
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 load_charset('iso-8859-1');

ecrire/charsets/html.php

Indentation +114 added lines, -114 removed lines

@@ -8,120 +8,120 @@
  **/
 
 $GLOBALS['CHARSET']['html'] = array(
-	'ldquo' => '“',
-	'rdquo' => '”',
-	'bdquo' => '„',
-	'cent' => '¢',
-	'pound' => '£',
-	'curren' => '¤',
-	'yen' => '¥',
-	'brvbar' => '¦',
-	'sect' => '§',
-	'uml' => '¨',
-	'ordf' => 'ª',
-	'laquo' => '«',
-	'lsquo' => '‘',
-	'rsquo' => '’',
-	'not' => '¬',
-	'shy' => '­',
-	'macr' => '¯',
-	'deg' => '°',
-	'plusmn' => '±',
-	'sup2' => '²',
-	'sup3' => '³',
-	'acute' => '´',
-	'micro' => 'µ',
-	'para' => '¶',
-	'middot' => '·',
-	'cedil' => '¸',
-	'sup1' => '¹',
-	'ordm' => 'º',
-	'raquo' => '»',
-	'iquest' => '¿',
-	'Agrave' => 'À',
-	'Aacute' => 'Á',
-	'Acirc' => 'Â',
-	'Atilde' => 'Ã',
-	'Auml' => 'Ä',
-	'Aring' => 'Å',
-	'AElig' => 'Æ',
-	'Ccedil' => 'Ç',
-	'Egrave' => 'È',
-	'Eacute' => 'É',
-	'Ecirc' => 'Ê',
-	'Euml' => 'Ë',
-	'Igrave' => 'Ì',
-	'Iacute' => 'Í',
-	'Icirc' => 'Î',
-	'Iuml' => 'Ï',
-	'ETH' => 'Ð',
-	'Ntilde' => 'Ñ',
-	'Ograve' => 'Ò',
-	'Oacute' => 'Ó',
-	'Ocirc' => 'Ô',
-	'Otilde' => 'Õ',
-	'Ouml' => 'Ö',
-	'times' => '×',
-	'Oslash' => 'Ø',
-	'Ugrave' => 'Ù',
-	'Uacute' => 'Ú',
-	'Ucirc' => 'Û',
-	'Uuml' => 'Ü',
-	'Yacute' => 'Ý',
-	'THORN' => 'Þ',
-	'szlig' => 'ß',
-	'agrave' => 'à',
-	'Scaron' => 'Š',
-	'scaron' => 'š',
-	'zcaron' => 'ž',
-	'Zcaron' => 'Ž',
-	'aacute' => 'á',
-	'acirc' => 'â',
-	'atilde' => 'ã',
-	'auml' => 'ä',
-	'aring' => 'å',
-	'aelig' => 'æ',
-	'ccedil' => 'ç',
-	'egrave' => 'è',
-	'eacute' => 'é',
-	'ecirc' => 'ê',
-	'euml' => 'ë',
-	'igrave' => 'ì',
-	'iacute' => 'í',
-	'icirc' => 'î',
-	'iuml' => 'ï',
-	'eth' => 'ð',
-	'ntilde' => 'ñ',
-	'ograve' => 'ò',
-	'oacute' => 'ó',
-	'ocirc' => 'ô',
-	'otilde' => 'õ',
-	'ouml' => 'ö',
-	'divide' => '÷',
-	'oslash' => 'ø',
-	'ugrave' => 'ù',
-	'uacute' => 'ú',
-	'ucirc' => 'û',
-	'uuml' => 'ü',
-	'yacute' => 'ý',
-	'thorn' => 'þ',
-	'nbsp' => ' ',
-	'thinsp' => ' ',
-	'ensp' => ' ',
-	'emsp' => ' ',
-	'copy' => '(c)',
-	'reg' => '(r)',
-	'frac14' => '1/4',
-	'frac12' => '1/2',
-	'frac34' => '3/4',
-	'apos' => "'",
-	'mdash' => '—',
-	'ndash' => '–',
-	'hellip' => '…',
-	'euro' => '€',
-	'OElig' => 'Œ',
-	'oelig' => 'œ',
-	'iexcl' => '¡'
+    'ldquo' => '“',
+    'rdquo' => '”',
+    'bdquo' => '„',
+    'cent' => '¢',
+    'pound' => '£',
+    'curren' => '¤',
+    'yen' => '¥',
+    'brvbar' => '¦',
+    'sect' => '§',
+    'uml' => '¨',
+    'ordf' => 'ª',
+    'laquo' => '«',
+    'lsquo' => '‘',
+    'rsquo' => '’',
+    'not' => '¬',
+    'shy' => '­',
+    'macr' => '¯',
+    'deg' => '°',
+    'plusmn' => '±',
+    'sup2' => '²',
+    'sup3' => '³',
+    'acute' => '´',
+    'micro' => 'µ',
+    'para' => '¶',
+    'middot' => '·',
+    'cedil' => '¸',
+    'sup1' => '¹',
+    'ordm' => 'º',
+    'raquo' => '»',
+    'iquest' => '¿',
+    'Agrave' => 'À',
+    'Aacute' => 'Á',
+    'Acirc' => 'Â',
+    'Atilde' => 'Ã',
+    'Auml' => 'Ä',
+    'Aring' => 'Å',
+    'AElig' => 'Æ',
+    'Ccedil' => 'Ç',
+    'Egrave' => 'È',
+    'Eacute' => 'É',
+    'Ecirc' => 'Ê',
+    'Euml' => 'Ë',
+    'Igrave' => 'Ì',
+    'Iacute' => 'Í',
+    'Icirc' => 'Î',
+    'Iuml' => 'Ï',
+    'ETH' => 'Ð',
+    'Ntilde' => 'Ñ',
+    'Ograve' => 'Ò',
+    'Oacute' => 'Ó',
+    'Ocirc' => 'Ô',
+    'Otilde' => 'Õ',
+    'Ouml' => 'Ö',
+    'times' => '×',
+    'Oslash' => 'Ø',
+    'Ugrave' => 'Ù',
+    'Uacute' => 'Ú',
+    'Ucirc' => 'Û',
+    'Uuml' => 'Ü',
+    'Yacute' => 'Ý',
+    'THORN' => 'Þ',
+    'szlig' => 'ß',
+    'agrave' => 'à',
+    'Scaron' => 'Š',
+    'scaron' => 'š',
+    'zcaron' => 'ž',
+    'Zcaron' => 'Ž',
+    'aacute' => 'á',
+    'acirc' => 'â',
+    'atilde' => 'ã',
+    'auml' => 'ä',
+    'aring' => 'å',
+    'aelig' => 'æ',
+    'ccedil' => 'ç',
+    'egrave' => 'è',
+    'eacute' => 'é',
+    'ecirc' => 'ê',
+    'euml' => 'ë',
+    'igrave' => 'ì',
+    'iacute' => 'í',
+    'icirc' => 'î',
+    'iuml' => 'ï',
+    'eth' => 'ð',
+    'ntilde' => 'ñ',
+    'ograve' => 'ò',
+    'oacute' => 'ó',
+    'ocirc' => 'ô',
+    'otilde' => 'õ',
+    'ouml' => 'ö',
+    'divide' => '÷',
+    'oslash' => 'ø',
+    'ugrave' => 'ù',
+    'uacute' => 'ú',
+    'ucirc' => 'û',
+    'uuml' => 'ü',
+    'yacute' => 'ý',
+    'thorn' => 'þ',
+    'nbsp' => ' ',
+    'thinsp' => ' ',
+    'ensp' => ' ',
+    'emsp' => ' ',
+    'copy' => '(c)',
+    'reg' => '(r)',
+    'frac14' => '1/4',
+    'frac12' => '1/2',
+    'frac34' => '3/4',
+    'apos' => "'",
+    'mdash' => '—',
+    'ndash' => '–',
+    'hellip' => '…',
+    'euro' => '€',
+    'OElig' => 'Œ',
+    'oelig' => 'œ',
+    'iexcl' => '¡'
 
 );
 

ecrire/charsets/iso-8859-1.php

Indentation +128 added lines, -128 removed lines

@@ -11,134 +11,134 @@
 // plage invalide en iso-8859-1 mais souvent utilisee quand meme (windows)
 // cf. http://openweb.eu.org/articles/caracteres_illegaux/
 // voir aussi copie de ces valeurs dans inc/charsets.php
-	128 => 8364,
-	129 => 129 /* ?? */,
-	130 => 8218,
-	131 => 402,
-	132 => 8222,
-	133 => 8230,
-	134 => 8224,
-	135 => 8225,
-	136 => 710,
-	137 => 8240,
-	138 => 352,
-	139 => 8249,
-	140 => 338,
-	141 => 141 /* ?? */,
-	142 => 381,
-	143 => 143 /* ?? */,
-	144 => 144 /* ?? */,
-	145 => 8216,
-	146 => 8217,
-	147 => 8220,
-	148 => 8221,
-	149 => 8226,
-	150 => 8211,
-	151 => 8212,
-	152 => 732,
-	153 => 8482,
-	154 => 353,
-	155 => 8250,
-	156 => 339,
-	157 => 157 /* ?? */,
-	158 => 382,
-	159 => 376,
+    128 => 8364,
+    129 => 129 /* ?? */,
+    130 => 8218,
+    131 => 402,
+    132 => 8222,
+    133 => 8230,
+    134 => 8224,
+    135 => 8225,
+    136 => 710,
+    137 => 8240,
+    138 => 352,
+    139 => 8249,
+    140 => 338,
+    141 => 141 /* ?? */,
+    142 => 381,
+    143 => 143 /* ?? */,
+    144 => 144 /* ?? */,
+    145 => 8216,
+    146 => 8217,
+    147 => 8220,
+    148 => 8221,
+    149 => 8226,
+    150 => 8211,
+    151 => 8212,
+    152 => 732,
+    153 => 8482,
+    154 => 353,
+    155 => 8250,
+    156 => 339,
+    157 => 157 /* ?? */,
+    158 => 382,
+    159 => 376,
 
-	160 => 160,
-	161 => 161,
-	162 => 162,
-	163 => 163,
-	164 => 164,
-	165 => 165,
-	166 => 166,
-	167 => 167,
-	168 => 168,
-	169 => 169,
-	170 => 170,
-	171 => 171,
-	172 => 172,
-	173 => 173,
-	174 => 174,
-	175 => 175,
-	176 => 176,
-	177 => 177,
-	178 => 178,
-	179 => 179,
-	180 => 180,
-	181 => 181,
-	182 => 182,
-	183 => 183,
-	184 => 184,
-	185 => 185,
-	186 => 186,
-	187 => 187,
-	188 => 188,
-	189 => 189,
-	190 => 190,
-	191 => 191,
-	192 => 192,
-	193 => 193,
-	194 => 194,
-	195 => 195,
-	196 => 196,
-	197 => 197,
-	198 => 198,
-	199 => 199,
-	200 => 200,
-	201 => 201,
-	202 => 202,
-	203 => 203,
-	204 => 204,
-	205 => 205,
-	206 => 206,
-	207 => 207,
-	208 => 208,
-	209 => 209,
-	210 => 210,
-	211 => 211,
-	212 => 212,
-	213 => 213,
-	214 => 214,
-	215 => 215,
-	216 => 216,
-	217 => 217,
-	218 => 218,
-	219 => 219,
-	220 => 220,
-	221 => 221,
-	222 => 222,
-	223 => 223,
-	224 => 224,
-	225 => 225,
-	226 => 226,
-	227 => 227,
-	228 => 228,
-	229 => 229,
-	230 => 230,
-	231 => 231,
-	232 => 232,
-	233 => 233,
-	234 => 234,
-	235 => 235,
-	236 => 236,
-	237 => 237,
-	238 => 238,
-	239 => 239,
-	240 => 240,
-	241 => 241,
-	242 => 242,
-	243 => 243,
-	244 => 244,
-	245 => 245,
-	246 => 246,
-	247 => 247,
-	248 => 248,
-	249 => 249,
-	250 => 250,
-	251 => 251,
-	252 => 252,
-	253 => 253,
-	254 => 254,
-	255 => 255
+    160 => 160,
+    161 => 161,
+    162 => 162,
+    163 => 163,
+    164 => 164,
+    165 => 165,
+    166 => 166,
+    167 => 167,
+    168 => 168,
+    169 => 169,
+    170 => 170,
+    171 => 171,
+    172 => 172,
+    173 => 173,
+    174 => 174,
+    175 => 175,
+    176 => 176,
+    177 => 177,
+    178 => 178,
+    179 => 179,
+    180 => 180,
+    181 => 181,
+    182 => 182,
+    183 => 183,
+    184 => 184,
+    185 => 185,
+    186 => 186,
+    187 => 187,
+    188 => 188,
+    189 => 189,
+    190 => 190,
+    191 => 191,
+    192 => 192,
+    193 => 193,
+    194 => 194,
+    195 => 195,
+    196 => 196,
+    197 => 197,
+    198 => 198,
+    199 => 199,
+    200 => 200,
+    201 => 201,
+    202 => 202,
+    203 => 203,
+    204 => 204,
+    205 => 205,
+    206 => 206,
+    207 => 207,
+    208 => 208,
+    209 => 209,
+    210 => 210,
+    211 => 211,
+    212 => 212,
+    213 => 213,
+    214 => 214,
+    215 => 215,
+    216 => 216,
+    217 => 217,
+    218 => 218,
+    219 => 219,
+    220 => 220,
+    221 => 221,
+    222 => 222,
+    223 => 223,
+    224 => 224,
+    225 => 225,
+    226 => 226,
+    227 => 227,
+    228 => 228,
+    229 => 229,
+    230 => 230,
+    231 => 231,
+    232 => 232,
+    233 => 233,
+    234 => 234,
+    235 => 235,
+    236 => 236,
+    237 => 237,
+    238 => 238,
+    239 => 239,
+    240 => 240,
+    241 => 241,
+    242 => 242,
+    243 => 243,
+    244 => 244,
+    245 => 245,
+    246 => 246,
+    247 => 247,
+    248 => 248,
+    249 => 249,
+    250 => 250,
+    251 => 251,
+    252 => 252,
+    253 => 253,
+    254 => 254,
+    255 => 255
 
 );

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;
 }