spip / SPIP

ecrire/charsets/translit.php

Indentation +361 added lines, -361 removed lines

@@ -9,385 +9,385 @@
 
 $GLOBALS['CHARSET']['translit'] = [
 // latin [fausse plage]
-	128 => 'EUR',
-	131 => 'f',
-	140 => 'OE',
-	147 => '\'\'',
-	148 => '\'\'',
-	153 => '(TM)',
-	156 => 'oe',
-	159 => 'Y',
+    128 => 'EUR',
+    131 => 'f',
+    140 => 'OE',
+    147 => '\'\'',
+    148 => '\'\'',
+    153 => '(TM)',
+    156 => 'oe',
+    159 => 'Y',
 
 // latin [legal]
-	160 => ' ',
-	161 => '!',
-	162 => 'c',
-	163 => 'L',
-	164 => 'O',
-	165 => 'yen',
-	166 => '|',
-	167 => 'p',
-	169 => '(c)',
-	171 => '<<',
-	172 => '-',
-	173 => '-',
-	174 => '(R)',
-	176 => 'o',
-	177 => '+-',
-	181 => 'mu',
-	182 => 'p',
-	183 => '.',
-	186 => 'o ',
-	187 => '>>',
-	191 => '?',
-	192 => 'A',
-	193 => 'A',
-	194 => 'A',
-	195 => 'A',
-	196 => 'A',
-	197 => 'A',
-	198 => 'AE',
-	199 => 'C',
-	200 => 'E',
-	201 => 'E',
-	202 => 'E',
-	203 => 'E',
-	204 => 'I',
-	205 => 'I',
-	206 => 'I',
-	207 => 'I',
-	209 => 'N',
-	210 => 'O',
-	211 => 'O',
-	212 => 'O',
-	213 => 'O',
-	214 => 'O',
-	216 => 'O',
-	217 => 'U',
-	218 => 'U',
-	219 => 'U',
-	220 => 'U',
-	223 => 'ss',
-	224 => 'a',
-	225 => 'a',
-	226 => 'a',
-	227 => 'a',
-	228 => 'a',
-	229 => 'a',
-	230 => 'ae',
-	231 => 'c',
-	232 => 'e',
-	233 => 'e',
-	234 => 'e',
-	235 => 'e',
-	236 => 'i',
-	237 => 'i',
-	238 => 'i',
-	239 => 'i',
-	241 => 'n',
-	242 => 'o',
-	243 => 'o',
-	244 => 'o',
-	245 => 'o',
-	246 => 'o',
-	248 => 'o',
-	249 => 'u',
-	250 => 'u',
-	251 => 'u',
-	252 => 'u',
-	255 => 'y',
+    160 => ' ',
+    161 => '!',
+    162 => 'c',
+    163 => 'L',
+    164 => 'O',
+    165 => 'yen',
+    166 => '|',
+    167 => 'p',
+    169 => '(c)',
+    171 => '<<',
+    172 => '-',
+    173 => '-',
+    174 => '(R)',
+    176 => 'o',
+    177 => '+-',
+    181 => 'mu',
+    182 => 'p',
+    183 => '.',
+    186 => 'o ',
+    187 => '>>',
+    191 => '?',
+    192 => 'A',
+    193 => 'A',
+    194 => 'A',
+    195 => 'A',
+    196 => 'A',
+    197 => 'A',
+    198 => 'AE',
+    199 => 'C',
+    200 => 'E',
+    201 => 'E',
+    202 => 'E',
+    203 => 'E',
+    204 => 'I',
+    205 => 'I',
+    206 => 'I',
+    207 => 'I',
+    209 => 'N',
+    210 => 'O',
+    211 => 'O',
+    212 => 'O',
+    213 => 'O',
+    214 => 'O',
+    216 => 'O',
+    217 => 'U',
+    218 => 'U',
+    219 => 'U',
+    220 => 'U',
+    223 => 'ss',
+    224 => 'a',
+    225 => 'a',
+    226 => 'a',
+    227 => 'a',
+    228 => 'a',
+    229 => 'a',
+    230 => 'ae',
+    231 => 'c',
+    232 => 'e',
+    233 => 'e',
+    234 => 'e',
+    235 => 'e',
+    236 => 'i',
+    237 => 'i',
+    238 => 'i',
+    239 => 'i',
+    241 => 'n',
+    242 => 'o',
+    243 => 'o',
+    244 => 'o',
+    245 => 'o',
+    246 => 'o',
+    248 => 'o',
+    249 => 'u',
+    250 => 'u',
+    251 => 'u',
+    252 => 'u',
+    255 => 'y',
 
 // turc
-	286 => 'G',
-	287 => 'g',
-	304 => 'I',
-	305 => 'i',
-	350 => 'S',
-	351 => 's',
+    286 => 'G',
+    287 => 'g',
+    304 => 'I',
+    305 => 'i',
+    350 => 'S',
+    351 => 's',
 
 // esperanto
-	264 => 'Cx',
-	265 => 'cx',
-	284 => 'Gx',
-	285 => 'gx',
-	292 => 'Hx',
-	293 => 'hx',
-	308 => 'Jx',
-	309 => 'jx',
-	348 => 'Sx',
-	349 => 'sx',
-	364 => 'Ux',
-	365 => 'ux',
+    264 => 'Cx',
+    265 => 'cx',
+    284 => 'Gx',
+    285 => 'gx',
+    292 => 'Hx',
+    293 => 'hx',
+    308 => 'Jx',
+    309 => 'jx',
+    348 => 'Sx',
+    349 => 'sx',
+    364 => 'Ux',
+    365 => 'ux',
 
 
 // latin2 [Czech]
-	283 => 'e',
-	353 => 's',
-	269 => 'c',
-	345 => 'r',
-	382 => 'z',
-	367 => 'u',
-	328 => 'n',
-	357 => 't',
-	271 => 'd',
-	449 => 'o',
-	282 => 'E',
-	352 => 'S',
-	268 => 'C',
-	344 => 'R',
-	381 => 'Z',
-	366 => 'U',
-	327 => 'N',
-	356 => 'T',
-	270 => 'D',
-	467 => 'O',
+    283 => 'e',
+    353 => 's',
+    269 => 'c',
+    345 => 'r',
+    382 => 'z',
+    367 => 'u',
+    328 => 'n',
+    357 => 't',
+    271 => 'd',
+    449 => 'o',
+    282 => 'E',
+    352 => 'S',
+    268 => 'C',
+    344 => 'R',
+    381 => 'Z',
+    366 => 'U',
+    327 => 'N',
+    356 => 'T',
+    270 => 'D',
+    467 => 'O',
 
 // francais
-	338 => 'OE',
-	339 => 'oe',
-	376 => 'Y',
-	402 => 'f',
+    338 => 'OE',
+    339 => 'oe',
+    376 => 'Y',
+    402 => 'f',
 
 //polskie
-	260 => 'A',
-	261 => 'a',
-	262 => 'C',
-	263 => 'c',
-	280 => 'E',
-	281 => 'e',
-	321 => 'L',
-	322 => 'l',
-	323 => 'N',
-	324 => 'n',
-	346 => 'S',
-	347 => 's',
-	377 => 'Z',
-	378 => 'z',
-	379 => 'Z',
-	380 => 'z',
+    260 => 'A',
+    261 => 'a',
+    262 => 'C',
+    263 => 'c',
+    280 => 'E',
+    281 => 'e',
+    321 => 'L',
+    322 => 'l',
+    323 => 'N',
+    324 => 'n',
+    346 => 'S',
+    347 => 's',
+    377 => 'Z',
+    378 => 'z',
+    379 => 'Z',
+    380 => 'z',
 
 //roumain
-	258 => 'A',
-	259 => 'a',
-	350 => 'S',
-	351 => 's',
-	354 => 'T',
-	355 => 't',
+    258 => 'A',
+    259 => 'a',
+    350 => 'S',
+    351 => 's',
+    354 => 'T',
+    355 => 't',
 
 // cyrillique
-	1026 => 'D%',
-	1027 => 'G%',
-	8218 => '\'',
-	1107 => 'g%',
-	8222 => '"',
-	8230 => '...',
-	8224 => '/-',
-	8225 => '/=',
-	8364 => 'EUR',
-	8240 => '0/00',
-	1033 => 'LJ',
-	8249 => '<',
-	1034 => 'NJ',
-	1036 => 'KJ',
-	1035 => 'Ts',
-	1039 => 'DZ',
-	1106 => 'd%',
-	8216 => '`',
-	8217 => '\'',
-	8220 => '"',
-	8221 => '"',
-	8226 => ' o ',
-	8211 => '-',
-	8212 => '--',
-	8212 => '~',
-	8482 => '(TM)',
-	1113 => 'lj',
-	8250 => '>',
-	1114 => 'nj',
-	1116 => 'kj',
-	1115 => 'ts',
-	1119 => 'dz',
-	1038 => 'V%',
-	1118 => 'v%',
-	1032 => 'J%',
-	1168 => 'G3',
-	1025 => 'IO',
-	1028 => 'IE',
-	1031 => 'YI',
-	1030 => 'II',
-	1110 => 'ii',
-	1169 => 'g3',
-	1105 => 'io',
-	8470 => 'No.',
-	1108 => 'ie',
-	1112 => 'j%',
-	1029 => 'DS',
-	1109 => 'ds',
-	1111 => 'yi',
-	1040 => 'A',
-	1041 => 'B',
-	1042 => 'V',
-	1043 => 'G',
-	1044 => 'D',
-	1045 => 'E',
-	1046 => 'ZH',
-	1047 => 'Z',
-	1048 => 'I',
-	1049 => 'J',
-	1050 => 'K',
-	1051 => 'L',
-	1052 => 'M',
-	1053 => 'N',
-	1054 => 'O',
-	1055 => 'P',
-	1056 => 'R',
-	1057 => 'S',
-	1058 => 'T',
-	1059 => 'U',
-	1060 => 'F',
-	1061 => 'H',
-	1062 => 'C',
-	1063 => 'CH',
-	1064 => 'SH',
-	1065 => 'SCH',
-	1066 => '"',
-	1067 => 'Y',
-	1068 => '\'',
-	1069 => '`E',
-	1070 => 'YU',
-	1071 => 'YA',
-	1072 => 'a',
-	1073 => 'b',
-	1074 => 'v',
-	1075 => 'g',
-	1076 => 'd',
-	1077 => 'e',
-	1078 => 'zh',
-	1079 => 'z',
-	1080 => 'i',
-	1081 => 'j',
-	1082 => 'k',
-	1083 => 'l',
-	1084 => 'm',
-	1085 => 'n',
-	1086 => 'o',
-	1087 => 'p',
-	1088 => 'r',
-	1089 => 's',
-	1090 => 't',
-	1091 => 'u',
-	1092 => 'f',
-	1093 => 'h',
-	1094 => 'c',
-	1095 => 'ch',
-	1096 => 'sh',
-	1097 => 'sch',
-	1098 => '"',
-	1099 => 'y',
-	1100 => '\'',
-	1101 => '`e',
-	1102 => 'yu',
-	1103 => 'ya',
+    1026 => 'D%',
+    1027 => 'G%',
+    8218 => '\'',
+    1107 => 'g%',
+    8222 => '"',
+    8230 => '...',
+    8224 => '/-',
+    8225 => '/=',
+    8364 => 'EUR',
+    8240 => '0/00',
+    1033 => 'LJ',
+    8249 => '<',
+    1034 => 'NJ',
+    1036 => 'KJ',
+    1035 => 'Ts',
+    1039 => 'DZ',
+    1106 => 'd%',
+    8216 => '`',
+    8217 => '\'',
+    8220 => '"',
+    8221 => '"',
+    8226 => ' o ',
+    8211 => '-',
+    8212 => '--',
+    8212 => '~',
+    8482 => '(TM)',
+    1113 => 'lj',
+    8250 => '>',
+    1114 => 'nj',
+    1116 => 'kj',
+    1115 => 'ts',
+    1119 => 'dz',
+    1038 => 'V%',
+    1118 => 'v%',
+    1032 => 'J%',
+    1168 => 'G3',
+    1025 => 'IO',
+    1028 => 'IE',
+    1031 => 'YI',
+    1030 => 'II',
+    1110 => 'ii',
+    1169 => 'g3',
+    1105 => 'io',
+    8470 => 'No.',
+    1108 => 'ie',
+    1112 => 'j%',
+    1029 => 'DS',
+    1109 => 'ds',
+    1111 => 'yi',
+    1040 => 'A',
+    1041 => 'B',
+    1042 => 'V',
+    1043 => 'G',
+    1044 => 'D',
+    1045 => 'E',
+    1046 => 'ZH',
+    1047 => 'Z',
+    1048 => 'I',
+    1049 => 'J',
+    1050 => 'K',
+    1051 => 'L',
+    1052 => 'M',
+    1053 => 'N',
+    1054 => 'O',
+    1055 => 'P',
+    1056 => 'R',
+    1057 => 'S',
+    1058 => 'T',
+    1059 => 'U',
+    1060 => 'F',
+    1061 => 'H',
+    1062 => 'C',
+    1063 => 'CH',
+    1064 => 'SH',
+    1065 => 'SCH',
+    1066 => '"',
+    1067 => 'Y',
+    1068 => '\'',
+    1069 => '`E',
+    1070 => 'YU',
+    1071 => 'YA',
+    1072 => 'a',
+    1073 => 'b',
+    1074 => 'v',
+    1075 => 'g',
+    1076 => 'd',
+    1077 => 'e',
+    1078 => 'zh',
+    1079 => 'z',
+    1080 => 'i',
+    1081 => 'j',
+    1082 => 'k',
+    1083 => 'l',
+    1084 => 'm',
+    1085 => 'n',
+    1086 => 'o',
+    1087 => 'p',
+    1088 => 'r',
+    1089 => 's',
+    1090 => 't',
+    1091 => 'u',
+    1092 => 'f',
+    1093 => 'h',
+    1094 => 'c',
+    1095 => 'ch',
+    1096 => 'sh',
+    1097 => 'sch',
+    1098 => '"',
+    1099 => 'y',
+    1100 => '\'',
+    1101 => '`e',
+    1102 => 'yu',
+    1103 => 'ya',
 
 // vietnamien en translitteration de base
-	7843 => 'a',
-	7841 => 'a',
-	7845 => 'a',
-	7847 => 'a',
-	7849 => 'a',
-	7851 => 'a',
-	7853 => 'a',
-	7855 => 'a',
-	7857 => 'a',
-	7859 => 'a',
-	7861 => 'a',
-	7863 => 'a',
-	7842 => 'A',
-	7840 => 'A',
-	7844 => 'A',
-	7846 => 'A',
-	7848 => 'A',
-	7850 => 'A',
-	7852 => 'A',
-	7854 => 'A',
-	7856 => 'A',
-	7858 => 'A',
-	7860 => 'A',
-	7862 => 'A',
-	7867 => 'e',
-	7869 => 'e',
-	7865 => 'e',
-	7871 => 'e',
-	7873 => 'e',
-	7875 => 'e',
-	7877 => 'e',
-	7879 => 'e',
-	7866 => 'E',
-	7868 => 'E',
-	7864 => 'E',
-	7870 => 'E',
-	7872 => 'E',
-	7874 => 'E',
-	7876 => 'E',
-	7878 => 'E',
-	7881 => 'i',
-	7883 => 'i',
-	7880 => 'I',
-	7882 => 'I',
-	7887 => 'o',
-	7885 => 'o',
-	7889 => 'o',
-	7891 => 'o',
-	7893 => 'o',
-	7895 => 'o',
-	7897 => 'o',
-	417 => 'o',
-	7899 => 'o',
-	7901 => 'o',
-	7903 => 'o',
-	7905 => 'o',
-	7907 => 'o',
-	7886 => 'O',
-	7884 => 'O',
-	7888 => 'O',
-	7890 => 'O',
-	7892 => 'O',
-	7894 => 'O',
-	7896 => 'O',
-	416 => 'O',
-	7898 => 'O',
-	7900 => 'O',
-	7902 => 'O',
-	7904 => 'O',
-	7906 => 'O',
-	7911 => 'u',
-	361 => 'u',
-	7909 => 'u',
-	432 => 'u',
-	7913 => 'u',
-	7915 => 'u',
-	7917 => 'u',
-	7919 => 'u',
-	7921 => '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'
+    7843 => 'a',
+    7841 => 'a',
+    7845 => 'a',
+    7847 => 'a',
+    7849 => 'a',
+    7851 => 'a',
+    7853 => 'a',
+    7855 => 'a',
+    7857 => 'a',
+    7859 => 'a',
+    7861 => 'a',
+    7863 => 'a',
+    7842 => 'A',
+    7840 => 'A',
+    7844 => 'A',
+    7846 => 'A',
+    7848 => 'A',
+    7850 => 'A',
+    7852 => 'A',
+    7854 => 'A',
+    7856 => 'A',
+    7858 => 'A',
+    7860 => 'A',
+    7862 => 'A',
+    7867 => 'e',
+    7869 => 'e',
+    7865 => 'e',
+    7871 => 'e',
+    7873 => 'e',
+    7875 => 'e',
+    7877 => 'e',
+    7879 => 'e',
+    7866 => 'E',
+    7868 => 'E',
+    7864 => 'E',
+    7870 => 'E',
+    7872 => 'E',
+    7874 => 'E',
+    7876 => 'E',
+    7878 => 'E',
+    7881 => 'i',
+    7883 => 'i',
+    7880 => 'I',
+    7882 => 'I',
+    7887 => 'o',
+    7885 => 'o',
+    7889 => 'o',
+    7891 => 'o',
+    7893 => 'o',
+    7895 => 'o',
+    7897 => 'o',
+    417 => 'o',
+    7899 => 'o',
+    7901 => 'o',
+    7903 => 'o',
+    7905 => 'o',
+    7907 => 'o',
+    7886 => 'O',
+    7884 => 'O',
+    7888 => 'O',
+    7890 => 'O',
+    7892 => 'O',
+    7894 => 'O',
+    7896 => 'O',
+    416 => 'O',
+    7898 => 'O',
+    7900 => 'O',
+    7902 => 'O',
+    7904 => 'O',
+    7906 => 'O',
+    7911 => 'u',
+    361 => 'u',
+    7909 => 'u',
+    432 => 'u',
+    7913 => 'u',
+    7915 => 'u',
+    7917 => 'u',
+    7919 => 'u',
+    7921 => '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'
 
 ];

