spip /
SPIP
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | **/ |
| 18 | 18 | |
| 19 | 19 | if (!defined('_ECRIRE_INC_VERSION')) { |
| 20 | - return; |
|
| 20 | + return; |
|
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | /** |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | * Pile complétée du code compilé |
| 38 | 38 | **/ |
| 39 | 39 | function balise_MENU_LANG_ECRIRE($p) { |
| 40 | - return calculer_balise_dynamique($p, 'MENU_LANG_ECRIRE', ['lang']); |
|
| 40 | + return calculer_balise_dynamique($p, 'MENU_LANG_ECRIRE', ['lang']); |
|
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | /** |
@@ -55,12 +55,12 @@ discard block |
||
| 55 | 55 | * Liste (lang) des arguments collectés et fournis. |
| 56 | 56 | */ |
| 57 | 57 | function balise_MENU_LANG_ECRIRE_stat($args, $context_compil) { |
| 58 | - include_spip('inc/lang'); |
|
| 59 | - if (strpos($GLOBALS['meta']['langues_proposees'], ',') === false) { |
|
| 60 | - return ''; |
|
| 61 | - } |
|
| 58 | + include_spip('inc/lang'); |
|
| 59 | + if (strpos($GLOBALS['meta']['langues_proposees'], ',') === false) { |
|
| 60 | + return ''; |
|
| 61 | + } |
|
| 62 | 62 | |
| 63 | - return $args; |
|
| 63 | + return $args; |
|
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | /** |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | * Liste : Chemin du squelette, durée du cache, contexte |
| 77 | 77 | **/ |
| 78 | 78 | function balise_MENU_LANG_ECRIRE_dyn($opt) { |
| 79 | - return menu_lang_pour_tous('var_lang_ecrire', $opt); |
|
| 79 | + return menu_lang_pour_tous('var_lang_ecrire', $opt); |
|
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 82 | /** |
@@ -96,30 +96,30 @@ discard block |
||
| 96 | 96 | * Liste : Chemin du squelette, durée du cache, contexte |
| 97 | 97 | **/ |
| 98 | 98 | function menu_lang_pour_tous($nom, $default) { |
| 99 | - include_spip('inc/lang'); |
|
| 99 | + include_spip('inc/lang'); |
|
| 100 | 100 | |
| 101 | - if ($GLOBALS['spip_lang'] <> $default) { |
|
| 102 | - $opt = lang_select($default); # et remplace |
|
| 103 | - if ($GLOBALS['spip_lang'] <> $default) { |
|
| 104 | - $default = ''; # annule tout choix par defaut |
|
| 105 | - if ($opt) { |
|
| 106 | - lang_select(); |
|
| 107 | - } |
|
| 108 | - } |
|
| 109 | - } |
|
| 101 | + if ($GLOBALS['spip_lang'] <> $default) { |
|
| 102 | + $opt = lang_select($default); # et remplace |
|
| 103 | + if ($GLOBALS['spip_lang'] <> $default) { |
|
| 104 | + $default = ''; # annule tout choix par defaut |
|
| 105 | + if ($opt) { |
|
| 106 | + lang_select(); |
|
| 107 | + } |
|
| 108 | + } |
|
| 109 | + } |
|
| 110 | 110 | |
| 111 | - # lien a partir de / |
|
| 112 | - $cible = parametre_url(self(), 'lang', '', '&'); |
|
| 113 | - $post = generer_url_action('converser', 'redirect=' . rawurlencode($cible), '&'); |
|
| 111 | + # lien a partir de / |
|
| 112 | + $cible = parametre_url(self(), 'lang', '', '&'); |
|
| 113 | + $post = generer_url_action('converser', 'redirect=' . rawurlencode($cible), '&'); |
|
| 114 | 114 | |
| 115 | - return [ |
|
| 116 | - 'formulaires/menu_lang', |
|
| 117 | - 3600, |
|
| 118 | - [ |
|
| 119 | - 'nom' => $nom, |
|
| 120 | - 'url' => $post, |
|
| 121 | - 'name' => $nom, |
|
| 122 | - 'default' => $default, |
|
| 123 | - ] |
|
| 124 | - ]; |
|
| 115 | + return [ |
|
| 116 | + 'formulaires/menu_lang', |
|
| 117 | + 3600, |
|
| 118 | + [ |
|
| 119 | + 'nom' => $nom, |
|
| 120 | + 'url' => $post, |
|
| 121 | + 'name' => $nom, |
|
| 122 | + 'default' => $default, |
|
| 123 | + ] |
|
| 124 | + ]; |
|
| 125 | 125 | } |
@@ -99,9 +99,9 @@ discard block |
||
| 99 | 99 | include_spip('inc/lang'); |
| 100 | 100 | |
| 101 | 101 | if ($GLOBALS['spip_lang'] <> $default) { |
| 102 | - $opt = lang_select($default); # et remplace |
|
| 102 | + $opt = lang_select($default); # et remplace |
|
| 103 | 103 | if ($GLOBALS['spip_lang'] <> $default) { |
| 104 | - $default = ''; # annule tout choix par defaut |
|
| 104 | + $default = ''; # annule tout choix par defaut |
|
| 105 | 105 | if ($opt) { |
| 106 | 106 | lang_select(); |
| 107 | 107 | } |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | |
| 111 | 111 | # lien a partir de / |
| 112 | 112 | $cible = parametre_url(self(), 'lang', '', '&'); |
| 113 | - $post = generer_url_action('converser', 'redirect=' . rawurlencode($cible), '&'); |
|
| 113 | + $post = generer_url_action('converser', 'redirect='.rawurlencode($cible), '&'); |
|
| 114 | 114 | |
| 115 | 115 | return [ |
| 116 | 116 | 'formulaires/menu_lang', |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | **/ |
| 18 | 18 | |
| 19 | 19 | if (!defined('_ECRIRE_INC_VERSION')) { |
| 20 | - return; |
|
| 20 | + return; |
|
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | /** |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | * Pile complétée du code compilé |
| 38 | 38 | **/ |
| 39 | 39 | function balise_MENU_LANG($p) { |
| 40 | - return calculer_balise_dynamique($p, 'MENU_LANG', ['lang']); |
|
| 40 | + return calculer_balise_dynamique($p, 'MENU_LANG', ['lang']); |
|
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | /** |
@@ -55,11 +55,11 @@ discard block |
||
| 55 | 55 | * Liste (lang) des arguments collectés et fournis. |
| 56 | 56 | */ |
| 57 | 57 | function balise_MENU_LANG_stat($args, $context_compil) { |
| 58 | - if (strpos($GLOBALS['meta']['langues_multilingue'], ',') === false) { |
|
| 59 | - return ''; |
|
| 60 | - } |
|
| 58 | + if (strpos($GLOBALS['meta']['langues_multilingue'], ',') === false) { |
|
| 59 | + return ''; |
|
| 60 | + } |
|
| 61 | 61 | |
| 62 | - return $args; |
|
| 62 | + return $args; |
|
| 63 | 63 | } |
| 64 | 64 | |
| 65 | 65 | /** |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | * Liste : Chemin du squelette, durée du cache, contexte |
| 76 | 76 | **/ |
| 77 | 77 | function balise_MENU_LANG_dyn($opt) { |
| 78 | - include_spip('balise/menu_lang_ecrire'); |
|
| 78 | + include_spip('balise/menu_lang_ecrire'); |
|
| 79 | 79 | |
| 80 | - return menu_lang_pour_tous('var_lang', $opt); |
|
| 80 | + return menu_lang_pour_tous('var_lang', $opt); |
|
| 81 | 81 | } |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | function generer_generer_url_arg($type, $p, $_id) { |
| 76 | 76 | if ($s = trouver_nom_serveur_distant($p)) { |
| 77 | 77 | // si une fonction de generation des url a ete definie pour ce connect l'utiliser |
| 78 | - if (function_exists($f = 'generer_generer_url_' . $s)) { |
|
| 78 | + if (function_exists($f = 'generer_generer_url_'.$s)) { |
|
| 79 | 79 | return $f($type, $_id, $s); |
| 80 | 80 | } |
| 81 | 81 | if (!$GLOBALS['connexions'][strtolower($s)]['spip_connect_version']) { |
@@ -85,8 +85,8 @@ discard block |
||
| 85 | 85 | # exception des urls de documents sur un serveur distant... |
| 86 | 86 | if ($type == 'document') { |
| 87 | 87 | return |
| 88 | - "quete_meta('adresse_site', $s) . '/' .\n\t" . |
|
| 89 | - "quete_meta('dir_img', $s) . \n\t" . |
|
| 88 | + "quete_meta('adresse_site', $s) . '/' .\n\t". |
|
| 89 | + "quete_meta('dir_img', $s) . \n\t". |
|
| 90 | 90 | "quete_fichier($_id,$s)"; |
| 91 | 91 | } |
| 92 | 92 | $s = ", '', '', $s, quete_meta('type_urls', $s)"; |
@@ -230,7 +230,7 @@ discard block |
||
| 230 | 230 | */ |
| 231 | 231 | function balise_URL_SITE_SPIP_dist($p) { |
| 232 | 232 | $p->code = "sinon(\$GLOBALS['meta']['adresse_site'],'.')"; |
| 233 | - $p->code = 'spip_htmlspecialchars(' . $p->code . ')'; |
|
| 233 | + $p->code = 'spip_htmlspecialchars('.$p->code.')'; |
|
| 234 | 234 | $p->interdire_scripts = false; |
| 235 | 235 | |
| 236 | 236 | return $p; |
@@ -271,7 +271,7 @@ discard block |
||
| 271 | 271 | if ($s = trouver_nom_serveur_distant($p)) { |
| 272 | 272 | // si une fonction de generation des url a ete definie pour ce connect l'utiliser |
| 273 | 273 | // elle devra aussi traiter le cas derogatoire type=page |
| 274 | - if (function_exists($f = 'generer_generer_url_' . $s)) { |
|
| 274 | + if (function_exists($f = 'generer_generer_url_'.$s)) { |
|
| 275 | 275 | if ($args and $args !== "''") { |
| 276 | 276 | $code .= ", $args"; |
| 277 | 277 | } |
@@ -279,7 +279,7 @@ discard block |
||
| 279 | 279 | $p->code = $code; |
| 280 | 280 | return $p; |
| 281 | 281 | } |
| 282 | - $s = 'connect=' . addslashes($s); |
|
| 282 | + $s = 'connect='.addslashes($s); |
|
| 283 | 283 | $args = (($args and $args !== "''") ? "$args . '&$s'" : "'$s'"); |
| 284 | 284 | } |
| 285 | 285 | |
@@ -294,7 +294,7 @@ discard block |
||
| 294 | 294 | $code = "generer_url_public($code, $args$noentities)"; |
| 295 | 295 | } |
| 296 | 296 | $p->code = $code; |
| 297 | - spip_log("Calcul url page : connect vaut $s ca donne :" . $p->code . " args $args", _LOG_INFO); |
|
| 297 | + spip_log("Calcul url page : connect vaut $s ca donne :".$p->code." args $args", _LOG_INFO); |
|
| 298 | 298 | |
| 299 | 299 | #$p->interdire_scripts = true; |
| 300 | 300 | return $p; |
@@ -338,7 +338,7 @@ discard block |
||
| 338 | 338 | $fonc .= ",$args$noentities"; |
| 339 | 339 | } |
| 340 | 340 | } |
| 341 | - $p->code = 'generer_url_ecrire(' . $fonc . ')'; |
|
| 341 | + $p->code = 'generer_url_ecrire('.$fonc.')'; |
|
| 342 | 342 | $p->interdire_scripts = false; |
| 343 | 343 | |
| 344 | 344 | return $p; |
@@ -373,17 +373,17 @@ discard block |
||
| 373 | 373 | |
| 374 | 374 | $args = interprete_argument_balise(2, $p); |
| 375 | 375 | if ($args != "''" && $args !== null) { |
| 376 | - $p->code .= ',' . $args; |
|
| 376 | + $p->code .= ','.$args; |
|
| 377 | 377 | } |
| 378 | 378 | $redirect = interprete_argument_balise(3, $p); |
| 379 | 379 | if ($redirect != "''" && $redirect !== null) { |
| 380 | 380 | if ($args == "''" || $args === null) { |
| 381 | 381 | $p->code .= ",''"; |
| 382 | 382 | } |
| 383 | - $p->code .= ',' . $redirect; |
|
| 383 | + $p->code .= ','.$redirect; |
|
| 384 | 384 | } |
| 385 | 385 | |
| 386 | - $p->code = 'generer_action_auteur(' . $p->code . ')'; |
|
| 386 | + $p->code = 'generer_action_auteur('.$p->code.')'; |
|
| 387 | 387 | $p->interdire_scripts = false; |
| 388 | 388 | |
| 389 | 389 | return $p; |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | **/ |
| 20 | 20 | |
| 21 | 21 | if (!defined('_ECRIRE_INC_VERSION')) { |
| 22 | - return; |
|
| 22 | + return; |
|
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | /** |
@@ -37,14 +37,14 @@ discard block |
||
| 37 | 37 | * Code compilé |
| 38 | 38 | **/ |
| 39 | 39 | function generer_generer_url($type, $p) { |
| 40 | - $_id = interprete_argument_balise(1, $p); |
|
| 40 | + $_id = interprete_argument_balise(1, $p); |
|
| 41 | 41 | |
| 42 | - if (!$_id) { |
|
| 43 | - $primary = id_table_objet($type); |
|
| 44 | - $_id = champ_sql($primary, $p); |
|
| 45 | - } |
|
| 42 | + if (!$_id) { |
|
| 43 | + $primary = id_table_objet($type); |
|
| 44 | + $_id = champ_sql($primary, $p); |
|
| 45 | + } |
|
| 46 | 46 | |
| 47 | - return generer_generer_url_arg($type, $p, $_id); |
|
| 47 | + return generer_generer_url_arg($type, $p, $_id); |
|
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | /** |
@@ -73,28 +73,28 @@ discard block |
||
| 73 | 73 | * Code compilé |
| 74 | 74 | **/ |
| 75 | 75 | function generer_generer_url_arg($type, $p, $_id) { |
| 76 | - if ($s = trouver_nom_serveur_distant($p)) { |
|
| 77 | - // si une fonction de generation des url a ete definie pour ce connect l'utiliser |
|
| 78 | - if (function_exists($f = 'generer_generer_url_' . $s)) { |
|
| 79 | - return $f($type, $_id, $s); |
|
| 80 | - } |
|
| 81 | - if (!$GLOBALS['connexions'][strtolower($s)]['spip_connect_version']) { |
|
| 82 | - return null; |
|
| 83 | - } |
|
| 84 | - $s = _q($s); |
|
| 85 | - # exception des urls de documents sur un serveur distant... |
|
| 86 | - if ($type == 'document') { |
|
| 87 | - return |
|
| 88 | - "quete_meta('adresse_site', $s) . '/' .\n\t" . |
|
| 89 | - "quete_meta('dir_img', $s) . \n\t" . |
|
| 90 | - "quete_fichier($_id,$s)"; |
|
| 91 | - } |
|
| 92 | - $s = ", '', '', $s, quete_meta('type_urls', $s)"; |
|
| 93 | - } else { |
|
| 94 | - $s = ", '', '', true"; |
|
| 95 | - } |
|
| 96 | - |
|
| 97 | - return "urlencode_1738(generer_objet_url($_id, '$type'$s))"; |
|
| 76 | + if ($s = trouver_nom_serveur_distant($p)) { |
|
| 77 | + // si une fonction de generation des url a ete definie pour ce connect l'utiliser |
|
| 78 | + if (function_exists($f = 'generer_generer_url_' . $s)) { |
|
| 79 | + return $f($type, $_id, $s); |
|
| 80 | + } |
|
| 81 | + if (!$GLOBALS['connexions'][strtolower($s)]['spip_connect_version']) { |
|
| 82 | + return null; |
|
| 83 | + } |
|
| 84 | + $s = _q($s); |
|
| 85 | + # exception des urls de documents sur un serveur distant... |
|
| 86 | + if ($type == 'document') { |
|
| 87 | + return |
|
| 88 | + "quete_meta('adresse_site', $s) . '/' .\n\t" . |
|
| 89 | + "quete_meta('dir_img', $s) . \n\t" . |
|
| 90 | + "quete_fichier($_id,$s)"; |
|
| 91 | + } |
|
| 92 | + $s = ", '', '', $s, quete_meta('type_urls', $s)"; |
|
| 93 | + } else { |
|
| 94 | + $s = ", '', '', true"; |
|
| 95 | + } |
|
| 96 | + |
|
| 97 | + return "urlencode_1738(generer_objet_url($_id, '$type'$s))"; |
|
| 98 | 98 | } |
| 99 | 99 | |
| 100 | 100 | |
@@ -119,27 +119,27 @@ discard block |
||
| 119 | 119 | */ |
| 120 | 120 | function balise_URL__dist($p) { |
| 121 | 121 | |
| 122 | - $nom = $p->nom_champ; |
|
| 123 | - if ($nom === 'URL_') { |
|
| 124 | - $msg = ['zbug_balise_sans_argument', ['balise' => ' URL_']]; |
|
| 125 | - erreur_squelette($msg, $p); |
|
| 126 | - $p->interdire_scripts = false; |
|
| 127 | - |
|
| 128 | - return $p; |
|
| 129 | - } elseif ($f = charger_fonction($nom, 'balise', true)) { |
|
| 130 | - return $f($p); |
|
| 131 | - } else { |
|
| 132 | - $nom = strtolower($nom); |
|
| 133 | - $code = generer_generer_url(substr($nom, 4), $p); |
|
| 134 | - $code = champ_sql($nom, $p, $code); |
|
| 135 | - $p->code = $code; |
|
| 136 | - if (!$p->etoile) { |
|
| 137 | - $p->code = "vider_url($code)"; |
|
| 138 | - } |
|
| 139 | - $p->interdire_scripts = false; |
|
| 140 | - |
|
| 141 | - return $p; |
|
| 142 | - } |
|
| 122 | + $nom = $p->nom_champ; |
|
| 123 | + if ($nom === 'URL_') { |
|
| 124 | + $msg = ['zbug_balise_sans_argument', ['balise' => ' URL_']]; |
|
| 125 | + erreur_squelette($msg, $p); |
|
| 126 | + $p->interdire_scripts = false; |
|
| 127 | + |
|
| 128 | + return $p; |
|
| 129 | + } elseif ($f = charger_fonction($nom, 'balise', true)) { |
|
| 130 | + return $f($p); |
|
| 131 | + } else { |
|
| 132 | + $nom = strtolower($nom); |
|
| 133 | + $code = generer_generer_url(substr($nom, 4), $p); |
|
| 134 | + $code = champ_sql($nom, $p, $code); |
|
| 135 | + $p->code = $code; |
|
| 136 | + if (!$p->etoile) { |
|
| 137 | + $p->code = "vider_url($code)"; |
|
| 138 | + } |
|
| 139 | + $p->interdire_scripts = false; |
|
| 140 | + |
|
| 141 | + return $p; |
|
| 142 | + } |
|
| 143 | 143 | } |
| 144 | 144 | |
| 145 | 145 | /** |
@@ -163,20 +163,20 @@ discard block |
||
| 163 | 163 | */ |
| 164 | 164 | function balise_URL_ARTICLE_dist($p) { |
| 165 | 165 | |
| 166 | - // Cas particulier des boucles (SYNDIC_ARTICLES) |
|
| 167 | - if ($p->type_requete == 'syndic_articles') { |
|
| 168 | - $code = champ_sql('url', $p); |
|
| 169 | - } else { |
|
| 170 | - $code = generer_generer_url('article', $p); |
|
| 171 | - } |
|
| 166 | + // Cas particulier des boucles (SYNDIC_ARTICLES) |
|
| 167 | + if ($p->type_requete == 'syndic_articles') { |
|
| 168 | + $code = champ_sql('url', $p); |
|
| 169 | + } else { |
|
| 170 | + $code = generer_generer_url('article', $p); |
|
| 171 | + } |
|
| 172 | 172 | |
| 173 | - $p->code = $code; |
|
| 174 | - if (!$p->etoile) { |
|
| 175 | - $p->code = "vider_url($code)"; |
|
| 176 | - } |
|
| 177 | - $p->interdire_scripts = false; |
|
| 173 | + $p->code = $code; |
|
| 174 | + if (!$p->etoile) { |
|
| 175 | + $p->code = "vider_url($code)"; |
|
| 176 | + } |
|
| 177 | + $p->interdire_scripts = false; |
|
| 178 | 178 | |
| 179 | - return $p; |
|
| 179 | + return $p; |
|
| 180 | 180 | } |
| 181 | 181 | |
| 182 | 182 | /** |
@@ -196,21 +196,21 @@ discard block |
||
| 196 | 196 | * Pile complétée par le code à générer |
| 197 | 197 | */ |
| 198 | 198 | function balise_URL_SITE_dist($p) { |
| 199 | - $code = champ_sql('url_site', $p, ''); |
|
| 200 | - if (!$code) { |
|
| 201 | - $code = generer_generer_url('site', $p); |
|
| 202 | - if ($code === null) { |
|
| 203 | - return null; |
|
| 204 | - } |
|
| 205 | - } else { |
|
| 206 | - if (!$p->etoile) { |
|
| 207 | - $code = "calculer_url($code,'','url', \$connect)"; |
|
| 208 | - } |
|
| 209 | - } |
|
| 210 | - $p->code = $code; |
|
| 211 | - $p->interdire_scripts = false; |
|
| 212 | - |
|
| 213 | - return $p; |
|
| 199 | + $code = champ_sql('url_site', $p, ''); |
|
| 200 | + if (!$code) { |
|
| 201 | + $code = generer_generer_url('site', $p); |
|
| 202 | + if ($code === null) { |
|
| 203 | + return null; |
|
| 204 | + } |
|
| 205 | + } else { |
|
| 206 | + if (!$p->etoile) { |
|
| 207 | + $code = "calculer_url($code,'','url', \$connect)"; |
|
| 208 | + } |
|
| 209 | + } |
|
| 210 | + $p->code = $code; |
|
| 211 | + $p->interdire_scripts = false; |
|
| 212 | + |
|
| 213 | + return $p; |
|
| 214 | 214 | } |
| 215 | 215 | |
| 216 | 216 | // Autres balises URL_*, qui ne concernent pas une table |
@@ -229,11 +229,11 @@ discard block |
||
| 229 | 229 | * Pile complétée par le code à générer |
| 230 | 230 | */ |
| 231 | 231 | function balise_URL_SITE_SPIP_dist($p) { |
| 232 | - $p->code = "sinon(\$GLOBALS['meta']['adresse_site'],'.')"; |
|
| 233 | - $p->code = 'spip_htmlspecialchars(' . $p->code . ')'; |
|
| 234 | - $p->interdire_scripts = false; |
|
| 232 | + $p->code = "sinon(\$GLOBALS['meta']['adresse_site'],'.')"; |
|
| 233 | + $p->code = 'spip_htmlspecialchars(' . $p->code . ')'; |
|
| 234 | + $p->interdire_scripts = false; |
|
| 235 | 235 | |
| 236 | - return $p; |
|
| 236 | + return $p; |
|
| 237 | 237 | } |
| 238 | 238 | |
| 239 | 239 | |
@@ -262,42 +262,42 @@ discard block |
||
| 262 | 262 | */ |
| 263 | 263 | function balise_URL_PAGE_dist($p) { |
| 264 | 264 | |
| 265 | - $code = interprete_argument_balise(1, $p); |
|
| 266 | - $args = interprete_argument_balise(2, $p); |
|
| 267 | - if ($args == null) { |
|
| 268 | - $args = "''"; |
|
| 269 | - } |
|
| 270 | - |
|
| 271 | - if ($s = trouver_nom_serveur_distant($p)) { |
|
| 272 | - // si une fonction de generation des url a ete definie pour ce connect l'utiliser |
|
| 273 | - // elle devra aussi traiter le cas derogatoire type=page |
|
| 274 | - if (function_exists($f = 'generer_generer_url_' . $s)) { |
|
| 275 | - if ($args and $args !== "''") { |
|
| 276 | - $code .= ", $args"; |
|
| 277 | - } |
|
| 278 | - $code = $f('page', $code, $s); |
|
| 279 | - $p->code = $code; |
|
| 280 | - return $p; |
|
| 281 | - } |
|
| 282 | - $s = 'connect=' . addslashes($s); |
|
| 283 | - $args = (($args and $args !== "''") ? "$args . '&$s'" : "'$s'"); |
|
| 284 | - } |
|
| 285 | - |
|
| 286 | - if (!$code) { |
|
| 287 | - $noentities = $p->etoile ? "'&'" : ''; |
|
| 288 | - $code = "url_de_base() . preg_replace(',^./,', '', self($noentities))"; |
|
| 289 | - } else { |
|
| 290 | - if (!$args) { |
|
| 291 | - $args = "''"; |
|
| 292 | - } |
|
| 293 | - $noentities = $p->etoile ? ', true' : ''; |
|
| 294 | - $code = "generer_url_public($code, $args$noentities)"; |
|
| 295 | - } |
|
| 296 | - $p->code = $code; |
|
| 297 | - spip_log("Calcul url page : connect vaut $s ca donne :" . $p->code . " args $args", _LOG_INFO); |
|
| 298 | - |
|
| 299 | - #$p->interdire_scripts = true; |
|
| 300 | - return $p; |
|
| 265 | + $code = interprete_argument_balise(1, $p); |
|
| 266 | + $args = interprete_argument_balise(2, $p); |
|
| 267 | + if ($args == null) { |
|
| 268 | + $args = "''"; |
|
| 269 | + } |
|
| 270 | + |
|
| 271 | + if ($s = trouver_nom_serveur_distant($p)) { |
|
| 272 | + // si une fonction de generation des url a ete definie pour ce connect l'utiliser |
|
| 273 | + // elle devra aussi traiter le cas derogatoire type=page |
|
| 274 | + if (function_exists($f = 'generer_generer_url_' . $s)) { |
|
| 275 | + if ($args and $args !== "''") { |
|
| 276 | + $code .= ", $args"; |
|
| 277 | + } |
|
| 278 | + $code = $f('page', $code, $s); |
|
| 279 | + $p->code = $code; |
|
| 280 | + return $p; |
|
| 281 | + } |
|
| 282 | + $s = 'connect=' . addslashes($s); |
|
| 283 | + $args = (($args and $args !== "''") ? "$args . '&$s'" : "'$s'"); |
|
| 284 | + } |
|
| 285 | + |
|
| 286 | + if (!$code) { |
|
| 287 | + $noentities = $p->etoile ? "'&'" : ''; |
|
| 288 | + $code = "url_de_base() . preg_replace(',^./,', '', self($noentities))"; |
|
| 289 | + } else { |
|
| 290 | + if (!$args) { |
|
| 291 | + $args = "''"; |
|
| 292 | + } |
|
| 293 | + $noentities = $p->etoile ? ', true' : ''; |
|
| 294 | + $code = "generer_url_public($code, $args$noentities)"; |
|
| 295 | + } |
|
| 296 | + $p->code = $code; |
|
| 297 | + spip_log("Calcul url page : connect vaut $s ca donne :" . $p->code . " args $args", _LOG_INFO); |
|
| 298 | + |
|
| 299 | + #$p->interdire_scripts = true; |
|
| 300 | + return $p; |
|
| 301 | 301 | } |
| 302 | 302 | |
| 303 | 303 | |
@@ -324,24 +324,24 @@ discard block |
||
| 324 | 324 | */ |
| 325 | 325 | function balise_URL_ECRIRE_dist($p) { |
| 326 | 326 | |
| 327 | - $code = interprete_argument_balise(1, $p); |
|
| 328 | - if (!$code) { |
|
| 329 | - $fonc = "''"; |
|
| 330 | - } else { |
|
| 331 | - $fonc = $code; |
|
| 332 | - $args = interprete_argument_balise(2, $p); |
|
| 333 | - if ($args === null) { |
|
| 334 | - $args = "''"; |
|
| 335 | - } |
|
| 336 | - $noentities = $p->etoile ? ', true' : ''; |
|
| 337 | - if (($args != "''") or $noentities) { |
|
| 338 | - $fonc .= ",$args$noentities"; |
|
| 339 | - } |
|
| 340 | - } |
|
| 341 | - $p->code = 'generer_url_ecrire(' . $fonc . ')'; |
|
| 342 | - $p->interdire_scripts = false; |
|
| 343 | - |
|
| 344 | - return $p; |
|
| 327 | + $code = interprete_argument_balise(1, $p); |
|
| 328 | + if (!$code) { |
|
| 329 | + $fonc = "''"; |
|
| 330 | + } else { |
|
| 331 | + $fonc = $code; |
|
| 332 | + $args = interprete_argument_balise(2, $p); |
|
| 333 | + if ($args === null) { |
|
| 334 | + $args = "''"; |
|
| 335 | + } |
|
| 336 | + $noentities = $p->etoile ? ', true' : ''; |
|
| 337 | + if (($args != "''") or $noentities) { |
|
| 338 | + $fonc .= ",$args$noentities"; |
|
| 339 | + } |
|
| 340 | + } |
|
| 341 | + $p->code = 'generer_url_ecrire(' . $fonc . ')'; |
|
| 342 | + $p->interdire_scripts = false; |
|
| 343 | + |
|
| 344 | + return $p; |
|
| 345 | 345 | } |
| 346 | 346 | |
| 347 | 347 | |
@@ -367,24 +367,24 @@ discard block |
||
| 367 | 367 | * Pile complétée par le code à générer |
| 368 | 368 | */ |
| 369 | 369 | function balise_URL_ACTION_AUTEUR_dist($p) { |
| 370 | - $p->descr['session'] = true; |
|
| 371 | - |
|
| 372 | - $p->code = interprete_argument_balise(1, $p); |
|
| 373 | - |
|
| 374 | - $args = interprete_argument_balise(2, $p); |
|
| 375 | - if ($args != "''" && $args !== null) { |
|
| 376 | - $p->code .= ',' . $args; |
|
| 377 | - } |
|
| 378 | - $redirect = interprete_argument_balise(3, $p); |
|
| 379 | - if ($redirect != "''" && $redirect !== null) { |
|
| 380 | - if ($args == "''" || $args === null) { |
|
| 381 | - $p->code .= ",''"; |
|
| 382 | - } |
|
| 383 | - $p->code .= ',' . $redirect; |
|
| 384 | - } |
|
| 385 | - |
|
| 386 | - $p->code = 'generer_action_auteur(' . $p->code . ')'; |
|
| 387 | - $p->interdire_scripts = false; |
|
| 388 | - |
|
| 389 | - return $p; |
|
| 370 | + $p->descr['session'] = true; |
|
| 371 | + |
|
| 372 | + $p->code = interprete_argument_balise(1, $p); |
|
| 373 | + |
|
| 374 | + $args = interprete_argument_balise(2, $p); |
|
| 375 | + if ($args != "''" && $args !== null) { |
|
| 376 | + $p->code .= ',' . $args; |
|
| 377 | + } |
|
| 378 | + $redirect = interprete_argument_balise(3, $p); |
|
| 379 | + if ($redirect != "''" && $redirect !== null) { |
|
| 380 | + if ($args == "''" || $args === null) { |
|
| 381 | + $p->code .= ",''"; |
|
| 382 | + } |
|
| 383 | + $p->code .= ',' . $redirect; |
|
| 384 | + } |
|
| 385 | + |
|
| 386 | + $p->code = 'generer_action_auteur(' . $p->code . ')'; |
|
| 387 | + $p->interdire_scripts = false; |
|
| 388 | + |
|
| 389 | + return $p; |
|
| 390 | 390 | } |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | **/ |
| 18 | 18 | |
| 19 | 19 | if (!defined('_ECRIRE_INC_VERSION')) { |
| 20 | - return; |
|
| 20 | + return; |
|
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | include_spip('base/abstract_sql'); |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | * Pile complétée du code compilé |
| 42 | 42 | **/ |
| 43 | 43 | function balise_FORMULAIRE_ECRIRE_AUTEUR($p) { |
| 44 | - return calculer_balise_dynamique($p, 'FORMULAIRE_ECRIRE_AUTEUR', ['id_auteur', 'id_article', 'email']); |
|
| 44 | + return calculer_balise_dynamique($p, 'FORMULAIRE_ECRIRE_AUTEUR', ['id_auteur', 'id_article', 'email']); |
|
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | /** |
@@ -59,44 +59,44 @@ discard block |
||
| 59 | 59 | * - chaîne vide sinon (erreur ou non affichage). |
| 60 | 60 | */ |
| 61 | 61 | function balise_FORMULAIRE_ECRIRE_AUTEUR_stat($args, $context_compil) { |
| 62 | - include_spip('inc/filtres'); |
|
| 63 | - // Pas d'id_auteur ni d'id_article ? Erreur de contexte |
|
| 64 | - $id = intval($args[1]); |
|
| 65 | - if (!$args[0] and !$id) { |
|
| 66 | - $msg = [ |
|
| 67 | - 'zbug_champ_hors_motif', |
|
| 68 | - [ |
|
| 69 | - 'champ' => 'FORMULAIRE_ECRIRE_AUTEUR', |
|
| 70 | - 'motif' => 'AUTEURS/ARTICLES' |
|
| 71 | - ] |
|
| 72 | - ]; |
|
| 62 | + include_spip('inc/filtres'); |
|
| 63 | + // Pas d'id_auteur ni d'id_article ? Erreur de contexte |
|
| 64 | + $id = intval($args[1]); |
|
| 65 | + if (!$args[0] and !$id) { |
|
| 66 | + $msg = [ |
|
| 67 | + 'zbug_champ_hors_motif', |
|
| 68 | + [ |
|
| 69 | + 'champ' => 'FORMULAIRE_ECRIRE_AUTEUR', |
|
| 70 | + 'motif' => 'AUTEURS/ARTICLES' |
|
| 71 | + ] |
|
| 72 | + ]; |
|
| 73 | 73 | |
| 74 | - erreur_squelette($msg, $context_compil); |
|
| 74 | + erreur_squelette($msg, $context_compil); |
|
| 75 | 75 | |
| 76 | - return ''; |
|
| 77 | - } |
|
| 78 | - // Si on est dans un contexte article, |
|
| 79 | - // sortir tous les mails des auteurs de l'article |
|
| 80 | - if (!$args[0] and $id) { |
|
| 81 | - $r = ''; |
|
| 82 | - $s = sql_allfetsel( |
|
| 83 | - 'email', |
|
| 84 | - 'spip_auteurs AS A LEFT JOIN spip_auteurs_liens AS L ON (A.id_auteur=L.id_auteur AND L.objet=\'article\')', |
|
| 85 | - "A.email != '' AND L.id_objet=$id" |
|
| 86 | - ); |
|
| 87 | - foreach ($s as $row) { |
|
| 88 | - if (email_valide($row['email'])) { |
|
| 89 | - $r .= ', ' . $row['email']; |
|
| 90 | - } |
|
| 91 | - } |
|
| 92 | - $args[2] = substr($r, 2); |
|
| 93 | - } |
|
| 76 | + return ''; |
|
| 77 | + } |
|
| 78 | + // Si on est dans un contexte article, |
|
| 79 | + // sortir tous les mails des auteurs de l'article |
|
| 80 | + if (!$args[0] and $id) { |
|
| 81 | + $r = ''; |
|
| 82 | + $s = sql_allfetsel( |
|
| 83 | + 'email', |
|
| 84 | + 'spip_auteurs AS A LEFT JOIN spip_auteurs_liens AS L ON (A.id_auteur=L.id_auteur AND L.objet=\'article\')', |
|
| 85 | + "A.email != '' AND L.id_objet=$id" |
|
| 86 | + ); |
|
| 87 | + foreach ($s as $row) { |
|
| 88 | + if (email_valide($row['email'])) { |
|
| 89 | + $r .= ', ' . $row['email']; |
|
| 90 | + } |
|
| 91 | + } |
|
| 92 | + $args[2] = substr($r, 2); |
|
| 93 | + } |
|
| 94 | 94 | |
| 95 | - // On ne peut pas ecrire a un auteur dont le mail n'est pas valide |
|
| 96 | - if (!$args[2] or !email_valide($args[2])) { |
|
| 97 | - return ''; |
|
| 98 | - } |
|
| 95 | + // On ne peut pas ecrire a un auteur dont le mail n'est pas valide |
|
| 96 | + if (!$args[2] or !email_valide($args[2])) { |
|
| 97 | + return ''; |
|
| 98 | + } |
|
| 99 | 99 | |
| 100 | - // OK |
|
| 101 | - return $args; |
|
| 100 | + // OK |
|
| 101 | + return $args; |
|
| 102 | 102 | } |
@@ -86,7 +86,7 @@ |
||
| 86 | 86 | ); |
| 87 | 87 | foreach ($s as $row) { |
| 88 | 88 | if (email_valide($row['email'])) { |
| 89 | - $r .= ', ' . $row['email']; |
|
| 89 | + $r .= ', '.$row['email']; |
|
| 90 | 90 | } |
| 91 | 91 | } |
| 92 | 92 | $args[2] = substr($r, 2); |
@@ -11,134 +11,134 @@ |
||
| 11 | 11 | // plage invalide en iso-8859-1 mais souvent utilisee quand meme (windows) |
| 12 | 12 | // cf. http://openweb.eu.org/articles/caracteres_illegaux/ |
| 13 | 13 | // voir aussi copie de ces valeurs dans inc/charsets.php |
| 14 | - 128 => 8364, |
|
| 15 | - 129 => 129 /* ?? */, |
|
| 16 | - 130 => 8218, |
|
| 17 | - 131 => 402, |
|
| 18 | - 132 => 8222, |
|
| 19 | - 133 => 8230, |
|
| 20 | - 134 => 8224, |
|
| 21 | - 135 => 8225, |
|
| 22 | - 136 => 710, |
|
| 23 | - 137 => 8240, |
|
| 24 | - 138 => 352, |
|
| 25 | - 139 => 8249, |
|
| 26 | - 140 => 338, |
|
| 27 | - 141 => 141 /* ?? */, |
|
| 28 | - 142 => 381, |
|
| 29 | - 143 => 143 /* ?? */, |
|
| 30 | - 144 => 144 /* ?? */, |
|
| 31 | - 145 => 8216, |
|
| 32 | - 146 => 8217, |
|
| 33 | - 147 => 8220, |
|
| 34 | - 148 => 8221, |
|
| 35 | - 149 => 8226, |
|
| 36 | - 150 => 8211, |
|
| 37 | - 151 => 8212, |
|
| 38 | - 152 => 732, |
|
| 39 | - 153 => 8482, |
|
| 40 | - 154 => 353, |
|
| 41 | - 155 => 8250, |
|
| 42 | - 156 => 339, |
|
| 43 | - 157 => 157 /* ?? */, |
|
| 44 | - 158 => 382, |
|
| 45 | - 159 => 376, |
|
| 14 | + 128 => 8364, |
|
| 15 | + 129 => 129 /* ?? */, |
|
| 16 | + 130 => 8218, |
|
| 17 | + 131 => 402, |
|
| 18 | + 132 => 8222, |
|
| 19 | + 133 => 8230, |
|
| 20 | + 134 => 8224, |
|
| 21 | + 135 => 8225, |
|
| 22 | + 136 => 710, |
|
| 23 | + 137 => 8240, |
|
| 24 | + 138 => 352, |
|
| 25 | + 139 => 8249, |
|
| 26 | + 140 => 338, |
|
| 27 | + 141 => 141 /* ?? */, |
|
| 28 | + 142 => 381, |
|
| 29 | + 143 => 143 /* ?? */, |
|
| 30 | + 144 => 144 /* ?? */, |
|
| 31 | + 145 => 8216, |
|
| 32 | + 146 => 8217, |
|
| 33 | + 147 => 8220, |
|
| 34 | + 148 => 8221, |
|
| 35 | + 149 => 8226, |
|
| 36 | + 150 => 8211, |
|
| 37 | + 151 => 8212, |
|
| 38 | + 152 => 732, |
|
| 39 | + 153 => 8482, |
|
| 40 | + 154 => 353, |
|
| 41 | + 155 => 8250, |
|
| 42 | + 156 => 339, |
|
| 43 | + 157 => 157 /* ?? */, |
|
| 44 | + 158 => 382, |
|
| 45 | + 159 => 376, |
|
| 46 | 46 | |
| 47 | - 160 => 160, |
|
| 48 | - 161 => 161, |
|
| 49 | - 162 => 162, |
|
| 50 | - 163 => 163, |
|
| 51 | - 164 => 164, |
|
| 52 | - 165 => 165, |
|
| 53 | - 166 => 166, |
|
| 54 | - 167 => 167, |
|
| 55 | - 168 => 168, |
|
| 56 | - 169 => 169, |
|
| 57 | - 170 => 170, |
|
| 58 | - 171 => 171, |
|
| 59 | - 172 => 172, |
|
| 60 | - 173 => 173, |
|
| 61 | - 174 => 174, |
|
| 62 | - 175 => 175, |
|
| 63 | - 176 => 176, |
|
| 64 | - 177 => 177, |
|
| 65 | - 178 => 178, |
|
| 66 | - 179 => 179, |
|
| 67 | - 180 => 180, |
|
| 68 | - 181 => 181, |
|
| 69 | - 182 => 182, |
|
| 70 | - 183 => 183, |
|
| 71 | - 184 => 184, |
|
| 72 | - 185 => 185, |
|
| 73 | - 186 => 186, |
|
| 74 | - 187 => 187, |
|
| 75 | - 188 => 188, |
|
| 76 | - 189 => 189, |
|
| 77 | - 190 => 190, |
|
| 78 | - 191 => 191, |
|
| 79 | - 192 => 192, |
|
| 80 | - 193 => 193, |
|
| 81 | - 194 => 194, |
|
| 82 | - 195 => 195, |
|
| 83 | - 196 => 196, |
|
| 84 | - 197 => 197, |
|
| 85 | - 198 => 198, |
|
| 86 | - 199 => 199, |
|
| 87 | - 200 => 200, |
|
| 88 | - 201 => 201, |
|
| 89 | - 202 => 202, |
|
| 90 | - 203 => 203, |
|
| 91 | - 204 => 204, |
|
| 92 | - 205 => 205, |
|
| 93 | - 206 => 206, |
|
| 94 | - 207 => 207, |
|
| 95 | - 208 => 208, |
|
| 96 | - 209 => 209, |
|
| 97 | - 210 => 210, |
|
| 98 | - 211 => 211, |
|
| 99 | - 212 => 212, |
|
| 100 | - 213 => 213, |
|
| 101 | - 214 => 214, |
|
| 102 | - 215 => 215, |
|
| 103 | - 216 => 216, |
|
| 104 | - 217 => 217, |
|
| 105 | - 218 => 218, |
|
| 106 | - 219 => 219, |
|
| 107 | - 220 => 220, |
|
| 108 | - 221 => 221, |
|
| 109 | - 222 => 222, |
|
| 110 | - 223 => 223, |
|
| 111 | - 224 => 224, |
|
| 112 | - 225 => 225, |
|
| 113 | - 226 => 226, |
|
| 114 | - 227 => 227, |
|
| 115 | - 228 => 228, |
|
| 116 | - 229 => 229, |
|
| 117 | - 230 => 230, |
|
| 118 | - 231 => 231, |
|
| 119 | - 232 => 232, |
|
| 120 | - 233 => 233, |
|
| 121 | - 234 => 234, |
|
| 122 | - 235 => 235, |
|
| 123 | - 236 => 236, |
|
| 124 | - 237 => 237, |
|
| 125 | - 238 => 238, |
|
| 126 | - 239 => 239, |
|
| 127 | - 240 => 240, |
|
| 128 | - 241 => 241, |
|
| 129 | - 242 => 242, |
|
| 130 | - 243 => 243, |
|
| 131 | - 244 => 244, |
|
| 132 | - 245 => 245, |
|
| 133 | - 246 => 246, |
|
| 134 | - 247 => 247, |
|
| 135 | - 248 => 248, |
|
| 136 | - 249 => 249, |
|
| 137 | - 250 => 250, |
|
| 138 | - 251 => 251, |
|
| 139 | - 252 => 252, |
|
| 140 | - 253 => 253, |
|
| 141 | - 254 => 254, |
|
| 142 | - 255 => 255 |
|
| 47 | + 160 => 160, |
|
| 48 | + 161 => 161, |
|
| 49 | + 162 => 162, |
|
| 50 | + 163 => 163, |
|
| 51 | + 164 => 164, |
|
| 52 | + 165 => 165, |
|
| 53 | + 166 => 166, |
|
| 54 | + 167 => 167, |
|
| 55 | + 168 => 168, |
|
| 56 | + 169 => 169, |
|
| 57 | + 170 => 170, |
|
| 58 | + 171 => 171, |
|
| 59 | + 172 => 172, |
|
| 60 | + 173 => 173, |
|
| 61 | + 174 => 174, |
|
| 62 | + 175 => 175, |
|
| 63 | + 176 => 176, |
|
| 64 | + 177 => 177, |
|
| 65 | + 178 => 178, |
|
| 66 | + 179 => 179, |
|
| 67 | + 180 => 180, |
|
| 68 | + 181 => 181, |
|
| 69 | + 182 => 182, |
|
| 70 | + 183 => 183, |
|
| 71 | + 184 => 184, |
|
| 72 | + 185 => 185, |
|
| 73 | + 186 => 186, |
|
| 74 | + 187 => 187, |
|
| 75 | + 188 => 188, |
|
| 76 | + 189 => 189, |
|
| 77 | + 190 => 190, |
|
| 78 | + 191 => 191, |
|
| 79 | + 192 => 192, |
|
| 80 | + 193 => 193, |
|
| 81 | + 194 => 194, |
|
| 82 | + 195 => 195, |
|
| 83 | + 196 => 196, |
|
| 84 | + 197 => 197, |
|
| 85 | + 198 => 198, |
|
| 86 | + 199 => 199, |
|
| 87 | + 200 => 200, |
|
| 88 | + 201 => 201, |
|
| 89 | + 202 => 202, |
|
| 90 | + 203 => 203, |
|
| 91 | + 204 => 204, |
|
| 92 | + 205 => 205, |
|
| 93 | + 206 => 206, |
|
| 94 | + 207 => 207, |
|
| 95 | + 208 => 208, |
|
| 96 | + 209 => 209, |
|
| 97 | + 210 => 210, |
|
| 98 | + 211 => 211, |
|
| 99 | + 212 => 212, |
|
| 100 | + 213 => 213, |
|
| 101 | + 214 => 214, |
|
| 102 | + 215 => 215, |
|
| 103 | + 216 => 216, |
|
| 104 | + 217 => 217, |
|
| 105 | + 218 => 218, |
|
| 106 | + 219 => 219, |
|
| 107 | + 220 => 220, |
|
| 108 | + 221 => 221, |
|
| 109 | + 222 => 222, |
|
| 110 | + 223 => 223, |
|
| 111 | + 224 => 224, |
|
| 112 | + 225 => 225, |
|
| 113 | + 226 => 226, |
|
| 114 | + 227 => 227, |
|
| 115 | + 228 => 228, |
|
| 116 | + 229 => 229, |
|
| 117 | + 230 => 230, |
|
| 118 | + 231 => 231, |
|
| 119 | + 232 => 232, |
|
| 120 | + 233 => 233, |
|
| 121 | + 234 => 234, |
|
| 122 | + 235 => 235, |
|
| 123 | + 236 => 236, |
|
| 124 | + 237 => 237, |
|
| 125 | + 238 => 238, |
|
| 126 | + 239 => 239, |
|
| 127 | + 240 => 240, |
|
| 128 | + 241 => 241, |
|
| 129 | + 242 => 242, |
|
| 130 | + 243 => 243, |
|
| 131 | + 244 => 244, |
|
| 132 | + 245 => 245, |
|
| 133 | + 246 => 246, |
|
| 134 | + 247 => 247, |
|
| 135 | + 248 => 248, |
|
| 136 | + 249 => 249, |
|
| 137 | + 250 => 250, |
|
| 138 | + 251 => 251, |
|
| 139 | + 252 => 252, |
|
| 140 | + 253 => 253, |
|
| 141 | + 254 => 254, |
|
| 142 | + 255 => 255 |
|
| 143 | 143 | |
| 144 | 144 | ]; |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | **/ |
| 20 | 20 | |
| 21 | 21 | if (!defined('_ECRIRE_INC_VERSION')) { |
| 22 | - return; |
|
| 22 | + return; |
|
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | load_charset('iso-8859-1'); |
@@ -27,61 +27,61 @@ discard block |
||
| 27 | 27 | $trans = $GLOBALS['CHARSET']['iso-8859-1']; |
| 28 | 28 | |
| 29 | 29 | $mod = [ |
| 30 | - 0xA0 => 0x00A0, |
|
| 31 | - 0xA4 => 0x00A4, |
|
| 32 | - 0xAC => 0x060C, |
|
| 33 | - 0xAD => 0x00AD, |
|
| 34 | - 0xBB => 0x061B, |
|
| 35 | - 0xBF => 0x061F, |
|
| 36 | - 0xC1 => 0x0621, |
|
| 37 | - 0xC2 => 0x0622, |
|
| 38 | - 0xC3 => 0x0623, |
|
| 39 | - 0xC4 => 0x0624, |
|
| 40 | - 0xC5 => 0x0625, |
|
| 41 | - 0xC6 => 0x0626, |
|
| 42 | - 0xC7 => 0x0627, |
|
| 43 | - 0xC8 => 0x0628, |
|
| 44 | - 0xC9 => 0x0629, |
|
| 45 | - 0xCA => 0x062A, |
|
| 46 | - 0xCB => 0x062B, |
|
| 47 | - 0xCC => 0x062C, |
|
| 48 | - 0xCD => 0x062D, |
|
| 49 | - 0xCE => 0x062E, |
|
| 50 | - 0xCF => 0x062F, |
|
| 51 | - 0xD0 => 0x0630, |
|
| 52 | - 0xD1 => 0x0631, |
|
| 53 | - 0xD2 => 0x0632, |
|
| 54 | - 0xD3 => 0x0633, |
|
| 55 | - 0xD4 => 0x0634, |
|
| 56 | - 0xD5 => 0x0635, |
|
| 57 | - 0xD6 => 0x0636, |
|
| 58 | - 0xD7 => 0x0637, |
|
| 59 | - 0xD8 => 0x0638, |
|
| 60 | - 0xD9 => 0x0639, |
|
| 61 | - 0xDA => 0x063A, |
|
| 62 | - 0xE0 => 0x0640, |
|
| 63 | - 0xE1 => 0x0641, |
|
| 64 | - 0xE2 => 0x0642, |
|
| 65 | - 0xE3 => 0x0643, |
|
| 66 | - 0xE4 => 0x0644, |
|
| 67 | - 0xE5 => 0x0645, |
|
| 68 | - 0xE6 => 0x0646, |
|
| 69 | - 0xE7 => 0x0647, |
|
| 70 | - 0xE8 => 0x0648, |
|
| 71 | - 0xE9 => 0x0649, |
|
| 72 | - 0xEA => 0x064A, |
|
| 73 | - 0xEB => 0x064B, |
|
| 74 | - 0xEC => 0x064C, |
|
| 75 | - 0xED => 0x064D, |
|
| 76 | - 0xEE => 0x064E, |
|
| 77 | - 0xEF => 0x064F, |
|
| 78 | - 0xF0 => 0x0650, |
|
| 79 | - 0xF1 => 0x0651, |
|
| 80 | - 0xF2 => 0x0652 |
|
| 30 | + 0xA0 => 0x00A0, |
|
| 31 | + 0xA4 => 0x00A4, |
|
| 32 | + 0xAC => 0x060C, |
|
| 33 | + 0xAD => 0x00AD, |
|
| 34 | + 0xBB => 0x061B, |
|
| 35 | + 0xBF => 0x061F, |
|
| 36 | + 0xC1 => 0x0621, |
|
| 37 | + 0xC2 => 0x0622, |
|
| 38 | + 0xC3 => 0x0623, |
|
| 39 | + 0xC4 => 0x0624, |
|
| 40 | + 0xC5 => 0x0625, |
|
| 41 | + 0xC6 => 0x0626, |
|
| 42 | + 0xC7 => 0x0627, |
|
| 43 | + 0xC8 => 0x0628, |
|
| 44 | + 0xC9 => 0x0629, |
|
| 45 | + 0xCA => 0x062A, |
|
| 46 | + 0xCB => 0x062B, |
|
| 47 | + 0xCC => 0x062C, |
|
| 48 | + 0xCD => 0x062D, |
|
| 49 | + 0xCE => 0x062E, |
|
| 50 | + 0xCF => 0x062F, |
|
| 51 | + 0xD0 => 0x0630, |
|
| 52 | + 0xD1 => 0x0631, |
|
| 53 | + 0xD2 => 0x0632, |
|
| 54 | + 0xD3 => 0x0633, |
|
| 55 | + 0xD4 => 0x0634, |
|
| 56 | + 0xD5 => 0x0635, |
|
| 57 | + 0xD6 => 0x0636, |
|
| 58 | + 0xD7 => 0x0637, |
|
| 59 | + 0xD8 => 0x0638, |
|
| 60 | + 0xD9 => 0x0639, |
|
| 61 | + 0xDA => 0x063A, |
|
| 62 | + 0xE0 => 0x0640, |
|
| 63 | + 0xE1 => 0x0641, |
|
| 64 | + 0xE2 => 0x0642, |
|
| 65 | + 0xE3 => 0x0643, |
|
| 66 | + 0xE4 => 0x0644, |
|
| 67 | + 0xE5 => 0x0645, |
|
| 68 | + 0xE6 => 0x0646, |
|
| 69 | + 0xE7 => 0x0647, |
|
| 70 | + 0xE8 => 0x0648, |
|
| 71 | + 0xE9 => 0x0649, |
|
| 72 | + 0xEA => 0x064A, |
|
| 73 | + 0xEB => 0x064B, |
|
| 74 | + 0xEC => 0x064C, |
|
| 75 | + 0xED => 0x064D, |
|
| 76 | + 0xEE => 0x064E, |
|
| 77 | + 0xEF => 0x064F, |
|
| 78 | + 0xF0 => 0x0650, |
|
| 79 | + 0xF1 => 0x0651, |
|
| 80 | + 0xF2 => 0x0652 |
|
| 81 | 81 | ]; |
| 82 | 82 | |
| 83 | 83 | foreach ($mod as $num => $val) { |
| 84 | - $trans[$num] = $val; |
|
| 84 | + $trans[$num] = $val; |
|
| 85 | 85 | } |
| 86 | 86 | |
| 87 | 87 | $GLOBALS['CHARSET']['iso-8859-6'] = $trans; |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | **/ |
| 21 | 21 | |
| 22 | 22 | if (!defined('_ECRIRE_INC_VERSION')) { |
| 23 | - return; |
|
| 23 | + return; |
|
| 24 | 24 | } |
| 25 | 25 | |
| 26 | 26 | load_charset('translit'); |
@@ -28,151 +28,151 @@ discard block |
||
| 28 | 28 | |
| 29 | 29 | $translit_c = [ |
| 30 | 30 | // vietnamien |
| 31 | - 225 => "a'", |
|
| 32 | - 224 => 'a`', |
|
| 33 | - 7843 => 'a?', |
|
| 34 | - 227 => 'a~', |
|
| 35 | - 7841 => 'a.', |
|
| 36 | - 226 => 'a^', |
|
| 37 | - 7845 => "a^'", |
|
| 38 | - 7847 => 'a^`', |
|
| 39 | - 7849 => 'a^?', |
|
| 40 | - 7851 => 'a^~', |
|
| 41 | - 7853 => 'a^.', |
|
| 42 | - 259 => 'a(', |
|
| 43 | - 7855 => "a('", |
|
| 44 | - 7857 => 'a(`', |
|
| 45 | - 7859 => 'a(?', |
|
| 46 | - 7861 => 'a(~', |
|
| 47 | - 7863 => 'a(.', |
|
| 48 | - 193 => "A'", |
|
| 49 | - 192 => 'A`', |
|
| 50 | - 7842 => 'A?', |
|
| 51 | - 195 => 'A~', |
|
| 52 | - 7840 => 'A.', |
|
| 53 | - 194 => 'A^', |
|
| 54 | - 7844 => "A^'", |
|
| 55 | - 7846 => 'A^`', |
|
| 56 | - 7848 => 'A^?', |
|
| 57 | - 7850 => 'A^~', |
|
| 58 | - 7852 => 'A^.', |
|
| 59 | - 258 => 'A(', |
|
| 60 | - 7854 => "A('", |
|
| 61 | - 7856 => 'A(`', |
|
| 62 | - 7858 => 'A(?', |
|
| 63 | - 7860 => 'A(~', |
|
| 64 | - 7862 => 'A(.', |
|
| 65 | - 233 => "e'", |
|
| 66 | - 232 => 'e`', |
|
| 67 | - 7867 => 'e?', |
|
| 68 | - 7869 => 'e~', |
|
| 69 | - 7865 => 'e.', |
|
| 70 | - 234 => 'e^', |
|
| 71 | - 7871 => "e^'", |
|
| 72 | - 7873 => 'e^`', |
|
| 73 | - 7875 => 'e^?', |
|
| 74 | - 7877 => 'e^~', |
|
| 75 | - 7879 => 'e^.', |
|
| 76 | - 201 => "E'", |
|
| 77 | - 200 => 'E`', |
|
| 78 | - 7866 => 'E?', |
|
| 79 | - 7868 => 'E~', |
|
| 80 | - 7864 => 'E.', |
|
| 81 | - 202 => 'E^', |
|
| 82 | - 7870 => "E^'", |
|
| 83 | - 7872 => 'E^`', |
|
| 84 | - 7874 => 'E^?', |
|
| 85 | - 7876 => 'E^~', |
|
| 86 | - 7878 => 'E^.', |
|
| 87 | - 237 => "i'", |
|
| 88 | - 236 => 'i`', |
|
| 89 | - 7881 => 'i?', |
|
| 90 | - 297 => 'i~', |
|
| 91 | - 7883 => 'i.', |
|
| 92 | - 205 => "I'", |
|
| 93 | - 204 => 'I`', |
|
| 94 | - 7880 => 'I?', |
|
| 95 | - 296 => 'I~', |
|
| 96 | - 7882 => 'I.', |
|
| 97 | - 243 => "o'", |
|
| 98 | - 242 => 'o`', |
|
| 99 | - 7887 => 'o?', |
|
| 100 | - 245 => 'o~', |
|
| 101 | - 7885 => 'o.', |
|
| 102 | - 244 => 'o^', |
|
| 103 | - 7889 => "o^'", |
|
| 104 | - 7891 => 'o^`', |
|
| 105 | - 7893 => 'o^?', |
|
| 106 | - 7895 => 'o^~', |
|
| 107 | - 7897 => 'o^.', |
|
| 108 | - 417 => 'o+', |
|
| 109 | - 7899 => "o+'", |
|
| 110 | - 7901 => 'o+`', |
|
| 111 | - 7903 => 'o+?', |
|
| 112 | - 7905 => 'o+~', |
|
| 113 | - 7907 => 'o+.', |
|
| 114 | - 211 => "O'", |
|
| 115 | - 210 => 'O`', |
|
| 116 | - 7886 => 'O?', |
|
| 117 | - 213 => 'O~', |
|
| 118 | - 7884 => 'O.', |
|
| 119 | - 212 => 'O^', |
|
| 120 | - 7888 => "O^'", |
|
| 121 | - 7890 => 'O^`', |
|
| 122 | - 7892 => 'O^?', |
|
| 123 | - 7894 => 'O^~', |
|
| 124 | - 7896 => 'O^.', |
|
| 125 | - 416 => 'O+', |
|
| 126 | - 7898 => "O+'", |
|
| 127 | - 7900 => 'O+`', |
|
| 128 | - 7902 => 'O+?', |
|
| 129 | - 7904 => 'O+~', |
|
| 130 | - 7906 => 'O+.', |
|
| 131 | - 250 => "u'", |
|
| 132 | - 249 => 'u`', |
|
| 133 | - 7911 => 'u?', |
|
| 134 | - 361 => 'u~', |
|
| 135 | - 7909 => 'u.', |
|
| 136 | - 432 => 'u+', |
|
| 137 | - 7913 => "u+'", |
|
| 138 | - 7915 => 'u+`', |
|
| 139 | - 7917 => 'u+?', |
|
| 140 | - 7919 => 'u+~', |
|
| 141 | - 7921 => 'u+.', |
|
| 142 | - 218 => "U'", |
|
| 143 | - 217 => 'U`', |
|
| 144 | - 7910 => 'U?', |
|
| 145 | - 360 => 'U~', |
|
| 146 | - 7908 => 'U.', |
|
| 147 | - 431 => 'U+', |
|
| 148 | - 7912 => "U+'", |
|
| 149 | - 7914 => 'U+`', |
|
| 150 | - 7916 => 'U+?', |
|
| 151 | - 7918 => 'U+~', |
|
| 152 | - 7920 => 'U+.', |
|
| 153 | - 253 => "y'", |
|
| 154 | - 7923 => 'y`', |
|
| 155 | - 7927 => 'y?', |
|
| 156 | - 7929 => 'y~', |
|
| 157 | - 7925 => 'y.', |
|
| 158 | - 221 => "Y'", |
|
| 159 | - 7922 => 'Y`', |
|
| 160 | - 7926 => 'Y?', |
|
| 161 | - 7928 => 'Y~', |
|
| 162 | - 7924 => 'Y.', |
|
| 163 | - 273 => 'd-', |
|
| 164 | - 208 => 'D-', |
|
| 31 | + 225 => "a'", |
|
| 32 | + 224 => 'a`', |
|
| 33 | + 7843 => 'a?', |
|
| 34 | + 227 => 'a~', |
|
| 35 | + 7841 => 'a.', |
|
| 36 | + 226 => 'a^', |
|
| 37 | + 7845 => "a^'", |
|
| 38 | + 7847 => 'a^`', |
|
| 39 | + 7849 => 'a^?', |
|
| 40 | + 7851 => 'a^~', |
|
| 41 | + 7853 => 'a^.', |
|
| 42 | + 259 => 'a(', |
|
| 43 | + 7855 => "a('", |
|
| 44 | + 7857 => 'a(`', |
|
| 45 | + 7859 => 'a(?', |
|
| 46 | + 7861 => 'a(~', |
|
| 47 | + 7863 => 'a(.', |
|
| 48 | + 193 => "A'", |
|
| 49 | + 192 => 'A`', |
|
| 50 | + 7842 => 'A?', |
|
| 51 | + 195 => 'A~', |
|
| 52 | + 7840 => 'A.', |
|
| 53 | + 194 => 'A^', |
|
| 54 | + 7844 => "A^'", |
|
| 55 | + 7846 => 'A^`', |
|
| 56 | + 7848 => 'A^?', |
|
| 57 | + 7850 => 'A^~', |
|
| 58 | + 7852 => 'A^.', |
|
| 59 | + 258 => 'A(', |
|
| 60 | + 7854 => "A('", |
|
| 61 | + 7856 => 'A(`', |
|
| 62 | + 7858 => 'A(?', |
|
| 63 | + 7860 => 'A(~', |
|
| 64 | + 7862 => 'A(.', |
|
| 65 | + 233 => "e'", |
|
| 66 | + 232 => 'e`', |
|
| 67 | + 7867 => 'e?', |
|
| 68 | + 7869 => 'e~', |
|
| 69 | + 7865 => 'e.', |
|
| 70 | + 234 => 'e^', |
|
| 71 | + 7871 => "e^'", |
|
| 72 | + 7873 => 'e^`', |
|
| 73 | + 7875 => 'e^?', |
|
| 74 | + 7877 => 'e^~', |
|
| 75 | + 7879 => 'e^.', |
|
| 76 | + 201 => "E'", |
|
| 77 | + 200 => 'E`', |
|
| 78 | + 7866 => 'E?', |
|
| 79 | + 7868 => 'E~', |
|
| 80 | + 7864 => 'E.', |
|
| 81 | + 202 => 'E^', |
|
| 82 | + 7870 => "E^'", |
|
| 83 | + 7872 => 'E^`', |
|
| 84 | + 7874 => 'E^?', |
|
| 85 | + 7876 => 'E^~', |
|
| 86 | + 7878 => 'E^.', |
|
| 87 | + 237 => "i'", |
|
| 88 | + 236 => 'i`', |
|
| 89 | + 7881 => 'i?', |
|
| 90 | + 297 => 'i~', |
|
| 91 | + 7883 => 'i.', |
|
| 92 | + 205 => "I'", |
|
| 93 | + 204 => 'I`', |
|
| 94 | + 7880 => 'I?', |
|
| 95 | + 296 => 'I~', |
|
| 96 | + 7882 => 'I.', |
|
| 97 | + 243 => "o'", |
|
| 98 | + 242 => 'o`', |
|
| 99 | + 7887 => 'o?', |
|
| 100 | + 245 => 'o~', |
|
| 101 | + 7885 => 'o.', |
|
| 102 | + 244 => 'o^', |
|
| 103 | + 7889 => "o^'", |
|
| 104 | + 7891 => 'o^`', |
|
| 105 | + 7893 => 'o^?', |
|
| 106 | + 7895 => 'o^~', |
|
| 107 | + 7897 => 'o^.', |
|
| 108 | + 417 => 'o+', |
|
| 109 | + 7899 => "o+'", |
|
| 110 | + 7901 => 'o+`', |
|
| 111 | + 7903 => 'o+?', |
|
| 112 | + 7905 => 'o+~', |
|
| 113 | + 7907 => 'o+.', |
|
| 114 | + 211 => "O'", |
|
| 115 | + 210 => 'O`', |
|
| 116 | + 7886 => 'O?', |
|
| 117 | + 213 => 'O~', |
|
| 118 | + 7884 => 'O.', |
|
| 119 | + 212 => 'O^', |
|
| 120 | + 7888 => "O^'", |
|
| 121 | + 7890 => 'O^`', |
|
| 122 | + 7892 => 'O^?', |
|
| 123 | + 7894 => 'O^~', |
|
| 124 | + 7896 => 'O^.', |
|
| 125 | + 416 => 'O+', |
|
| 126 | + 7898 => "O+'", |
|
| 127 | + 7900 => 'O+`', |
|
| 128 | + 7902 => 'O+?', |
|
| 129 | + 7904 => 'O+~', |
|
| 130 | + 7906 => 'O+.', |
|
| 131 | + 250 => "u'", |
|
| 132 | + 249 => 'u`', |
|
| 133 | + 7911 => 'u?', |
|
| 134 | + 361 => 'u~', |
|
| 135 | + 7909 => 'u.', |
|
| 136 | + 432 => 'u+', |
|
| 137 | + 7913 => "u+'", |
|
| 138 | + 7915 => 'u+`', |
|
| 139 | + 7917 => 'u+?', |
|
| 140 | + 7919 => 'u+~', |
|
| 141 | + 7921 => 'u+.', |
|
| 142 | + 218 => "U'", |
|
| 143 | + 217 => 'U`', |
|
| 144 | + 7910 => 'U?', |
|
| 145 | + 360 => 'U~', |
|
| 146 | + 7908 => 'U.', |
|
| 147 | + 431 => 'U+', |
|
| 148 | + 7912 => "U+'", |
|
| 149 | + 7914 => 'U+`', |
|
| 150 | + 7916 => 'U+?', |
|
| 151 | + 7918 => 'U+~', |
|
| 152 | + 7920 => 'U+.', |
|
| 153 | + 253 => "y'", |
|
| 154 | + 7923 => 'y`', |
|
| 155 | + 7927 => 'y?', |
|
| 156 | + 7929 => 'y~', |
|
| 157 | + 7925 => 'y.', |
|
| 158 | + 221 => "Y'", |
|
| 159 | + 7922 => 'Y`', |
|
| 160 | + 7926 => 'Y?', |
|
| 161 | + 7928 => 'Y~', |
|
| 162 | + 7924 => 'Y.', |
|
| 163 | + 273 => 'd-', |
|
| 164 | + 208 => 'D-', |
|
| 165 | 165 | |
| 166 | 166 | // allemand |
| 167 | - 228 => 'ae', |
|
| 168 | - 246 => 'oe', |
|
| 169 | - 252 => 'ue', |
|
| 170 | - 196 => 'Ae', |
|
| 171 | - 214 => 'Oe', |
|
| 172 | - 220 => 'Ue' |
|
| 167 | + 228 => 'ae', |
|
| 168 | + 246 => 'oe', |
|
| 169 | + 252 => 'ue', |
|
| 170 | + 196 => 'Ae', |
|
| 171 | + 214 => 'Oe', |
|
| 172 | + 220 => 'Ue' |
|
| 173 | 173 | ]; |
| 174 | 174 | |
| 175 | 175 | foreach ($translit_c as $u => $t) { |
| 176 | - $trans[$u] = $t; |
|
| 176 | + $trans[$u] = $t; |
|
| 177 | 177 | } |
| 178 | 178 | $GLOBALS['CHARSET']['translitcomplexe'] = $trans; |
@@ -9,131 +9,131 @@ |
||
| 9 | 9 | **/ |
| 10 | 10 | |
| 11 | 11 | $GLOBALS['CHARSET']['cp1251'] = [ |
| 12 | - 0x80 => 0x0402, |
|
| 13 | - 0x81 => 0x0403, |
|
| 14 | - 0x82 => 0x201A, |
|
| 15 | - 0x83 => 0x0453, |
|
| 16 | - 0x84 => 0x201E, |
|
| 17 | - 0x85 => 0x2026, |
|
| 18 | - 0x86 => 0x2020, |
|
| 19 | - 0x87 => 0x2021, |
|
| 20 | - 0x88 => 0x20AC, |
|
| 21 | - 0x89 => 0x2030, |
|
| 22 | - 0x8A => 0x0409, |
|
| 23 | - 0x8B => 0x2039, |
|
| 24 | - 0x8C => 0x040A, |
|
| 25 | - 0x8D => 0x040C, |
|
| 26 | - 0x8E => 0x040B, |
|
| 27 | - 0x8F => 0x040F, |
|
| 28 | - 0x90 => 0x0452, |
|
| 29 | - 0x91 => 0x2018, |
|
| 30 | - 0x92 => 0x2019, |
|
| 31 | - 0x93 => 0x201C, |
|
| 32 | - 0x94 => 0x201D, |
|
| 33 | - 0x95 => 0x2022, |
|
| 34 | - 0x96 => 0x2013, |
|
| 35 | - 0x97 => 0x2014, |
|
| 36 | - 0x99 => 0x2122, |
|
| 37 | - 0x9A => 0x0459, |
|
| 38 | - 0x9B => 0x203A, |
|
| 39 | - 0x9C => 0x045A, |
|
| 40 | - 0x9D => 0x045C, |
|
| 41 | - 0x9E => 0x045B, |
|
| 42 | - 0x9F => 0x045F, |
|
| 43 | - 0xA0 => 0x00A0, |
|
| 44 | - 0xA1 => 0x040E, |
|
| 45 | - 0xA2 => 0x045E, |
|
| 46 | - 0xA3 => 0x0408, |
|
| 47 | - 0xA4 => 0x00A4, |
|
| 48 | - 0xA5 => 0x0490, |
|
| 49 | - 0xA6 => 0x00A6, |
|
| 50 | - 0xA7 => 0x00A7, |
|
| 51 | - 0xA8 => 0x0401, |
|
| 52 | - 0xA9 => 0x00A9, |
|
| 53 | - 0xAA => 0x0404, |
|
| 54 | - 0xAB => 0x00AB, |
|
| 55 | - 0xAC => 0x00AC, |
|
| 56 | - 0xAD => 0x00AD, |
|
| 57 | - 0xAE => 0x00AE, |
|
| 58 | - 0xAF => 0x0407, |
|
| 59 | - 0xB0 => 0x00B0, |
|
| 60 | - 0xB1 => 0x00B1, |
|
| 61 | - 0xB2 => 0x0406, |
|
| 62 | - 0xB3 => 0x0456, |
|
| 63 | - 0xB4 => 0x0491, |
|
| 64 | - 0xB5 => 0x00B5, |
|
| 65 | - 0xB6 => 0x00B6, |
|
| 66 | - 0xB7 => 0x00B7, |
|
| 67 | - 0xB8 => 0x0451, |
|
| 68 | - 0xB9 => 0x2116, |
|
| 69 | - 0xBA => 0x0454, |
|
| 70 | - 0xBB => 0x00BB, |
|
| 71 | - 0xBC => 0x0458, |
|
| 72 | - 0xBD => 0x0405, |
|
| 73 | - 0xBE => 0x0455, |
|
| 74 | - 0xBF => 0x0457, |
|
| 75 | - 0xC0 => 0x0410, |
|
| 76 | - 0xC1 => 0x0411, |
|
| 77 | - 0xC2 => 0x0412, |
|
| 78 | - 0xC3 => 0x0413, |
|
| 79 | - 0xC4 => 0x0414, |
|
| 80 | - 0xC5 => 0x0415, |
|
| 81 | - 0xC6 => 0x0416, |
|
| 82 | - 0xC7 => 0x0417, |
|
| 83 | - 0xC8 => 0x0418, |
|
| 84 | - 0xC9 => 0x0419, |
|
| 85 | - 0xCA => 0x041A, |
|
| 86 | - 0xCB => 0x041B, |
|
| 87 | - 0xCC => 0x041C, |
|
| 88 | - 0xCD => 0x041D, |
|
| 89 | - 0xCE => 0x041E, |
|
| 90 | - 0xCF => 0x041F, |
|
| 91 | - 0xD0 => 0x0420, |
|
| 92 | - 0xD1 => 0x0421, |
|
| 93 | - 0xD2 => 0x0422, |
|
| 94 | - 0xD3 => 0x0423, |
|
| 95 | - 0xD4 => 0x0424, |
|
| 96 | - 0xD5 => 0x0425, |
|
| 97 | - 0xD6 => 0x0426, |
|
| 98 | - 0xD7 => 0x0427, |
|
| 99 | - 0xD8 => 0x0428, |
|
| 100 | - 0xD9 => 0x0429, |
|
| 101 | - 0xDA => 0x042A, |
|
| 102 | - 0xDB => 0x042B, |
|
| 103 | - 0xDC => 0x042C, |
|
| 104 | - 0xDD => 0x042D, |
|
| 105 | - 0xDE => 0x042E, |
|
| 106 | - 0xDF => 0x042F, |
|
| 107 | - 0xE0 => 0x0430, |
|
| 108 | - 0xE1 => 0x0431, |
|
| 109 | - 0xE2 => 0x0432, |
|
| 110 | - 0xE3 => 0x0433, |
|
| 111 | - 0xE4 => 0x0434, |
|
| 112 | - 0xE5 => 0x0435, |
|
| 113 | - 0xE6 => 0x0436, |
|
| 114 | - 0xE7 => 0x0437, |
|
| 115 | - 0xE8 => 0x0438, |
|
| 116 | - 0xE9 => 0x0439, |
|
| 117 | - 0xEA => 0x043A, |
|
| 118 | - 0xEB => 0x043B, |
|
| 119 | - 0xEC => 0x043C, |
|
| 120 | - 0xED => 0x043D, |
|
| 121 | - 0xEE => 0x043E, |
|
| 122 | - 0xEF => 0x043F, |
|
| 123 | - 0xF0 => 0x0440, |
|
| 124 | - 0xF1 => 0x0441, |
|
| 125 | - 0xF2 => 0x0442, |
|
| 126 | - 0xF3 => 0x0443, |
|
| 127 | - 0xF4 => 0x0444, |
|
| 128 | - 0xF5 => 0x0445, |
|
| 129 | - 0xF6 => 0x0446, |
|
| 130 | - 0xF7 => 0x0447, |
|
| 131 | - 0xF8 => 0x0448, |
|
| 132 | - 0xF9 => 0x0449, |
|
| 133 | - 0xFA => 0x044A, |
|
| 134 | - 0xFB => 0x044B, |
|
| 135 | - 0xFC => 0x044C, |
|
| 136 | - 0xFD => 0x044D, |
|
| 137 | - 0xFE => 0x044E, |
|
| 138 | - 0xFF => 0x044F |
|
| 12 | + 0x80 => 0x0402, |
|
| 13 | + 0x81 => 0x0403, |
|
| 14 | + 0x82 => 0x201A, |
|
| 15 | + 0x83 => 0x0453, |
|
| 16 | + 0x84 => 0x201E, |
|
| 17 | + 0x85 => 0x2026, |
|
| 18 | + 0x86 => 0x2020, |
|
| 19 | + 0x87 => 0x2021, |
|
| 20 | + 0x88 => 0x20AC, |
|
| 21 | + 0x89 => 0x2030, |
|
| 22 | + 0x8A => 0x0409, |
|
| 23 | + 0x8B => 0x2039, |
|
| 24 | + 0x8C => 0x040A, |
|
| 25 | + 0x8D => 0x040C, |
|
| 26 | + 0x8E => 0x040B, |
|
| 27 | + 0x8F => 0x040F, |
|
| 28 | + 0x90 => 0x0452, |
|
| 29 | + 0x91 => 0x2018, |
|
| 30 | + 0x92 => 0x2019, |
|
| 31 | + 0x93 => 0x201C, |
|
| 32 | + 0x94 => 0x201D, |
|
| 33 | + 0x95 => 0x2022, |
|
| 34 | + 0x96 => 0x2013, |
|
| 35 | + 0x97 => 0x2014, |
|
| 36 | + 0x99 => 0x2122, |
|
| 37 | + 0x9A => 0x0459, |
|
| 38 | + 0x9B => 0x203A, |
|
| 39 | + 0x9C => 0x045A, |
|
| 40 | + 0x9D => 0x045C, |
|
| 41 | + 0x9E => 0x045B, |
|
| 42 | + 0x9F => 0x045F, |
|
| 43 | + 0xA0 => 0x00A0, |
|
| 44 | + 0xA1 => 0x040E, |
|
| 45 | + 0xA2 => 0x045E, |
|
| 46 | + 0xA3 => 0x0408, |
|
| 47 | + 0xA4 => 0x00A4, |
|
| 48 | + 0xA5 => 0x0490, |
|
| 49 | + 0xA6 => 0x00A6, |
|
| 50 | + 0xA7 => 0x00A7, |
|
| 51 | + 0xA8 => 0x0401, |
|
| 52 | + 0xA9 => 0x00A9, |
|
| 53 | + 0xAA => 0x0404, |
|
| 54 | + 0xAB => 0x00AB, |
|
| 55 | + 0xAC => 0x00AC, |
|
| 56 | + 0xAD => 0x00AD, |
|
| 57 | + 0xAE => 0x00AE, |
|
| 58 | + 0xAF => 0x0407, |
|
| 59 | + 0xB0 => 0x00B0, |
|
| 60 | + 0xB1 => 0x00B1, |
|
| 61 | + 0xB2 => 0x0406, |
|
| 62 | + 0xB3 => 0x0456, |
|
| 63 | + 0xB4 => 0x0491, |
|
| 64 | + 0xB5 => 0x00B5, |
|
| 65 | + 0xB6 => 0x00B6, |
|
| 66 | + 0xB7 => 0x00B7, |
|
| 67 | + 0xB8 => 0x0451, |
|
| 68 | + 0xB9 => 0x2116, |
|
| 69 | + 0xBA => 0x0454, |
|
| 70 | + 0xBB => 0x00BB, |
|
| 71 | + 0xBC => 0x0458, |
|
| 72 | + 0xBD => 0x0405, |
|
| 73 | + 0xBE => 0x0455, |
|
| 74 | + 0xBF => 0x0457, |
|
| 75 | + 0xC0 => 0x0410, |
|
| 76 | + 0xC1 => 0x0411, |
|
| 77 | + 0xC2 => 0x0412, |
|
| 78 | + 0xC3 => 0x0413, |
|
| 79 | + 0xC4 => 0x0414, |
|
| 80 | + 0xC5 => 0x0415, |
|
| 81 | + 0xC6 => 0x0416, |
|
| 82 | + 0xC7 => 0x0417, |
|
| 83 | + 0xC8 => 0x0418, |
|
| 84 | + 0xC9 => 0x0419, |
|
| 85 | + 0xCA => 0x041A, |
|
| 86 | + 0xCB => 0x041B, |
|
| 87 | + 0xCC => 0x041C, |
|
| 88 | + 0xCD => 0x041D, |
|
| 89 | + 0xCE => 0x041E, |
|
| 90 | + 0xCF => 0x041F, |
|
| 91 | + 0xD0 => 0x0420, |
|
| 92 | + 0xD1 => 0x0421, |
|
| 93 | + 0xD2 => 0x0422, |
|
| 94 | + 0xD3 => 0x0423, |
|
| 95 | + 0xD4 => 0x0424, |
|
| 96 | + 0xD5 => 0x0425, |
|
| 97 | + 0xD6 => 0x0426, |
|
| 98 | + 0xD7 => 0x0427, |
|
| 99 | + 0xD8 => 0x0428, |
|
| 100 | + 0xD9 => 0x0429, |
|
| 101 | + 0xDA => 0x042A, |
|
| 102 | + 0xDB => 0x042B, |
|
| 103 | + 0xDC => 0x042C, |
|
| 104 | + 0xDD => 0x042D, |
|
| 105 | + 0xDE => 0x042E, |
|
| 106 | + 0xDF => 0x042F, |
|
| 107 | + 0xE0 => 0x0430, |
|
| 108 | + 0xE1 => 0x0431, |
|
| 109 | + 0xE2 => 0x0432, |
|
| 110 | + 0xE3 => 0x0433, |
|
| 111 | + 0xE4 => 0x0434, |
|
| 112 | + 0xE5 => 0x0435, |
|
| 113 | + 0xE6 => 0x0436, |
|
| 114 | + 0xE7 => 0x0437, |
|
| 115 | + 0xE8 => 0x0438, |
|
| 116 | + 0xE9 => 0x0439, |
|
| 117 | + 0xEA => 0x043A, |
|
| 118 | + 0xEB => 0x043B, |
|
| 119 | + 0xEC => 0x043C, |
|
| 120 | + 0xED => 0x043D, |
|
| 121 | + 0xEE => 0x043E, |
|
| 122 | + 0xEF => 0x043F, |
|
| 123 | + 0xF0 => 0x0440, |
|
| 124 | + 0xF1 => 0x0441, |
|
| 125 | + 0xF2 => 0x0442, |
|
| 126 | + 0xF3 => 0x0443, |
|
| 127 | + 0xF4 => 0x0444, |
|
| 128 | + 0xF5 => 0x0445, |
|
| 129 | + 0xF6 => 0x0446, |
|
| 130 | + 0xF7 => 0x0447, |
|
| 131 | + 0xF8 => 0x0448, |
|
| 132 | + 0xF9 => 0x0449, |
|
| 133 | + 0xFA => 0x044A, |
|
| 134 | + 0xFB => 0x044B, |
|
| 135 | + 0xFC => 0x044C, |
|
| 136 | + 0xFD => 0x044D, |
|
| 137 | + 0xFE => 0x044E, |
|
| 138 | + 0xFF => 0x044F |
|
| 139 | 139 | ]; |
@@ -8,120 +8,120 @@ |
||
| 8 | 8 | **/ |
| 9 | 9 | |
| 10 | 10 | $GLOBALS['CHARSET']['html'] = [ |
| 11 | - 'ldquo' => '“', |
|
| 12 | - 'rdquo' => '”', |
|
| 13 | - 'bdquo' => '„', |
|
| 14 | - 'cent' => '¢', |
|
| 15 | - 'pound' => '£', |
|
| 16 | - 'curren' => '¤', |
|
| 17 | - 'yen' => '¥', |
|
| 18 | - 'brvbar' => '¦', |
|
| 19 | - 'sect' => '§', |
|
| 20 | - 'uml' => '¨', |
|
| 21 | - 'ordf' => 'ª', |
|
| 22 | - 'laquo' => '«', |
|
| 23 | - 'lsquo' => '‘', |
|
| 24 | - 'rsquo' => '’', |
|
| 25 | - 'not' => '¬', |
|
| 26 | - 'shy' => '­', |
|
| 27 | - 'macr' => '¯', |
|
| 28 | - 'deg' => '°', |
|
| 29 | - 'plusmn' => '±', |
|
| 30 | - 'sup2' => '²', |
|
| 31 | - 'sup3' => '³', |
|
| 32 | - 'acute' => '´', |
|
| 33 | - 'micro' => 'µ', |
|
| 34 | - 'para' => '¶', |
|
| 35 | - 'middot' => '·', |
|
| 36 | - 'cedil' => '¸', |
|
| 37 | - 'sup1' => '¹', |
|
| 38 | - 'ordm' => 'º', |
|
| 39 | - 'raquo' => '»', |
|
| 40 | - 'iquest' => '¿', |
|
| 41 | - 'Agrave' => 'À', |
|
| 42 | - 'Aacute' => 'Á', |
|
| 43 | - 'Acirc' => 'Â', |
|
| 44 | - 'Atilde' => 'Ã', |
|
| 45 | - 'Auml' => 'Ä', |
|
| 46 | - 'Aring' => 'Å', |
|
| 47 | - 'AElig' => 'Æ', |
|
| 48 | - 'Ccedil' => 'Ç', |
|
| 49 | - 'Egrave' => 'È', |
|
| 50 | - 'Eacute' => 'É', |
|
| 51 | - 'Ecirc' => 'Ê', |
|
| 52 | - 'Euml' => 'Ë', |
|
| 53 | - 'Igrave' => 'Ì', |
|
| 54 | - 'Iacute' => 'Í', |
|
| 55 | - 'Icirc' => 'Î', |
|
| 56 | - 'Iuml' => 'Ï', |
|
| 57 | - 'ETH' => 'Ð', |
|
| 58 | - 'Ntilde' => 'Ñ', |
|
| 59 | - 'Ograve' => 'Ò', |
|
| 60 | - 'Oacute' => 'Ó', |
|
| 61 | - 'Ocirc' => 'Ô', |
|
| 62 | - 'Otilde' => 'Õ', |
|
| 63 | - 'Ouml' => 'Ö', |
|
| 64 | - 'times' => '×', |
|
| 65 | - 'Oslash' => 'Ø', |
|
| 66 | - 'Ugrave' => 'Ù', |
|
| 67 | - 'Uacute' => 'Ú', |
|
| 68 | - 'Ucirc' => 'Û', |
|
| 69 | - 'Uuml' => 'Ü', |
|
| 70 | - 'Yacute' => 'Ý', |
|
| 71 | - 'THORN' => 'Þ', |
|
| 72 | - 'szlig' => 'ß', |
|
| 73 | - 'agrave' => 'à', |
|
| 74 | - 'Scaron' => 'Š', |
|
| 75 | - 'scaron' => 'š', |
|
| 76 | - 'zcaron' => 'ž', |
|
| 77 | - 'Zcaron' => 'Ž', |
|
| 78 | - 'aacute' => 'á', |
|
| 79 | - 'acirc' => 'â', |
|
| 80 | - 'atilde' => 'ã', |
|
| 81 | - 'auml' => 'ä', |
|
| 82 | - 'aring' => 'å', |
|
| 83 | - 'aelig' => 'æ', |
|
| 84 | - 'ccedil' => 'ç', |
|
| 85 | - 'egrave' => 'è', |
|
| 86 | - 'eacute' => 'é', |
|
| 87 | - 'ecirc' => 'ê', |
|
| 88 | - 'euml' => 'ë', |
|
| 89 | - 'igrave' => 'ì', |
|
| 90 | - 'iacute' => 'í', |
|
| 91 | - 'icirc' => 'î', |
|
| 92 | - 'iuml' => 'ï', |
|
| 93 | - 'eth' => 'ð', |
|
| 94 | - 'ntilde' => 'ñ', |
|
| 95 | - 'ograve' => 'ò', |
|
| 96 | - 'oacute' => 'ó', |
|
| 97 | - 'ocirc' => 'ô', |
|
| 98 | - 'otilde' => 'õ', |
|
| 99 | - 'ouml' => 'ö', |
|
| 100 | - 'divide' => '÷', |
|
| 101 | - 'oslash' => 'ø', |
|
| 102 | - 'ugrave' => 'ù', |
|
| 103 | - 'uacute' => 'ú', |
|
| 104 | - 'ucirc' => 'û', |
|
| 105 | - 'uuml' => 'ü', |
|
| 106 | - 'yacute' => 'ý', |
|
| 107 | - 'thorn' => 'þ', |
|
| 108 | - 'nbsp' => ' ', |
|
| 109 | - 'thinsp' => ' ', |
|
| 110 | - 'ensp' => ' ', |
|
| 111 | - 'emsp' => ' ', |
|
| 112 | - 'copy' => '(c)', |
|
| 113 | - 'reg' => '(r)', |
|
| 114 | - 'frac14' => '1/4', |
|
| 115 | - 'frac12' => '1/2', |
|
| 116 | - 'frac34' => '3/4', |
|
| 117 | - 'apos' => "'", |
|
| 118 | - 'mdash' => '—', |
|
| 119 | - 'ndash' => '–', |
|
| 120 | - 'hellip' => '…', |
|
| 121 | - 'euro' => '€', |
|
| 122 | - 'OElig' => 'Œ', |
|
| 123 | - 'oelig' => 'œ', |
|
| 124 | - 'iexcl' => '¡' |
|
| 11 | + 'ldquo' => '“', |
|
| 12 | + 'rdquo' => '”', |
|
| 13 | + 'bdquo' => '„', |
|
| 14 | + 'cent' => '¢', |
|
| 15 | + 'pound' => '£', |
|
| 16 | + 'curren' => '¤', |
|
| 17 | + 'yen' => '¥', |
|
| 18 | + 'brvbar' => '¦', |
|
| 19 | + 'sect' => '§', |
|
| 20 | + 'uml' => '¨', |
|
| 21 | + 'ordf' => 'ª', |
|
| 22 | + 'laquo' => '«', |
|
| 23 | + 'lsquo' => '‘', |
|
| 24 | + 'rsquo' => '’', |
|
| 25 | + 'not' => '¬', |
|
| 26 | + 'shy' => '­', |
|
| 27 | + 'macr' => '¯', |
|
| 28 | + 'deg' => '°', |
|
| 29 | + 'plusmn' => '±', |
|
| 30 | + 'sup2' => '²', |
|
| 31 | + 'sup3' => '³', |
|
| 32 | + 'acute' => '´', |
|
| 33 | + 'micro' => 'µ', |
|
| 34 | + 'para' => '¶', |
|
| 35 | + 'middot' => '·', |
|
| 36 | + 'cedil' => '¸', |
|
| 37 | + 'sup1' => '¹', |
|
| 38 | + 'ordm' => 'º', |
|
| 39 | + 'raquo' => '»', |
|
| 40 | + 'iquest' => '¿', |
|
| 41 | + 'Agrave' => 'À', |
|
| 42 | + 'Aacute' => 'Á', |
|
| 43 | + 'Acirc' => 'Â', |
|
| 44 | + 'Atilde' => 'Ã', |
|
| 45 | + 'Auml' => 'Ä', |
|
| 46 | + 'Aring' => 'Å', |
|
| 47 | + 'AElig' => 'Æ', |
|
| 48 | + 'Ccedil' => 'Ç', |
|
| 49 | + 'Egrave' => 'È', |
|
| 50 | + 'Eacute' => 'É', |
|
| 51 | + 'Ecirc' => 'Ê', |
|
| 52 | + 'Euml' => 'Ë', |
|
| 53 | + 'Igrave' => 'Ì', |
|
| 54 | + 'Iacute' => 'Í', |
|
| 55 | + 'Icirc' => 'Î', |
|
| 56 | + 'Iuml' => 'Ï', |
|
| 57 | + 'ETH' => 'Ð', |
|
| 58 | + 'Ntilde' => 'Ñ', |
|
| 59 | + 'Ograve' => 'Ò', |
|
| 60 | + 'Oacute' => 'Ó', |
|
| 61 | + 'Ocirc' => 'Ô', |
|
| 62 | + 'Otilde' => 'Õ', |
|
| 63 | + 'Ouml' => 'Ö', |
|
| 64 | + 'times' => '×', |
|
| 65 | + 'Oslash' => 'Ø', |
|
| 66 | + 'Ugrave' => 'Ù', |
|
| 67 | + 'Uacute' => 'Ú', |
|
| 68 | + 'Ucirc' => 'Û', |
|
| 69 | + 'Uuml' => 'Ü', |
|
| 70 | + 'Yacute' => 'Ý', |
|
| 71 | + 'THORN' => 'Þ', |
|
| 72 | + 'szlig' => 'ß', |
|
| 73 | + 'agrave' => 'à', |
|
| 74 | + 'Scaron' => 'Š', |
|
| 75 | + 'scaron' => 'š', |
|
| 76 | + 'zcaron' => 'ž', |
|
| 77 | + 'Zcaron' => 'Ž', |
|
| 78 | + 'aacute' => 'á', |
|
| 79 | + 'acirc' => 'â', |
|
| 80 | + 'atilde' => 'ã', |
|
| 81 | + 'auml' => 'ä', |
|
| 82 | + 'aring' => 'å', |
|
| 83 | + 'aelig' => 'æ', |
|
| 84 | + 'ccedil' => 'ç', |
|
| 85 | + 'egrave' => 'è', |
|
| 86 | + 'eacute' => 'é', |
|
| 87 | + 'ecirc' => 'ê', |
|
| 88 | + 'euml' => 'ë', |
|
| 89 | + 'igrave' => 'ì', |
|
| 90 | + 'iacute' => 'í', |
|
| 91 | + 'icirc' => 'î', |
|
| 92 | + 'iuml' => 'ï', |
|
| 93 | + 'eth' => 'ð', |
|
| 94 | + 'ntilde' => 'ñ', |
|
| 95 | + 'ograve' => 'ò', |
|
| 96 | + 'oacute' => 'ó', |
|
| 97 | + 'ocirc' => 'ô', |
|
| 98 | + 'otilde' => 'õ', |
|
| 99 | + 'ouml' => 'ö', |
|
| 100 | + 'divide' => '÷', |
|
| 101 | + 'oslash' => 'ø', |
|
| 102 | + 'ugrave' => 'ù', |
|
| 103 | + 'uacute' => 'ú', |
|
| 104 | + 'ucirc' => 'û', |
|
| 105 | + 'uuml' => 'ü', |
|
| 106 | + 'yacute' => 'ý', |
|
| 107 | + 'thorn' => 'þ', |
|
| 108 | + 'nbsp' => ' ', |
|
| 109 | + 'thinsp' => ' ', |
|
| 110 | + 'ensp' => ' ', |
|
| 111 | + 'emsp' => ' ', |
|
| 112 | + 'copy' => '(c)', |
|
| 113 | + 'reg' => '(r)', |
|
| 114 | + 'frac14' => '1/4', |
|
| 115 | + 'frac12' => '1/2', |
|
| 116 | + 'frac34' => '3/4', |
|
| 117 | + 'apos' => "'", |
|
| 118 | + 'mdash' => '—', |
|
| 119 | + 'ndash' => '–', |
|
| 120 | + 'hellip' => '…', |
|
| 121 | + 'euro' => '€', |
|
| 122 | + 'OElig' => 'Œ', |
|
| 123 | + 'oelig' => 'œ', |
|
| 124 | + 'iexcl' => '¡' |
|
| 125 | 125 | |
| 126 | 126 | ]; |
| 127 | 127 | |