ecrire/charsets/cp1250.php

Indentation +123 added lines, -123 removed lines

@@ -10,127 +10,127 @@
  **/
 
 $GLOBALS['CHARSET']['cp1250'] = [
-	0x80 => 0x20AC,
-	0x82 => 0x201A,
-	0x84 => 0x201E,
-	0x85 => 0x2026,
-	0x86 => 0x2020,
-	0x87 => 0x2021,
-	0x89 => 0x2030,
-	0x8A => 0x0160,
-	0x8B => 0x2039,
-	0x8C => 0x015A,
-	0x8D => 0x0164,
-	0x8E => 0x017D,
-	0x8F => 0x0179,
-	0x91 => 0x2018,
-	0x92 => 0x2019,
-	0x93 => 0x201C,
-	0x94 => 0x201D,
-	0x95 => 0x2022,
-	0x96 => 0x2013,
-	0x97 => 0x2014,
-	0x99 => 0x2122,
-	0x9A => 0x0161,
-	0x9B => 0x203A,
-	0x9C => 0x015B,
-	0x9D => 0x0165,
-	0x9E => 0x017E,
-	0x9F => 0x017A,
-	0xA0 => 0x00A0,
-	0xA1 => 0x02C7,
-	0xA2 => 0x02D8,
-	0xA3 => 0x0141,
-	0xA4 => 0x00A4,
-	0xA5 => 0x0104,
-	0xA6 => 0x00A6,
-	0xA7 => 0x00A7,
-	0xA8 => 0x00A8,
-	0xA9 => 0x00A9,
-	0xAA => 0x015E,
-	0xAB => 0x00AB,
-	0xAC => 0x00AC,
-	0xAD => 0x00AD,
-	0xAE => 0x00AE,
-	0xAF => 0x017B,
-	0xB0 => 0x00B0,
-	0xB1 => 0x00B1,
-	0xB2 => 0x02DB,
-	0xB3 => 0x0142,
-	0xB4 => 0x00B4,
-	0xB5 => 0x00B5,
-	0xB6 => 0x00B6,
-	0xB7 => 0x00B7,
-	0xB8 => 0x00B8,
-	0xB9 => 0x0105,
-	0xBA => 0x015F,
-	0xBB => 0x00BB,
-	0xBC => 0x013D,
-	0xBD => 0x02DD,
-	0xBE => 0x013E,
-	0xBF => 0x017C,
-	0xC0 => 0x0154,
-	0xC1 => 0x00C1,
-	0xC2 => 0x00C2,
-	0xC3 => 0x0102,
-	0xC4 => 0x00C4,
-	0xC5 => 0x0139,
-	0xC6 => 0x0106,
-	0xC7 => 0x00C7,
-	0xC8 => 0x010C,
-	0xC9 => 0x00C9,
-	0xCA => 0x0118,
-	0xCB => 0x00CB,
-	0xCC => 0x011A,
-	0xCD => 0x00CD,
-	0xCE => 0x00CE,
-	0xCF => 0x010E,
-	0xD0 => 0x0110,
-	0xD1 => 0x0143,
-	0xD2 => 0x0147,
-	0xD3 => 0x00D3,
-	0xD4 => 0x00D4,
-	0xD5 => 0x0150,
-	0xD6 => 0x00D6,
-	0xD7 => 0x00D7,
-	0xD8 => 0x0158,
-	0xD9 => 0x016E,
-	0xDA => 0x00DA,
-	0xDB => 0x0170,
-	0xDC => 0x00DC,
-	0xDD => 0x00DD,
-	0xDE => 0x0162,
-	0xDF => 0x00DF,
-	0xE0 => 0x0155,
-	0xE1 => 0x00E1,
-	0xE2 => 0x00E2,
-	0xE3 => 0x0103,
-	0xE4 => 0x00E4,
-	0xE5 => 0x013A,
-	0xE6 => 0x0107,
-	0xE7 => 0x00E7,
-	0xE8 => 0x010D,
-	0xE9 => 0x00E9,
-	0xEA => 0x0119,
-	0xEB => 0x00EB,
-	0xEC => 0x011B,
-	0xED => 0x00ED,
-	0xEE => 0x00EE,
-	0xEF => 0x010F,
-	0xF0 => 0x0111,
-	0xF1 => 0x0144,
-	0xF2 => 0x0148,
-	0xF3 => 0x00F3,
-	0xF4 => 0x00F4,
-	0xF5 => 0x0151,
-	0xF6 => 0x00F6,
-	0xF7 => 0x00F7,
-	0xF8 => 0x0159,
-	0xF9 => 0x016F,
-	0xFA => 0x00FA,
-	0xFB => 0x0171,
-	0xFC => 0x00FC,
-	0xFD => 0x00FD,
-	0xFE => 0x0163,
-	0xFF => 0x02D9
+    0x80 => 0x20AC,
+    0x82 => 0x201A,
+    0x84 => 0x201E,
+    0x85 => 0x2026,
+    0x86 => 0x2020,
+    0x87 => 0x2021,
+    0x89 => 0x2030,
+    0x8A => 0x0160,
+    0x8B => 0x2039,
+    0x8C => 0x015A,
+    0x8D => 0x0164,
+    0x8E => 0x017D,
+    0x8F => 0x0179,
+    0x91 => 0x2018,
+    0x92 => 0x2019,
+    0x93 => 0x201C,
+    0x94 => 0x201D,
+    0x95 => 0x2022,
+    0x96 => 0x2013,
+    0x97 => 0x2014,
+    0x99 => 0x2122,
+    0x9A => 0x0161,
+    0x9B => 0x203A,
+    0x9C => 0x015B,
+    0x9D => 0x0165,
+    0x9E => 0x017E,
+    0x9F => 0x017A,
+    0xA0 => 0x00A0,
+    0xA1 => 0x02C7,
+    0xA2 => 0x02D8,
+    0xA3 => 0x0141,
+    0xA4 => 0x00A4,
+    0xA5 => 0x0104,
+    0xA6 => 0x00A6,
+    0xA7 => 0x00A7,
+    0xA8 => 0x00A8,
+    0xA9 => 0x00A9,
+    0xAA => 0x015E,
+    0xAB => 0x00AB,
+    0xAC => 0x00AC,
+    0xAD => 0x00AD,
+    0xAE => 0x00AE,
+    0xAF => 0x017B,
+    0xB0 => 0x00B0,
+    0xB1 => 0x00B1,
+    0xB2 => 0x02DB,
+    0xB3 => 0x0142,
+    0xB4 => 0x00B4,
+    0xB5 => 0x00B5,
+    0xB6 => 0x00B6,
+    0xB7 => 0x00B7,
+    0xB8 => 0x00B8,
+    0xB9 => 0x0105,
+    0xBA => 0x015F,
+    0xBB => 0x00BB,
+    0xBC => 0x013D,
+    0xBD => 0x02DD,
+    0xBE => 0x013E,
+    0xBF => 0x017C,
+    0xC0 => 0x0154,
+    0xC1 => 0x00C1,
+    0xC2 => 0x00C2,
+    0xC3 => 0x0102,
+    0xC4 => 0x00C4,
+    0xC5 => 0x0139,
+    0xC6 => 0x0106,
+    0xC7 => 0x00C7,
+    0xC8 => 0x010C,
+    0xC9 => 0x00C9,
+    0xCA => 0x0118,
+    0xCB => 0x00CB,
+    0xCC => 0x011A,
+    0xCD => 0x00CD,
+    0xCE => 0x00CE,
+    0xCF => 0x010E,
+    0xD0 => 0x0110,
+    0xD1 => 0x0143,
+    0xD2 => 0x0147,
+    0xD3 => 0x00D3,
+    0xD4 => 0x00D4,
+    0xD5 => 0x0150,
+    0xD6 => 0x00D6,
+    0xD7 => 0x00D7,
+    0xD8 => 0x0158,
+    0xD9 => 0x016E,
+    0xDA => 0x00DA,
+    0xDB => 0x0170,
+    0xDC => 0x00DC,
+    0xDD => 0x00DD,
+    0xDE => 0x0162,
+    0xDF => 0x00DF,
+    0xE0 => 0x0155,
+    0xE1 => 0x00E1,
+    0xE2 => 0x00E2,
+    0xE3 => 0x0103,
+    0xE4 => 0x00E4,
+    0xE5 => 0x013A,
+    0xE6 => 0x0107,
+    0xE7 => 0x00E7,
+    0xE8 => 0x010D,
+    0xE9 => 0x00E9,
+    0xEA => 0x0119,
+    0xEB => 0x00EB,
+    0xEC => 0x011B,
+    0xED => 0x00ED,
+    0xEE => 0x00EE,
+    0xEF => 0x010F,
+    0xF0 => 0x0111,
+    0xF1 => 0x0144,
+    0xF2 => 0x0148,
+    0xF3 => 0x00F3,
+    0xF4 => 0x00F4,
+    0xF5 => 0x0151,
+    0xF6 => 0x00F6,
+    0xF7 => 0x00F7,
+    0xF8 => 0x0159,
+    0xF9 => 0x016F,
+    0xFA => 0x00FA,
+    0xFB => 0x0171,
+    0xFC => 0x00FC,
+    0xFD => 0x00FD,
+    0xFE => 0x0163,
+    0xFF => 0x02D9
 ];

ecrire/exec/info_plugin.php

Indentation +20 added lines, -20 removed lines

@@ -7,7 +7,7 @@ 
  */
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 include_spip('inc/actions');
@@ -21,23 +21,23 @@ 
  * @uses ajax_retour()
  */
 function exec_info_plugin_dist() {
-	if (!autoriser('configurer', '_plugins')) {
-		include_spip('inc/minipres');
-		echo minipres();
-	} else {
-		$plug = _DIR_RACINE . htmlspecialchars(_request('plugin'));
-		$get_infos = charger_fonction('get_infos', 'plugins');
-		$dir = '';
-		if (strncmp($plug, _DIR_PLUGINS, strlen(_DIR_PLUGINS)) == 0) {
-			$dir = _DIR_PLUGINS;
-		} elseif (strncmp($plug, _DIR_PLUGINS_DIST, strlen(_DIR_PLUGINS_DIST)) == 0) {
-			$dir = _DIR_PLUGINS_DIST;
-		}
-		if ($dir) {
-			$plug = substr($plug, strlen($dir));
-		}
-		$info = $get_infos($plug, false, $dir);
-		$afficher_plugin = charger_fonction('afficher_plugin', 'plugins');
-		ajax_retour(affiche_bloc_plugin($plug, $info, $dir));
-	}
+    if (!autoriser('configurer', '_plugins')) {
+        include_spip('inc/minipres');
+        echo minipres();
+    } else {
+        $plug = _DIR_RACINE . htmlspecialchars(_request('plugin'));
+        $get_infos = charger_fonction('get_infos', 'plugins');
+        $dir = '';
+        if (strncmp($plug, _DIR_PLUGINS, strlen(_DIR_PLUGINS)) == 0) {
+            $dir = _DIR_PLUGINS;
+        } elseif (strncmp($plug, _DIR_PLUGINS_DIST, strlen(_DIR_PLUGINS_DIST)) == 0) {
+            $dir = _DIR_PLUGINS_DIST;
+        }
+        if ($dir) {
+            $plug = substr($plug, strlen($dir));
+        }
+        $info = $get_infos($plug, false, $dir);
+        $afficher_plugin = charger_fonction('afficher_plugin', 'plugins');
+        ajax_retour(affiche_bloc_plugin($plug, $info, $dir));
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 		include_spip('inc/minipres');
 		echo minipres();
 	} else {
-		$plug = _DIR_RACINE . htmlspecialchars(_request('plugin'));
+		$plug = _DIR_RACINE.htmlspecialchars(_request('plugin'));
 		$get_infos = charger_fonction('get_infos', 'plugins');
 		$dir = '';
 		if (strncmp($plug, _DIR_PLUGINS, strlen(_DIR_PLUGINS)) == 0) {

ecrire/exec/403.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 		$message = _T('avis_acces_interdit_prive', ['exec' => _request('exec')]);
 	}
 
-	$contenu = "<h1 class='grostitre'>" . _T('info_acces_interdit') . '</h1>' . $message;
+	$contenu = "<h1 class='grostitre'>"._T('info_acces_interdit').'</h1>'.$message;
 
 	if (_request('var_zajax')) {
 		include_spip('inc/actions');

Indentation +28 added lines, -28 removed lines

@@ -17,7 +17,7 @@ 
  */
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 /**
@@ -27,40 +27,40 @@ 
  */
 function exec_403_dist($message = '') {
 
-	$exec = _request('exec');
+    $exec = _request('exec');
 
-	$titre = "exec_$exec";
-	$navigation = '';
-	$extra = '';
+    $titre = "exec_$exec";
+    $navigation = '';
+    $extra = '';
 
-	if (!$message) {
-		$message = _T('avis_acces_interdit_prive', ['exec' => _request('exec')]);
-	}
+    if (!$message) {
+        $message = _T('avis_acces_interdit_prive', ['exec' => _request('exec')]);
+    }
 
-	$contenu = "<h1 class='grostitre'>" . _T('info_acces_interdit') . '</h1>' . $message;
+    $contenu = "<h1 class='grostitre'>" . _T('info_acces_interdit') . '</h1>' . $message;
 
-	if (_request('var_zajax')) {
-		include_spip('inc/actions');
-		ajax_retour($contenu);
-	} else {
-		include_spip('inc/presentation'); // alleger les inclusions avec un inc/presentation_mini
+    if (_request('var_zajax')) {
+        include_spip('inc/actions');
+        ajax_retour($contenu);
+    } else {
+        include_spip('inc/presentation'); // alleger les inclusions avec un inc/presentation_mini
 
-		$commencer_page = charger_fonction('commencer_page', 'inc');
-		echo $commencer_page($titre);
+        $commencer_page = charger_fonction('commencer_page', 'inc');
+        echo $commencer_page($titre);
 
-		echo debut_gauche();
-		echo recuperer_fond('prive/squelettes/navigation/dist', []);
-		echo pipeline('affiche_gauche', ['args' => ['exec' => '403', 'exec_erreur' => $exec], 'data' => '']);
+        echo debut_gauche();
+        echo recuperer_fond('prive/squelettes/navigation/dist', []);
+        echo pipeline('affiche_gauche', ['args' => ['exec' => '403', 'exec_erreur' => $exec], 'data' => '']);
 
-		echo creer_colonne_droite();
-		echo pipeline('affiche_droite', ['args' => ['exec' => '403', 'exec_erreur' => $exec], 'data' => '']);
+        echo creer_colonne_droite();
+        echo pipeline('affiche_droite', ['args' => ['exec' => '403', 'exec_erreur' => $exec], 'data' => '']);
 
-		echo debut_droite();
-		echo pipeline(
-			'affiche_milieu',
-			['args' => ['exec' => '403', 'exec_erreur' => $exec], 'data' => $contenu]
-		);
+        echo debut_droite();
+        echo pipeline(
+            'affiche_milieu',
+            ['args' => ['exec' => '403', 'exec_erreur' => $exec], 'data' => $contenu]
+        );
 
-		echo fin_gauche(), fin_page();
-	}
+        echo fin_gauche(), fin_page();
+    }
 }

ecrire/exec/plonger.php

Indentation +17 added lines, -17 removed lines

@@ -17,7 +17,7 @@ 
  */
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 /**
@@ -27,23 +27,23 @@ 
  * @uses ajax_retour()
  **/
 function exec_plonger_dist() {
-	include_spip('inc/actions');
+    include_spip('inc/actions');
 
-	$rac = preg_replace(',[^\w\,/#&;-]+,', ' ', _request('rac'));
-	$id = intval(_request('id'));
-	$exclus = intval(_request('exclus'));
-	$col = intval(_request('col'));
-	$do = _request('do');
-	if (preg_match('/^\w*$/', $do)) {
-		if (!$do) {
-			$do = 'aff';
-		}
+    $rac = preg_replace(',[^\w\,/#&;-]+,', ' ', _request('rac'));
+    $id = intval(_request('id'));
+    $exclus = intval(_request('exclus'));
+    $col = intval(_request('col'));
+    $do = _request('do');
+    if (preg_match('/^\w*$/', $do)) {
+        if (!$do) {
+            $do = 'aff';
+        }
 
-		$plonger = charger_fonction('plonger', 'inc');
-		$r = $plonger($id, spip_htmlentities($rac), [], $col, $exclus, $do);
-	} else {
-		$r = '';
-	}
+        $plonger = charger_fonction('plonger', 'inc');
+        $r = $plonger($id, spip_htmlentities($rac), [], $col, $exclus, $do);
+    } else {
+        $r = '';
+    }
 
-	ajax_retour($r);
+    ajax_retour($r);
 }

ecrire/exec/puce_statut.php

Indentation +24 added lines, -24 removed lines

@@ -17,7 +17,7 @@ 
  **/
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 include_spip('inc/presentation');
@@ -32,7 +32,7 @@ 
  * @return string Code HTML
  **/
 function exec_puce_statut_dist() {
-	exec_puce_statut_args(_request('id'), _request('type'));
+    exec_puce_statut_args(_request('id'), _request('type'));
 }
 
 /**
@@ -52,26 +52,26 @@ 
  * @return string Code HTML
  **/
 function exec_puce_statut_args($id, $type) {
-	$id = intval($id);
-	if (
-		$table_objet_sql = table_objet_sql($type)
-		and $d = lister_tables_objets_sql($table_objet_sql)
-		and isset($d['statut_textes_instituer'])
-		and $d['statut_textes_instituer']
-	) {
-		$prim = id_table_objet($type);
-		if (isset($d['field']['id_rubrique'])) {
-			$select = 'id_rubrique,statut';
-		} else {
-			$select = '0 as id_rubrique,statut';
-		}
-		$r = sql_fetsel($select, $table_objet_sql, "$prim=$id");
-		$statut = $r['statut'];
-		$id_rubrique = $r['id_rubrique'];
-	} else {
-		$id_rubrique = $id;
-		$statut = 'prop'; // arbitraire
-	}
-	$puce_statut = charger_fonction('puce_statut', 'inc');
-	ajax_retour($puce_statut($id, $statut, $id_rubrique, $type, true));
+    $id = intval($id);
+    if (
+        $table_objet_sql = table_objet_sql($type)
+        and $d = lister_tables_objets_sql($table_objet_sql)
+        and isset($d['statut_textes_instituer'])
+        and $d['statut_textes_instituer']
+    ) {
+        $prim = id_table_objet($type);
+        if (isset($d['field']['id_rubrique'])) {
+            $select = 'id_rubrique,statut';
+        } else {
+            $select = '0 as id_rubrique,statut';
+        }
+        $r = sql_fetsel($select, $table_objet_sql, "$prim=$id");
+        $statut = $r['statut'];
+        $id_rubrique = $r['id_rubrique'];
+    } else {
+        $id_rubrique = $id;
+        $statut = 'prop'; // arbitraire
+    }
+    $puce_statut = charger_fonction('puce_statut', 'inc');
+    ajax_retour($puce_statut($id, $statut, $id_rubrique, $type, true));
 }

ecrire/exec/install.php

Indentation +22 added lines, -22 removed lines

@@ -17,7 +17,7 @@ 
  */
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 include_spip('inc/minipres');
@@ -42,27 +42,27 @@ 
  *
  **/
 function exec_install_dist() {
-	$etape = _request('etape');
-	$deja = (_FILE_CONNECT and analyse_fichier_connection(_FILE_CONNECT));
+    $etape = _request('etape');
+    $deja = (_FILE_CONNECT and analyse_fichier_connection(_FILE_CONNECT));
 
-	// Si deja installe, on n'a plus le droit qu'a l'etape chmod
-	// pour chgt post-install ou aux etapes supplementaires
-	// de declaration de base externes.
-	// Mais alors il faut authentifier car ecrire/index.php l'a omis
+    // Si deja installe, on n'a plus le droit qu'a l'etape chmod
+    // pour chgt post-install ou aux etapes supplementaires
+    // de declaration de base externes.
+    // Mais alors il faut authentifier car ecrire/index.php l'a omis
 
-	if ($deja and in_array($etape, ['chmod', 'sup1', 'sup2'])) {
-		$auth = charger_fonction('auth', 'inc');
-		if (!$auth()) {
-			verifier_visiteur();
-			$deja = (!autoriser('configurer'));
-		}
-	}
-	if ($deja) {
-		// Rien a faire ici
-		echo minipres();
-	} else {
-		include_spip('base/create');
-		$fonc = charger_fonction("etape_$etape", 'install');
-		$fonc();
-	}
+    if ($deja and in_array($etape, ['chmod', 'sup1', 'sup2'])) {
+        $auth = charger_fonction('auth', 'inc');
+        if (!$auth()) {
+            verifier_visiteur();
+            $deja = (!autoriser('configurer'));
+        }
+    }
+    if ($deja) {
+        // Rien a faire ici
+        echo minipres();
+    } else {
+        include_spip('base/create');
+        $fonc = charger_fonction("etape_$etape", 'install');
+        $fonc();
+    }
 }

ecrire/exec/rechercher.php

Spacing +8 added lines, -8 removed lines

@@ -68,15 +68,15 @@ 
 	$where = preg_split(',\s+,', $type);
 	if ($where) {
 		foreach ($where as $k => $v) {
-			$where[$k] = "'%" . substr(str_replace('%', '\%', sql_quote($v, '', 'string')), 1, -1) . "%'";
+			$where[$k] = "'%".substr(str_replace('%', '\%', sql_quote($v, '', 'string')), 1, -1)."%'";
 		}
-		$where_titre = ('(titre LIKE ' . join(' AND titre LIKE ', $where) . ')');
-		$where_desc = ('(descriptif LIKE ' . join(' AND descriptif LIKE ', $where) . ')');
-		$where_id = ('(id_rubrique = ' . intval($type) . ')');
+		$where_titre = ('(titre LIKE '.join(' AND titre LIKE ', $where).')');
+		$where_desc = ('(descriptif LIKE '.join(' AND descriptif LIKE ', $where).')');
+		$where_id = ('(id_rubrique = '.intval($type).')');
 
 		if ($exclus) {
 			include_spip('inc/rubriques');
-			$where_exclus = ' AND ' . sql_in('id_rubrique', calcul_branche_in($exclus), 'NOT');
+			$where_exclus = ' AND '.sql_in('id_rubrique', calcul_branche_in($exclus), 'NOT');
 		} else {
 			$where_exclus = '';
 		}
@@ -106,7 +106,7 @@ 
 
 	if ($points) {
 		arsort($points);
-		$style = " style='background-image: url(" . chemin_image('secteur-12.png') . ")'";
+		$style = " style='background-image: url(".chemin_image('secteur-12.png').")'";
 		foreach ($rub as $k => $v) {
 			$rub[$k]['atts'] = ($v['id_parent'] ? $style : '')
 				. " class='petite-rubrique'";
@@ -139,13 +139,13 @@ 
 	if (!$ids) {
 		return "<br /><br /><div style='padding: 5px; color: red;'><b>"
 		. spip_htmlentities($type)
-		. '</b> :  ' . _T('avis_aucun_resultat') . '</div>';
+		. '</b> :  '._T('avis_aucun_resultat').'</div>';
 	}
 
 	$ret = '';
 	$info = generer_url_ecrire('informer', "type=rubrique&rac=$rac&id=");
 
-	$onClick = "aff_selection(this.firstChild.title,'$rac" . "_selection','$info', event)";
+	$onClick = "aff_selection(this.firstChild.title,'$rac"."_selection','$info', event)";
 
 	$ondbClick = "$do(this.firstChild.firstChild.nodeValue,this.firstChild.title,'selection_rubrique', 'id_parent');";
 

Indentation +100 added lines, -100 removed lines

@@ -19,7 +19,7 @@ 
  **/
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 include_spip('inc/actions');
@@ -32,17 +32,17 @@ 
  * @uses ajax_retour()
  **/
 function exec_rechercher_dist() {
-	$id = intval(_request('id'));
-	$exclus = intval(_request('exclus'));
-	$rac = spip_htmlentities(_request('rac'));
-	$type = _request('type');
-	$do = _request('do');
-	if (preg_match('/^\w*$/', $do)) {
-		$r = exec_rechercher_args($id, $type, $exclus, $rac, $do);
-	} else {
-		$r = '';
-	}
-	ajax_retour($r);
+    $id = intval(_request('id'));
+    $exclus = intval(_request('exclus'));
+    $rac = spip_htmlentities(_request('rac'));
+    $type = _request('type');
+    $do = _request('do');
+    if (preg_match('/^\w*$/', $do)) {
+        $r = exec_rechercher_args($id, $type, $exclus, $rac, $do);
+    } else {
+        $r = '';
+    }
+    ajax_retour($r);
 }
 
 /**
@@ -59,61 +59,61 @@ 
  * @return string
  **/
 function exec_rechercher_args($id, $type, $exclus, $rac, $do) {
-	if (!$do) {
-		$do = 'aff';
-	}
-
-	$points = $rub = [];
-
-	$where = preg_split(',\s+,', $type);
-	if ($where) {
-		foreach ($where as $k => $v) {
-			$where[$k] = "'%" . substr(str_replace('%', '\%', sql_quote($v, '', 'string')), 1, -1) . "%'";
-		}
-		$where_titre = ('(titre LIKE ' . join(' AND titre LIKE ', $where) . ')');
-		$where_desc = ('(descriptif LIKE ' . join(' AND descriptif LIKE ', $where) . ')');
-		$where_id = ('(id_rubrique = ' . intval($type) . ')');
-
-		if ($exclus) {
-			include_spip('inc/rubriques');
-			$where_exclus = ' AND ' . sql_in('id_rubrique', calcul_branche_in($exclus), 'NOT');
-		} else {
-			$where_exclus = '';
-		}
-
-		foreach (
-			[
-				3 => $where_titre,
-				2 => $where_desc,
-				1 => $where_id,
-			] as $point => $recherche
-		) {
-			$res = sql_select('id_rubrique, id_parent, titre', 'spip_rubriques', "$recherche$where_exclus");
-			while ($row = sql_fetch($res)) {
-				$id_rubrique = $row['id_rubrique'];
-				if (!isset($rub[$id_rubrique])) {
-					$rub[$id_rubrique] = [];
-				}
-				$rub[$id_rubrique]['titre'] = typo($row['titre']);
-				$rub[$id_rubrique]['id_parent'] = $row['id_parent'];
-				if (!isset($points[$id_rubrique])) {
-					$points[$id_rubrique] = 0;
-				}
-				$points[$id_rubrique] = $points[$id_rubrique] + $point;
-			}
-		}
-	}
-
-	if ($points) {
-		arsort($points);
-		$style = " style='background-image: url(" . chemin_image('secteur-12.png') . ")'";
-		foreach ($rub as $k => $v) {
-			$rub[$k]['atts'] = ($v['id_parent'] ? $style : '')
-				. " class='petite-rubrique'";
-		}
-	}
-
-	return (proposer_item($points, $rub, $rac, $type, $do));
+    if (!$do) {
+        $do = 'aff';
+    }
+
+    $points = $rub = [];
+
+    $where = preg_split(',\s+,', $type);
+    if ($where) {
+        foreach ($where as $k => $v) {
+            $where[$k] = "'%" . substr(str_replace('%', '\%', sql_quote($v, '', 'string')), 1, -1) . "%'";
+        }
+        $where_titre = ('(titre LIKE ' . join(' AND titre LIKE ', $where) . ')');
+        $where_desc = ('(descriptif LIKE ' . join(' AND descriptif LIKE ', $where) . ')');
+        $where_id = ('(id_rubrique = ' . intval($type) . ')');
+
+        if ($exclus) {
+            include_spip('inc/rubriques');
+            $where_exclus = ' AND ' . sql_in('id_rubrique', calcul_branche_in($exclus), 'NOT');
+        } else {
+            $where_exclus = '';
+        }
+
+        foreach (
+            [
+                3 => $where_titre,
+                2 => $where_desc,
+                1 => $where_id,
+            ] as $point => $recherche
+        ) {
+            $res = sql_select('id_rubrique, id_parent, titre', 'spip_rubriques', "$recherche$where_exclus");
+            while ($row = sql_fetch($res)) {
+                $id_rubrique = $row['id_rubrique'];
+                if (!isset($rub[$id_rubrique])) {
+                    $rub[$id_rubrique] = [];
+                }
+                $rub[$id_rubrique]['titre'] = typo($row['titre']);
+                $rub[$id_rubrique]['id_parent'] = $row['id_parent'];
+                if (!isset($points[$id_rubrique])) {
+                    $points[$id_rubrique] = 0;
+                }
+                $points[$id_rubrique] = $points[$id_rubrique] + $point;
+            }
+        }
+    }
+
+    if ($points) {
+        arsort($points);
+        $style = " style='background-image: url(" . chemin_image('secteur-12.png') . ")'";
+        foreach ($rub as $k => $v) {
+            $rub[$k]['atts'] = ($v['id_parent'] ? $style : '')
+                . " class='petite-rubrique'";
+        }
+    }
+
+    return (proposer_item($points, $rub, $rac, $type, $do));
 }
 
 
@@ -136,37 +136,37 @@ 
  **/
 function proposer_item($ids, $titles, $rac, $type, $do) {
 
-	if (!$ids) {
-		return "<br /><br /><div style='padding: 5px; color: red;'><b>"
-		. spip_htmlentities($type)
-		. '</b> :  ' . _T('avis_aucun_resultat') . '</div>';
-	}
-
-	$ret = '';
-	$info = generer_url_ecrire('informer', "type=rubrique&rac=$rac&id=");
-
-	$onClick = "aff_selection(this.firstChild.title,'$rac" . "_selection','$info', event)";
-
-	$ondbClick = "$do(this.firstChild.firstChild.nodeValue,this.firstChild.title,'selection_rubrique', 'id_parent');";
-
-	foreach ($ids as $id => $bof) {
-		$titre = strtr(
-			str_replace("'", '&#8217;', str_replace('"', '&#34;', textebrut($titles[$id]['titre']))),
-			"\n\r",
-			'  '
-		);
-
-		$ret .= "<div class='highlight off'\nonclick=\"changerhighlight(this); "
-			. $onClick
-			. "\"\nondblclick=\""
-			. $ondbClick
-			. $onClick
-			. ' "><div'
-			. $titles[$id]['atts']
-			. " title='$id'>&nbsp; "
-			. $titre
-			. '</div></div>';
-	}
-
-	return $ret;
+    if (!$ids) {
+        return "<br /><br /><div style='padding: 5px; color: red;'><b>"
+        . spip_htmlentities($type)
+        . '</b> :  ' . _T('avis_aucun_resultat') . '</div>';
+    }
+
+    $ret = '';
+    $info = generer_url_ecrire('informer', "type=rubrique&rac=$rac&id=");
+
+    $onClick = "aff_selection(this.firstChild.title,'$rac" . "_selection','$info', event)";
+
+    $ondbClick = "$do(this.firstChild.firstChild.nodeValue,this.firstChild.title,'selection_rubrique', 'id_parent');";
+
+    foreach ($ids as $id => $bof) {
+        $titre = strtr(
+            str_replace("'", '&#8217;', str_replace('"', '&#34;', textebrut($titles[$id]['titre']))),
+            "\n\r",
+            '  '
+        );
+
+        $ret .= "<div class='highlight off'\nonclick=\"changerhighlight(this); "
+            . $onClick
+            . "\"\nondblclick=\""
+            . $ondbClick
+            . $onClick
+            . ' "><div'
+            . $titles[$id]['atts']
+            . " title='$id'>&nbsp; "
+            . $titre
+            . '</div></div>';
+    }
+
+    return $ret;
 }

ecrire/exec/upgrade.php

Indentation +63 added lines, -63 removed lines

@@ -17,7 +17,7 @@ 
  */
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 include_spip('inc/actions');
@@ -30,70 +30,70 @@ 
  **/
 function exec_upgrade_dist() {
 
-	if (!_FILE_CONNECT) {
-		redirige_url_ecrire('install');
-	}
+    if (!_FILE_CONNECT) {
+        redirige_url_ecrire('install');
+    }
 
-	// Si reinstallation necessaire, message ad hoc
-	if (_request('reinstall') == 'oui') {
-		include_spip('inc/minipres');
-		$r = minipres(
-			_T('titre_page_upgrade'),
-			'<p><b>'
-			. _T('texte_nouvelle_version_spip_1')
-			. '</b><p> '
-			. _T(
-				'texte_nouvelle_version_spip_2',
-				['connect' => '<tt>' . _FILE_CONNECT . '</tt>']
-			)
-			. generer_form_ecrire(
-				'upgrade',
-				"<input type='hidden' name='reinstall' value='non' />",
-				'',
-				_T('bouton_relancer_installation')
-			)
-		);
-		echo $r;
-	} elseif (_request('fin')) {
-		include_spip('inc/plugin');
-		actualise_plugins_actifs();
-		include_spip('inc/headers');
-		$res = generer_url_ecrire('admin_plugin', 'var_mode=recalcul');
-		echo redirige_formulaire($res);
-	} else {
-		if (!isset($GLOBALS['meta']['version_installee'])) {
-			$GLOBALS['meta']['version_installee'] = 0.0;
-		} else {
-			$GLOBALS['meta']['version_installee'] =
-				(double)str_replace(',', '.', $GLOBALS['meta']['version_installee']);
-		}
-		# NB: str_replace car, sur club-internet, il semble que version_installe soit
-		# enregistree au format '1,812' et non '1.812'
+    // Si reinstallation necessaire, message ad hoc
+    if (_request('reinstall') == 'oui') {
+        include_spip('inc/minipres');
+        $r = minipres(
+            _T('titre_page_upgrade'),
+            '<p><b>'
+            . _T('texte_nouvelle_version_spip_1')
+            . '</b><p> '
+            . _T(
+                'texte_nouvelle_version_spip_2',
+                ['connect' => '<tt>' . _FILE_CONNECT . '</tt>']
+            )
+            . generer_form_ecrire(
+                'upgrade',
+                "<input type='hidden' name='reinstall' value='non' />",
+                '',
+                _T('bouton_relancer_installation')
+            )
+        );
+        echo $r;
+    } elseif (_request('fin')) {
+        include_spip('inc/plugin');
+        actualise_plugins_actifs();
+        include_spip('inc/headers');
+        $res = generer_url_ecrire('admin_plugin', 'var_mode=recalcul');
+        echo redirige_formulaire($res);
+    } else {
+        if (!isset($GLOBALS['meta']['version_installee'])) {
+            $GLOBALS['meta']['version_installee'] = 0.0;
+        } else {
+            $GLOBALS['meta']['version_installee'] =
+                (double)str_replace(',', '.', $GLOBALS['meta']['version_installee']);
+        }
+        # NB: str_replace car, sur club-internet, il semble que version_installe soit
+        # enregistree au format '1,812' et non '1.812'
 
-		// Erreur downgrade
-		// (cas de double installation de fichiers SPIP sur une meme base)
-		if ($GLOBALS['spip_version_base'] < $GLOBALS['meta']['version_installee']) {
-			$commentaire = _T('info_mise_a_niveau_base_2');
-		} // Commentaire standard upgrade
-		else {
-			$commentaire = _T('texte_mise_a_niveau_base_1');
-		}
+        // Erreur downgrade
+        // (cas de double installation de fichiers SPIP sur une meme base)
+        if ($GLOBALS['spip_version_base'] < $GLOBALS['meta']['version_installee']) {
+            $commentaire = _T('info_mise_a_niveau_base_2');
+        } // Commentaire standard upgrade
+        else {
+            $commentaire = _T('texte_mise_a_niveau_base_1');
+        }
 
-		$commentaire .= '<br />[' . $GLOBALS['meta']['version_installee'] . '/' . $GLOBALS['spip_version_base'] . ']';
+        $commentaire .= '<br />[' . $GLOBALS['meta']['version_installee'] . '/' . $GLOBALS['spip_version_base'] . ']';
 
-		$_POST['reinstall'] = 'non'; // pour copy_request dans admin
-		include_spip('inc/headers');
-		$admin = charger_fonction('admin', 'inc');
-		$res = $admin('upgrade', _T('info_mise_a_niveau_base'), $commentaire);
-		if ($res) {
-			echo $res;
-		} else {
-			// effacer les alea pour forcer leur relecture
-			// si jamais ils ont change pendant l'upgrade
-			unset($GLOBALS['meta']['alea_ephemere']);
-			unset($GLOBALS['meta']['alea_ephemere_ancien']);
-			$res = redirige_action_auteur('purger', 'cache', 'upgrade', 'fin=oui', true);
-			echo redirige_formulaire($res);
-		}
-	}
+        $_POST['reinstall'] = 'non'; // pour copy_request dans admin
+        include_spip('inc/headers');
+        $admin = charger_fonction('admin', 'inc');
+        $res = $admin('upgrade', _T('info_mise_a_niveau_base'), $commentaire);
+        if ($res) {
+            echo $res;
+        } else {
+            // effacer les alea pour forcer leur relecture
+            // si jamais ils ont change pendant l'upgrade
+            unset($GLOBALS['meta']['alea_ephemere']);
+            unset($GLOBALS['meta']['alea_ephemere_ancien']);
+            $res = redirige_action_auteur('purger', 'cache', 'upgrade', 'fin=oui', true);
+            echo redirige_formulaire($res);
+        }
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -44,7 +44,7 @@ 
 			. '</b><p> '
 			. _T(
 				'texte_nouvelle_version_spip_2',
-				['connect' => '<tt>' . _FILE_CONNECT . '</tt>']
+				['connect' => '<tt>'._FILE_CONNECT.'</tt>']
 			)
 			. generer_form_ecrire(
 				'upgrade',
@@ -65,7 +65,7 @@ 
 			$GLOBALS['meta']['version_installee'] = 0.0;
 		} else {
 			$GLOBALS['meta']['version_installee'] =
-				(double)str_replace(',', '.', $GLOBALS['meta']['version_installee']);
+				(double) str_replace(',', '.', $GLOBALS['meta']['version_installee']);
 		}
 		# NB: str_replace car, sur club-internet, il semble que version_installe soit
 		# enregistree au format '1,812' et non '1.812'
@@ -79,7 +79,7 @@ 
 			$commentaire = _T('texte_mise_a_niveau_base_1');
 		}
 
-		$commentaire .= '<br />[' . $GLOBALS['meta']['version_installee'] . '/' . $GLOBALS['spip_version_base'] . ']';
+		$commentaire .= '<br />['.$GLOBALS['meta']['version_installee'].'/'.$GLOBALS['spip_version_base'].']';
 
 		$_POST['reinstall'] = 'non'; // pour copy_request dans admin
 		include_spip('inc/headers');