spip / SPIP

ecrire/lang/ecrire_en.php

Indentation +839 added lines, -839 removed lines

@@ -4,431 +4,431 @@ 
 // ** ne pas modifier le fichier **
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 $GLOBALS[$GLOBALS['idx_lang']] = array(
 
-	// A
-	'activer_plugin' => 'Enable plugin',
-	'affichage' => 'Display',
-	'aide_non_disponible' => 'This part of the online help is not yet available in this language.',
-	'annuler_recherche' => 'Cancel the search',
-	'auteur' => 'Author:',
-	'avis_acces_interdit' => 'Access forbidden.',
-	'avis_acces_interdit_prive' => 'You are not allowed to access the page <b>@exec@</b>.',
-	'avis_article_modifie' => 'Warning: @nom_auteur_modif@ modified this article @date_diff@ minutes ago',
-	'avis_aucun_resultat' => 'No results found.',
-	'avis_base_inaccessible' => 'Impossible to connect to the database @base@.',
-	'avis_chemin_invalide_1' => 'The path you selected',
-	'avis_chemin_invalide_2' => 'does not seem to be valid. Please go back to previous page and check the information you provided.',
-	'avis_connexion_echec_1' => 'Connection to the SQL server failed.',
-	'avis_connexion_echec_2' => 'Go back to the previous page, and check the information you provided.',
-	'avis_connexion_echec_3' => '<b>N.B.</b> On many servers, you must <b>request</b> activation of your access to the SQL database before you can use it. If you cannot connect to your database, check that activation has been done.',
-	'avis_connexion_erreur_creer_base' => 'The database could not be created.',
-	'avis_connexion_erreur_fichier_cle_manquant_1' => 'Installation must be performed by a webmaster with a backup of the keys and their password',
-	'avis_connexion_erreur_fichier_cle_manquant_2' => 'Installation must be performed by a webmaster with a backup of the keys',
-	'avis_connexion_erreur_nom_base' => 'The database’s name should only contain letters, digits and hyphens.',
-	'avis_connexion_ldap_echec_1' => 'Connection to the LDAP server failed.',
-	'avis_connexion_ldap_echec_2' => 'Go back to the previous page, and check the information you provided.',
-	'avis_connexion_ldap_echec_3' => 'Alternatively, do not use LDAP support to import users.',
-	'avis_deplacement_rubrique' => 'Warning! This section contains @contient_breves@ news item@scb@: if you move it, please check this box to confirm.',
-	'avis_erreur_connexion_mysql' => 'SQL connection error',
-	'avis_erreur_creation_compte' => 'Failure during account initialisation',
-	'avis_espace_interdit' => '<b>Forbidden area</b> <div>SPIP is already installed.</div>',
-	'avis_lecture_noms_bases_1' => 'The installer could not read the names of any databases already installed.',
-	'avis_lecture_noms_bases_2' => 'Either no database is available, or the option listing databases was disabled for security reasons (which is the case with various hosting services).',
-	'avis_lecture_noms_bases_3' => 'In the second case, a database named after your login might already be available:',
-	'avis_non_acces_page' => 'You do not have access to this page.',
-	'avis_operation_echec' => 'The operation failed.',
-	'avis_operation_impossible' => 'Operation impossible',
-	'avis_suppression_base' => 'WARNING: data deletion is irreversible',
+    // A
+    'activer_plugin' => 'Enable plugin',
+    'affichage' => 'Display',
+    'aide_non_disponible' => 'This part of the online help is not yet available in this language.',
+    'annuler_recherche' => 'Cancel the search',
+    'auteur' => 'Author:',
+    'avis_acces_interdit' => 'Access forbidden.',
+    'avis_acces_interdit_prive' => 'You are not allowed to access the page <b>@exec@</b>.',
+    'avis_article_modifie' => 'Warning: @nom_auteur_modif@ modified this article @date_diff@ minutes ago',
+    'avis_aucun_resultat' => 'No results found.',
+    'avis_base_inaccessible' => 'Impossible to connect to the database @base@.',
+    'avis_chemin_invalide_1' => 'The path you selected',
+    'avis_chemin_invalide_2' => 'does not seem to be valid. Please go back to previous page and check the information you provided.',
+    'avis_connexion_echec_1' => 'Connection to the SQL server failed.',
+    'avis_connexion_echec_2' => 'Go back to the previous page, and check the information you provided.',
+    'avis_connexion_echec_3' => '<b>N.B.</b> On many servers, you must <b>request</b> activation of your access to the SQL database before you can use it. If you cannot connect to your database, check that activation has been done.',
+    'avis_connexion_erreur_creer_base' => 'The database could not be created.',
+    'avis_connexion_erreur_fichier_cle_manquant_1' => 'Installation must be performed by a webmaster with a backup of the keys and their password',
+    'avis_connexion_erreur_fichier_cle_manquant_2' => 'Installation must be performed by a webmaster with a backup of the keys',
+    'avis_connexion_erreur_nom_base' => 'The database’s name should only contain letters, digits and hyphens.',
+    'avis_connexion_ldap_echec_1' => 'Connection to the LDAP server failed.',
+    'avis_connexion_ldap_echec_2' => 'Go back to the previous page, and check the information you provided.',
+    'avis_connexion_ldap_echec_3' => 'Alternatively, do not use LDAP support to import users.',
+    'avis_deplacement_rubrique' => 'Warning! This section contains @contient_breves@ news item@scb@: if you move it, please check this box to confirm.',
+    'avis_erreur_connexion_mysql' => 'SQL connection error',
+    'avis_erreur_creation_compte' => 'Failure during account initialisation',
+    'avis_espace_interdit' => '<b>Forbidden area</b> <div>SPIP is already installed.</div>',
+    'avis_lecture_noms_bases_1' => 'The installer could not read the names of any databases already installed.',
+    'avis_lecture_noms_bases_2' => 'Either no database is available, or the option listing databases was disabled for security reasons (which is the case with various hosting services).',
+    'avis_lecture_noms_bases_3' => 'In the second case, a database named after your login might already be available:',
+    'avis_non_acces_page' => 'You do not have access to this page.',
+    'avis_operation_echec' => 'The operation failed.',
+    'avis_operation_impossible' => 'Operation impossible',
+    'avis_suppression_base' => 'WARNING: data deletion is irreversible',
 
-	// B
-	'bouton_acces_ldap' => 'Add LDAP access',
-	'bouton_ajouter' => 'Add',
-	'bouton_annuler' => 'Cancel',
-	'bouton_cache_activer' => 'Re-activate the cache',
-	'bouton_cache_desactiver' => 'Disable the cache momentarily',
-	'bouton_demande_publication' => 'Request publication of this article',
-	'bouton_desactive_tout' => 'Disable all',
-	'bouton_desinstaller' => 'Uninstall',
-	'bouton_effacer_tout' => 'Delete ALL',
-	'bouton_envoyer_message' => 'Message complete: send',
-	'bouton_fermer' => 'Close',
-	'bouton_mettre_a_jour_base' => 'Update the database',
-	'bouton_modifier' => 'Modify',
-	'bouton_radio_afficher' => 'Show',
-	'bouton_radio_apparaitre_liste_redacteurs_connectes' => 'Appear in the list of editors online',
-	'bouton_radio_envoi_annonces_adresse' => 'Send announcements to:',
-	'bouton_radio_envoi_liste_nouveautes' => 'Send news update list',
-	'bouton_radio_non_apparaitre_liste_redacteurs_connectes' => 'Do not appear in the list of editors online',
-	'bouton_radio_non_envoi_annonces_editoriales' => 'Do not send any editorial announcements',
-	'bouton_redirection' => 'REDIRECT',
-	'bouton_reinitialiser_aux_valeurs_par_defaut' => 'Reset to default values',
-	'bouton_relancer_inscription' => 'Re-launch registration',
-	'bouton_relancer_inscriptions' => 'Re-launch registrations',
-	'bouton_relancer_installation' => 'Recommence installation',
-	'bouton_reset_password' => 'Create a new password and send by e-mail',
-	'bouton_suivant' => 'Next',
-	'bouton_tenter_recuperation' => 'Attempt to repair',
-	'bouton_test_proxy' => 'Test the proxy',
-	'bouton_vider_cache' => 'Empty the cache',
+    // B
+    'bouton_acces_ldap' => 'Add LDAP access',
+    'bouton_ajouter' => 'Add',
+    'bouton_annuler' => 'Cancel',
+    'bouton_cache_activer' => 'Re-activate the cache',
+    'bouton_cache_desactiver' => 'Disable the cache momentarily',
+    'bouton_demande_publication' => 'Request publication of this article',
+    'bouton_desactive_tout' => 'Disable all',
+    'bouton_desinstaller' => 'Uninstall',
+    'bouton_effacer_tout' => 'Delete ALL',
+    'bouton_envoyer_message' => 'Message complete: send',
+    'bouton_fermer' => 'Close',
+    'bouton_mettre_a_jour_base' => 'Update the database',
+    'bouton_modifier' => 'Modify',
+    'bouton_radio_afficher' => 'Show',
+    'bouton_radio_apparaitre_liste_redacteurs_connectes' => 'Appear in the list of editors online',
+    'bouton_radio_envoi_annonces_adresse' => 'Send announcements to:',
+    'bouton_radio_envoi_liste_nouveautes' => 'Send news update list',
+    'bouton_radio_non_apparaitre_liste_redacteurs_connectes' => 'Do not appear in the list of editors online',
+    'bouton_radio_non_envoi_annonces_editoriales' => 'Do not send any editorial announcements',
+    'bouton_redirection' => 'REDIRECT',
+    'bouton_reinitialiser_aux_valeurs_par_defaut' => 'Reset to default values',
+    'bouton_relancer_inscription' => 'Re-launch registration',
+    'bouton_relancer_inscriptions' => 'Re-launch registrations',
+    'bouton_relancer_installation' => 'Recommence installation',
+    'bouton_reset_password' => 'Create a new password and send by e-mail',
+    'bouton_suivant' => 'Next',
+    'bouton_tenter_recuperation' => 'Attempt to repair',
+    'bouton_test_proxy' => 'Test the proxy',
+    'bouton_vider_cache' => 'Empty the cache',
 
-	// C
-	'cache_modifiable_webmestre' => 'This parameter can be modified by the webmaster.',
-	'calendrier_synchro' => 'If you use a calendar application compatible with <b>iCal</b>, you can synchronise it with information from this site.',
-	'config_activer_champs' => 'Activate the following fields',
-	'config_choix_base_sup' => 'Choose a database on this server',
-	'config_erreur_base_sup' => 'SPIP does not have access to the list of databases available',
-	'config_info_base_sup' => 'If you need to query other databases using SPIP, whether on this SQL server or elsewhere, use this form to declare them. If you leave any fields empty, connection details to the main database will be used.',
-	'config_info_base_sup_disponibles' => 'Additional databases to which queries may be sent:',
-	'config_info_enregistree' => 'The new configuration has been saved',
-	'config_info_logos' => 'Each element of the site can have its own logo as well as a "mouseover" logo',
-	'config_info_logos_utiliser' => 'Use logos',
-	'config_info_logos_utiliser_non' => 'Do not use logos',
-	'config_info_logos_utiliser_survol' => 'Use "mouseover" logos',
-	'config_info_logos_utiliser_survol_non' => 'Do not use "mouseover" logos',
-	'config_info_redirection' => 'By activating this option you can create virtual articles, which are simply links to articles published on other sites, not necessarily using SPIP.',
-	'config_redirection' => 'Virtual articles',
-	'config_titre_base_sup' => 'Declaration of an additional database',
-	'config_titre_base_sup_choix' => 'Choose an additional database',
-	'connexion_ldap' => 'Connection:',
-	'creer_et_associer_un_auteur' => 'Create and associate an author',
+    // C
+    'cache_modifiable_webmestre' => 'This parameter can be modified by the webmaster.',
+    'calendrier_synchro' => 'If you use a calendar application compatible with <b>iCal</b>, you can synchronise it with information from this site.',
+    'config_activer_champs' => 'Activate the following fields',
+    'config_choix_base_sup' => 'Choose a database on this server',
+    'config_erreur_base_sup' => 'SPIP does not have access to the list of databases available',
+    'config_info_base_sup' => 'If you need to query other databases using SPIP, whether on this SQL server or elsewhere, use this form to declare them. If you leave any fields empty, connection details to the main database will be used.',
+    'config_info_base_sup_disponibles' => 'Additional databases to which queries may be sent:',
+    'config_info_enregistree' => 'The new configuration has been saved',
+    'config_info_logos' => 'Each element of the site can have its own logo as well as a "mouseover" logo',
+    'config_info_logos_utiliser' => 'Use logos',
+    'config_info_logos_utiliser_non' => 'Do not use logos',
+    'config_info_logos_utiliser_survol' => 'Use "mouseover" logos',
+    'config_info_logos_utiliser_survol_non' => 'Do not use "mouseover" logos',
+    'config_info_redirection' => 'By activating this option you can create virtual articles, which are simply links to articles published on other sites, not necessarily using SPIP.',
+    'config_redirection' => 'Virtual articles',
+    'config_titre_base_sup' => 'Declaration of an additional database',
+    'config_titre_base_sup_choix' => 'Choose an additional database',
+    'connexion_ldap' => 'Connection:',
+    'creer_et_associer_un_auteur' => 'Create and associate an author',
 
-	// D
-	'date_mot_heures' => 'H',
+    // D
+    'date_mot_heures' => 'H',
 
-	// E
-	'ecran_connexion_couleur_principale' => 'Main colour',
-	'ecran_connexion_image_fond' => 'Background image',
-	'ecran_connexion_image_fond_explication' => 'Use an image (JPEG format, 1920x1080 pixels)',
-	'ecran_connexion_image_revenir_couleur_defaut' => 'Back to the default colour',
-	'ecran_connexion_titre' => 'Connection screen',
-	'ecran_securite' => '+ safety screen @version@',
-	'email' => 'email',
-	'email_2' => 'email:',
-	'en_savoir_plus' => 'Learn more',
-	'entree_adresse_annuaire' => 'Directory address',
-	'entree_adresse_email' => 'Your email address',
-	'entree_adresse_email_2' => 'E-mail address',
-	'entree_base_donnee_1' => 'Database address',
-	'entree_base_donnee_2' => '(This address is often your site’s URL, although sometimes it will be "localhost", and sometimes it should be left blank.)',
-	'entree_biographie' => 'Brief biography',
-	'entree_chemin_acces' => '<b>Enter</b> the path:',
-	'entree_cle_pgp' => 'Your PGP key',
-	'entree_cle_pgp_2' => 'PGP key',
-	'entree_contenu_rubrique' => '(Brief description of the content of this section.)',
-	'entree_identifiants_connexion' => 'Your connection identifiers...',
-	'entree_identifiants_connexion_2' => 'Connection identifiers',
-	'entree_informations_connexion_ldap' => 'Please fill this form with the LDAP connection information provided by your system or network administrator.',
-	'entree_infos_perso' => 'Who are you?',
-	'entree_infos_perso_2' => 'Who is the author?',
-	'entree_interieur_rubrique' => 'In the section:',
-	'entree_liens_sites' => '<b>Hyperlink</b> (reference, site to visit etc.)',
-	'entree_login' => 'Your login',
-	'entree_login_connexion_1' => 'Connection login',
-	'entree_login_connexion_2' => '(Sometimes matches your FTP account login and sometimes left empty)',
-	'entree_mot_passe' => 'Your password',
-	'entree_mot_passe_1' => 'Password',
-	'entree_mot_passe_2' => '(Sometimes matches your FTP access password and sometimes left empty)',
-	'entree_nom_fichier' => 'Please enter the filename @texte_compresse@:',
-	'entree_nom_pseudo' => 'Your name or alias',
-	'entree_nom_pseudo_1' => '(Your name or alias)',
-	'entree_nom_pseudo_2' => 'Name or alias',
-	'entree_nom_site' => 'Website’s name',
-	'entree_nom_site_2' => 'Author’s website’s name',
-	'entree_nouveau_passe' => 'New password',
-	'entree_passe_ldap' => 'Password',
-	'entree_port_annuaire' => 'Port number of the directory',
-	'entree_signature' => 'Signature',
-	'entree_titre_obligatoire' => '<b>Title</b> [Required]<br />',
-	'entree_url' => 'Website’s URL',
-	'entree_url_2' => 'Website’s URL',
-	'erreur_connect_deja_existant' => 'A server by that name already exists',
-	'erreur_contenu_suspect' => 'Text escaped',
-	'erreur_email_deja_existant' => 'This email address has already been registered.',
-	'erreur_nom_connect_incorrect' => 'Server name not allowed',
-	'erreur_plugin_attribut_balise_manquant' => 'Missing attribute @attribut@ in tag @balise@',
-	'erreur_plugin_desinstalation_echouee' => 'Uninstallation of the plugin failed. However, you may deactivate it.',
-	'erreur_plugin_fichier_absent' => 'File missing',
-	'erreur_plugin_fichier_def_absent' => 'Definition file missing',
-	'erreur_plugin_nom_fonction_interdit' => 'Prohibited function name',
-	'erreur_plugin_nom_manquant' => 'Missing plugin name',
-	'erreur_plugin_prefix_manquant' => 'Namespace undefined for this plugin',
-	'erreur_plugin_tag_plugin_absent' => '&lt;plugin&gt; missing in the definition file',
-	'erreur_plugin_version_manquant' => 'Plugin version missing',
-	'erreur_type_fichier' => 'Wrong file type',
+    // E
+    'ecran_connexion_couleur_principale' => 'Main colour',
+    'ecran_connexion_image_fond' => 'Background image',
+    'ecran_connexion_image_fond_explication' => 'Use an image (JPEG format, 1920x1080 pixels)',
+    'ecran_connexion_image_revenir_couleur_defaut' => 'Back to the default colour',
+    'ecran_connexion_titre' => 'Connection screen',
+    'ecran_securite' => '+ safety screen @version@',
+    'email' => 'email',
+    'email_2' => 'email:',
+    'en_savoir_plus' => 'Learn more',
+    'entree_adresse_annuaire' => 'Directory address',
+    'entree_adresse_email' => 'Your email address',
+    'entree_adresse_email_2' => 'E-mail address',
+    'entree_base_donnee_1' => 'Database address',
+    'entree_base_donnee_2' => '(This address is often your site’s URL, although sometimes it will be "localhost", and sometimes it should be left blank.)',
+    'entree_biographie' => 'Brief biography',
+    'entree_chemin_acces' => '<b>Enter</b> the path:',
+    'entree_cle_pgp' => 'Your PGP key',
+    'entree_cle_pgp_2' => 'PGP key',
+    'entree_contenu_rubrique' => '(Brief description of the content of this section.)',
+    'entree_identifiants_connexion' => 'Your connection identifiers...',
+    'entree_identifiants_connexion_2' => 'Connection identifiers',
+    'entree_informations_connexion_ldap' => 'Please fill this form with the LDAP connection information provided by your system or network administrator.',
+    'entree_infos_perso' => 'Who are you?',
+    'entree_infos_perso_2' => 'Who is the author?',
+    'entree_interieur_rubrique' => 'In the section:',
+    'entree_liens_sites' => '<b>Hyperlink</b> (reference, site to visit etc.)',
+    'entree_login' => 'Your login',
+    'entree_login_connexion_1' => 'Connection login',
+    'entree_login_connexion_2' => '(Sometimes matches your FTP account login and sometimes left empty)',
+    'entree_mot_passe' => 'Your password',
+    'entree_mot_passe_1' => 'Password',
+    'entree_mot_passe_2' => '(Sometimes matches your FTP access password and sometimes left empty)',
+    'entree_nom_fichier' => 'Please enter the filename @texte_compresse@:',
+    'entree_nom_pseudo' => 'Your name or alias',
+    'entree_nom_pseudo_1' => '(Your name or alias)',
+    'entree_nom_pseudo_2' => 'Name or alias',
+    'entree_nom_site' => 'Website’s name',
+    'entree_nom_site_2' => 'Author’s website’s name',
+    'entree_nouveau_passe' => 'New password',
+    'entree_passe_ldap' => 'Password',
+    'entree_port_annuaire' => 'Port number of the directory',
+    'entree_signature' => 'Signature',
+    'entree_titre_obligatoire' => '<b>Title</b> [Required]<br />',
+    'entree_url' => 'Website’s URL',
+    'entree_url_2' => 'Website’s URL',
+    'erreur_connect_deja_existant' => 'A server by that name already exists',
+    'erreur_contenu_suspect' => 'Text escaped',
+    'erreur_email_deja_existant' => 'This email address has already been registered.',
+    'erreur_nom_connect_incorrect' => 'Server name not allowed',
+    'erreur_plugin_attribut_balise_manquant' => 'Missing attribute @attribut@ in tag @balise@',
+    'erreur_plugin_desinstalation_echouee' => 'Uninstallation of the plugin failed. However, you may deactivate it.',
+    'erreur_plugin_fichier_absent' => 'File missing',
+    'erreur_plugin_fichier_def_absent' => 'Definition file missing',
+    'erreur_plugin_nom_fonction_interdit' => 'Prohibited function name',
+    'erreur_plugin_nom_manquant' => 'Missing plugin name',
+    'erreur_plugin_prefix_manquant' => 'Namespace undefined for this plugin',
+    'erreur_plugin_tag_plugin_absent' => '&lt;plugin&gt; missing in the definition file',
+    'erreur_plugin_version_manquant' => 'Plugin version missing',
+    'erreur_type_fichier' => 'Wrong file type',
 
-	// H
-	'htaccess_a_simuler' => 'Warning: your HTTP server configuration ignores @htaccess@ files. To ensure good security, you should change the configuration for this. Alternatively, you should make sure that the constants @constantes@ (definable in the file mes_options.php) have as values directories outside @document_root@.',
-	'htaccess_inoperant' => 'inoperative htaccess',
+    // H
+    'htaccess_a_simuler' => 'Warning: your HTTP server configuration ignores @htaccess@ files. To ensure good security, you should change the configuration for this. Alternatively, you should make sure that the constants @constantes@ (definable in the file mes_options.php) have as values directories outside @document_root@.',
+    'htaccess_inoperant' => 'inoperative htaccess',
 
-	// I
-	'ical_info1' => 'This page offers several tools to be kept  up-to-date with website’s activity.',
-	'ical_info2' => 'For more information, do not hesitate to visit <a href="@spipnet@">SPIP’s documentation</a>.',
-	'ical_info_calendrier' => 'Two calendars are available. The first is a general, public calendar showing  articles as they are published. The second is personal and contains editorial announcements as well as your latest private messages: it is reserved for you via a personal key that you can modify at any time by renewing your password.',
-	'ical_methode_http' => 'Downloading',
-	'ical_methode_webcal' => 'Synchronisation (webcal://)',
-	'ical_texte_prive' => 'This calendar, which is strictly personal, informs you of the private editorial activity of this site (tasks, personal appointments, articles and news items submitted etc.).',
-	'ical_texte_public' => 'This calendar allows you to follow the public activity of this site (newly-published articles and news items).',
-	'ical_texte_rss' => 'You can syndicate the latest news from this site in any XML/RSS (Rich Site Summary) reader. This is also the format that allows SPIP to read the latest news published by other sites using a compatible exchange format (syndicated sites).',
-	'ical_titre_js' => 'Javascript',
-	'ical_titre_mailing' => 'Mailing-list',
-	'ical_titre_rss' => 'Syndication files',
-	'icone_accueil' => 'Home',
-	'icone_activer_cookie' => 'Place a cookie',
-	'icone_activite' => 'Feedback',
-	'icone_admin_plugin' => 'Manage plugins',
-	'icone_administration' => 'Maintenance',
-	'icone_afficher_auteurs' => 'Show authors',
-	'icone_afficher_visiteurs' => 'Show visitors',
-	'icone_arret_discussion' => 'Stop participating in this discussion',
-	'icone_calendrier' => 'Calendar',
-	'icone_configuration' => 'Configuration',
-	'icone_creer_auteur' => 'Create a new author and link him/her to this article',
-	'icone_creer_mot_cle' => 'Create a new keyword and link it to this article',
-	'icone_creer_rubrique_2' => 'Create a new section',
-	'icone_developpement' => 'Development',
-	'icone_edition' => 'Edit',
-	'icone_ma_langue' => 'My language',
-	'icone_mes_infos' => 'My details',
-	'icone_mes_preferences' => 'Preferences',
-	'icone_modifier_article' => 'Edit this article',
-	'icone_modifier_rubrique' => 'Edit this section',
-	'icone_publication' => 'Publish',
-	'icone_relancer_signataire' => 'Contact the signatory again',
-	'icone_retour' => 'Back',
-	'icone_retour_article' => 'Back to the article',
-	'icone_squelette' => 'Templates',
-	'icone_suivi_publication' => 'Publication follow up ',
-	'icone_supprimer_cookie' => 'Delete cookie',
-	'icone_supprimer_rubrique' => 'Delete this section',
-	'icone_supprimer_signature' => 'Delete this signature',
-	'icone_valider_signature' => 'Validate this signature',
-	'image_administrer_rubrique' => 'You can manage this section',
-	'impossible_modifier_login_auteur' => 'Login cannot be changed.',
-	'impossible_modifier_pass_auteur' => 'Password cannot be changed.',
-	'info_1_article' => '1 article',
-	'info_1_auteur' => '1 author',
-	'info_1_message' => '1 message',
-	'info_1_mot_cle' => '1 keyword',
-	'info_1_rubrique' => '1 section',
-	'info_1_visiteur' => '1 visitor',
-	'info_activer_cookie' => 'You can activate an <b>administration cookie</b>, which lets you switch easily between the public website and the admin area.',
-	'info_activer_menu_developpement' => 'Show the Development menu',
-	'info_admin_etre_webmestre' => 'Give me web administrator rights',
-	'info_admin_je_suis_webmestre' => 'I am a <b>webmaster</b>',
-	'info_admin_statuer_webmestre' => 'Give webmaster rights to this administrator ',
-	'info_admin_webmestre' => 'This administrator is <b>webmaster</b>',
-	'info_administrateur' => 'Administrator',
-	'info_administrateur_1' => 'Administrator',
-	'info_administrateur_2' => 'of the site (<i>use with caution</i>)',
-	'info_administrateur_site_01' => 'If you are a site administrator, please',
-	'info_administrateur_site_02' => 'click on this link',
-	'info_administrateurs' => 'Administrators',
-	'info_administrer_rubrique' => 'You can manage this section',
-	'info_adresse' => 'to this address:',
-	'info_adresse_desinscription' => 'Unsubscription address:',
-	'info_adresse_url' => 'URL of the public site',
-	'info_afficher_par_nb' => 'Show ',
-	'info_aide_en_ligne' => 'SPIP Online Help',
-	'info_ajout_image' => 'When you add images as attached documents to an article,
+    // I
+    'ical_info1' => 'This page offers several tools to be kept  up-to-date with website’s activity.',
+    'ical_info2' => 'For more information, do not hesitate to visit <a href="@spipnet@">SPIP’s documentation</a>.',
+    'ical_info_calendrier' => 'Two calendars are available. The first is a general, public calendar showing  articles as they are published. The second is personal and contains editorial announcements as well as your latest private messages: it is reserved for you via a personal key that you can modify at any time by renewing your password.',
+    'ical_methode_http' => 'Downloading',
+    'ical_methode_webcal' => 'Synchronisation (webcal://)',
+    'ical_texte_prive' => 'This calendar, which is strictly personal, informs you of the private editorial activity of this site (tasks, personal appointments, articles and news items submitted etc.).',
+    'ical_texte_public' => 'This calendar allows you to follow the public activity of this site (newly-published articles and news items).',
+    'ical_texte_rss' => 'You can syndicate the latest news from this site in any XML/RSS (Rich Site Summary) reader. This is also the format that allows SPIP to read the latest news published by other sites using a compatible exchange format (syndicated sites).',
+    'ical_titre_js' => 'Javascript',
+    'ical_titre_mailing' => 'Mailing-list',
+    'ical_titre_rss' => 'Syndication files',
+    'icone_accueil' => 'Home',
+    'icone_activer_cookie' => 'Place a cookie',
+    'icone_activite' => 'Feedback',
+    'icone_admin_plugin' => 'Manage plugins',
+    'icone_administration' => 'Maintenance',
+    'icone_afficher_auteurs' => 'Show authors',
+    'icone_afficher_visiteurs' => 'Show visitors',
+    'icone_arret_discussion' => 'Stop participating in this discussion',
+    'icone_calendrier' => 'Calendar',
+    'icone_configuration' => 'Configuration',
+    'icone_creer_auteur' => 'Create a new author and link him/her to this article',
+    'icone_creer_mot_cle' => 'Create a new keyword and link it to this article',
+    'icone_creer_rubrique_2' => 'Create a new section',
+    'icone_developpement' => 'Development',
+    'icone_edition' => 'Edit',
+    'icone_ma_langue' => 'My language',
+    'icone_mes_infos' => 'My details',
+    'icone_mes_preferences' => 'Preferences',
+    'icone_modifier_article' => 'Edit this article',
+    'icone_modifier_rubrique' => 'Edit this section',
+    'icone_publication' => 'Publish',
+    'icone_relancer_signataire' => 'Contact the signatory again',
+    'icone_retour' => 'Back',
+    'icone_retour_article' => 'Back to the article',
+    'icone_squelette' => 'Templates',
+    'icone_suivi_publication' => 'Publication follow up ',
+    'icone_supprimer_cookie' => 'Delete cookie',
+    'icone_supprimer_rubrique' => 'Delete this section',
+    'icone_supprimer_signature' => 'Delete this signature',
+    'icone_valider_signature' => 'Validate this signature',
+    'image_administrer_rubrique' => 'You can manage this section',
+    'impossible_modifier_login_auteur' => 'Login cannot be changed.',
+    'impossible_modifier_pass_auteur' => 'Password cannot be changed.',
+    'info_1_article' => '1 article',
+    'info_1_auteur' => '1 author',
+    'info_1_message' => '1 message',
+    'info_1_mot_cle' => '1 keyword',
+    'info_1_rubrique' => '1 section',
+    'info_1_visiteur' => '1 visitor',
+    'info_activer_cookie' => 'You can activate an <b>administration cookie</b>, which lets you switch easily between the public website and the admin area.',
+    'info_activer_menu_developpement' => 'Show the Development menu',
+    'info_admin_etre_webmestre' => 'Give me web administrator rights',
+    'info_admin_je_suis_webmestre' => 'I am a <b>webmaster</b>',
+    'info_admin_statuer_webmestre' => 'Give webmaster rights to this administrator ',
+    'info_admin_webmestre' => 'This administrator is <b>webmaster</b>',
+    'info_administrateur' => 'Administrator',
+    'info_administrateur_1' => 'Administrator',
+    'info_administrateur_2' => 'of the site (<i>use with caution</i>)',
+    'info_administrateur_site_01' => 'If you are a site administrator, please',
+    'info_administrateur_site_02' => 'click on this link',
+    'info_administrateurs' => 'Administrators',
+    'info_administrer_rubrique' => 'You can manage this section',
+    'info_adresse' => 'to this address:',
+    'info_adresse_desinscription' => 'Unsubscription address:',
+    'info_adresse_url' => 'URL of the public site',
+    'info_afficher_par_nb' => 'Show ',
+    'info_aide_en_ligne' => 'SPIP Online Help',
+    'info_ajout_image' => 'When you add images as attached documents to an article,
   SPIP can automatically create thumbnails from
   inserted images. This will allow, for instance, the automated
   creation of a gallery or portfolio.',
-	'info_ajouter_rubrique' => 'Add another section to manage:',
-	'info_annonce_nouveautes' => 'Latest news announcements',
-	'info_article' => 'article',
-	'info_article_2' => 'articles',
-	'info_article_a_paraitre' => 'Post-dated articles set for publication',
-	'info_articles_02' => 'articles',
-	'info_articles_2' => 'Articles',
-	'info_articles_auteur' => 'Articles by this author',
-	'info_articles_miens' => 'My articles',
-	'info_articles_tous' => 'All the articles',
-	'info_articles_trouves' => 'Articles found',
-	'info_attente_validation' => 'Your articles awaiting validation',
-	'info_aucun_article' => 'No articles',
-	'info_aucun_auteur' => 'No authors',
-	'info_aucun_message' => 'No messages',
-	'info_aucun_rubrique' => 'No sections',
-	'info_aujourdhui' => 'today:',
-	'info_auteur_gere_rubriques' => 'This author manages the following sections:',
-	'info_auteur_gere_toutes_rubriques' => 'This author manage <b>all the sections</b>',
-	'info_auteur_gere_toutes_rubriques_2' => 'I manage <b>all the sections</b>',
-	'info_auteurs' => 'Authors',
-	'info_auteurs_par_tri' => 'Authors@partri@',
-	'info_auteurs_trouves' => 'Authors found',
-	'info_authentification_externe' => 'External authentication',
-	'info_avertissement' => 'Warning',
-	'info_barre_outils' => 'with its toolbar?',
-	'info_base_installee' => 'Your database structure has been installed.',
-	'info_bio' => 'Biography',
-	'info_cache_desactive' => 'The cache is temporarily disabled',
-	'info_chapeau' => 'Introduction',
-	'info_chapeau_2' => 'Introduction:',
-	'info_chemin_acces_1' => 'Options: <b>Access path in directory</b>',
-	'info_chemin_acces_2' => 'You must now configure the access path to the directory information. This information is essential to read the user profiles stored in the directory.',
-	'info_chemin_acces_annuaire' => 'Options: <b>Access path in directory</b>',
-	'info_choix_base' => 'Third step:',
-	'info_classement_1' => ' out of @liste@',
-	'info_classement_2' => ' out of @liste@',
-	'info_code_acces' => 'Do not forget your own access codes!',
-	'info_config_suivi' => 'If this address corresponds to a mailing list, you can indicate the subscription address for this list. This may be a URL (e.g. a webpage enabling subscription online), or an email address with a specific subject (for instance: <tt>@adresse_suivi@?subject=subscribe</tt>):',
-	'info_config_suivi_explication' => 'You can subscribe to the mailing-list for this site. You will then receive email announcements concerning articles and news items submitted for publication.',
-	'info_confirmer_passe' => 'Confirm new password:',
-	'info_conflit_edition_avis_non_sauvegarde' => 'Caution: the following fields have been modified elsewhere. Your changes to these fields have therefore not been saved.',
-	'info_conflit_edition_differences' => 'Differences:',
-	'info_conflit_edition_version_enregistree' => 'Saved version:',
-	'info_conflit_edition_votre_version' => 'Your version:',
-	'info_connexion_base' => 'Trying to connect to database',
-	'info_connexion_base_donnee' => 'Connection to your database',
-	'info_connexion_ldap_ok' => '<b>LDAP connection succeeded.</b><p> You can go to the next step.</p>',
-	'info_connexion_mysql' => 'Your SQL connection',
-	'info_connexion_ok' => 'Connection succeeded.',
-	'info_contact' => 'Contact',
-	'info_contenu_articles' => 'Article content',
-	'info_contributions' => 'Contributions',
-	'info_creation_paragraphe' => 'To create paragraphs, just leave blank lines.',
-	'info_creation_rubrique' => 'Before writing any articles,<br /> you must create at least one section.<br />',
-	'info_creation_tables' => 'Creating the database tables',
-	'info_creer_base' => '<b>Create</b> a new database:',
-	'info_dans_rubrique' => 'In section:',
-	'info_date_publication_anterieure' => 'Previously published on:',
-	'info_date_referencement' => 'THIS SITE REFERENCED ON:',
-	'info_derniere_etape' => 'Done!',
-	'info_descriptif' => 'Description:',
-	'info_desinstaller_plugin' => ' deactivates the plugin and deletes the data',
-	'info_discussion_cours' => 'Current discussions',
-	'info_ecrire_article' => 'Before writing any articles, you must create at least one section.',
-	'info_email_envoi' => 'Sender’s email address (optional)',
-	'info_email_envoi_txt' => 'Enter the sender’s email address used for sending emails (by default, the recipient’s address is used as the sender’s address) :',
-	'info_email_webmestre' => 'Webmaster’s email address',
-	'info_envoi_email_automatique' => 'Automated mailing',
-	'info_envoyer_maintenant' => 'Send now',
-	'info_etape_suivante' => 'Go to the next step',
-	'info_etape_suivante_1' => 'You can move on to the next step.',
-	'info_etape_suivante_2' => 'You can move on to the next step.',
-	'info_exceptions_proxy' => 'Exceptions for the proxy',
-	'info_exportation_base' => 'export database to @archive@',
-	'info_facilite_suivi_activite' => 'To simplify monitoring of the site’s editorial;
+    'info_ajouter_rubrique' => 'Add another section to manage:',
+    'info_annonce_nouveautes' => 'Latest news announcements',
+    'info_article' => 'article',
+    'info_article_2' => 'articles',
+    'info_article_a_paraitre' => 'Post-dated articles set for publication',
+    'info_articles_02' => 'articles',
+    'info_articles_2' => 'Articles',
+    'info_articles_auteur' => 'Articles by this author',
+    'info_articles_miens' => 'My articles',
+    'info_articles_tous' => 'All the articles',
+    'info_articles_trouves' => 'Articles found',
+    'info_attente_validation' => 'Your articles awaiting validation',
+    'info_aucun_article' => 'No articles',
+    'info_aucun_auteur' => 'No authors',
+    'info_aucun_message' => 'No messages',
+    'info_aucun_rubrique' => 'No sections',
+    'info_aujourdhui' => 'today:',
+    'info_auteur_gere_rubriques' => 'This author manages the following sections:',
+    'info_auteur_gere_toutes_rubriques' => 'This author manage <b>all the sections</b>',
+    'info_auteur_gere_toutes_rubriques_2' => 'I manage <b>all the sections</b>',
+    'info_auteurs' => 'Authors',
+    'info_auteurs_par_tri' => 'Authors@partri@',
+    'info_auteurs_trouves' => 'Authors found',
+    'info_authentification_externe' => 'External authentication',
+    'info_avertissement' => 'Warning',
+    'info_barre_outils' => 'with its toolbar?',
+    'info_base_installee' => 'Your database structure has been installed.',
+    'info_bio' => 'Biography',
+    'info_cache_desactive' => 'The cache is temporarily disabled',
+    'info_chapeau' => 'Introduction',
+    'info_chapeau_2' => 'Introduction:',
+    'info_chemin_acces_1' => 'Options: <b>Access path in directory</b>',
+    'info_chemin_acces_2' => 'You must now configure the access path to the directory information. This information is essential to read the user profiles stored in the directory.',
+    'info_chemin_acces_annuaire' => 'Options: <b>Access path in directory</b>',
+    'info_choix_base' => 'Third step:',
+    'info_classement_1' => ' out of @liste@',
+    'info_classement_2' => ' out of @liste@',
+    'info_code_acces' => 'Do not forget your own access codes!',
+    'info_config_suivi' => 'If this address corresponds to a mailing list, you can indicate the subscription address for this list. This may be a URL (e.g. a webpage enabling subscription online), or an email address with a specific subject (for instance: <tt>@adresse_suivi@?subject=subscribe</tt>):',
+    'info_config_suivi_explication' => 'You can subscribe to the mailing-list for this site. You will then receive email announcements concerning articles and news items submitted for publication.',
+    'info_confirmer_passe' => 'Confirm new password:',
+    'info_conflit_edition_avis_non_sauvegarde' => 'Caution: the following fields have been modified elsewhere. Your changes to these fields have therefore not been saved.',
+    'info_conflit_edition_differences' => 'Differences:',
+    'info_conflit_edition_version_enregistree' => 'Saved version:',
+    'info_conflit_edition_votre_version' => 'Your version:',
+    'info_connexion_base' => 'Trying to connect to database',
+    'info_connexion_base_donnee' => 'Connection to your database',
+    'info_connexion_ldap_ok' => '<b>LDAP connection succeeded.</b><p> You can go to the next step.</p>',
+    'info_connexion_mysql' => 'Your SQL connection',
+    'info_connexion_ok' => 'Connection succeeded.',
+    'info_contact' => 'Contact',
+    'info_contenu_articles' => 'Article content',
+    'info_contributions' => 'Contributions',
+    'info_creation_paragraphe' => 'To create paragraphs, just leave blank lines.',
+    'info_creation_rubrique' => 'Before writing any articles,<br /> you must create at least one section.<br />',
+    'info_creation_tables' => 'Creating the database tables',
+    'info_creer_base' => '<b>Create</b> a new database:',
+    'info_dans_rubrique' => 'In section:',
+    'info_date_publication_anterieure' => 'Previously published on:',
+    'info_date_referencement' => 'THIS SITE REFERENCED ON:',
+    'info_derniere_etape' => 'Done!',
+    'info_descriptif' => 'Description:',
+    'info_desinstaller_plugin' => ' deactivates the plugin and deletes the data',
+    'info_discussion_cours' => 'Current discussions',
+    'info_ecrire_article' => 'Before writing any articles, you must create at least one section.',
+    'info_email_envoi' => 'Sender’s email address (optional)',
+    'info_email_envoi_txt' => 'Enter the sender’s email address used for sending emails (by default, the recipient’s address is used as the sender’s address) :',
+    'info_email_webmestre' => 'Webmaster’s email address',
+    'info_envoi_email_automatique' => 'Automated mailing',
+    'info_envoyer_maintenant' => 'Send now',
+    'info_etape_suivante' => 'Go to the next step',
+    'info_etape_suivante_1' => 'You can move on to the next step.',
+    'info_etape_suivante_2' => 'You can move on to the next step.',
+    'info_exceptions_proxy' => 'Exceptions for the proxy',
+    'info_exportation_base' => 'export database to @archive@',
+    'info_facilite_suivi_activite' => 'To simplify monitoring of the site’s editorial;
   activities, SPIP can send rmail notifications, e.g. to an editors’ mailing list,
   of publication requests and article validations. Enter one or more adresses separated by commas.',
-	'info_fichiers_authent' => 'Authentication file ".htpasswd"',
-	'info_forums_abo_invites' => 'Your site contains forums by subscription; visitors may register for them on the public site.',
-	'info_gauche_admin_tech' => '<b>Only webmasters have access to this page.</b><p> It provides access to various
+    'info_fichiers_authent' => 'Authentication file ".htpasswd"',
+    'info_forums_abo_invites' => 'Your site contains forums by subscription; visitors may register for them on the public site.',
+    'info_gauche_admin_tech' => '<b>Only webmasters have access to this page.</b><p> It provides access to various
 maintenance tasks. Some of them require a specific authentication process
 via FTP.</p>',
-	'info_gauche_admin_vider' => '<b>Only webmasters have access to this page.</b><p> It provides access to various
+    'info_gauche_admin_vider' => '<b>Only webmasters have access to this page.</b><p> It provides access to various
 maintenance tasks. Some of them require a specific authentication process
 via FTP.</p>',
-	'info_gauche_auteurs' => 'All the site authors are listed here.
+    'info_gauche_auteurs' => 'All the site authors are listed here.
  The status of each is indicated by the colour of their icon (administrator = green; editor = yellow).',
-	'info_gauche_auteurs_exterieurs' => 'Visiting authors, without any access to the site, are indicated by a blue icon; deleted authors by a grey icon.',
-	'info_gauche_messagerie' => 'Internal messaging lets you exchange messages between editors, keep memos (for personal use) or, display announcements on the admin area’s homepage (if you are an administrator).',
-	'info_gauche_statistiques_referers' => 'This page displays the list of <i>referrers</i>, i.e. websites containing links to your own site, for yesterday and today. The list is reset every 24 hours.',
-	'info_gauche_visiteurs_enregistres' => 'You will find here the visitors registered
+    'info_gauche_auteurs_exterieurs' => 'Visiting authors, without any access to the site, are indicated by a blue icon; deleted authors by a grey icon.',
+    'info_gauche_messagerie' => 'Internal messaging lets you exchange messages between editors, keep memos (for personal use) or, display announcements on the admin area’s homepage (if you are an administrator).',
+    'info_gauche_statistiques_referers' => 'This page displays the list of <i>referrers</i>, i.e. websites containing links to your own site, for yesterday and today. The list is reset every 24 hours.',
+    'info_gauche_visiteurs_enregistres' => 'You will find here the visitors registered
  for the public area of the site (subscription-only forums).',
-	'info_generation_miniatures_images' => 'Generation of thumbnail images',
-	'info_gerer_trad_objets' => '@objets@: manage translation links',
-	'info_hebergeur_desactiver_envoi_email' => 'Some hosts disable automated mail sending
+    'info_generation_miniatures_images' => 'Generation of thumbnail images',
+    'info_gerer_trad_objets' => '@objets@: manage translation links',
+    'info_hebergeur_desactiver_envoi_email' => 'Some hosts disable automated mail sending
 		on their servers. In this case the following features
 		of SPIP cannot be implemented.',
-	'info_hier' => 'yesterday:',
-	'info_identification_publique' => 'Your public identity...',
-	'info_image_process' => 'Select the best method to create thumbnails by clicking on the corresponding picture.',
-	'info_image_process2' => 'If you can’t see any images, then your server is not configured to use such tools. If you want to use these features, contact your provider’s technical support and ask for the «GD» or «Imagick» extensions to be installed.',
-	'info_images_auto' => 'Images calculated automatically',
-	'info_informations_personnelles' => 'Personal information',
-	'info_inscription' => 'Registered on',
-	'info_inscription_automatique' => 'Automatic registration for new editors',
-	'info_jeu_caractere' => 'Character set for the site',
-	'info_jours' => 'days',
-	'info_laisser_champs_vides' => 'leave these fields empty)',
-	'info_langues' => 'Site languages',
-	'info_ldap_ok' => 'LDAP authentication is installed.',
-	'info_lien_hypertexte' => 'Hyperlink:',
-	'info_liste_nouveautes_envoyee' => 'The news update list has been sent',
-	'info_liste_redacteurs_connectes' => 'List of editors online',
-	'info_login_existant' => 'This login already exists.',
-	'info_login_trop_court' => 'Login too short.',
-	'info_login_trop_court_car_pluriel' => 'Your login must contain at least @nb@ characters.',
-	'info_logos' => 'Logos',
-	'info_maximum' => 'maximum:',
-	'info_meme_rubrique' => 'In this section',
-	'info_message_en_redaction' => 'Your draft messages',
-	'info_message_technique' => 'Technical message:',
-	'info_messagerie_interne' => 'Internal messaging',
-	'info_mise_a_niveau_base' => 'SQL database upgrade',
-	'info_mise_a_niveau_base_2' => '{{Warning!}} You have installed an {older} SPIP version, prior to the one
+    'info_hier' => 'yesterday:',
+    'info_identification_publique' => 'Your public identity...',
+    'info_image_process' => 'Select the best method to create thumbnails by clicking on the corresponding picture.',
+    'info_image_process2' => 'If you can’t see any images, then your server is not configured to use such tools. If you want to use these features, contact your provider’s technical support and ask for the «GD» or «Imagick» extensions to be installed.',
+    'info_images_auto' => 'Images calculated automatically',
+    'info_informations_personnelles' => 'Personal information',
+    'info_inscription' => 'Registered on',
+    'info_inscription_automatique' => 'Automatic registration for new editors',
+    'info_jeu_caractere' => 'Character set for the site',
+    'info_jours' => 'days',
+    'info_laisser_champs_vides' => 'leave these fields empty)',
+    'info_langues' => 'Site languages',
+    'info_ldap_ok' => 'LDAP authentication is installed.',
+    'info_lien_hypertexte' => 'Hyperlink:',
+    'info_liste_nouveautes_envoyee' => 'The news update list has been sent',
+    'info_liste_redacteurs_connectes' => 'List of editors online',
+    'info_login_existant' => 'This login already exists.',
+    'info_login_trop_court' => 'Login too short.',
+    'info_login_trop_court_car_pluriel' => 'Your login must contain at least @nb@ characters.',
+    'info_logos' => 'Logos',
+    'info_maximum' => 'maximum:',
+    'info_meme_rubrique' => 'In this section',
+    'info_message_en_redaction' => 'Your draft messages',
+    'info_message_technique' => 'Technical message:',
+    'info_messagerie_interne' => 'Internal messaging',
+    'info_mise_a_niveau_base' => 'SQL database upgrade',
+    'info_mise_a_niveau_base_2' => '{{Warning!}} You have installed an {older} SPIP version, prior to the one
   originally installed on this website: your database is at risk of being corrupted
   and your site might not work properly anymore.<br />{{Please, re-install
   SPIP files.}}',
-	'info_modification_enregistree' => 'Your changes have been saved',
-	'info_modifier_auteur' => 'Edit author details:',
-	'info_modifier_rubrique' => 'Edit the section:',
-	'info_modifier_titre' => 'Edit: @titre@',
-	'info_mon_site_spip' => 'My SPIP site',
-	'info_moyenne' => 'average:',
-	'info_multi_cet_article' => 'Language for this article:',
-	'info_multi_langues_choisies' => 'Please select the languages to be made available to the editors of your site.
+    'info_modification_enregistree' => 'Your changes have been saved',
+    'info_modifier_auteur' => 'Edit author details:',
+    'info_modifier_rubrique' => 'Edit the section:',
+    'info_modifier_titre' => 'Edit: @titre@',
+    'info_mon_site_spip' => 'My SPIP site',
+    'info_moyenne' => 'average:',
+    'info_multi_cet_article' => 'Language for this article:',
+    'info_multi_langues_choisies' => 'Please select the languages to be made available to the editors of your site.
   Languages already used on your site (at the top of the list) cannot be disabled.',
-	'info_multi_objets' => '@objets@: activate the language menu',
-	'info_multi_secteurs' => '... only for root-level sections?',
-	'info_nb_articles' => '@nb@ articles',
-	'info_nb_auteurs' => '@nb@ authors',
-	'info_nb_messages' => '@nb@ messages',
-	'info_nb_mots_cles' => '@nb@ keywords',
-	'info_nb_rubriques' => '@nb@ sections',
-	'info_nb_visiteurs' => '@nb@ visitors',
-	'info_nom' => 'Name',
-	'info_nom_destinataire' => 'Name of recipient',
-	'info_nom_pas_conforme' => 'html tags are not allowed',
-	'info_nom_site' => 'Name of your site',
-	'info_nombre_articles' => '@nb_articles@ articles,',
-	'info_nombre_rubriques' => '@nb_rubriques@ sections,',
-	'info_nombre_sites' => '@nb_sites@ sites,',
-	'info_non_deplacer' => 'Do not move...',
-	'info_non_envoi_annonce_dernieres_nouveautes' => 'SPIP can send a site newsletter (list of newly-published articles and news items).
+    'info_multi_objets' => '@objets@: activate the language menu',
+    'info_multi_secteurs' => '... only for root-level sections?',
+    'info_nb_articles' => '@nb@ articles',
+    'info_nb_auteurs' => '@nb@ authors',
+    'info_nb_messages' => '@nb@ messages',
+    'info_nb_mots_cles' => '@nb@ keywords',
+    'info_nb_rubriques' => '@nb@ sections',
+    'info_nb_visiteurs' => '@nb@ visitors',
+    'info_nom' => 'Name',
+    'info_nom_destinataire' => 'Name of recipient',
+    'info_nom_pas_conforme' => 'html tags are not allowed',
+    'info_nom_site' => 'Name of your site',
+    'info_nombre_articles' => '@nb_articles@ articles,',
+    'info_nombre_rubriques' => '@nb_rubriques@ sections,',
+    'info_nombre_sites' => '@nb_sites@ sites,',
+    'info_non_deplacer' => 'Do not move...',
+    'info_non_envoi_annonce_dernieres_nouveautes' => 'SPIP can send a site newsletter (list of newly-published articles and news items).
   .',
-	'info_non_envoi_liste_nouveautes' => 'Do not send newsletter',
-	'info_non_modifiable' => 'cannot be modified',
-	'info_non_suppression_mot_cle' => 'I do not want to delete this keyword.',
-	'info_notes' => 'Footnotes',
-	'info_nouvel_article' => 'New article',
-	'info_nouvelle_traduction' => 'New translation:',
-	'info_numero_article' => 'ARTICLE NUMBER:',
-	'info_obligatoire_02' => '(Required)',
-	'info_option_accepter_visiteurs' => 'Allow visitor registration via the public site',
-	'info_option_ne_pas_accepter_visiteurs' => 'Disable visitor registration',
-	'info_options_avancees' => 'ADVANCED OPTIONS',
-	'info_ou' => 'or...',
-	'info_page_interdite' => 'Forbidden page',
-	'info_par_nom' => 'by name',
-	'info_par_nombre_article' => 'by number of articles',
-	'info_par_statut' => 'by status',
-	'info_par_tri' => '’(by @tri@)’',
-	'info_passe_trop_court' => 'Password too short.',
-	'info_passe_trop_court_car_pluriel' => 'Your password must contain at least @nb@ characters.',
-	'info_passes_identiques' => 'The two passwords are not identical.',
-	'info_plus_cinq_car' => 'more than 5 characters',
-	'info_plus_cinq_car_2' => '(More than 5 characters)',
-	'info_plus_trois_car' => '(More than 3 characters)',
-	'info_popularite' => 'popularity: @popularite@; visits: @visites@',
-	'info_post_scriptum' => 'Postscript',
-	'info_post_scriptum_2' => 'Postscript:',
-	'info_pour' => 'for',
-	'info_preview_texte' => 'It is possible to preview the site’s  various editorial elements with at least the "submitted" status, as well as the"editing in progress" elements of which you are the author. Should this preview mode be restricted to administrators, open to all authors, or disabled completely?',
-	'info_procedez_par_etape' => 'please proceed step by step',
-	'info_procedure_maj_version' => 'the upgrade procedure must be run to adapt
+    'info_non_envoi_liste_nouveautes' => 'Do not send newsletter',
+    'info_non_modifiable' => 'cannot be modified',
+    'info_non_suppression_mot_cle' => 'I do not want to delete this keyword.',
+    'info_notes' => 'Footnotes',
+    'info_nouvel_article' => 'New article',
+    'info_nouvelle_traduction' => 'New translation:',
+    'info_numero_article' => 'ARTICLE NUMBER:',
+    'info_obligatoire_02' => '(Required)',
+    'info_option_accepter_visiteurs' => 'Allow visitor registration via the public site',
+    'info_option_ne_pas_accepter_visiteurs' => 'Disable visitor registration',
+    'info_options_avancees' => 'ADVANCED OPTIONS',
+    'info_ou' => 'or...',
+    'info_page_interdite' => 'Forbidden page',
+    'info_par_nom' => 'by name',
+    'info_par_nombre_article' => 'by number of articles',
+    'info_par_statut' => 'by status',
+    'info_par_tri' => '’(by @tri@)’',
+    'info_passe_trop_court' => 'Password too short.',
+    'info_passe_trop_court_car_pluriel' => 'Your password must contain at least @nb@ characters.',
+    'info_passes_identiques' => 'The two passwords are not identical.',
+    'info_plus_cinq_car' => 'more than 5 characters',
+    'info_plus_cinq_car_2' => '(More than 5 characters)',
+    'info_plus_trois_car' => '(More than 3 characters)',
+    'info_popularite' => 'popularity: @popularite@; visits: @visites@',
+    'info_post_scriptum' => 'Postscript',
+    'info_post_scriptum_2' => 'Postscript:',
+    'info_pour' => 'for',
+    'info_preview_texte' => 'It is possible to preview the site’s  various editorial elements with at least the "submitted" status, as well as the"editing in progress" elements of which you are the author. Should this preview mode be restricted to administrators, open to all authors, or disabled completely?',
+    'info_procedez_par_etape' => 'please proceed step by step',
+    'info_procedure_maj_version' => 'the upgrade procedure must be run to adapt
  the database to this new version of SPIP.',
-	'info_proxy_ok' => 'Proxy test successful.',
-	'info_ps' => 'P.S.',
-	'info_publier' => 'publish',
-	'info_publies' => 'Your articles published online',
-	'info_question_accepter_visiteurs' => 'If your website’s templates allows visitors to register with no access to the admin area, please activate the following option:',
-	'info_question_inscription_nouveaux_redacteurs' => 'Do you wish to allow new editors to register
+    'info_proxy_ok' => 'Proxy test successful.',
+    'info_ps' => 'P.S.',
+    'info_publier' => 'publish',
+    'info_publies' => 'Your articles published online',
+    'info_question_accepter_visiteurs' => 'If your website’s templates allows visitors to register with no access to the admin area, please activate the following option:',
+    'info_question_inscription_nouveaux_redacteurs' => 'Do you wish to allow new editors to register
  from the public website? If you agree with this, visitors will be able to  register
   using an automatic form, and then access the admin area to
   write their own articles. <div class="notice">During the registration process, users usually receive an automatic email
@@ -436,404 +436,404 @@ 
   service providers disallow sending emails from their
   servers: in that case, automated registration is not
   possible.</div>',
-	'info_qui_edite' => '@nom_auteur_modif@ worked on the contents @date_diff@ minutes ago',
-	'info_racine_site' => 'Site root',
-	'info_recharger_page' => 'Please wait a few moments, then reload this page.',
-	'info_recherche_auteur_zero' => 'No results for "@cherche_auteur@".',
-	'info_recommencer' => 'Please try again.',
-	'info_redacteur_1' => 'Editor',
-	'info_redacteur_2' => 'with access to the admin area (<i>recommended</i>)',
-	'info_redacteurs' => 'Editors',
-	'info_redaction_en_cours' => 'EDITING IN PROGRESS',
-	'info_redirection' => 'Redirection',
-	'info_redirection_activee' => 'Redirection is enabled.',
-	'info_redirection_boucle' => 'You are trying to redirect the article toward itself. ',
-	'info_redirection_desactivee' => 'Redirection is deleted.',
-	'info_refuses' => 'Your rejected articles ',
-	'info_reglage_ldap' => 'Options: <b>Adjusting LDAP import</b>',
-	'info_renvoi_article' => '<b>Redirection.</b> This article redirects to:',
-	'info_reserve_admin' => 'Only administrators can modify this address.',
-	'info_restreindre_rubrique' => 'Restrict management to section:',
-	'info_resultat_recherche' => 'Search results:',
-	'info_rubriques' => 'Sections',
-	'info_rubriques_02' => 'sections',
-	'info_rubriques_trouvees' => 'Sections found',
-	'info_sans_titre' => 'Untitled',
-	'info_selection_chemin_acces' => '<b>Select</b> the access path in the directory:',
-	'info_signatures' => 'signatures',
-	'info_site' => 'Site',
-	'info_site_2' => 'site:',
-	'info_site_min' => 'site',
-	'info_site_reference_2' => 'Referenced site',
-	'info_site_web' => 'Web site:',
-	'info_sites' => 'sites',
-	'info_sites_lies_mot' => 'Referenced sites with this keyword',
-	'info_sites_proxy' => 'Using a proxy',
-	'info_sites_trouves' => 'Sites found',
-	'info_sous_titre' => 'Subtitle:',
-	'info_statut_administrateur' => 'Administrator',
-	'info_statut_auteur' => 'This author’s status:',
-	'info_statut_auteur_2' => 'I am',
-	'info_statut_auteur_a_confirmer' => 'Registration to be confirmed',
-	'info_statut_auteur_autre' => 'Other status:',
-	'info_statut_redacteur' => 'Editor',
-	'info_statut_utilisateurs_1' => 'Default status for imported users',
-	'info_statut_utilisateurs_2' => 'Choose the status to be attributed to persons present in the LDAP directory when they connect for the first time. You can modify this value for each individual author later on.',
-	'info_suivi_activite' => 'Follow editorial activity',
-	'info_surtitre' => 'Top title:',
-	'info_syndication_integrale_1' => 'Your site provides syndication files (see "<a href="@url@">@titre@</a>").',
-	'info_syndication_integrale_2' => 'Do you wish to send whole articles or only a summary of a few hundred characters?',
-	'info_table_prefix' => 'It is possible to change the prefix of the names of the database tables. (you need to do this if you are installing several sites in the same database). The prefix must be written in unaccented, lower-case letters without any spaces.',
-	'info_taille_maximale_images' => 'SPIP will test for the maximum image size (in millions of pixels) which it can process.<br /> Images bigger than this will not be reduced.',
-	'info_taille_maximale_vignette' => 'Maximum size for vignettes generated by the system:',
-	'info_terminer_installation' => 'You can now finish the standard installation process.',
-	'info_texte' => 'Text',
-	'info_texte_explicatif' => 'Explanation',
-	'info_texte_long' => '(The text is long: it will appear in several parts which will be reassembled after validation.)',
-	'info_texte_message' => 'Text of your message:',
-	'info_texte_message_02' => 'Message text',
-	'info_titre' => 'Title:',
-	'info_total' => 'total:',
-	'info_tous_articles_en_redaction' => 'All articles in progress',
-	'info_tous_articles_presents' => 'All articles published in this section',
-	'info_tous_articles_refuses' => 'All refused articles',
-	'info_tous_les' => 'every:',
-	'info_tout_site' => 'The entire site',
-	'info_tout_site2' => 'The article has not been translated into this language.',
-	'info_tout_site3' => 'The article has been translated into this language, but changes have since been made to the reference article. The translation needs updating.',
-	'info_tout_site4' => 'The article has been translated into this language, and the translation is up-to-date.',
-	'info_tout_site5' => 'Original article.',
-	'info_tout_site6' => '<b>Warning:</b> only original articles are displayed.
+    'info_qui_edite' => '@nom_auteur_modif@ worked on the contents @date_diff@ minutes ago',
+    'info_racine_site' => 'Site root',
+    'info_recharger_page' => 'Please wait a few moments, then reload this page.',
+    'info_recherche_auteur_zero' => 'No results for "@cherche_auteur@".',
+    'info_recommencer' => 'Please try again.',
+    'info_redacteur_1' => 'Editor',
+    'info_redacteur_2' => 'with access to the admin area (<i>recommended</i>)',
+    'info_redacteurs' => 'Editors',
+    'info_redaction_en_cours' => 'EDITING IN PROGRESS',
+    'info_redirection' => 'Redirection',
+    'info_redirection_activee' => 'Redirection is enabled.',
+    'info_redirection_boucle' => 'You are trying to redirect the article toward itself. ',
+    'info_redirection_desactivee' => 'Redirection is deleted.',
+    'info_refuses' => 'Your rejected articles ',
+    'info_reglage_ldap' => 'Options: <b>Adjusting LDAP import</b>',
+    'info_renvoi_article' => '<b>Redirection.</b> This article redirects to:',
+    'info_reserve_admin' => 'Only administrators can modify this address.',
+    'info_restreindre_rubrique' => 'Restrict management to section:',
+    'info_resultat_recherche' => 'Search results:',
+    'info_rubriques' => 'Sections',
+    'info_rubriques_02' => 'sections',
+    'info_rubriques_trouvees' => 'Sections found',
+    'info_sans_titre' => 'Untitled',
+    'info_selection_chemin_acces' => '<b>Select</b> the access path in the directory:',
+    'info_signatures' => 'signatures',
+    'info_site' => 'Site',
+    'info_site_2' => 'site:',
+    'info_site_min' => 'site',
+    'info_site_reference_2' => 'Referenced site',
+    'info_site_web' => 'Web site:',
+    'info_sites' => 'sites',
+    'info_sites_lies_mot' => 'Referenced sites with this keyword',
+    'info_sites_proxy' => 'Using a proxy',
+    'info_sites_trouves' => 'Sites found',
+    'info_sous_titre' => 'Subtitle:',
+    'info_statut_administrateur' => 'Administrator',
+    'info_statut_auteur' => 'This author’s status:',
+    'info_statut_auteur_2' => 'I am',
+    'info_statut_auteur_a_confirmer' => 'Registration to be confirmed',
+    'info_statut_auteur_autre' => 'Other status:',
+    'info_statut_redacteur' => 'Editor',
+    'info_statut_utilisateurs_1' => 'Default status for imported users',
+    'info_statut_utilisateurs_2' => 'Choose the status to be attributed to persons present in the LDAP directory when they connect for the first time. You can modify this value for each individual author later on.',
+    'info_suivi_activite' => 'Follow editorial activity',
+    'info_surtitre' => 'Top title:',
+    'info_syndication_integrale_1' => 'Your site provides syndication files (see "<a href="@url@">@titre@</a>").',
+    'info_syndication_integrale_2' => 'Do you wish to send whole articles or only a summary of a few hundred characters?',
+    'info_table_prefix' => 'It is possible to change the prefix of the names of the database tables. (you need to do this if you are installing several sites in the same database). The prefix must be written in unaccented, lower-case letters without any spaces.',
+    'info_taille_maximale_images' => 'SPIP will test for the maximum image size (in millions of pixels) which it can process.<br /> Images bigger than this will not be reduced.',
+    'info_taille_maximale_vignette' => 'Maximum size for vignettes generated by the system:',
+    'info_terminer_installation' => 'You can now finish the standard installation process.',
+    'info_texte' => 'Text',
+    'info_texte_explicatif' => 'Explanation',
+    'info_texte_long' => '(The text is long: it will appear in several parts which will be reassembled after validation.)',
+    'info_texte_message' => 'Text of your message:',
+    'info_texte_message_02' => 'Message text',
+    'info_titre' => 'Title:',
+    'info_total' => 'total:',
+    'info_tous_articles_en_redaction' => 'All articles in progress',
+    'info_tous_articles_presents' => 'All articles published in this section',
+    'info_tous_articles_refuses' => 'All refused articles',
+    'info_tous_les' => 'every:',
+    'info_tout_site' => 'The entire site',
+    'info_tout_site2' => 'The article has not been translated into this language.',
+    'info_tout_site3' => 'The article has been translated into this language, but changes have since been made to the reference article. The translation needs updating.',
+    'info_tout_site4' => 'The article has been translated into this language, and the translation is up-to-date.',
+    'info_tout_site5' => 'Original article.',
+    'info_tout_site6' => '<b>Warning:</b> only original articles are displayed.
 Translations are linked to the original,
 and their status is colour-coded:',
-	'info_traductions' => 'Translations',
-	'info_travail_colaboratif' => 'Collaborative work on articles',
-	'info_un_article' => 'an article,',
-	'info_un_site' => 'a site,',
-	'info_une_rubrique' => 'a section,',
-	'info_une_rubrique_02' => '1 section',
-	'info_url' => 'URL:',
-	'info_url_proxy' => 'Proxy URL',
-	'info_url_proxy_pas_conforme' => 'Proxy’s URL not valid.',
-	'info_url_site_pas_conforme' => 'the website URL is invalid.',
-	'info_url_test_proxy' => 'Test URL',
-	'info_urlref' => 'Hyperlink:',
-	'info_utilisation_spip' => 'SPIP is now ready for use',
-	'info_visites_par_mois' => 'Monthly display:',
-	'info_visiteur_1' => 'Visitor',
-	'info_visiteur_2' => 'to the public site',
-	'info_visiteurs' => 'Visitors',
-	'info_visiteurs_02' => 'Public site visitors',
-	'info_webmestre_forces' => 'The web administrators are currently defined in <tt>@file_options@</tt>.',
-	'install_adresse_base_hebergeur' => 'Database address attributed by the hosting provider',
-	'install_connect_ok' => 'The new database has been declared using the server name @connect@.',
-	'install_echec_annonce' => 'This installation will probably fail, or damage your site.',
-	'install_extension_mbstring' => 'SPIP does not work with:',
-	'install_extension_php_obligatoire' => 'SPIP requires the php extension:',
-	'install_login_base_hebergeur' => 'Login attributed by the service provider',
-	'install_nom_base_hebergeur' => 'Database name attributed by the service provider:',
-	'install_pas_table' => 'The database has no tables',
-	'install_pass_base_hebergeur' => 'Password attributed by your hosting service ',
-	'install_php_extension' => 'The following extensions are missing : @extensions@',
-	'install_php_version' => 'This version of PHP @version@ is too old (minimum = @minimum@)',
-	'install_php_version_max' => 'PHP version @version@ too recent (maximum = @maximum@)',
-	'install_select_langue' => 'Select a language, then click on "next" to start installation.',
-	'install_select_type_db' => 'Indicate the type of database:',
-	'install_select_type_mysql' => 'MySQL',
-	'install_select_type_pg' => 'PostgreSQL',
-	'install_select_type_sqlite2' => 'SQLite 2',
-	'install_select_type_sqlite3' => 'SQLite 3',
-	'install_serveur_hebergeur' => 'Database server attributed by the hosting provider',
-	'install_table_prefix_hebergeur' => 'Table prefix attributed by your hosting provider:',
-	'install_tables_base' => 'Tables in the database',
-	'install_types_db_connus' => 'SPIP can use <b>MySQL</b> (the most common) and <b>SQLite</b>.',
-	'install_types_db_connus_avertissement' => 'The support of <b>PostgreSQL</b is actually proposed as experimental',
-	'instituer_erreur_statut_a_change' => 'The status has already been modified',
-	'instituer_erreur_statut_non_autorise' => 'You cannot select this status',
-	'intem_redacteur' => 'editor',
-	'intitule_licence' => 'Licence',
-	'item_accepter_inscriptions' => 'Allow registration',
-	'item_activer_messages_avertissement' => 'Activate warning messages',
-	'item_administrateur_2' => 'administrator',
-	'item_afficher_calendrier' => 'Display in calendar',
-	'item_autoriser_syndication_integrale' => 'Include entire articles in syndication feeds',
-	'item_choix_administrateurs' => 'administrators',
-	'item_choix_generation_miniature' => 'Generate thumbnails automatically.',
-	'item_choix_non_generation_miniature' => 'Do not generate thumbnails.',
-	'item_choix_redacteurs' => 'editors',
-	'item_choix_visiteurs' => 'visitors to the public site',
-	'item_creer_fichiers_authent' => 'Create .htpasswd files',
-	'item_login' => 'Login',
-	'item_messagerie_agenda' => 'Activate messaging system and calendars',
-	'item_mots_cles_association_articles' => 'articles',
-	'item_mots_cles_association_rubriques' => 'sections',
-	'item_mots_cles_association_sites' => 'referenced or syndicated sites.',
-	'item_non' => 'No',
-	'item_non_accepter_inscriptions' => 'Disable registration',
-	'item_non_activer_messages_avertissement' => 'No warning messages',
-	'item_non_afficher_calendrier' => 'Do not show in calendar',
-	'item_non_autoriser_syndication_integrale' => 'Only send a summary',
-	'item_non_creer_fichiers_authent' => 'Do not create these files',
-	'item_non_messagerie_agenda' => 'Disable the messaging system and calendars',
-	'item_non_publier_articles' => 'Do not publish articles before their specified publication date.',
-	'item_nouvel_auteur' => 'New author',
-	'item_nouvelle_rubrique' => 'New section',
-	'item_oui' => 'Yes',
-	'item_publier_articles' => 'Publish articles, irrespective of publication date.',
-	'item_reponse_article' => 'Reply to the article',
-	'item_visiteur' => 'visitor',
+    'info_traductions' => 'Translations',
+    'info_travail_colaboratif' => 'Collaborative work on articles',
+    'info_un_article' => 'an article,',
+    'info_un_site' => 'a site,',
+    'info_une_rubrique' => 'a section,',
+    'info_une_rubrique_02' => '1 section',
+    'info_url' => 'URL:',
+    'info_url_proxy' => 'Proxy URL',
+    'info_url_proxy_pas_conforme' => 'Proxy’s URL not valid.',
+    'info_url_site_pas_conforme' => 'the website URL is invalid.',
+    'info_url_test_proxy' => 'Test URL',
+    'info_urlref' => 'Hyperlink:',
+    'info_utilisation_spip' => 'SPIP is now ready for use',
+    'info_visites_par_mois' => 'Monthly display:',
+    'info_visiteur_1' => 'Visitor',
+    'info_visiteur_2' => 'to the public site',
+    'info_visiteurs' => 'Visitors',
+    'info_visiteurs_02' => 'Public site visitors',
+    'info_webmestre_forces' => 'The web administrators are currently defined in <tt>@file_options@</tt>.',
+    'install_adresse_base_hebergeur' => 'Database address attributed by the hosting provider',
+    'install_connect_ok' => 'The new database has been declared using the server name @connect@.',
+    'install_echec_annonce' => 'This installation will probably fail, or damage your site.',
+    'install_extension_mbstring' => 'SPIP does not work with:',
+    'install_extension_php_obligatoire' => 'SPIP requires the php extension:',
+    'install_login_base_hebergeur' => 'Login attributed by the service provider',
+    'install_nom_base_hebergeur' => 'Database name attributed by the service provider:',
+    'install_pas_table' => 'The database has no tables',
+    'install_pass_base_hebergeur' => 'Password attributed by your hosting service ',
+    'install_php_extension' => 'The following extensions are missing : @extensions@',
+    'install_php_version' => 'This version of PHP @version@ is too old (minimum = @minimum@)',
+    'install_php_version_max' => 'PHP version @version@ too recent (maximum = @maximum@)',
+    'install_select_langue' => 'Select a language, then click on "next" to start installation.',
+    'install_select_type_db' => 'Indicate the type of database:',
+    'install_select_type_mysql' => 'MySQL',
+    'install_select_type_pg' => 'PostgreSQL',
+    'install_select_type_sqlite2' => 'SQLite 2',
+    'install_select_type_sqlite3' => 'SQLite 3',
+    'install_serveur_hebergeur' => 'Database server attributed by the hosting provider',
+    'install_table_prefix_hebergeur' => 'Table prefix attributed by your hosting provider:',
+    'install_tables_base' => 'Tables in the database',
+    'install_types_db_connus' => 'SPIP can use <b>MySQL</b> (the most common) and <b>SQLite</b>.',
+    'install_types_db_connus_avertissement' => 'The support of <b>PostgreSQL</b is actually proposed as experimental',
+    'instituer_erreur_statut_a_change' => 'The status has already been modified',
+    'instituer_erreur_statut_non_autorise' => 'You cannot select this status',
+    'intem_redacteur' => 'editor',
+    'intitule_licence' => 'Licence',
+    'item_accepter_inscriptions' => 'Allow registration',
+    'item_activer_messages_avertissement' => 'Activate warning messages',
+    'item_administrateur_2' => 'administrator',
+    'item_afficher_calendrier' => 'Display in calendar',
+    'item_autoriser_syndication_integrale' => 'Include entire articles in syndication feeds',
+    'item_choix_administrateurs' => 'administrators',
+    'item_choix_generation_miniature' => 'Generate thumbnails automatically.',
+    'item_choix_non_generation_miniature' => 'Do not generate thumbnails.',
+    'item_choix_redacteurs' => 'editors',
+    'item_choix_visiteurs' => 'visitors to the public site',
+    'item_creer_fichiers_authent' => 'Create .htpasswd files',
+    'item_login' => 'Login',
+    'item_messagerie_agenda' => 'Activate messaging system and calendars',
+    'item_mots_cles_association_articles' => 'articles',
+    'item_mots_cles_association_rubriques' => 'sections',
+    'item_mots_cles_association_sites' => 'referenced or syndicated sites.',
+    'item_non' => 'No',
+    'item_non_accepter_inscriptions' => 'Disable registration',
+    'item_non_activer_messages_avertissement' => 'No warning messages',
+    'item_non_afficher_calendrier' => 'Do not show in calendar',
+    'item_non_autoriser_syndication_integrale' => 'Only send a summary',
+    'item_non_creer_fichiers_authent' => 'Do not create these files',
+    'item_non_messagerie_agenda' => 'Disable the messaging system and calendars',
+    'item_non_publier_articles' => 'Do not publish articles before their specified publication date.',
+    'item_nouvel_auteur' => 'New author',
+    'item_nouvelle_rubrique' => 'New section',
+    'item_oui' => 'Yes',
+    'item_publier_articles' => 'Publish articles, irrespective of publication date.',
+    'item_reponse_article' => 'Reply to the article',
+    'item_visiteur' => 'visitor',
 
-	// J
-	'jour_non_connu_nc' => 'unknown',
+    // J
+    'jour_non_connu_nc' => 'unknown',
 
-	// L
-	'label_bando_outils' => 'Toolbar',
-	'label_bando_outils_afficher' => 'Show the tools',
-	'label_bando_outils_masquer' => 'Hide the tools',
-	'label_choix_langue' => 'Choose your language',
-	'label_langue' => 'Language',
-	'label_nom_fichier_connect' => 'Indicate the name for this server',
-	'label_slogan_site' => 'Website slogan',
-	'label_taille_ecran' => 'Screen width',
-	'label_texte_et_icones_navigation' => 'Navigation menu',
-	'label_texte_et_icones_page' => 'Page display',
-	'ldap_correspondance' => 'inherit field @champ@',
-	'ldap_correspondance_1' => 'Inherit LDAP fields',
-	'ldap_correspondance_2' => 'For each of these SPIP fields, enter the name of the corresponding LDAP field. Leave blank if you don’t want it filled, separate with spaces or commas to try several LDAP fields.',
-	'lien_ajouter_auteur' => 'Add this author',
-	'lien_ajouter_une_rubrique' => 'Add this section',
-	'lien_email' => 'email',
-	'lien_nom_site' => 'SITE NAME:',
-	'lien_rapide_contenu' => 'Go to the content',
-	'lien_rapide_navigation' => 'Go to the navigation',
-	'lien_rapide_recherche' => 'Go to the search',
-	'lien_retirer_auteur' => 'Remove author',
-	'lien_retirer_rubrique' => 'Remove the section',
-	'lien_retirer_tous_auteurs' => 'Remove all authors',
-	'lien_retirer_toutes_rubriques' => 'Remove all sections',
-	'lien_site' => 'site',
-	'lien_tout_decocher' => 'Uncheck all',
-	'lien_tout_deplier' => 'Expand all',
-	'lien_tout_replier' => 'Collapse all',
-	'lien_tout_supprimer' => 'Delete all',
-	'lien_trier_nom' => 'Sort by name',
-	'lien_trier_nombre_articles' => 'Sort by total articles',
-	'lien_trier_statut' => 'Sort by status',
-	'lien_voir_en_ligne' => 'VIEW ONLINE:',
-	'logo_article' => 'Article’s logo',
-	'logo_auteur' => 'Author’s logo',
-	'logo_rubrique' => 'Section’s logo',
-	'logo_site' => 'Website’s logo',
-	'logo_standard_rubrique' => 'Default sections’ logo',
-	'logo_survol' => 'Mouseover logo',
+    // L
+    'label_bando_outils' => 'Toolbar',
+    'label_bando_outils_afficher' => 'Show the tools',
+    'label_bando_outils_masquer' => 'Hide the tools',
+    'label_choix_langue' => 'Choose your language',
+    'label_langue' => 'Language',
+    'label_nom_fichier_connect' => 'Indicate the name for this server',
+    'label_slogan_site' => 'Website slogan',
+    'label_taille_ecran' => 'Screen width',
+    'label_texte_et_icones_navigation' => 'Navigation menu',
+    'label_texte_et_icones_page' => 'Page display',
+    'ldap_correspondance' => 'inherit field @champ@',
+    'ldap_correspondance_1' => 'Inherit LDAP fields',
+    'ldap_correspondance_2' => 'For each of these SPIP fields, enter the name of the corresponding LDAP field. Leave blank if you don’t want it filled, separate with spaces or commas to try several LDAP fields.',
+    'lien_ajouter_auteur' => 'Add this author',
+    'lien_ajouter_une_rubrique' => 'Add this section',
+    'lien_email' => 'email',
+    'lien_nom_site' => 'SITE NAME:',
+    'lien_rapide_contenu' => 'Go to the content',
+    'lien_rapide_navigation' => 'Go to the navigation',
+    'lien_rapide_recherche' => 'Go to the search',
+    'lien_retirer_auteur' => 'Remove author',
+    'lien_retirer_rubrique' => 'Remove the section',
+    'lien_retirer_tous_auteurs' => 'Remove all authors',
+    'lien_retirer_toutes_rubriques' => 'Remove all sections',
+    'lien_site' => 'site',
+    'lien_tout_decocher' => 'Uncheck all',
+    'lien_tout_deplier' => 'Expand all',
+    'lien_tout_replier' => 'Collapse all',
+    'lien_tout_supprimer' => 'Delete all',
+    'lien_trier_nom' => 'Sort by name',
+    'lien_trier_nombre_articles' => 'Sort by total articles',
+    'lien_trier_statut' => 'Sort by status',
+    'lien_voir_en_ligne' => 'VIEW ONLINE:',
+    'logo_article' => 'Article’s logo',
+    'logo_auteur' => 'Author’s logo',
+    'logo_rubrique' => 'Section’s logo',
+    'logo_site' => 'Website’s logo',
+    'logo_standard_rubrique' => 'Default sections’ logo',
+    'logo_survol' => 'Mouseover logo',
 
-	// M
-	'menu_aide_installation_choix_base' => 'Choosing your database',
-	'module_fichier_langue' => 'Language file',
-	'module_raccourci' => 'Shortcut',
-	'module_texte_affiche' => 'Displayed text',
-	'module_texte_explicatif' => 'You can insert thse shortcuts in your website templates. They will be automatically translated into any languages for which a language file exists.',
-	'module_texte_traduction' => 'The language file « @module@ » is available in:',
-	'mois_non_connu' => 'unknown',
+    // M
+    'menu_aide_installation_choix_base' => 'Choosing your database',
+    'module_fichier_langue' => 'Language file',
+    'module_raccourci' => 'Shortcut',
+    'module_texte_affiche' => 'Displayed text',
+    'module_texte_explicatif' => 'You can insert thse shortcuts in your website templates. They will be automatically translated into any languages for which a language file exists.',
+    'module_texte_traduction' => 'The language file « @module@ » is available in:',
+    'mois_non_connu' => 'unknown',
 
-	// N
-	'nouvelle_version_spip' => 'SPIP upgrade @version@ is available',
-	'nouvelle_version_spip_majeure' => 'A new SPIP version @version@ is available',
+    // N
+    'nouvelle_version_spip' => 'SPIP upgrade @version@ is available',
+    'nouvelle_version_spip_majeure' => 'A new SPIP version @version@ is available',
 
-	// O
-	'onglet_contenu' => 'Contents',
-	'onglet_declarer_une_autre_base' => 'Declare another database',
-	'onglet_discuter' => 'Discuss',
-	'onglet_interactivite' => 'Interactivity',
-	'onglet_proprietes' => 'Properties',
-	'onglet_repartition_actuelle' => 'now',
-	'onglet_sous_rubriques' => 'Subsections',
+    // O
+    'onglet_contenu' => 'Contents',
+    'onglet_declarer_une_autre_base' => 'Declare another database',
+    'onglet_discuter' => 'Discuss',
+    'onglet_interactivite' => 'Interactivity',
+    'onglet_proprietes' => 'Properties',
+    'onglet_repartition_actuelle' => 'now',
+    'onglet_sous_rubriques' => 'Subsections',
 
-	// P
-	'page_pas_proxy' => 'This page must not go through the proxy',
-	'pas_de_proxy_pour' => 'If necessary, indicate to which machines or domains this proxy should not apply (for example: @exemple@)',
-	'phpinfo' => 'PHP configuration',
-	'plugin_charge_paquet' => 'Loading the archive file @name@',
-	'plugin_charger' => 'Download',
-	'plugin_erreur_charger' => 'error: @zip@ cannot be loaded',
-	'plugin_erreur_droit1' => 'Cannot write to directory <code>@dest@</code>.',
-	'plugin_erreur_droit2' => 'Please check write permissions for this directory (and create the directory if necessary). Alternatively, install the files by FTP.',
-	'plugin_erreur_zip' => 'pclzip failure: error @status@',
-	'plugin_etat_developpement' => 'under development',
-	'plugin_etat_experimental' => 'experimental',
-	'plugin_etat_stable' => 'stable',
-	'plugin_etat_test' => 'being tested',
-	'plugin_impossible_activer' => 'Impossible to activate the plugin @plugin@',
-	'plugin_info_automatique1' => 'If you wish to allow automatic plugin installation, please:',
-	'plugin_info_automatique1_lib' => 'If you want to let this library to be installed automatically, please:',
-	'plugin_info_automatique2' => 'Create a directory <code>@rep@</code> ;',
-	'plugin_info_automatique3' => 'Check that the server has the proper permissions to write to this directory.',
-	'plugin_info_automatique_creer' => 'to create at the root of the website.',
-	'plugin_info_automatique_exemples' => 'examples:',
-	'plugin_info_automatique_ftp' => 'You may install plugins by FTP in the  <tt>@rep@</tt> directory',
-	'plugin_info_automatique_lib' => 'Some plugins need to be able to load files into the <code>lib/</code> directory. This directory should be created at the website root.',
-	'plugin_info_automatique_liste' => 'Your plugin lists:',
-	'plugin_info_automatique_liste_officielle' => 'official plugins',
-	'plugin_info_automatique_liste_update' => 'Update lists',
-	'plugin_info_automatique_ou' => 'or...',
-	'plugin_info_automatique_select' => 'Select a plugin below: SPIP will load it and will install it in the <code>@rep@</code> directory. If the plugin already exists, it will be updated.',
-	'plugin_info_credit' => 'Credits',
-	'plugin_info_erreur_xml' => 'Incorrect declaration of the plugin',
-	'plugin_info_install_ok' => 'Installation successful',
-	'plugin_info_necessite' => 'Requires:',
-	'plugin_info_non_compatible_spip' => 'This plugin is incompatible with this version of SPIP',
-	'plugin_info_plugins_dist_1' => 'The following plugins are loaded and activated in the @plugins_dist@ directory.',
-	'plugin_info_plugins_dist_2' => 'They cannot be disabled.',
-	'plugin_info_telecharger' => 'load from @url@ and install to @rep@',
-	'plugin_info_upgrade_ok' => 'Successful update',
-	'plugin_librairies_installees' => 'Libraries installed',
-	'plugin_necessite_extension_php' => 'Requires the PHP extension @plugin@ version @version@.',
-	'plugin_necessite_extension_php_sans_version' => 'Requires the PHP extension @plugin@',
-	'plugin_necessite_lib' => 'This plugin requires the library @lib@',
-	'plugin_necessite_php' => 'Requires @plugin@ version @version@.',
-	'plugin_necessite_plugin' => 'Version @version@ of the plugin @plugin@ is required.',
-	'plugin_necessite_plugin_sans_version' => 'Requires the plugin @plugin@',
-	'plugin_necessite_spip' => 'SPIP version @version@ or newer is required.',
-	'plugin_source' => 'source: ',
-	'plugin_titre_automatique' => 'Automatic installation',
-	'plugin_titre_automatique_ajouter' => 'Add plugins',
-	'plugin_titre_installation' => '@plugin@ plugin installation',
-	'plugin_titre_modifier' => 'My plugins',
-	'plugin_utilise_extension_php' => 'The version of the PHP extension @plugin@ must be @version@.',
-	'plugin_utilise_php' => '@plugin@ version must be @version@.',
-	'plugin_utilise_plugin' => 'The version of the plugin @plugin@ must be @version@.',
-	'plugin_zip_active' => 'Continue in order to activate',
-	'plugin_zip_adresse' => 'To load a zipped plugin file, or a list of plugins, enter the path below.',
-	'plugin_zip_adresse_champ' => 'Path of the plugin or list ',
-	'plugin_zip_content' => 'It contains the following files(@taille@),<br />ready to be installed in the <code>@rep@</code> directory',
-	'plugin_zip_installe_finie' => 'The file @zip@ has been unpacked and installed.',
-	'plugin_zip_installe_rep_finie' => 'The file @zip@ has been unpacked and installed in the @rep@ directory',
-	'plugin_zip_installer' => 'You may now install it.',
-	'plugin_zip_telecharge' => 'The file @zip@ has been loaded',
-	'plugins_actif_aucun' => 'No plugins active.',
-	'plugins_actif_un' => 'One plugin active',
-	'plugins_actifs' => '@count@ active plugins.',
-	'plugins_actifs_liste' => 'Enabled',
-	'plugins_compte' => '@count@ plugins',
-	'plugins_disponible_un' => 'One plugin available',
-	'plugins_disponibles' => '@count@ plugins available.',
-	'plugins_erreur' => 'Error in the plugins: @plugins@',
-	'plugins_liste' => 'List of plugins',
-	'plugins_liste_dist' => 'Locked plugins',
-	'plugins_recents' => 'Recent plugins',
-	'plugins_tous_liste' => 'All',
-	'plugins_vue_hierarchie' => 'Hierarchy',
-	'plugins_vue_liste' => 'List',
-	'protocole_ldap' => 'Protocol version:',
+    // P
+    'page_pas_proxy' => 'This page must not go through the proxy',
+    'pas_de_proxy_pour' => 'If necessary, indicate to which machines or domains this proxy should not apply (for example: @exemple@)',
+    'phpinfo' => 'PHP configuration',
+    'plugin_charge_paquet' => 'Loading the archive file @name@',
+    'plugin_charger' => 'Download',
+    'plugin_erreur_charger' => 'error: @zip@ cannot be loaded',
+    'plugin_erreur_droit1' => 'Cannot write to directory <code>@dest@</code>.',
+    'plugin_erreur_droit2' => 'Please check write permissions for this directory (and create the directory if necessary). Alternatively, install the files by FTP.',
+    'plugin_erreur_zip' => 'pclzip failure: error @status@',
+    'plugin_etat_developpement' => 'under development',
+    'plugin_etat_experimental' => 'experimental',
+    'plugin_etat_stable' => 'stable',
+    'plugin_etat_test' => 'being tested',
+    'plugin_impossible_activer' => 'Impossible to activate the plugin @plugin@',
+    'plugin_info_automatique1' => 'If you wish to allow automatic plugin installation, please:',
+    'plugin_info_automatique1_lib' => 'If you want to let this library to be installed automatically, please:',
+    'plugin_info_automatique2' => 'Create a directory <code>@rep@</code> ;',
+    'plugin_info_automatique3' => 'Check that the server has the proper permissions to write to this directory.',
+    'plugin_info_automatique_creer' => 'to create at the root of the website.',
+    'plugin_info_automatique_exemples' => 'examples:',
+    'plugin_info_automatique_ftp' => 'You may install plugins by FTP in the  <tt>@rep@</tt> directory',
+    'plugin_info_automatique_lib' => 'Some plugins need to be able to load files into the <code>lib/</code> directory. This directory should be created at the website root.',
+    'plugin_info_automatique_liste' => 'Your plugin lists:',
+    'plugin_info_automatique_liste_officielle' => 'official plugins',
+    'plugin_info_automatique_liste_update' => 'Update lists',
+    'plugin_info_automatique_ou' => 'or...',
+    'plugin_info_automatique_select' => 'Select a plugin below: SPIP will load it and will install it in the <code>@rep@</code> directory. If the plugin already exists, it will be updated.',
+    'plugin_info_credit' => 'Credits',
+    'plugin_info_erreur_xml' => 'Incorrect declaration of the plugin',
+    'plugin_info_install_ok' => 'Installation successful',
+    'plugin_info_necessite' => 'Requires:',
+    'plugin_info_non_compatible_spip' => 'This plugin is incompatible with this version of SPIP',
+    'plugin_info_plugins_dist_1' => 'The following plugins are loaded and activated in the @plugins_dist@ directory.',
+    'plugin_info_plugins_dist_2' => 'They cannot be disabled.',
+    'plugin_info_telecharger' => 'load from @url@ and install to @rep@',
+    'plugin_info_upgrade_ok' => 'Successful update',
+    'plugin_librairies_installees' => 'Libraries installed',
+    'plugin_necessite_extension_php' => 'Requires the PHP extension @plugin@ version @version@.',
+    'plugin_necessite_extension_php_sans_version' => 'Requires the PHP extension @plugin@',
+    'plugin_necessite_lib' => 'This plugin requires the library @lib@',
+    'plugin_necessite_php' => 'Requires @plugin@ version @version@.',
+    'plugin_necessite_plugin' => 'Version @version@ of the plugin @plugin@ is required.',
+    'plugin_necessite_plugin_sans_version' => 'Requires the plugin @plugin@',
+    'plugin_necessite_spip' => 'SPIP version @version@ or newer is required.',
+    'plugin_source' => 'source: ',
+    'plugin_titre_automatique' => 'Automatic installation',
+    'plugin_titre_automatique_ajouter' => 'Add plugins',
+    'plugin_titre_installation' => '@plugin@ plugin installation',
+    'plugin_titre_modifier' => 'My plugins',
+    'plugin_utilise_extension_php' => 'The version of the PHP extension @plugin@ must be @version@.',
+    'plugin_utilise_php' => '@plugin@ version must be @version@.',
+    'plugin_utilise_plugin' => 'The version of the plugin @plugin@ must be @version@.',
+    'plugin_zip_active' => 'Continue in order to activate',
+    'plugin_zip_adresse' => 'To load a zipped plugin file, or a list of plugins, enter the path below.',
+    'plugin_zip_adresse_champ' => 'Path of the plugin or list ',
+    'plugin_zip_content' => 'It contains the following files(@taille@),<br />ready to be installed in the <code>@rep@</code> directory',
+    'plugin_zip_installe_finie' => 'The file @zip@ has been unpacked and installed.',
+    'plugin_zip_installe_rep_finie' => 'The file @zip@ has been unpacked and installed in the @rep@ directory',
+    'plugin_zip_installer' => 'You may now install it.',
+    'plugin_zip_telecharge' => 'The file @zip@ has been loaded',
+    'plugins_actif_aucun' => 'No plugins active.',
+    'plugins_actif_un' => 'One plugin active',
+    'plugins_actifs' => '@count@ active plugins.',
+    'plugins_actifs_liste' => 'Enabled',
+    'plugins_compte' => '@count@ plugins',
+    'plugins_disponible_un' => 'One plugin available',
+    'plugins_disponibles' => '@count@ plugins available.',
+    'plugins_erreur' => 'Error in the plugins: @plugins@',
+    'plugins_liste' => 'List of plugins',
+    'plugins_liste_dist' => 'Locked plugins',
+    'plugins_recents' => 'Recent plugins',
+    'plugins_tous_liste' => 'All',
+    'plugins_vue_hierarchie' => 'Hierarchy',
+    'plugins_vue_liste' => 'List',
+    'protocole_ldap' => 'Protocol version:',
 
-	// Q
-	'queue_executer_maintenant' => 'Run now',
-	'queue_info_purger' => 'You can delete all pending tasks and reset the list with periodic tasks',
-	'queue_nb_jobs_in_queue' => '@nb@ pending tasks',
-	'queue_next_job_in_nb_sec' => 'Next task in @nb@ s',
-	'queue_no_job_in_queue' => 'No pending tasks',
-	'queue_one_job_in_queue' => '1 pending task',
-	'queue_priorite_tache' => 'priority',
-	'queue_purger_queue' => 'Reset the tasks queue',
-	'queue_titre' => 'Background tasks',
+    // Q
+    'queue_executer_maintenant' => 'Run now',
+    'queue_info_purger' => 'You can delete all pending tasks and reset the list with periodic tasks',
+    'queue_nb_jobs_in_queue' => '@nb@ pending tasks',
+    'queue_next_job_in_nb_sec' => 'Next task in @nb@ s',
+    'queue_no_job_in_queue' => 'No pending tasks',
+    'queue_one_job_in_queue' => '1 pending task',
+    'queue_priorite_tache' => 'priority',
+    'queue_purger_queue' => 'Reset the tasks queue',
+    'queue_titre' => 'Background tasks',
 
-	// R
-	'repertoire_plugins' => 'Directory:',
-	'required' => '(Required)',
+    // R
+    'repertoire_plugins' => 'Directory:',
+    'required' => '(Required)',
 
-	// S
-	'sans_heure' => 'time not specified',
-	'statut_admin_restreint' => 'restricted admin',
-	'statut_webmestre' => 'webmaster',
+    // S
+    'sans_heure' => 'time not specified',
+    'statut_admin_restreint' => 'restricted admin',
+    'statut_webmestre' => 'webmaster',
 
-	// T
-	'tache_cron_asap' => 'CRON task @function@ (ASAP)',
-	'tache_cron_secondes' => 'CRON task @function@ (every @nb@ s)',
-	'taille_cache_image' => 'The images calculated automatically by SPIP (thumbnails, titles transformed into graphics, mathematical formulae in TeX format, etc.) take up a total of @taille@ in the @dir@ directory.',
-	'taille_cache_moins_de' => 'The cache size is less than @octets@.',
-	'taille_cache_octets' => 'The size of the cache is currently around @octets@.',
-	'taille_cache_vide' => 'The cache is empty.',
-	'taille_repertoire_cache' => 'Current cache size ',
-	'text_article_propose_publication' => 'Article submitted for publication.',
-	'texte_acces_ldap_anonyme_1' => 'Some LDAP servers do not allow anonymous access. In this case you must indicate an initial access identifier for future directory searches. However, in most cases the following fields can be left empty.',
-	'texte_admin_effacer_01' => 'This command deletes <i>all</i> content in the database,
+    // T
+    'tache_cron_asap' => 'CRON task @function@ (ASAP)',
+    'tache_cron_secondes' => 'CRON task @function@ (every @nb@ s)',
+    'taille_cache_image' => 'The images calculated automatically by SPIP (thumbnails, titles transformed into graphics, mathematical formulae in TeX format, etc.) take up a total of @taille@ in the @dir@ directory.',
+    'taille_cache_moins_de' => 'The cache size is less than @octets@.',
+    'taille_cache_octets' => 'The size of the cache is currently around @octets@.',
+    'taille_cache_vide' => 'The cache is empty.',
+    'taille_repertoire_cache' => 'Current cache size ',
+    'text_article_propose_publication' => 'Article submitted for publication.',
+    'texte_acces_ldap_anonyme_1' => 'Some LDAP servers do not allow anonymous access. In this case you must indicate an initial access identifier for future directory searches. However, in most cases the following fields can be left empty.',
+    'texte_admin_effacer_01' => 'This command deletes <i>all</i> content in the database,
 including <i>all</i> the access parameters for editors and administrators. After using it, you must
 reinstall SPIP, create a new database and a new administrator account.',
-	'texte_adresse_annuaire_1' => '(If your directory is installed on the same machine as your website, it is probably «localhost».)',
-	'texte_ajout_auteur' => 'The following author was added to the article:',
-	'texte_annuaire_ldap_1' => 'If you have access to a LDAP directory server, you can use it to import users automatically into SPIP.',
-	'texte_article_statut' => 'Article status:',
-	'texte_article_virtuel' => 'Virtual article',
-	'texte_article_virtuel_reference' => '<b>Virtual article:</b> an article on your SPIP website which redirects to another URL. To remove redirection, delete the URL.',
-	'texte_aucun_resultat_auteur' => 'No results for "@cherche_auteur@".',
-	'texte_auteur_messagerie' => 'This site can update the list of editors online in real time, which allows you to be contacted by other users. You can opt not to appear in this list (you are then "invisible" to other users).',
-	'texte_auteurs' => 'THE AUTHORS',
-	'texte_choix_base_1' => 'Select your database:',
-	'texte_choix_base_2' => 'The SQL server contains several databases.',
-	'texte_choix_base_3' => '<b>Select</b> below the one attributed by your hosting provider:',
-	'texte_choix_table_prefix' => 'Prefix for tables:',
-	'texte_compte_element' => '@count@ element',
-	'texte_compte_elements' => '@count@ elements',
-	'texte_conflit_edition_correction' => 'Please compare differences between the two versions. You can also copy your changes and start over.',
-	'texte_connexion_mysql' => 'Consult the information provided by your hosting service. It should contain the connection codes for the SQL server.',
-	'texte_contenu_article' => '(Brief description of the article.)',
-	'texte_contenu_articles' => 'Depending on the layout chosen for your site, you can decide
+    'texte_adresse_annuaire_1' => '(If your directory is installed on the same machine as your website, it is probably «localhost».)',
+    'texte_ajout_auteur' => 'The following author was added to the article:',
+    'texte_annuaire_ldap_1' => 'If you have access to a LDAP directory server, you can use it to import users automatically into SPIP.',
+    'texte_article_statut' => 'Article status:',
+    'texte_article_virtuel' => 'Virtual article',
+    'texte_article_virtuel_reference' => '<b>Virtual article:</b> an article on your SPIP website which redirects to another URL. To remove redirection, delete the URL.',
+    'texte_aucun_resultat_auteur' => 'No results for "@cherche_auteur@".',
+    'texte_auteur_messagerie' => 'This site can update the list of editors online in real time, which allows you to be contacted by other users. You can opt not to appear in this list (you are then "invisible" to other users).',
+    'texte_auteurs' => 'THE AUTHORS',
+    'texte_choix_base_1' => 'Select your database:',
+    'texte_choix_base_2' => 'The SQL server contains several databases.',
+    'texte_choix_base_3' => '<b>Select</b> below the one attributed by your hosting provider:',
+    'texte_choix_table_prefix' => 'Prefix for tables:',
+    'texte_compte_element' => '@count@ element',
+    'texte_compte_elements' => '@count@ elements',
+    'texte_conflit_edition_correction' => 'Please compare differences between the two versions. You can also copy your changes and start over.',
+    'texte_connexion_mysql' => 'Consult the information provided by your hosting service. It should contain the connection codes for the SQL server.',
+    'texte_contenu_article' => '(Brief description of the article.)',
+    'texte_contenu_articles' => 'Depending on the layout chosen for your site, you can decide
   that some article options are not to be used.
   Use the following list to choose which options should be available.',
-	'texte_crash_base' => 'If your database
+    'texte_crash_base' => 'If your database
    crashed, you can try to repair it
    automatically.',
-	'texte_creer_rubrique' => 'Before writing any articles,<br /> you must create a section.',
-	'texte_date_creation_article' => 'ARTICLE CREATION DATE:',
-	'texte_date_creation_objet' => 'Creation date:', # on ajoute le ":"
-	'texte_date_publication_anterieure' => 'Date first published:',
-	'texte_date_publication_anterieure_nonaffichee' => 'Hide previous publication date.',
-	'texte_date_publication_article' => 'PUBLISHED ON:',
-	'texte_date_publication_objet' => 'Published on:',
-	'texte_definir_comme_traduction_rubrique' => 'This section is a translation of section number:',
-	'texte_descriptif_rapide' => 'Brief description',
-	'texte_effacer_base' => 'Delete the SPIP database',
-	'texte_effacer_statistiques' => 'Delete the statistics',
-	'texte_en_cours_validation' => 'The following articles and news have been submitted for evaluation.',
-	'texte_enrichir_mise_a_jour' => 'You can enrich the layout of your text by using "typographical shortcuts".',
-	'texte_fichier_authent' => '<b>Should SPIP create the special files <tt>.htpasswd</tt>
+    'texte_creer_rubrique' => 'Before writing any articles,<br /> you must create a section.',
+    'texte_date_creation_article' => 'ARTICLE CREATION DATE:',
+    'texte_date_creation_objet' => 'Creation date:', # on ajoute le ":"
+    'texte_date_publication_anterieure' => 'Date first published:',
+    'texte_date_publication_anterieure_nonaffichee' => 'Hide previous publication date.',
+    'texte_date_publication_article' => 'PUBLISHED ON:',
+    'texte_date_publication_objet' => 'Published on:',
+    'texte_definir_comme_traduction_rubrique' => 'This section is a translation of section number:',
+    'texte_descriptif_rapide' => 'Brief description',
+    'texte_effacer_base' => 'Delete the SPIP database',
+    'texte_effacer_statistiques' => 'Delete the statistics',
+    'texte_en_cours_validation' => 'The following articles and news have been submitted for evaluation.',
+    'texte_enrichir_mise_a_jour' => 'You can enrich the layout of your text by using "typographical shortcuts".',
+    'texte_fichier_authent' => '<b>Should SPIP create the special files <tt>.htpasswd</tt>
   and <tt>.htpasswd-admin</tt> in the directory @dossier@?</b>
 <p>These files can be used to restrict access to authors and administrators to other parts of your site (for instance, external statistical programme).</p><p>If you have no need of such files, you can keep this option with its default value (no file creation).</p>',
-	'texte_informations_personnelles_1' => 'The system will now  create your personal account for this site.',
-	'texte_informations_personnelles_2' => '(Note: if it is a reinstallation, if your former access is still working, you can',
-	'texte_introductif_article' => '(Introductory text for the article.)',
-	'texte_jeu_caractere' => 'We advise using the universal alphabet (<tt>utf-8</tt>) on your site. This will make it possible to display text in any language. All modern browsers are fully comptabile with this character set.',
-	'texte_jeu_caractere_3' => 'Your site currently uses this character set:',
-	'texte_jeu_caractere_4' => 'If that does not correspond to your current data (this may occur after restoring your database from a backup), or if <em>you are setting up this site</em> and wish to use a different character set, please indicate the character set here:',
-	'texte_login_ldap_1' => '(Keep empty for anonymous access or enter complete path, for instance «<tt>uid=smith, ou=users, dc=my-domain, dc=com</tt>».)',
-	'texte_login_precaution' => 'Warning! This is the login which you are currently using.
+    'texte_informations_personnelles_1' => 'The system will now  create your personal account for this site.',
+    'texte_informations_personnelles_2' => '(Note: if it is a reinstallation, if your former access is still working, you can',
+    'texte_introductif_article' => '(Introductory text for the article.)',
+    'texte_jeu_caractere' => 'We advise using the universal alphabet (<tt>utf-8</tt>) on your site. This will make it possible to display text in any language. All modern browsers are fully comptabile with this character set.',
+    'texte_jeu_caractere_3' => 'Your site currently uses this character set:',
+    'texte_jeu_caractere_4' => 'If that does not correspond to your current data (this may occur after restoring your database from a backup), or if <em>you are setting up this site</em> and wish to use a different character set, please indicate the character set here:',
+    'texte_login_ldap_1' => '(Keep empty for anonymous access or enter complete path, for instance «<tt>uid=smith, ou=users, dc=my-domain, dc=com</tt>».)',
+    'texte_login_precaution' => 'Warning! This is the login which you are currently using.
  Use this form with caution...',
-	'texte_messagerie_agenda' => 'A messaging system lets website’s authors communicate directly into the admin area. It is linked to a calendar.',
-	'texte_mise_a_niveau_base_1' => 'You have just updated SPIP files.
+    'texte_messagerie_agenda' => 'A messaging system lets website’s authors communicate directly into the admin area. It is linked to a calendar.',
+    'texte_mise_a_niveau_base_1' => 'You have just updated SPIP files.
  Now you must upgrade the site
  database.',
-	'texte_modifier_article' => 'Edit this article:',
-	'texte_multilinguisme' => 'If you want to manage objects in several languages​​, with complex navigation, you can add a language selection menu to these objects, depending on the organization of your site.',
-	'texte_multilinguisme_trad' => 'You can also enable a system for managing links between the various translations of certain objects.',
-	'texte_non_compresse' => '<i>uncompressed</i> (your server does not support this feature)',
-	'texte_nouvelle_version_spip_1' => 'You have just installed a new version of SPIP.',
-	'texte_nouvelle_version_spip_2' => 'This new version requires a more thorough update than usual. If you are the webmaster of this site, please delete the file @connect@ and restart installation in order to update your database connection parameters. <p>(PS.: if you have forgotten your connection parameters, take a look at the file @connect@ before deleting it!)</p>',
-	'texte_operation_echec' => 'Go back to the previous page, select another database or create a new one. Verify the information provided by your hosting service.',
-	'texte_plus_trois_car' => 'more than 3 characters',
-	'texte_plusieurs_articles' => 'Several authors were found for "@cherche_auteur@":',
-	'texte_port_annuaire' => '(Default value is generally suitable.)',
-	'texte_presente_plugin' => 'This page shows the plugins available on this site. Activate the plugins you require by ticking the corresponding box.',
-	'texte_proposer_publication' => 'When your article is finished,<br /> you can submit it for publication.',
-	'texte_proxy' => 'In some cases (e.g. intranet, protected network), it is necessary to use an <i>HTTP proxy</i> to reach external sites (SPIP documentation, syndicated sites, etc.). If this is the case, enter its address in the form @proxy_en_cours@. In most cases you can leave this box empty.',
-	'texte_publication_articles_post_dates' => 'Which behaviour should SPIP adopt for articles whose
+    'texte_modifier_article' => 'Edit this article:',
+    'texte_multilinguisme' => 'If you want to manage objects in several languages​​, with complex navigation, you can add a language selection menu to these objects, depending on the organization of your site.',
+    'texte_multilinguisme_trad' => 'You can also enable a system for managing links between the various translations of certain objects.',
+    'texte_non_compresse' => '<i>uncompressed</i> (your server does not support this feature)',
+    'texte_nouvelle_version_spip_1' => 'You have just installed a new version of SPIP.',
+    'texte_nouvelle_version_spip_2' => 'This new version requires a more thorough update than usual. If you are the webmaster of this site, please delete the file @connect@ and restart installation in order to update your database connection parameters. <p>(PS.: if you have forgotten your connection parameters, take a look at the file @connect@ before deleting it!)</p>',
+    'texte_operation_echec' => 'Go back to the previous page, select another database or create a new one. Verify the information provided by your hosting service.',
+    'texte_plus_trois_car' => 'more than 3 characters',
+    'texte_plusieurs_articles' => 'Several authors were found for "@cherche_auteur@":',
+    'texte_port_annuaire' => '(Default value is generally suitable.)',
+    'texte_presente_plugin' => 'This page shows the plugins available on this site. Activate the plugins you require by ticking the corresponding box.',
+    'texte_proposer_publication' => 'When your article is finished,<br /> you can submit it for publication.',
+    'texte_proxy' => 'In some cases (e.g. intranet, protected network), it is necessary to use an <i>HTTP proxy</i> to reach external sites (SPIP documentation, syndicated sites, etc.). If this is the case, enter its address in the form @proxy_en_cours@. In most cases you can leave this box empty.',
+    'texte_publication_articles_post_dates' => 'Which behaviour should SPIP adopt for articles whose
   publication date has been set in
   the future?',
-	'texte_rappel_selection_champs' => '[Remember to select this field correctly.]',
-	'texte_recalcul_page' => 'If you want
+    'texte_rappel_selection_champs' => '[Remember to select this field correctly.]',
+    'texte_recalcul_page' => 'If you want
 to re-process a single page, it is easier to view that page from the public site and click "Re-process this page".',
-	'texte_recuperer_base' => 'Repair the database',
-	'texte_reference_mais_redirige' => 'article referenced in your SPIP site, but redirected to another URL.',
-	'texte_requetes_echouent' => '<b>When some SQL queries fail
+    'texte_recuperer_base' => 'Repair the database',
+    'texte_reference_mais_redirige' => 'article referenced in your SPIP site, but redirected to another URL.',
+    'texte_requetes_echouent' => '<b>When some SQL queries fail
   systematically, without apparent reason, it is possible
   that the database itself
   is the culprit.</b><p>
@@ -844,87 +844,87 @@ 
   clues as to where the problem lies.</p><p>
   If the problem persists, contact your 
   service provider.</p>',
-	'texte_selection_langue_principale' => 'You can choose the website’s "primary language". This does not mean that you can only write articles in that language, but it will be used to determine
+    'texte_selection_langue_principale' => 'You can choose the website’s "primary language". This does not mean that you can only write articles in that language, but it will be used to determine
 
 <ul><li> the default date/time format on the public website,</li>
 <li> the nature of the typographical engine which will be used by SPIP for rendering text,</li>
 <li> the language in use in public website’s forms,</li>
 <li> the default language in use in the admin area.</li></ul>',
-	'texte_sous_titre' => 'Subtitle',
-	'texte_statistiques_visites' => '(dark bars = Sunday, dark curve: average visits)',
-	'texte_statut_attente_validation' => 'awaiting validation',
-	'texte_statut_publies' => 'published online',
-	'texte_statut_refuses' => 'rejected',
-	'texte_suppression_fichiers' => 'Use this command to purge all the files
+    'texte_sous_titre' => 'Subtitle',
+    'texte_statistiques_visites' => '(dark bars = Sunday, dark curve: average visits)',
+    'texte_statut_attente_validation' => 'awaiting validation',
+    'texte_statut_publies' => 'published online',
+    'texte_statut_refuses' => 'rejected',
+    'texte_suppression_fichiers' => 'Use this command to purge all the files
 in the SPIP cache. This will force recalculation of every page on the site, useful after
 significant modifications to the site’s graphics or structure.',
-	'texte_sur_titre' => 'Lead-in title',
-	'texte_table_ok' => ': this table is OK.',
-	'texte_tentative_recuperation' => 'Attempting to repair',
-	'texte_tenter_reparation' => 'Attempt to repair the database',
-	'texte_test_proxy' => 'To test this proxy, enter the address of a website
+    'texte_sur_titre' => 'Lead-in title',
+    'texte_table_ok' => ': this table is OK.',
+    'texte_tentative_recuperation' => 'Attempting to repair',
+    'texte_tenter_reparation' => 'Attempt to repair the database',
+    'texte_test_proxy' => 'To test this proxy, enter the address of a website
     for verification.',
-	'texte_titre_02' => 'Subject:',
-	'texte_titre_obligatoire' => '<b>Title</b> [Required]',
-	'texte_travail_article' => '@nom_auteur_modif@ edited this article @date_diff@ minutes ago',
-	'texte_travail_collaboratif' => 'If several editors often work on the same article, the system can mark recently "opened" articles in order to avoid multiple simultaneous editing.
+    'texte_titre_02' => 'Subject:',
+    'texte_titre_obligatoire' => '<b>Title</b> [Required]',
+    'texte_travail_article' => '@nom_auteur_modif@ edited this article @date_diff@ minutes ago',
+    'texte_travail_collaboratif' => 'If several editors often work on the same article, the system can mark recently "opened" articles in order to avoid multiple simultaneous editing.
   This option is disabled by default to avoid displaying unnecessary warning
   messages.',
-	'texte_vide' => 'empty',
-	'texte_vider_cache' => 'Empty the cache',
-	'titre_admin_tech' => 'Technical maintenance',
-	'titre_admin_vider' => 'Technical maintenance',
-	'titre_ajouter_un_auteur' => 'Add an author',
-	'titre_ajouter_un_mot' => 'Add a keyword',
-	'titre_cadre_afficher_article' => 'Show the articles:',
-	'titre_cadre_afficher_traductions' => 'Display the translation status for these languages:',
-	'titre_cadre_ajouter_auteur' => 'ADD AN AUTHOR:',
-	'titre_cadre_interieur_rubrique' => 'In section',
-	'titre_cadre_numero_auteur' => 'AUTHOR NUMBER',
-	'titre_cadre_numero_objet' => '@objet@ NUMBER:',
-	'titre_cadre_signature_obligatoire' => '<b>Signature</b> [Required]<br />',
-	'titre_config_contenu_notifications' => 'Notifications',
-	'titre_config_contenu_prive' => 'In the admin area',
-	'titre_config_contenu_public' => 'On the public site',
-	'titre_config_fonctions' => 'Site configuration',
-	'titre_config_langage' => 'Configure the language',
-	'titre_configuration' => 'Site configuration',
-	'titre_configurer_preferences' => 'Configure your preferences',
-	'titre_configurer_preferences_menus' => 'Settings of your menus preferences',
-	'titre_conflit_edition' => 'Conflict while editing',
-	'titre_connexion_ldap' => 'Options: <b>Your LDAP connection</b>',
-	'titre_groupe_mots' => 'KEYWORD GROUP:',
-	'titre_identite_site' => 'Site identity',
-	'titre_langue_article' => 'Article language',
-	'titre_langue_rubrique' => 'Section language',
-	'titre_langue_trad_article' => 'ARTICLE LANGUAGE AND TRANSLATIONS',
-	'titre_les_articles' => 'ARTICLES',
-	'titre_messagerie_agenda' => 'Messaging system and calendar',
-	'titre_naviguer_dans_le_site' => 'Browse the site...',
-	'titre_nouvelle_rubrique' => 'New section',
-	'titre_numero_rubrique' => 'SECTION NUMBER:',
-	'titre_page_articles_edit' => 'Modify: @titre@',
-	'titre_page_articles_page' => 'Articles',
-	'titre_page_articles_tous' => 'The entire site',
-	'titre_page_calendrier' => 'Calendar @nom_mois@ @annee@',
-	'titre_page_config_contenu' => 'Site configuration',
-	'titre_page_delete_all' => 'total and irreversible deletion',
-	'titre_page_recherche' => 'Search results @recherche@',
-	'titre_page_statistiques_referers' => 'Statistics (incoming links)',
-	'titre_page_upgrade' => 'SPIP upgrade',
-	'titre_preference_menus_favoris' => 'Favourites menu',
-	'titre_publication_articles_post_dates' => 'Publication of post dated articles',
-	'titre_reparation' => 'Repair',
-	'titre_suivi_petition' => 'Petitions follow-up',
-	'tls_ldap' => 'Transport Layer Security :',
-	'trad_article_traduction' => 'All the versions of this article:',
-	'trad_delier' => 'Stop linking to these translations',
-	'trad_lier' => 'This article is a translation of article number:',
-	'trad_new' => 'Write a new translation',
+    'texte_vide' => 'empty',
+    'texte_vider_cache' => 'Empty the cache',
+    'titre_admin_tech' => 'Technical maintenance',
+    'titre_admin_vider' => 'Technical maintenance',
+    'titre_ajouter_un_auteur' => 'Add an author',
+    'titre_ajouter_un_mot' => 'Add a keyword',
+    'titre_cadre_afficher_article' => 'Show the articles:',
+    'titre_cadre_afficher_traductions' => 'Display the translation status for these languages:',
+    'titre_cadre_ajouter_auteur' => 'ADD AN AUTHOR:',
+    'titre_cadre_interieur_rubrique' => 'In section',
+    'titre_cadre_numero_auteur' => 'AUTHOR NUMBER',
+    'titre_cadre_numero_objet' => '@objet@ NUMBER:',
+    'titre_cadre_signature_obligatoire' => '<b>Signature</b> [Required]<br />',
+    'titre_config_contenu_notifications' => 'Notifications',
+    'titre_config_contenu_prive' => 'In the admin area',
+    'titre_config_contenu_public' => 'On the public site',
+    'titre_config_fonctions' => 'Site configuration',
+    'titre_config_langage' => 'Configure the language',
+    'titre_configuration' => 'Site configuration',
+    'titre_configurer_preferences' => 'Configure your preferences',
+    'titre_configurer_preferences_menus' => 'Settings of your menus preferences',
+    'titre_conflit_edition' => 'Conflict while editing',
+    'titre_connexion_ldap' => 'Options: <b>Your LDAP connection</b>',
+    'titre_groupe_mots' => 'KEYWORD GROUP:',
+    'titre_identite_site' => 'Site identity',
+    'titre_langue_article' => 'Article language',
+    'titre_langue_rubrique' => 'Section language',
+    'titre_langue_trad_article' => 'ARTICLE LANGUAGE AND TRANSLATIONS',
+    'titre_les_articles' => 'ARTICLES',
+    'titre_messagerie_agenda' => 'Messaging system and calendar',
+    'titre_naviguer_dans_le_site' => 'Browse the site...',
+    'titre_nouvelle_rubrique' => 'New section',
+    'titre_numero_rubrique' => 'SECTION NUMBER:',
+    'titre_page_articles_edit' => 'Modify: @titre@',
+    'titre_page_articles_page' => 'Articles',
+    'titre_page_articles_tous' => 'The entire site',
+    'titre_page_calendrier' => 'Calendar @nom_mois@ @annee@',
+    'titre_page_config_contenu' => 'Site configuration',
+    'titre_page_delete_all' => 'total and irreversible deletion',
+    'titre_page_recherche' => 'Search results @recherche@',
+    'titre_page_statistiques_referers' => 'Statistics (incoming links)',
+    'titre_page_upgrade' => 'SPIP upgrade',
+    'titre_preference_menus_favoris' => 'Favourites menu',
+    'titre_publication_articles_post_dates' => 'Publication of post dated articles',
+    'titre_reparation' => 'Repair',
+    'titre_suivi_petition' => 'Petitions follow-up',
+    'tls_ldap' => 'Transport Layer Security :',
+    'trad_article_traduction' => 'All the versions of this article:',
+    'trad_delier' => 'Stop linking to these translations',
+    'trad_lier' => 'This article is a translation of article number:',
+    'trad_new' => 'Write a new translation',
 
-	// U
-	'utf8_convert_erreur_orig' => 'Error: the character set @charset@ is not supported.',
+    // U
+    'utf8_convert_erreur_orig' => 'Error: the character set @charset@ is not supported.',
 
-	// V
-	'version' => 'Version:'
+    // V
+    'version' => 'Version:'
 );

ecrire/public/evaluer_page.php

Indentation +37 added lines, -37 removed lines

@@ -11,7 +11,7 @@ 
 \***************************************************************************/
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 /**
@@ -29,50 +29,50 @@ 
  * @return void
  */
 
- /** @var bool Évaluation réussie ? */
+    /** @var bool Évaluation réussie ? */
 $res = true;
 
 // Cas d'une page contenant du PHP :
 if (empty($page['process_ins']) or $page['process_ins'] != 'html') {
-	include_spip('inc/lang');
+    include_spip('inc/lang');
 
-	// restaurer l'etat des notes avant calcul
-	if (
-		isset($page['notes'])
-		and $page['notes']
-		and $notes = charger_fonction('notes', 'inc', true)
-	) {
-		$notes($page['notes'], 'restaurer_etat');
-	}
-	ob_start();
-	if (strpos($page['texte'], '?xml') !== false) {
-		$page['texte'] = str_replace('<' . '?xml', "<\1?xml", $page['texte']);
-	}
+    // restaurer l'etat des notes avant calcul
+    if (
+        isset($page['notes'])
+        and $page['notes']
+        and $notes = charger_fonction('notes', 'inc', true)
+    ) {
+        $notes($page['notes'], 'restaurer_etat');
+    }
+    ob_start();
+    if (strpos($page['texte'], '?xml') !== false) {
+        $page['texte'] = str_replace('<' . '?xml', "<\1?xml", $page['texte']);
+    }
 
-	try {
-		$res = eval('?' . '>' . $page['texte']);
-		$page['texte'] = ob_get_contents();
-	} catch (\Throwable $e) {
-		$code = $page['texte'];
-		$GLOBALS['numero_ligne_php'] = 1;
-		if (!function_exists('numerote_ligne_php')) {
-			function numerote_ligne_php($match) {
-				$GLOBALS['numero_ligne_php']++;
-				return "\n/*" . str_pad($GLOBALS['numero_ligne_php'], 3, '0', STR_PAD_LEFT) . '*/';
-			}
-		}
-		$code = '/*001*/' . preg_replace_callback(",\n,", 'numerote_ligne_php', $code);
-		$code = trim(highlight_string($code, true));
-		erreur_squelette('L' . $e->getLine() . ': ' . $e->getMessage() . '<br />' . $code, [$page['source'],'',$e->getFile(),'',$GLOBALS['spip_lang']]);
-		$page['texte'] = '<!-- Erreur -->';
-	}
-	ob_end_clean();
+    try {
+        $res = eval('?' . '>' . $page['texte']);
+        $page['texte'] = ob_get_contents();
+    } catch (\Throwable $e) {
+        $code = $page['texte'];
+        $GLOBALS['numero_ligne_php'] = 1;
+        if (!function_exists('numerote_ligne_php')) {
+            function numerote_ligne_php($match) {
+                $GLOBALS['numero_ligne_php']++;
+                return "\n/*" . str_pad($GLOBALS['numero_ligne_php'], 3, '0', STR_PAD_LEFT) . '*/';
+            }
+        }
+        $code = '/*001*/' . preg_replace_callback(",\n,", 'numerote_ligne_php', $code);
+        $code = trim(highlight_string($code, true));
+        erreur_squelette('L' . $e->getLine() . ': ' . $e->getMessage() . '<br />' . $code, [$page['source'],'',$e->getFile(),'',$GLOBALS['spip_lang']]);
+        $page['texte'] = '<!-- Erreur -->';
+    }
+    ob_end_clean();
 
-	$page['process_ins'] = 'html';
+    $page['process_ins'] = 'html';
 
-	if (strpos($page['texte'], '?xml') !== false) {
-		$page['texte'] = str_replace("<\1?xml", '<' . '?xml', $page['texte']);
-	}
+    if (strpos($page['texte'], '?xml') !== false) {
+        $page['texte'] = str_replace("<\1?xml", '<' . '?xml', $page['texte']);
+    }
 }
 
 // le résultat de calcul d'un squelette est toujours de type string

ecrire/inc/urls.php

Indentation +205 added lines, -205 removed lines

@@ -17,7 +17,7 @@ 
  **/
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 include_spip('base/objets');
 
@@ -57,106 +57,106 @@ 
  *
  */
 function urls_decoder_url($url, $fond = '', $contexte = [], $assembler = false) {
-	static $current_base = null;
+    static $current_base = null;
 
-	// les anciennes fonctions modifient directement les globales
-	// on les sauve avant l'appel, et on les retablit apres !
-	$save = [
-		$GLOBALS['fond'] ?? null,
-		$GLOBALS['contexte'] ?? null,
-		$_SERVER['REDIRECT_url_propre'] ?? null,
-		$_ENV['url_propre'] ?? null,
-		$GLOBALS['profondeur_url']
-	];
+    // les anciennes fonctions modifient directement les globales
+    // on les sauve avant l'appel, et on les retablit apres !
+    $save = [
+        $GLOBALS['fond'] ?? null,
+        $GLOBALS['contexte'] ?? null,
+        $_SERVER['REDIRECT_url_propre'] ?? null,
+        $_ENV['url_propre'] ?? null,
+        $GLOBALS['profondeur_url']
+    ];
 
-	if (is_null($current_base)) {
-		include_spip('inc/filtres_mini');
-		// le decodage des urls se fait toujours par rapport au site public
-		$current_base = url_absolue(_DIR_RACINE ?: './');
-	}
-	if (strncmp($url, $current_base, strlen($current_base)) == 0) {
-		$url = substr($url, strlen($current_base));
-	}
+    if (is_null($current_base)) {
+        include_spip('inc/filtres_mini');
+        // le decodage des urls se fait toujours par rapport au site public
+        $current_base = url_absolue(_DIR_RACINE ?: './');
+    }
+    if (strncmp($url, $current_base, strlen($current_base)) == 0) {
+        $url = substr($url, strlen($current_base));
+    }
 
-	// si on est en train d'assembler la page principale,
-	// recuperer l'url depuis les globales url propres si fournies
-	// sinon extraire la bonne portion d'url
-	if ($assembler) {
-		if (isset($_SERVER['REDIRECT_url_propre'])) {
-			$url = $_SERVER['REDIRECT_url_propre'];
-		} elseif (isset($_ENV['url_propre'])) {
-			$url = $_ENV['url_propre'];
-		} else {
-			$qs = explode('?', $url);
-			// ne prendre que le segment d'url qui correspond, en fonction de la profondeur calculee
-			$url = ltrim($qs[0], '/');
-			$url = explode('/', $url);
-			while (count($url) > $GLOBALS['profondeur_url'] + 1) {
-				array_shift($url);
-			}
-			$qs[0] = implode('/', $url);
-			$url = implode('?', $qs);
-		}
-	}
+    // si on est en train d'assembler la page principale,
+    // recuperer l'url depuis les globales url propres si fournies
+    // sinon extraire la bonne portion d'url
+    if ($assembler) {
+        if (isset($_SERVER['REDIRECT_url_propre'])) {
+            $url = $_SERVER['REDIRECT_url_propre'];
+        } elseif (isset($_ENV['url_propre'])) {
+            $url = $_ENV['url_propre'];
+        } else {
+            $qs = explode('?', $url);
+            // ne prendre que le segment d'url qui correspond, en fonction de la profondeur calculee
+            $url = ltrim($qs[0], '/');
+            $url = explode('/', $url);
+            while (count($url) > $GLOBALS['profondeur_url'] + 1) {
+                array_shift($url);
+            }
+            $qs[0] = implode('/', $url);
+            $url = implode('?', $qs);
+        }
+    }
 
-	unset($_SERVER['REDIRECT_url_propre']);
-	unset($_ENV['url_propre']);
-	include_spip('inc/filtres_mini');
-	if (strpos($url, '://') === false) {
-		$GLOBALS['profondeur_url'] = substr_count(ltrim(resolve_path("/$url"), '/'), '/');
-	} else {
-		$GLOBALS['profondeur_url'] = max(0, substr_count($url, '/') - substr_count($current_base, '/'));
-	}
+    unset($_SERVER['REDIRECT_url_propre']);
+    unset($_ENV['url_propre']);
+    include_spip('inc/filtres_mini');
+    if (strpos($url, '://') === false) {
+        $GLOBALS['profondeur_url'] = substr_count(ltrim(resolve_path("/$url"), '/'), '/');
+    } else {
+        $GLOBALS['profondeur_url'] = max(0, substr_count($url, '/') - substr_count($current_base, '/'));
+    }
 
-	$url_redirect = '';
-	$decoder = charger_fonction_url('decoder');
-	if ($decoder) {
-		$a = $decoder($url, $fond, $contexte);
-		if (is_array($a)) {
-			[$ncontexte, $type, $url_redirect, $nfond] = array_pad($a, 4, null);
-			$url_redirect ??= '';
-			if ($url_redirect === $url) {
-				$url_redirect = '';
-			} // securite pour eviter une redirection infinie
-			if ($assembler and strlen($url_redirect)) {
-				spip_log("Redirige $url vers $url_redirect");
-				include_spip('inc/headers');
-				redirige_par_entete($url_redirect, '', 301);
-			}
-			if (isset($nfond)) {
-				$fond = $nfond;
-			} else {
-				if (
-					$fond == ''
-					or $fond == 'type_urls' /* compat avec htaccess 2.0.0 */
-				) {
-					$fond = $type;
-				}
-			}
-			if (isset($ncontexte)) {
-				$contexte = $ncontexte;
-			}
-			if (defined('_DEFINIR_CONTEXTE_TYPE') and _DEFINIR_CONTEXTE_TYPE) {
-				$contexte['type'] = $type;
-			}
-			if (!defined('_DEFINIR_CONTEXTE_TYPE_PAGE') or _DEFINIR_CONTEXTE_TYPE_PAGE) {
-				$contexte['type-page'] = $type;
-			}
-		}
-	}
+    $url_redirect = '';
+    $decoder = charger_fonction_url('decoder');
+    if ($decoder) {
+        $a = $decoder($url, $fond, $contexte);
+        if (is_array($a)) {
+            [$ncontexte, $type, $url_redirect, $nfond] = array_pad($a, 4, null);
+            $url_redirect ??= '';
+            if ($url_redirect === $url) {
+                $url_redirect = '';
+            } // securite pour eviter une redirection infinie
+            if ($assembler and strlen($url_redirect)) {
+                spip_log("Redirige $url vers $url_redirect");
+                include_spip('inc/headers');
+                redirige_par_entete($url_redirect, '', 301);
+            }
+            if (isset($nfond)) {
+                $fond = $nfond;
+            } else {
+                if (
+                    $fond == ''
+                    or $fond == 'type_urls' /* compat avec htaccess 2.0.0 */
+                ) {
+                    $fond = $type;
+                }
+            }
+            if (isset($ncontexte)) {
+                $contexte = $ncontexte;
+            }
+            if (defined('_DEFINIR_CONTEXTE_TYPE') and _DEFINIR_CONTEXTE_TYPE) {
+                $contexte['type'] = $type;
+            }
+            if (!defined('_DEFINIR_CONTEXTE_TYPE_PAGE') or _DEFINIR_CONTEXTE_TYPE_PAGE) {
+                $contexte['type-page'] = $type;
+            }
+        }
+    }
 
-	// retablir les globales
-	[$GLOBALS['fond'], $GLOBALS['contexte'], $_SERVER['REDIRECT_url_propre'], $_ENV['url_propre'], $GLOBALS['profondeur_url']] = $save;
+    // retablir les globales
+    [$GLOBALS['fond'], $GLOBALS['contexte'], $_SERVER['REDIRECT_url_propre'], $_ENV['url_propre'], $GLOBALS['profondeur_url']] = $save;
 
-	// vider les globales url propres qui ne doivent plus etre utilisees en cas
-	// d'inversion url => objet
-	// maintenir pour compat ?
-	#if ($assembler) {
-	#	unset($_SERVER['REDIRECT_url_propre']);
-	#	unset($_ENV['url_propre']);
-	#}
+    // vider les globales url propres qui ne doivent plus etre utilisees en cas
+    // d'inversion url => objet
+    // maintenir pour compat ?
+    #if ($assembler) {
+    #	unset($_SERVER['REDIRECT_url_propre']);
+    #	unset($_ENV['url_propre']);
+    #}
 
-	return [$fond, $contexte, $url_redirect];
+    return [$fond, $contexte, $url_redirect];
 }
 
 /**
@@ -169,20 +169,20 @@ 
  * @return array|false|string
  */
 function urls_transition_retrouver_anciennes_url_propres(string $url_propre, string $entite, array $contexte = []): array {
-	if ($url_propre) {
-		if ($GLOBALS['profondeur_url'] <= 0) {
-			$urls_anciennes = charger_fonction_url('decoder', 'propres');
-		} else {
-			$urls_anciennes = charger_fonction_url('decoder', 'arbo');
-		}
+    if ($url_propre) {
+        if ($GLOBALS['profondeur_url'] <= 0) {
+            $urls_anciennes = charger_fonction_url('decoder', 'propres');
+        } else {
+            $urls_anciennes = charger_fonction_url('decoder', 'arbo');
+        }
 
-		if ($urls_anciennes) {
-			$urls_anciennes = $urls_anciennes($url_propre, $entite, $contexte);
-		}
-		return $urls_anciennes ?: [];
-	}
+        if ($urls_anciennes) {
+            $urls_anciennes = $urls_anciennes($url_propre, $entite, $contexte);
+        }
+        return $urls_anciennes ?: [];
+    }
 
-	return [];
+    return [];
 }
 
 /**
@@ -195,41 +195,41 @@ 
  * @return array|false|string
  */
 function urls_transition_retrouver_anciennes_url_html(string $url, string $entite, array $contexte = []): array {
-	// Migration depuis anciennes URLs ?
-	// traiter les injections domain.tld/spip.php/n/importe/quoi/rubrique23
-	if (
-		$url
-		and $GLOBALS['profondeur_url'] <= 0
-	) {
-		$r = nettoyer_url_page($url, $contexte);
-		if ($r) {
-			[$contexte, $type, , , $suite] = $r;
-			$_id = id_table_objet($type);
-			$id_objet = $contexte[$_id];
-			$url_propre = generer_objet_url($id_objet, $type);
-			if (
-				strlen($url_propre)
-				and !strstr($url, (string) $url_propre)
-				and (
-					objet_test_si_publie($type, $id_objet)
-					or (defined('_VAR_PREVIEW') and _VAR_PREVIEW and autoriser('voir', $type, $id_objet))
-				)
-			) {
-				[, $hash] = array_pad(explode('#', $url_propre), 2, '');
-				$args = [];
-				foreach (array_filter(explode('&', $suite ?? '')) as $fragment) {
-					if ($fragment != "$_id=$id_objet") {
-						$args[] = $fragment;
-					}
-				}
-				$url_redirect = generer_objet_url($id_objet, $type, join('&', array_filter($args)), $hash);
+    // Migration depuis anciennes URLs ?
+    // traiter les injections domain.tld/spip.php/n/importe/quoi/rubrique23
+    if (
+        $url
+        and $GLOBALS['profondeur_url'] <= 0
+    ) {
+        $r = nettoyer_url_page($url, $contexte);
+        if ($r) {
+            [$contexte, $type, , , $suite] = $r;
+            $_id = id_table_objet($type);
+            $id_objet = $contexte[$_id];
+            $url_propre = generer_objet_url($id_objet, $type);
+            if (
+                strlen($url_propre)
+                and !strstr($url, (string) $url_propre)
+                and (
+                    objet_test_si_publie($type, $id_objet)
+                    or (defined('_VAR_PREVIEW') and _VAR_PREVIEW and autoriser('voir', $type, $id_objet))
+                )
+            ) {
+                [, $hash] = array_pad(explode('#', $url_propre), 2, '');
+                $args = [];
+                foreach (array_filter(explode('&', $suite ?? '')) as $fragment) {
+                    if ($fragment != "$_id=$id_objet") {
+                        $args[] = $fragment;
+                    }
+                }
+                $url_redirect = generer_objet_url($id_objet, $type, join('&', array_filter($args)), $hash);
 
-				return [$contexte, $type, $url_redirect, $type];
-			}
-		}
-	}
-	/* Fin compatibilite anciennes urls */
-	return [];
+                return [$contexte, $type, $url_redirect, $type];
+            }
+        }
+    }
+    /* Fin compatibilite anciennes urls */
+    return [];
 }
 
 /**
@@ -242,24 +242,24 @@ 
  * @return string|array
  */
 function urls_liste_objets($preg = true) {
-	static $url_objets = null;
-	if (is_null($url_objets)) {
-		$url_objets = [];
-		// recuperer les tables_objets_sql declarees
-		$tables_objets = lister_tables_objets_sql();
-		foreach ($tables_objets as $t => $infos) {
-			if ($infos['page']) {
-				$url_objets[] = $infos['type'];
-				$url_objets = array_merge($url_objets, $infos['type_surnoms']);
-			}
-		}
-		$url_objets = pipeline('declarer_url_objets', $url_objets);
-	}
-	if (!$preg) {
-		return $url_objets;
-	}
+    static $url_objets = null;
+    if (is_null($url_objets)) {
+        $url_objets = [];
+        // recuperer les tables_objets_sql declarees
+        $tables_objets = lister_tables_objets_sql();
+        foreach ($tables_objets as $t => $infos) {
+            if ($infos['page']) {
+                $url_objets[] = $infos['type'];
+                $url_objets = array_merge($url_objets, $infos['type_surnoms']);
+            }
+        }
+        $url_objets = pipeline('declarer_url_objets', $url_objets);
+    }
+    if (!$preg) {
+        return $url_objets;
+    }
 
-	return implode('|', array_map('preg_quote', $url_objets));
+    return implode('|', array_map('preg_quote', $url_objets));
 }
 
 /**
@@ -273,26 +273,26 @@ 
  * @return array
  */
 function nettoyer_url_page($url, $contexte = []) {
-	$url_objets = urls_liste_objets();
-	$raccourci_url_page_html = ',^(?:[^?]*/)?(' . $url_objets . ')([0-9]+)(?:\.html)?([?&].*)?$,';
-	$raccourci_url_page_id = ',^(?:[^?]*/)?(' . $url_objets . ')\.php3?[?]id_\1=([0-9]+)([?&].*)?$,';
-	$raccourci_url_page_spip = ',^(?:[^?]*/)?(?:spip[.]php)?[?](' . $url_objets . ')([0-9]+)=?(&.*)?$,';
+    $url_objets = urls_liste_objets();
+    $raccourci_url_page_html = ',^(?:[^?]*/)?(' . $url_objets . ')([0-9]+)(?:\.html)?([?&].*)?$,';
+    $raccourci_url_page_id = ',^(?:[^?]*/)?(' . $url_objets . ')\.php3?[?]id_\1=([0-9]+)([?&].*)?$,';
+    $raccourci_url_page_spip = ',^(?:[^?]*/)?(?:spip[.]php)?[?](' . $url_objets . ')([0-9]+)=?(&.*)?$,';
 
-	if (
-		preg_match($raccourci_url_page_html, $url, $regs)
-		or preg_match($raccourci_url_page_id, $url, $regs)
-		or preg_match($raccourci_url_page_spip, $url, $regs)
-	) {
-		$regs = array_pad($regs, 4, null);
-		$type = objet_type($regs[1]);
-		$_id = id_table_objet($type);
-		$contexte[$_id] = $regs[2];
-		$suite = $regs[3];
+    if (
+        preg_match($raccourci_url_page_html, $url, $regs)
+        or preg_match($raccourci_url_page_id, $url, $regs)
+        or preg_match($raccourci_url_page_spip, $url, $regs)
+    ) {
+        $regs = array_pad($regs, 4, null);
+        $type = objet_type($regs[1]);
+        $_id = id_table_objet($type);
+        $contexte[$_id] = $regs[2];
+        $suite = $regs[3];
 
-		return [$contexte, $type, null, $type, $suite];
-	}
+        return [$contexte, $type, null, $type, $suite];
+    }
 
-	return [];
+    return [];
 }
 
 /**
@@ -310,38 +310,38 @@ 
  * @return string
  */
 function generer_objet_url_ecrire($id, string $objet, string $args = '', string $ancre = '', ?bool $public = null, string $connect = ''): string {
-	static $furls = [];
-	$id = intval($id);
-	if (!isset($furls[$objet])) {
-		if (
-			function_exists($f = 'generer_' . $objet . '_url_ecrire')
-			// ou definie par un plugin
-			or $f = charger_fonction($f, 'urls', true)
-			// deprecated
-			or function_exists($f = 'generer_url_ecrire_' . $objet) or $f = charger_fonction($f, 'urls', true)
-		) {
-			$furls[$objet] = $f;
-		} else {
-			$furls[$objet] = '';
-		}
-	}
-	if ($furls[$objet]) {
-		return $furls[$objet]($id, $args, $ancre, $public, $connect);
-	}
-	// si pas de flag public fourni
-	// le calculer en fonction de la declaration de statut
-	if (is_null($public) and !$connect) {
-		$public = objet_test_si_publie($objet, $id, $connect);
-	}
-	if ($public or $connect) {
-		return generer_objet_url_absolue($id, $objet, $args, $ancre, $public, '', $connect);
-	}
-	$a = id_table_objet($objet) . '=' . intval($id);
-	if (!function_exists('objet_info')) {
-		include_spip('inc/filtres');
-	}
+    static $furls = [];
+    $id = intval($id);
+    if (!isset($furls[$objet])) {
+        if (
+            function_exists($f = 'generer_' . $objet . '_url_ecrire')
+            // ou definie par un plugin
+            or $f = charger_fonction($f, 'urls', true)
+            // deprecated
+            or function_exists($f = 'generer_url_ecrire_' . $objet) or $f = charger_fonction($f, 'urls', true)
+        ) {
+            $furls[$objet] = $f;
+        } else {
+            $furls[$objet] = '';
+        }
+    }
+    if ($furls[$objet]) {
+        return $furls[$objet]($id, $args, $ancre, $public, $connect);
+    }
+    // si pas de flag public fourni
+    // le calculer en fonction de la declaration de statut
+    if (is_null($public) and !$connect) {
+        $public = objet_test_si_publie($objet, $id, $connect);
+    }
+    if ($public or $connect) {
+        return generer_objet_url_absolue($id, $objet, $args, $ancre, $public, '', $connect);
+    }
+    $a = id_table_objet($objet) . '=' . intval($id);
+    if (!function_exists('objet_info')) {
+        include_spip('inc/filtres');
+    }
 
-	return generer_url_ecrire(objet_info($objet, 'url_voir'), $a . ($args ? "&$args" : '')) . ($ancre ? "#$ancre" : '');
+    return generer_url_ecrire(objet_info($objet, 'url_voir'), $a . ($args ? "&$args" : '')) . ($ancre ? "#$ancre" : '');
 }
 
 /**
@@ -349,5 +349,5 @@ 
  * @see generer_objet_url_ecrire
  */
 function generer_url_ecrire_objet($objet, $id, $args = '', $ancre = '', $public = null, string $connect = '') {
-	return generer_objet_url_ecrire($id, $objet, $args, $ancre, $public, $connect);
+    return generer_objet_url_ecrire($id, $objet, $args, $ancre, $public, $connect);
 }

ecrire/inc/lien.php

Indentation +192 added lines, -192 removed lines

@@ -11,7 +11,7 @@ 
 \***************************************************************************/
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 include_spip('base/abstract_sql');
@@ -37,42 +37,42 @@ 
  * @return string
  */
 function inc_lien_dist(
-	$lien,
-	$texte = '',
-	$class = '',
-	$title = '',
-	$hlang = '',
-	$rel = '',
-	string $connect = '',
-	$env = []
+    $lien,
+    $texte = '',
+    $class = '',
+    $title = '',
+    $hlang = '',
+    $rel = '',
+    string $connect = '',
+    $env = []
 ) {
-	return $lien;
+    return $lien;
 }
 
 function expanser_liens($t, string $connect = '', $env = []) {
 
-	$t = pipeline('pre_liens', $t);
+    $t = pipeline('pre_liens', $t);
 
-	// on passe a traiter_modeles la liste des liens reperes pour lui permettre
-	// de remettre le texte d'origine dans les parametres du modele
-	$t = traiter_modeles($t, false, false, $connect);
+    // on passe a traiter_modeles la liste des liens reperes pour lui permettre
+    // de remettre le texte d'origine dans les parametres du modele
+    $t = traiter_modeles($t, false, false, $connect);
 
-	return $t;
+    return $t;
 }
 
 // Meme analyse mais pour eliminer les liens
 // et ne laisser que leur titre, a expliciter si ce n'est fait
 function nettoyer_raccourcis_typo($texte, string $connect = '') {
-	return $texte;
+    return $texte;
 }
 
 // Repere dans la partie texte d'un raccourci [texte->...]
 // la langue et la bulle eventuelles
 function traiter_raccourci_lien_atts($texte) {
-	$bulle = '';
-	$hlang = '';
+    $bulle = '';
+    $hlang = '';
 
-	return [trim($texte), $bulle, $hlang];
+    return [trim($texte), $bulle, $hlang];
 }
 
 define('_RACCOURCI_CHAPO', '/^(\W*)(\W*)(\w*\d+([?#].*)?)$/');
@@ -88,7 +88,7 @@ 
  * @return string
  */
 function virtuel_redirige($virtuel, $url = false) {
-	return $virtuel;
+    return $virtuel;
 }
 
 // Cherche un lien du type [->raccourci 123]
@@ -101,62 +101,62 @@ 
 // 'url':   seulement U  (i.e. generer_url_RACCOURCI)
 
 function calculer_url($ref, $texte = '', $pour = 'url', string $connect = '', $echappe_typo = true) {
-	$r = traiter_lien_implicite($ref, $texte, $pour, $connect);
+    $r = traiter_lien_implicite($ref, $texte, $pour, $connect);
 
-	return $r ?: traiter_lien_explicite($ref, $texte, $pour, $connect, $echappe_typo);
+    return $r ?: traiter_lien_explicite($ref, $texte, $pour, $connect, $echappe_typo);
 }
 
 define('_EXTRAIRE_LIEN', ',^\s*(?:' . _PROTOCOLES_STD . '):?/?/?\s*$,iS');
 
 function traiter_lien_explicite($ref, $texte = '', $pour = 'url', string $connect = '', $echappe_typo = true) {
-	if (preg_match(_EXTRAIRE_LIEN, $ref)) {
-		return ($pour != 'tout') ? '' : ['', '', '', ''];
-	}
-
-	$lien = entites_html(trim($ref));
-
-	// Liens explicites
-	if (!$texte) {
-		$texte = str_replace('"', '', $lien);
-		// evite l'affichage de trops longues urls.
-		$lien_court = charger_fonction('lien_court', 'inc');
-		$texte = $lien_court($texte);
-		if ($echappe_typo) {
-			$texte = '<html>' . quote_amp($texte) . '</html>';
-		}
-	}
-
-	// petites corrections d'URL
-	if (preg_match('/^www\.[^@]+$/S', $lien)) {
-		$lien = 'http://' . $lien;
-	} else {
-		if (strpos($lien, '@') && email_valide($lien)) {
-			if (!$texte) {
-				$texte = $lien;
-			}
-			$lien = 'mailto:' . $lien;
-		}
-	}
-
-	if ($pour == 'url') {
-		return $lien;
-	}
-
-	if ($pour == 'titre') {
-		return $texte;
-	}
-
-	return ['url' => $lien, 'titre' => $texte];
+    if (preg_match(_EXTRAIRE_LIEN, $ref)) {
+        return ($pour != 'tout') ? '' : ['', '', '', ''];
+    }
+
+    $lien = entites_html(trim($ref));
+
+    // Liens explicites
+    if (!$texte) {
+        $texte = str_replace('"', '', $lien);
+        // evite l'affichage de trops longues urls.
+        $lien_court = charger_fonction('lien_court', 'inc');
+        $texte = $lien_court($texte);
+        if ($echappe_typo) {
+            $texte = '<html>' . quote_amp($texte) . '</html>';
+        }
+    }
+
+    // petites corrections d'URL
+    if (preg_match('/^www\.[^@]+$/S', $lien)) {
+        $lien = 'http://' . $lien;
+    } else {
+        if (strpos($lien, '@') && email_valide($lien)) {
+            if (!$texte) {
+                $texte = $lien;
+            }
+            $lien = 'mailto:' . $lien;
+        }
+    }
+
+    if ($pour == 'url') {
+        return $lien;
+    }
+
+    if ($pour == 'titre') {
+        return $texte;
+    }
+
+    return ['url' => $lien, 'titre' => $texte];
 }
 
 function liens_implicite_glose_dist($texte, $id, $type, $args, $ancre, string $connect = '') {
-	if (function_exists($f = 'glossaire_' . $ancre)) {
-		$url = $f($texte, $id);
-	} else {
-		$url = glossaire_std($texte);
-	}
+    if (function_exists($f = 'glossaire_' . $ancre)) {
+        $url = $f($texte, $id);
+    } else {
+        $url = glossaire_std($texte);
+    }
 
-	return $url;
+    return $url;
 }
 
 /**
@@ -178,74 +178,74 @@ 
  * @return array|bool|string
  */
 function traiter_lien_implicite($ref, $texte = '', $pour = 'url', $connect = '') {
-	$cible = $GLOBALS['lien_implicite_cible_public'] ?? null;
-	if (!($match = typer_raccourci($ref))) {
-		return false;
-	}
-
-	[$type, , $id, , $args, , $ancre] = array_pad($match, 7, null);
-
-	# attention dans le cas des sites le lien doit pointer non pas sur
-	# la page locale du site, mais directement sur le site lui-meme
-	$url = '';
-	if ($f = charger_fonction("implicite_$type", 'liens', true)) {
-		$url = $f($texte, $id, $type, $args, $ancre, $connect);
-	}
-
-	if (!$url) {
-		$url = generer_objet_url($id, $type, $args ?? '', $ancre ?? '', $cible, '', $connect ?? '');
-	}
-
-	if (!$url) {
-		return false;
-	}
-
-	if (is_array($url)) {
-		[$type, $id] = array_pad($url, 2, null);
-		$url = generer_objet_url($id, $type, $args ?? '', $ancre ?? '', $cible, '', $connect ?? '');
-	}
-
-	if ($pour === 'url') {
-		return $url;
-	}
-
-	$r = traiter_raccourci_titre($id, $type, $connect);
-	if ($r) {
-		$r['class'] = ($type == 'site') ? 'spip_out' : 'spip_in';
-	}
-
-	if ($texte = trim($texte)) {
-		$r['titre'] = $texte;
-	}
-
-	if (!@$r['titre']) {
-		$r['titre'] = _T($type) . " $id";
-	}
-
-	if ($pour == 'titre') {
-		return $r['titre'];
-	}
-
-	$r['url'] = $url;
-
-	// dans le cas d'un lien vers un doc, ajouter le type='mime/type'
-	if (
-		$type == 'document'
-		and $mime = sql_getfetsel(
-			'mime_type',
-			'spip_types_documents',
-			'extension IN (' . sql_get_select('extension', 'spip_documents', 'id_document=' . sql_quote($id)) . ')',
-			'',
-			'',
-			'',
-			'',
-			$connect
-		)
-	) {
-		$r['mime'] = $mime;
-	}
-
-	return $r;
+    $cible = $GLOBALS['lien_implicite_cible_public'] ?? null;
+    if (!($match = typer_raccourci($ref))) {
+        return false;
+    }
+
+    [$type, , $id, , $args, , $ancre] = array_pad($match, 7, null);
+
+    # attention dans le cas des sites le lien doit pointer non pas sur
+    # la page locale du site, mais directement sur le site lui-meme
+    $url = '';
+    if ($f = charger_fonction("implicite_$type", 'liens', true)) {
+        $url = $f($texte, $id, $type, $args, $ancre, $connect);
+    }
+
+    if (!$url) {
+        $url = generer_objet_url($id, $type, $args ?? '', $ancre ?? '', $cible, '', $connect ?? '');
+    }
+
+    if (!$url) {
+        return false;
+    }
+
+    if (is_array($url)) {
+        [$type, $id] = array_pad($url, 2, null);
+        $url = generer_objet_url($id, $type, $args ?? '', $ancre ?? '', $cible, '', $connect ?? '');
+    }
+
+    if ($pour === 'url') {
+        return $url;
+    }
+
+    $r = traiter_raccourci_titre($id, $type, $connect);
+    if ($r) {
+        $r['class'] = ($type == 'site') ? 'spip_out' : 'spip_in';
+    }
+
+    if ($texte = trim($texte)) {
+        $r['titre'] = $texte;
+    }
+
+    if (!@$r['titre']) {
+        $r['titre'] = _T($type) . " $id";
+    }
+
+    if ($pour == 'titre') {
+        return $r['titre'];
+    }
+
+    $r['url'] = $url;
+
+    // dans le cas d'un lien vers un doc, ajouter le type='mime/type'
+    if (
+        $type == 'document'
+        and $mime = sql_getfetsel(
+            'mime_type',
+            'spip_types_documents',
+            'extension IN (' . sql_get_select('extension', 'spip_documents', 'id_document=' . sql_quote($id)) . ')',
+            '',
+            '',
+            '',
+            '',
+            $connect
+        )
+    ) {
+        $r['mime'] = $mime;
+    }
+
+    return $r;
 }
 
 // analyse des raccourcis issus de [TITRE->RACCOURCInnn] et connexes
@@ -253,43 +253,43 @@ 
 define('_RACCOURCI_URL', '/^\s*(\w*?)\s*(\d+)(\?(.*?))?(#([^\s]*))?\s*$/S');
 
 function typer_raccourci($lien) {
-	if (!preg_match(_RACCOURCI_URL, $lien, $match)) {
-		return [];
-	}
-
-	$f = $match[1];
-	// valeur par defaut et alias historiques
-	if (!$f) {
-		$f = 'article';
-	} else {
-		if ($f == 'art') {
-			$f = 'article';
-		} else {
-			if ($f == 'br') {
-				$f = 'breve';
-			} else {
-				if ($f == 'rub') {
-					$f = 'rubrique';
-				} else {
-					if ($f == 'aut') {
-						$f = 'auteur';
-					} else {
-						if ($f == 'doc' or $f == 'im' or $f == 'img' or $f == 'image' or $f == 'emb') {
-							$f = 'document';
-						} else {
-							if (preg_match('/^br..?ve$/S', $f)) {
-								$f = 'breve'; # accents :(
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
-	$match[0] = $f;
-
-	return $match;
+    if (!preg_match(_RACCOURCI_URL, $lien, $match)) {
+        return [];
+    }
+
+    $f = $match[1];
+    // valeur par defaut et alias historiques
+    if (!$f) {
+        $f = 'article';
+    } else {
+        if ($f == 'art') {
+            $f = 'article';
+        } else {
+            if ($f == 'br') {
+                $f = 'breve';
+            } else {
+                if ($f == 'rub') {
+                    $f = 'rubrique';
+                } else {
+                    if ($f == 'aut') {
+                        $f = 'auteur';
+                    } else {
+                        if ($f == 'doc' or $f == 'im' or $f == 'img' or $f == 'image' or $f == 'emb') {
+                            $f = 'document';
+                        } else {
+                            if (preg_match('/^br..?ve$/S', $f)) {
+                                $f = 'breve'; # accents :(
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    $match[0] = $f;
+
+    return $match;
 }
 
 /**
@@ -304,44 +304,44 @@ 
  * }
  **/
 function traiter_raccourci_titre($id, $type, $connect = null) {
-	$trouver_table = charger_fonction('trouver_table', 'base');
-	$desc = $trouver_table(table_objet($type));
+    $trouver_table = charger_fonction('trouver_table', 'base');
+    $desc = $trouver_table(table_objet($type));
 
-	if (!($desc and $s = $desc['titre'])) {
-		return [];
-	}
+    if (!($desc and $s = $desc['titre'])) {
+        return [];
+    }
 
-	$_id = $desc['key']['PRIMARY KEY'];
-	$r = sql_fetsel($s, $desc['table'], "$_id=$id", '', '', '', '', $connect);
+    $_id = $desc['key']['PRIMARY KEY'];
+    $r = sql_fetsel($s, $desc['table'], "$_id=$id", '', '', '', '', $connect);
 
-	if (!$r) {
-		return [];
-	}
+    if (!$r) {
+        return [];
+    }
 
-	$r['titre'] = supprimer_numero($r['titre']);
+    $r['titre'] = supprimer_numero($r['titre']);
 
-	if (!$r['titre'] and !empty($r['surnom'])) {
-		$r['titre'] = $r['surnom'];
-	}
+    if (!$r['titre'] and !empty($r['surnom'])) {
+        $r['titre'] = $r['surnom'];
+    }
 
-	if (!isset($r['lang'])) {
-		$r['lang'] = '';
-	}
+    if (!isset($r['lang'])) {
+        $r['lang'] = '';
+    }
 
-	return $r;
+    return $r;
 }
 
 //
 // Raccourcis ancre [#ancre<-]
 //
 function traiter_raccourci_ancre($letexte) {
-	return $letexte;
+    return $letexte;
 }
 
 function traiter_raccourci_glossaire($texte) {
-	return $texte;
+    return $texte;
 }
 
 function glossaire_std($terme) {
-	return $terme;
+    return $terme;
 }

ecrire/inc/auth.php

Indentation +453 added lines, -453 removed lines

@@ -17,7 +17,7 @@ 
  **/
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 include_spip('base/abstract_sql');
@@ -35,33 +35,33 @@ 
  *  - une chaîne vide si autorisation à pénétrer dans l'espace privé.
  */
 function inc_auth_dist() {
-	$row = auth_mode();
+    $row = auth_mode();
 
-	if ($row) {
-		return auth_init_droits($row);
-	}
+    if ($row) {
+        return auth_init_droits($row);
+    }
 
-	if (!$GLOBALS['connect_login']) {
-		return auth_a_loger();
-	}
+    if (!$GLOBALS['connect_login']) {
+        return auth_a_loger();
+    }
 
-	// Cas ou l'auteur a ete identifie mais on n'a pas d'info sur lui
-	// C'est soit parce que la base est inutilisable,
-	// soit parce que la table des auteurs a changee (restauration etc)
-	// Pas la peine d'insister.
-	// Renvoyer le nom fautif et une URL de remise a zero
+    // Cas ou l'auteur a ete identifie mais on n'a pas d'info sur lui
+    // C'est soit parce que la base est inutilisable,
+    // soit parce que la table des auteurs a changee (restauration etc)
+    // Pas la peine d'insister.
+    // Renvoyer le nom fautif et une URL de remise a zero
 
-	if (spip_connect()) {
-		return [
-			'login' => $GLOBALS['connect_login'],
-			'site' => generer_url_public('', 'action=logout&logout=prive')
-		];
-	}
+    if (spip_connect()) {
+        return [
+            'login' => $GLOBALS['connect_login'],
+            'site' => generer_url_public('', 'action=logout&logout=prive')
+        ];
+    }
 
-	$n = intval(sql_errno());
-	spip_log("Erreur base de donnees $n " . sql_error());
+    $n = intval(sql_errno());
+    spip_log("Erreur base de donnees $n " . sql_error());
 
-	return $n ?: 1;
+    return $n ?: 1;
 }
 
 /**
@@ -71,22 +71,22 @@ 
  */
 function auth_controler_password_auteur_connecte(string $password): bool {
 
-	if (
-		empty($GLOBALS['visiteur_session']['id_auteur'])
-		or empty($GLOBALS['visiteur_session']['login'])
-	) {
-		return false;
-	}
-
-	$auth = auth_identifier_login($GLOBALS['visiteur_session']['login'], $password, '', true);
-	if (
-		is_array($auth)
-		and $auth['id_auteur'] == $GLOBALS['visiteur_session']['id_auteur']
-	) {
-		return true;
-	}
-
-	return false;
+    if (
+        empty($GLOBALS['visiteur_session']['id_auteur'])
+        or empty($GLOBALS['visiteur_session']['login'])
+    ) {
+        return false;
+    }
+
+    $auth = auth_identifier_login($GLOBALS['visiteur_session']['login'], $password, '', true);
+    if (
+        is_array($auth)
+        and $auth['id_auteur'] == $GLOBALS['visiteur_session']['id_auteur']
+    ) {
+        return true;
+    }
+
+    return false;
 }
 
 /**
@@ -98,47 +98,47 @@ 
  * @return array|string
  */
 function auth_echec($raison) {
-	include_spip('inc/minipres');
-	include_spip('inc/headers');
-	// pas authentifie. Pourquoi ?
-	if (is_string($raison)) {
-		// redirection vers une page d'authentification
-		// on ne revient pas de cette fonction
-		// sauf si pb de header
-		$raison = redirige_formulaire($raison);
-	} elseif (is_int($raison)) {
-		// erreur SQL a afficher
-		$raison = minipres(
-			_T('info_travaux_titre'),
-			_T('titre_probleme_technique') . '<p><tt>' . sql_errno() . ' ' . sql_error() . '</tt></p>'
-		);
-	} elseif (@$raison['statut']) {
-		// un simple visiteur n'a pas acces a l'espace prive
-		spip_log('connexion refusee a ' . @$raison['id_auteur']);
-		$est_connecte = (!empty($GLOBALS['visiteur_session']['login']) and !empty($GLOBALS['visiteur_session']['statut'])); // idem test balise #URL_LOGOUT
-		$raison = minipres(
-			_T('avis_erreur_connexion'),
-			_T('avis_erreur_visiteur')
-				// Lien vers le site public
-				. '<br /><a href="' . url_de_base() . '">' . _T('login_retour_public') . '</a>'
-				// Si la personne est connectée, lien de déconnexion ramenant vers la page de login
-				. ($est_connecte ? ' | <a href="' . generer_url_public('', 'action=logout&amp;logout=prive') . '">' . _T('icone_deconnecter') . '</a>' : '')
-		);
-	} else {
-		// auteur en fin de droits ...
-		$h = $raison['site'];
-		$raison = minipres(
-			_T('avis_erreur_connexion'),
-			'<br /><br /><p>'
-			. _T('texte_inc_auth_1', ['auth_login' => $raison['login']])
-			. " <a href='$h'>"
-			. _T('texte_inc_auth_2')
-			. '</a>'
-			. _T('texte_inc_auth_3')
-		);
-	}
-
-	return $raison;
+    include_spip('inc/minipres');
+    include_spip('inc/headers');
+    // pas authentifie. Pourquoi ?
+    if (is_string($raison)) {
+        // redirection vers une page d'authentification
+        // on ne revient pas de cette fonction
+        // sauf si pb de header
+        $raison = redirige_formulaire($raison);
+    } elseif (is_int($raison)) {
+        // erreur SQL a afficher
+        $raison = minipres(
+            _T('info_travaux_titre'),
+            _T('titre_probleme_technique') . '<p><tt>' . sql_errno() . ' ' . sql_error() . '</tt></p>'
+        );
+    } elseif (@$raison['statut']) {
+        // un simple visiteur n'a pas acces a l'espace prive
+        spip_log('connexion refusee a ' . @$raison['id_auteur']);
+        $est_connecte = (!empty($GLOBALS['visiteur_session']['login']) and !empty($GLOBALS['visiteur_session']['statut'])); // idem test balise #URL_LOGOUT
+        $raison = minipres(
+            _T('avis_erreur_connexion'),
+            _T('avis_erreur_visiteur')
+                // Lien vers le site public
+                . '<br /><a href="' . url_de_base() . '">' . _T('login_retour_public') . '</a>'
+                // Si la personne est connectée, lien de déconnexion ramenant vers la page de login
+                . ($est_connecte ? ' | <a href="' . generer_url_public('', 'action=logout&amp;logout=prive') . '">' . _T('icone_deconnecter') . '</a>' : '')
+        );
+    } else {
+        // auteur en fin de droits ...
+        $h = $raison['site'];
+        $raison = minipres(
+            _T('avis_erreur_connexion'),
+            '<br /><br /><p>'
+            . _T('texte_inc_auth_1', ['auth_login' => $raison['login']])
+            . " <a href='$h'>"
+            . _T('texte_inc_auth_2')
+            . '</a>'
+            . _T('texte_inc_auth_3')
+        );
+    }
+
+    return $raison;
 }
 
 /**
@@ -148,81 +148,81 @@ 
  * @return array|bool|string
  */
 function auth_mode() {
-	//
-	// Initialiser variables (eviter hacks par URL)
-	//
-	$GLOBALS['connect_login'] = '';
-	$id_auteur = null;
-	$GLOBALS['auth_can_disconnect'] = false;
-
-	//
-	// Recuperer les donnees d'identification
-	//
-	include_spip('inc/session');
-	// Session valide en cours ?
-	if (isset($_COOKIE['spip_session'])) {
-		$session = charger_fonction('session', 'inc');
-		if (
-			$id_auteur = $session()
-			or $id_auteur === 0 // reprise sur restauration
-		) {
-			$GLOBALS['auth_can_disconnect'] = true;
-			$GLOBALS['connect_login'] = session_get('login');
-		} else {
-			unset($_COOKIE['spip_session']);
-		}
-	}
-
-	// Essayer auth http si significatif
-	// (ignorer les login d'intranet independants de spip)
-	if (!$GLOBALS['ignore_auth_http']) {
-		if (
-			(isset($_SERVER['PHP_AUTH_USER']) and isset($_SERVER['PHP_AUTH_PW'])
-				and $r = lire_php_auth($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']))
-			or
-			// Si auth http differtente de basic, PHP_AUTH_PW
-			// est indisponible mais tentons quand meme pour
-			// autocreation via LDAP
-			(isset($_SERVER['REMOTE_USER'])
-				and $r = lire_php_auth($_SERVER['PHP_AUTH_USER'] = $_SERVER['REMOTE_USER'], ''))
-		) {
-			if (!$id_auteur) {
-				$_SERVER['PHP_AUTH_PW'] = '';
-				$GLOBALS['auth_can_disconnect'] = true;
-				$GLOBALS['visiteur_session'] = $r;
-				$GLOBALS['connect_login'] = session_get('login');
-				$id_auteur = $r['id_auteur'];
-			} else {
-				// cas de la session en plus de PHP_AUTH
-				/*				  if ($id_auteur != $r['id_auteur']){
+    //
+    // Initialiser variables (eviter hacks par URL)
+    //
+    $GLOBALS['connect_login'] = '';
+    $id_auteur = null;
+    $GLOBALS['auth_can_disconnect'] = false;
+
+    //
+    // Recuperer les donnees d'identification
+    //
+    include_spip('inc/session');
+    // Session valide en cours ?
+    if (isset($_COOKIE['spip_session'])) {
+        $session = charger_fonction('session', 'inc');
+        if (
+            $id_auteur = $session()
+            or $id_auteur === 0 // reprise sur restauration
+        ) {
+            $GLOBALS['auth_can_disconnect'] = true;
+            $GLOBALS['connect_login'] = session_get('login');
+        } else {
+            unset($_COOKIE['spip_session']);
+        }
+    }
+
+    // Essayer auth http si significatif
+    // (ignorer les login d'intranet independants de spip)
+    if (!$GLOBALS['ignore_auth_http']) {
+        if (
+            (isset($_SERVER['PHP_AUTH_USER']) and isset($_SERVER['PHP_AUTH_PW'])
+                and $r = lire_php_auth($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']))
+            or
+            // Si auth http differtente de basic, PHP_AUTH_PW
+            // est indisponible mais tentons quand meme pour
+            // autocreation via LDAP
+            (isset($_SERVER['REMOTE_USER'])
+                and $r = lire_php_auth($_SERVER['PHP_AUTH_USER'] = $_SERVER['REMOTE_USER'], ''))
+        ) {
+            if (!$id_auteur) {
+                $_SERVER['PHP_AUTH_PW'] = '';
+                $GLOBALS['auth_can_disconnect'] = true;
+                $GLOBALS['visiteur_session'] = $r;
+                $GLOBALS['connect_login'] = session_get('login');
+                $id_auteur = $r['id_auteur'];
+            } else {
+                // cas de la session en plus de PHP_AUTH
+                /*				  if ($id_auteur != $r['id_auteur']){
 					spip_log("vol de session $id_auteur" . join(', ', $r));
 				unset($_COOKIE['spip_session']);
 				$id_auteur = '';
 				} */
-			}
-		} else {
-			// Authentification .htaccess old style, car .htaccess semble
-			// souvent definir *aussi* PHP_AUTH_USER et PHP_AUTH_PW
-			if (isset($_SERVER['REMOTE_USER'])) {
-				$GLOBALS['connect_login'] = $_SERVER['REMOTE_USER'];
-			}
-		}
-	}
-
-	$where = (is_numeric($id_auteur)
-		/*AND $id_auteur>0*/ // reprise lors des restaurations
-	) ?
-		"id_auteur=$id_auteur" :
-		(!strlen($GLOBALS['connect_login']) ? '' : 'login=' . sql_quote($GLOBALS['connect_login'], '', 'text'));
-
-	if (!$where) {
-		return '';
-	}
-
-	// Trouver les autres infos dans la table auteurs.
-	// le champ 'quand' est utilise par l'agenda
-
-	return sql_fetsel('*, en_ligne AS quand', 'spip_auteurs', "$where AND statut!='5poubelle'");
+            }
+        } else {
+            // Authentification .htaccess old style, car .htaccess semble
+            // souvent definir *aussi* PHP_AUTH_USER et PHP_AUTH_PW
+            if (isset($_SERVER['REMOTE_USER'])) {
+                $GLOBALS['connect_login'] = $_SERVER['REMOTE_USER'];
+            }
+        }
+    }
+
+    $where = (is_numeric($id_auteur)
+        /*AND $id_auteur>0*/ // reprise lors des restaurations
+    ) ?
+        "id_auteur=$id_auteur" :
+        (!strlen($GLOBALS['connect_login']) ? '' : 'login=' . sql_quote($GLOBALS['connect_login'], '', 'text'));
+
+    if (!$where) {
+        return '';
+    }
+
+    // Trouver les autres infos dans la table auteurs.
+    // le champ 'quand' est utilise par l'agenda
+
+    return sql_fetsel('*, en_ligne AS quand', 'spip_auteurs', "$where AND statut!='5poubelle'");
 }
 
 /**
@@ -240,85 +240,85 @@ 
  */
 function auth_init_droits($row) {
 
-	include_spip('inc/autoriser');
-	if (!autoriser('loger', '', 0, $row)) {
-		return false;
-	}
-
-
-	if ($row['statut'] == 'nouveau') {
-		include_spip('action/inscrire_auteur');
-		$row = confirmer_statut_inscription($row);
-	}
-
-	$GLOBALS['connect_id_auteur'] = $row['id_auteur'];
-	$GLOBALS['connect_login'] = $row['login'];
-	$GLOBALS['connect_statut'] = $row['statut'];
-
-	$GLOBALS['visiteur_session'] = array_merge((array)$GLOBALS['visiteur_session'], $row);
-
-	// au cas ou : ne pas memoriser les champs sensibles
-	unset($GLOBALS['visiteur_session']['pass']);
-	unset($GLOBALS['visiteur_session']['htpass']);
-	unset($GLOBALS['visiteur_session']['alea_actuel']);
-	unset($GLOBALS['visiteur_session']['alea_futur']);
-	unset($GLOBALS['visiteur_session']['ldap_password']);
-
-	// creer la session au besoin
-	if (!isset($_COOKIE['spip_session'])) {
-		$session = charger_fonction('session', 'inc');
-		$spip_session = $session($row);
-	}
-
-	// reinjecter les preferences_auteur apres le reset de spip_session
-	// car utilisees au retour par auth_loger()
-	$r = @unserialize($row['prefs']);
-	$GLOBALS['visiteur_session']['prefs'] = ($r ?: []);
-	// si prefs pas definies, les definir par defaut
-	if (!isset($GLOBALS['visiteur_session']['prefs']['couleur'])) {
-		$GLOBALS['visiteur_session']['prefs']['couleur'] = 2;
-		$GLOBALS['visiteur_session']['prefs']['display'] = 2;
-		$GLOBALS['visiteur_session']['prefs']['display_navigation'] = 'navigation_avec_icones';
-	}
-
-	$GLOBALS['visiteur_session'] = pipeline(
-		'preparer_visiteur_session',
-		['args' => ['row' => $row],
-		'data' => $GLOBALS['visiteur_session']]
-	);
-
-	// Etablir les droits selon le codage attendu
-	// dans ecrire/index.php ecrire/prive.php
-
-	// Pas autorise a acceder a ecrire ? renvoyer le tableau
-	// A noter : le premier appel a autoriser() a le bon gout
-	// d'initialiser $GLOBALS['visiteur_session']['restreint'],
-	// qui ne figure pas dans le fichier de session
-
-	if (!autoriser('ecrire')) {
-		return $row;
-	}
-
-	// autoriser('ecrire') ne laisse passer que les Admin et les Redac
-
-	auth_trace($row);
-
-	// Administrateurs
-	if (in_array($GLOBALS['connect_statut'], explode(',', _STATUT_AUTEUR_RUBRIQUE))) {
-		if (
-			isset($GLOBALS['visiteur_session']['restreint'])
-			and is_array($GLOBALS['visiteur_session']['restreint'])
-		) {
-			$GLOBALS['connect_id_rubrique'] = $GLOBALS['visiteur_session']['restreint'];
-		}
-		if ($GLOBALS['connect_statut'] == '0minirezo') {
-			$GLOBALS['connect_toutes_rubriques'] = !$GLOBALS['connect_id_rubrique'];
-		}
-	}
-
-	// Pour les redacteurs, inc_version a fait l'initialisation minimale
-
-	return ''; // i.e. pas de pb.
+    include_spip('inc/autoriser');
+    if (!autoriser('loger', '', 0, $row)) {
+        return false;
+    }
+
+
+    if ($row['statut'] == 'nouveau') {
+        include_spip('action/inscrire_auteur');
+        $row = confirmer_statut_inscription($row);
+    }
+
+    $GLOBALS['connect_id_auteur'] = $row['id_auteur'];
+    $GLOBALS['connect_login'] = $row['login'];
+    $GLOBALS['connect_statut'] = $row['statut'];
+
+    $GLOBALS['visiteur_session'] = array_merge((array)$GLOBALS['visiteur_session'], $row);
+
+    // au cas ou : ne pas memoriser les champs sensibles
+    unset($GLOBALS['visiteur_session']['pass']);
+    unset($GLOBALS['visiteur_session']['htpass']);
+    unset($GLOBALS['visiteur_session']['alea_actuel']);
+    unset($GLOBALS['visiteur_session']['alea_futur']);
+    unset($GLOBALS['visiteur_session']['ldap_password']);
+
+    // creer la session au besoin
+    if (!isset($_COOKIE['spip_session'])) {
+        $session = charger_fonction('session', 'inc');
+        $spip_session = $session($row);
+    }
+
+    // reinjecter les preferences_auteur apres le reset de spip_session
+    // car utilisees au retour par auth_loger()
+    $r = @unserialize($row['prefs']);
+    $GLOBALS['visiteur_session']['prefs'] = ($r ?: []);
+    // si prefs pas definies, les definir par defaut
+    if (!isset($GLOBALS['visiteur_session']['prefs']['couleur'])) {
+        $GLOBALS['visiteur_session']['prefs']['couleur'] = 2;
+        $GLOBALS['visiteur_session']['prefs']['display'] = 2;
+        $GLOBALS['visiteur_session']['prefs']['display_navigation'] = 'navigation_avec_icones';
+    }
+
+    $GLOBALS['visiteur_session'] = pipeline(
+        'preparer_visiteur_session',
+        ['args' => ['row' => $row],
+        'data' => $GLOBALS['visiteur_session']]
+    );
+
+    // Etablir les droits selon le codage attendu
+    // dans ecrire/index.php ecrire/prive.php
+
+    // Pas autorise a acceder a ecrire ? renvoyer le tableau
+    // A noter : le premier appel a autoriser() a le bon gout
+    // d'initialiser $GLOBALS['visiteur_session']['restreint'],
+    // qui ne figure pas dans le fichier de session
+
+    if (!autoriser('ecrire')) {
+        return $row;
+    }
+
+    // autoriser('ecrire') ne laisse passer que les Admin et les Redac
+
+    auth_trace($row);
+
+    // Administrateurs
+    if (in_array($GLOBALS['connect_statut'], explode(',', _STATUT_AUTEUR_RUBRIQUE))) {
+        if (
+            isset($GLOBALS['visiteur_session']['restreint'])
+            and is_array($GLOBALS['visiteur_session']['restreint'])
+        ) {
+            $GLOBALS['connect_id_rubrique'] = $GLOBALS['visiteur_session']['restreint'];
+        }
+        if ($GLOBALS['connect_statut'] == '0minirezo') {
+            $GLOBALS['connect_toutes_rubriques'] = !$GLOBALS['connect_id_rubrique'];
+        }
+    }
+
+    // Pour les redacteurs, inc_version a fait l'initialisation minimale
+
+    return ''; // i.e. pas de pb.
 }
 
 /**
@@ -327,23 +327,23 @@ 
  * @return string
  */
 function auth_a_loger() {
-	$redirect = generer_url_public('login', 'url=' . rawurlencode(self('&', true)), true);
-
-	// un echec au "bonjour" (login initial) quand le statut est
-	// inconnu signale sans doute un probleme de cookies
-	if (isset($_GET['bonjour'])) {
-		$redirect = parametre_url(
-			$redirect,
-			'var_erreur',
-			(!isset($GLOBALS['visiteur_session']['statut'])
-				? 'cookie'
-				: 'statut'
-			),
-			'&'
-		);
-	}
-
-	return $redirect;
+    $redirect = generer_url_public('login', 'url=' . rawurlencode(self('&', true)), true);
+
+    // un echec au "bonjour" (login initial) quand le statut est
+    // inconnu signale sans doute un probleme de cookies
+    if (isset($_GET['bonjour'])) {
+        $redirect = parametre_url(
+            $redirect,
+            'var_erreur',
+            (!isset($GLOBALS['visiteur_session']['statut'])
+                ? 'cookie'
+                : 'statut'
+            ),
+            '&'
+        );
+    }
+
+    return $redirect;
 }
 
 /**
@@ -355,19 +355,19 @@ 
  * @param null|string $date
  */
 function auth_trace($row, $date = null) {
-	// Indiquer la connexion. A la minute pres ca suffit.
-	if (!is_numeric($connect_quand = $row['quand'] ?? '')) {
-		$connect_quand = strtotime($connect_quand);
-	}
+    // Indiquer la connexion. A la minute pres ca suffit.
+    if (!is_numeric($connect_quand = $row['quand'] ?? '')) {
+        $connect_quand = strtotime($connect_quand);
+    }
 
-	$date ??= date('Y-m-d H:i:s');
+    $date ??= date('Y-m-d H:i:s');
 
-	if (abs(strtotime($date) - $connect_quand) >= 60) {
-		sql_updateq('spip_auteurs', ['en_ligne' => $date], 'id_auteur=' . intval($row['id_auteur']));
-		$row['en_ligne'] = $date;
-	}
+    if (abs(strtotime($date) - $connect_quand) >= 60) {
+        sql_updateq('spip_auteurs', ['en_ligne' => $date], 'id_auteur=' . intval($row['id_auteur']));
+        $row['en_ligne'] = $date;
+    }
 
-	pipeline('trig_auth_trace', ['args' => ['row' => $row, 'date' => $date]]);
+    pipeline('trig_auth_trace', ['args' => ['row' => $row, 'date' => $date]]);
 }
 
 
@@ -393,28 +393,28 @@ 
  * @return mixed
  */
 function auth_administrer($fonction, $args, $defaut = false) {
-	$auth_methode = array_shift($args);
-	$auth_methode = $auth_methode ?: 'spip'; // valeur par defaut au cas ou
-	if (
-		$auth = charger_fonction($auth_methode, 'auth', true)
-		and function_exists($f = "auth_{$auth_methode}_$fonction")
-	) {
-		$res = $f(...$args);
-	} else {
-		$res = $defaut;
-	}
-	$res = pipeline(
-		'auth_administrer',
-		[
-			'args' => [
-				'fonction' => $fonction,
-				'methode' => $auth_methode,
-				'args' => $args
-			],
-			'data' => $res
-		]
-	);
-	return $res;
+    $auth_methode = array_shift($args);
+    $auth_methode = $auth_methode ?: 'spip'; // valeur par defaut au cas ou
+    if (
+        $auth = charger_fonction($auth_methode, 'auth', true)
+        and function_exists($f = "auth_{$auth_methode}_$fonction")
+    ) {
+        $res = $f(...$args);
+    } else {
+        $res = $defaut;
+    }
+    $res = pipeline(
+        'auth_administrer',
+        [
+            'args' => [
+                'fonction' => $fonction,
+                'methode' => $auth_methode,
+                'args' => $args
+            ],
+            'data' => $res
+        ]
+    );
+    return $res;
 }
 
 /**
@@ -424,11 +424,11 @@ 
  * @return array
  */
 function auth_formulaire_login($flux) {
-	foreach ($GLOBALS['liste_des_authentifications'] as $methode) {
-		$flux = auth_administrer('formulaire_login', [$methode, $flux], $flux);
-	}
+    foreach ($GLOBALS['liste_des_authentifications'] as $methode) {
+        $flux = auth_administrer('formulaire_login', [$methode, $flux], $flux);
+    }
 
-	return $flux;
+    return $flux;
 }
 
 
@@ -442,19 +442,19 @@ 
  * @return string/bool
  */
 function auth_retrouver_login($login, $serveur = '') {
-	if (!spip_connect($serveur)) {
-		include_spip('inc/minipres');
-		echo minipres(_T('info_travaux_titre'), _T('titre_probleme_technique'));
-		exit;
-	}
-
-	foreach ($GLOBALS['liste_des_authentifications'] as $methode) {
-		if ($auteur = auth_administrer('retrouver_login', [$methode, $login, $serveur])) {
-			return $auteur;
-		}
-	}
-
-	return false;
+    if (!spip_connect($serveur)) {
+        include_spip('inc/minipres');
+        echo minipres(_T('info_travaux_titre'), _T('titre_probleme_technique'));
+        exit;
+    }
+
+    foreach ($GLOBALS['liste_des_authentifications'] as $methode) {
+        if ($auteur = auth_administrer('retrouver_login', [$methode, $login, $serveur])) {
+            return $auteur;
+        }
+    }
+
+    return false;
 }
 
 /**
@@ -469,34 +469,34 @@ 
  * @return array
  */
 function auth_informer_login($login, $serveur = '') {
-	if (
-		!$login
-		or !$login_base = auth_retrouver_login($login, $serveur)
-		or !$row = sql_fetsel('*', 'spip_auteurs', 'login=' . sql_quote($login_base, $serveur, 'text'), '', '', '', '', $serveur)
-	) {
-		// generer de fausses infos, mais credibles, pour eviter une attaque
-		// https://core.spip.net/issues/1758 + https://core.spip.net/issues/3691
-
-		$row = [
-			'login' => $login,
-			'cnx' => '0',
-			'logo' => '',
-		];
-
-		return $row;
-	}
-
-	$prefs = @unserialize($row['prefs']);
-	$infos = [
-		'id_auteur' => $row['id_auteur'],
-		'login' => $row['login'],
-		'cnx' => (isset($prefs['cnx']) and $prefs['cnx'] === 'perma') ? '1' : '0',
-		'logo' => recuperer_fond('formulaires/inc-logo_auteur', $row),
-	];
-
-	verifier_visiteur();
-
-	return auth_administrer('informer_login', [$row['source'], $infos, $row, $serveur], $infos);
+    if (
+        !$login
+        or !$login_base = auth_retrouver_login($login, $serveur)
+        or !$row = sql_fetsel('*', 'spip_auteurs', 'login=' . sql_quote($login_base, $serveur, 'text'), '', '', '', '', $serveur)
+    ) {
+        // generer de fausses infos, mais credibles, pour eviter une attaque
+        // https://core.spip.net/issues/1758 + https://core.spip.net/issues/3691
+
+        $row = [
+            'login' => $login,
+            'cnx' => '0',
+            'logo' => '',
+        ];
+
+        return $row;
+    }
+
+    $prefs = @unserialize($row['prefs']);
+    $infos = [
+        'id_auteur' => $row['id_auteur'],
+        'login' => $row['login'],
+        'cnx' => (isset($prefs['cnx']) and $prefs['cnx'] === 'perma') ? '1' : '0',
+        'logo' => recuperer_fond('formulaires/inc-logo_auteur', $row),
+    ];
+
+    verifier_visiteur();
+
+    return auth_administrer('informer_login', [$row['source'], $infos, $row, $serveur], $infos);
 }
 
 
@@ -510,21 +510,21 @@ 
  * @return mixed
  */
 function auth_identifier_login($login, $password, $serveur = '', bool $phpauth = false) {
-	$erreur = '';
-	foreach ($GLOBALS['liste_des_authentifications'] as $methode) {
-		if ($auth = charger_fonction($methode, 'auth', true)) {
-			$auteur = $auth($login, $password, $serveur, $phpauth);
-			if (is_array($auteur) and count($auteur)) {
-				spip_log("connexion de $login par methode $methode");
-				$auteur['auth'] = $methode;
-				return $auteur;
-			} elseif (is_string($auteur)) {
-				$erreur .= "$auteur ";
-			}
-		}
-	}
-
-	return $erreur;
+    $erreur = '';
+    foreach ($GLOBALS['liste_des_authentifications'] as $methode) {
+        if ($auth = charger_fonction($methode, 'auth', true)) {
+            $auteur = $auth($login, $password, $serveur, $phpauth);
+            if (is_array($auteur) and count($auteur)) {
+                spip_log("connexion de $login par methode $methode");
+                $auteur['auth'] = $methode;
+                return $auteur;
+            } elseif (is_string($auteur)) {
+                $erreur .= "$auteur ";
+            }
+        }
+    }
+
+    return $erreur;
 }
 
 /**
@@ -538,8 +538,8 @@ 
  * @return string
  */
 function auth_url_retour_login($auth_methode, $login, $redirect = '', $serveur = '') {
-	$securiser_action = charger_fonction('securiser_action', 'inc');
-	return $securiser_action('auth', "$auth_methode/$login", $redirect, true);
+    $securiser_action = charger_fonction('securiser_action', 'inc');
+    return $securiser_action('auth', "$auth_methode/$login", $redirect, true);
 }
 
 /**
@@ -553,9 +553,9 @@ 
  * @return mixed
  */
 function auth_terminer_identifier_login($auth_methode, $login, $serveur = '') {
-	$args = func_get_args();
-	$auteur = auth_administrer('terminer_identifier_login', $args);
-	return $auteur;
+    $args = func_get_args();
+    $auteur = auth_administrer('terminer_identifier_login', $args);
+    return $auteur;
 }
 
 /**
@@ -565,29 +565,29 @@ 
  * @return bool
  */
 function auth_loger($auteur) {
-	if (!is_array($auteur) or !count($auteur)) {
-		return false;
-	}
-
-	// initialiser et poser le cookie de session
-	unset($_COOKIE['spip_session']);
-	if (auth_init_droits($auteur) === false) {
-		return false;
-	}
-
-	// initialiser les prefs
-	$p = $GLOBALS['visiteur_session']['prefs'];
-	$p['cnx'] = (isset($auteur['cookie']) and $auteur['cookie'] == 'oui') ? 'perma' : '';
-
-	sql_updateq(
-		'spip_auteurs',
-		['prefs' => serialize($p)],
-		'id_auteur=' . intval($auteur['id_auteur'])
-	);
-
-	//  bloquer ici le visiteur qui tente d'abuser de ses droits
-	verifier_visiteur();
-	return true;
+    if (!is_array($auteur) or !count($auteur)) {
+        return false;
+    }
+
+    // initialiser et poser le cookie de session
+    unset($_COOKIE['spip_session']);
+    if (auth_init_droits($auteur) === false) {
+        return false;
+    }
+
+    // initialiser les prefs
+    $p = $GLOBALS['visiteur_session']['prefs'];
+    $p['cnx'] = (isset($auteur['cookie']) and $auteur['cookie'] == 'oui') ? 'perma' : '';
+
+    sql_updateq(
+        'spip_auteurs',
+        ['prefs' => serialize($p)],
+        'id_auteur=' . intval($auteur['id_auteur'])
+    );
+
+    //  bloquer ici le visiteur qui tente d'abuser de ses droits
+    verifier_visiteur();
+    return true;
 }
 
 /**
@@ -597,8 +597,8 @@ 
  * return void
  **/
 function auth_deloger() {
-	$logout = charger_fonction('logout', 'action');
-	$logout();
+    $logout = charger_fonction('logout', 'action');
+    $logout();
 }
 
 /**
@@ -612,8 +612,8 @@ 
  * @return bool
  */
 function auth_autoriser_modifier_login($auth_methode, $serveur = '') {
-	$args = func_get_args();
-	return auth_administrer('autoriser_modifier_login', $args);
+    $args = func_get_args();
+    return auth_administrer('autoriser_modifier_login', $args);
 }
 
 /**
@@ -628,8 +628,8 @@ 
  *  message d'erreur ou chaine vide si pas d'erreur
  */
 function auth_verifier_login($auth_methode, $new_login, $id_auteur = 0, $serveur = '') {
-	$args = func_get_args();
-	return auth_administrer('verifier_login', $args, '');
+    $args = func_get_args();
+    return auth_administrer('verifier_login', $args, '');
 }
 
 /**
@@ -642,8 +642,8 @@ 
  * @return bool
  */
 function auth_modifier_login($auth_methode, $new_login, $id_auteur, $serveur = '') {
-	$args = func_get_args();
-	return auth_administrer('modifier_login', $args);
+    $args = func_get_args();
+    return auth_administrer('modifier_login', $args);
 }
 
 /**
@@ -658,8 +658,8 @@ 
  *  succès ou échec
  */
 function auth_autoriser_modifier_pass($auth_methode, $serveur = '') {
-	$args = func_get_args();
-	return auth_administrer('autoriser_modifier_pass', $args);
+    $args = func_get_args();
+    return auth_administrer('autoriser_modifier_pass', $args);
 }
 
 /**
@@ -675,8 +675,8 @@ 
  *  message d'erreur ou chaine vide si pas d'erreur
  */
 function auth_verifier_pass($auth_methode, $login, $new_pass, $id_auteur = 0, $serveur = '') {
-	$args = func_get_args();
-	return auth_administrer('verifier_pass', $args, '');
+    $args = func_get_args();
+    return auth_administrer('verifier_pass', $args, '');
 }
 
 /**
@@ -692,8 +692,8 @@ 
  *  succes ou echec
  */
 function auth_modifier_pass($auth_methode, $login, $new_pass, $id_auteur, $serveur = '') {
-	$args = func_get_args();
-	return auth_administrer('modifier_pass', $args);
+    $args = func_get_args();
+    return auth_administrer('modifier_pass', $args);
 }
 
 /**
@@ -709,24 +709,24 @@ 
  * @return void
  */
 function auth_synchroniser_distant(
-	$auth_methode = true,
-	$id_auteur = 0,
-	$champs = [],
-	$options = [],
-	$serveur = ''
+    $auth_methode = true,
+    $id_auteur = 0,
+    $champs = [],
+    $options = [],
+    $serveur = ''
 ) {
-	$args = func_get_args();
-	if ($auth_methode === true or (isset($options['all']) and $options['all'] == true)) {
-		$options['all'] = true; // ajouter une option all=>true pour chaque auth
-		$args = [true, $id_auteur, $champs, $options, $serveur];
-		foreach ($GLOBALS['liste_des_authentifications'] as $methode) {
-			array_shift($args);
-			array_unshift($args, $methode);
-			auth_administrer('synchroniser_distant', $args);
-		}
-	} else {
-		auth_administrer('synchroniser_distant', $args);
-	}
+    $args = func_get_args();
+    if ($auth_methode === true or (isset($options['all']) and $options['all'] == true)) {
+        $options['all'] = true; // ajouter une option all=>true pour chaque auth
+        $args = [true, $id_auteur, $champs, $options, $serveur];
+        foreach ($GLOBALS['liste_des_authentifications'] as $methode) {
+            array_shift($args);
+            array_unshift($args, $methode);
+            auth_administrer('synchroniser_distant', $args);
+        }
+    } else {
+        auth_administrer('synchroniser_distant', $args);
+    }
 }
 
 
@@ -739,46 +739,46 @@ 
  * @return array|bool
  */
 function lire_php_auth($login, $pw, $serveur = '') {
-	if (
-		!$login
-		or !$login_base = auth_retrouver_login($login, $serveur)
-	) {
-		return false;
-	}
-
-	$row = sql_fetsel('*', 'spip_auteurs', 'login=' . sql_quote($login_base, $serveur, 'text'), '', '', '', '', $serveur);
-
-	if (!$row) {
-		if (
-			include_spip('inc/auth')
-			and auth_ldap_connect($serveur)
-			and $auth_ldap = charger_fonction('ldap', 'auth', true)
-		) {
-			return $auth_ldap($login_base, $pw, $serveur, true);
-		}
-
-		return false;
-	}
+    if (
+        !$login
+        or !$login_base = auth_retrouver_login($login, $serveur)
+    ) {
+        return false;
+    }
+
+    $row = sql_fetsel('*', 'spip_auteurs', 'login=' . sql_quote($login_base, $serveur, 'text'), '', '', '', '', $serveur);
+
+    if (!$row) {
+        if (
+            include_spip('inc/auth')
+            and auth_ldap_connect($serveur)
+            and $auth_ldap = charger_fonction('ldap', 'auth', true)
+        ) {
+            return $auth_ldap($login_base, $pw, $serveur, true);
+        }
+
+        return false;
+    }
 	
-	// si pas de source definie
-	// ou auth/xxx introuvable, utiliser 'spip' ou autre et avec le login passé par PHP_AUTH_USER
-	if (
-		!$auth_methode = $row['source']
-		or !$auth = charger_fonction($auth_methode, 'auth', true)
-	) {
-		$auth = charger_fonction('spip', 'auth', true);
-	}
-
-	$auteur = '';
-	if ($auth) {
-		$auteur = $auth($login, $pw, $serveur, true);
-	}
-	// verifier que ce n'est pas un message d'erreur
-	if (is_array($auteur) and count($auteur)) {
-		return $auteur;
-	}
-
-	return false;
+    // si pas de source definie
+    // ou auth/xxx introuvable, utiliser 'spip' ou autre et avec le login passé par PHP_AUTH_USER
+    if (
+        !$auth_methode = $row['source']
+        or !$auth = charger_fonction($auth_methode, 'auth', true)
+    ) {
+        $auth = charger_fonction('spip', 'auth', true);
+    }
+
+    $auteur = '';
+    if ($auth) {
+        $auteur = $auth($login, $pw, $serveur, true);
+    }
+    // verifier que ce n'est pas un message d'erreur
+    if (is_array($auteur) and count($auteur)) {
+        return $auteur;
+    }
+
+    return false;
 }
 
 /**
@@ -794,21 +794,21 @@ 
  * @param string $lien
  */
 function ask_php_auth($pb, $raison, $retour = '', $url = '', $re = '', $lien = '') {
-	@Header('WWW-Authenticate: Basic realm="espace prive"');
-	@Header('HTTP/1.0 401 Unauthorized');
-	$corps = '';
-	$public = generer_url_public();
-	$ecrire = generer_url_ecrire();
-	$retour = $retour ?: _T('icone_retour');
-	$corps .= "<p>$raison</p>[<a href='$public'>$retour</a>] ";
-	if ($url) {
-		$corps .= "[<a href='" . generer_url_action('cookie', "essai_auth_http=oui&$url") . "'>$re</a>]";
-	}
-
-	if ($lien) {
-		$corps .= " [<a href='$ecrire'>" . _T('login_espace_prive') . '</a>]';
-	}
-	include_spip('inc/minipres');
-	echo minipres($pb, $corps);
-	exit;
+    @Header('WWW-Authenticate: Basic realm="espace prive"');
+    @Header('HTTP/1.0 401 Unauthorized');
+    $corps = '';
+    $public = generer_url_public();
+    $ecrire = generer_url_ecrire();
+    $retour = $retour ?: _T('icone_retour');
+    $corps .= "<p>$raison</p>[<a href='$public'>$retour</a>] ";
+    if ($url) {
+        $corps .= "[<a href='" . generer_url_action('cookie', "essai_auth_http=oui&$url") . "'>$re</a>]";
+    }
+
+    if ($lien) {
+        $corps .= " [<a href='$ecrire'>" . _T('login_espace_prive') . '</a>]';
+    }
+    include_spip('inc/minipres');
+    echo minipres($pb, $corps);
+    exit;
 }

prive/formulaires/editer_liens.php

Indentation +438 added lines, -438 removed lines

@@ -16,7 +16,7 @@ 
  * @package SPIP\Core\Formulaires
  **/
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 
@@ -36,25 +36,25 @@ 
  *   ($table_source,$objet,$id_objet,$objet_lien)
  */
 function determine_source_lien_objet($a, $b, $c) {
-	$table_source = $objet_lien = $objet = $id_objet = null;
-	// auteurs, article, 23 :
-	// associer des auteurs à l'article 23, sur la table pivot spip_auteurs_liens
-	if (is_numeric($c) and !is_numeric($b)) {
-		$table_source = table_objet($a);
-		$objet_lien = objet_type($a);
-		$objet = objet_type($b);
-		$id_objet = $c;
-	}
-	// article, 23, auteurs
-	// associer des auteurs à l'article 23, sur la table pivot spip_articles_liens
-	if (is_numeric($b) and !is_numeric($c)) {
-		$table_source = table_objet($c);
-		$objet_lien = objet_type($a);
-		$objet = objet_type($a);
-		$id_objet = $b;
-	}
-
-	return [$table_source, $objet, $id_objet, $objet_lien];
+    $table_source = $objet_lien = $objet = $id_objet = null;
+    // auteurs, article, 23 :
+    // associer des auteurs à l'article 23, sur la table pivot spip_auteurs_liens
+    if (is_numeric($c) and !is_numeric($b)) {
+        $table_source = table_objet($a);
+        $objet_lien = objet_type($a);
+        $objet = objet_type($b);
+        $id_objet = $c;
+    }
+    // article, 23, auteurs
+    // associer des auteurs à l'article 23, sur la table pivot spip_articles_liens
+    if (is_numeric($b) and !is_numeric($c)) {
+        $table_source = table_objet($c);
+        $objet_lien = objet_type($a);
+        $objet = objet_type($a);
+        $id_objet = $b;
+    }
+
+    return [$table_source, $objet, $id_objet, $objet_lien];
 }
 
 /**
@@ -80,86 +80,86 @@ 
  */
 function formulaires_editer_liens_charger_dist($a, $b, $c, $options = []) {
 
-	// compat avec ancienne signature ou le 4eme argument est $editable
-	if (!is_array($options)) {
-		$options = ['editable' => $options];
-	} elseif (!isset($options['editable'])) {
-		$options['editable'] = true;
-	}
-
-	$editable = $options['editable'];
-
-	[$table_source, $objet, $id_objet, $objet_lien] = determine_source_lien_objet($a, $b, $c);
-	if (!$table_source or !$objet or !$objet_lien or !$id_objet) {
-		return false;
-	}
-
-	$objet_source = objet_type($table_source);
-	$table_sql_source = table_objet_sql($objet_source);
-
-	// verifier existence de la table xxx_liens
-	include_spip('action/editer_liens');
-	if (!objet_associable($objet_lien)) {
-		return false;
-	}
-
-	// L'éditabilité :) est définie par un test permanent (par exemple "associermots") ET le 4ème argument
-	include_spip('inc/autoriser');
-	$editable = ($editable and autoriser('associer' . $table_source, $objet, $id_objet)
-		and autoriser('modifier', $objet, $id_objet));
-
-	if (
-		!$editable and !count(objet_trouver_liens(
-			[$objet_lien => '*'],
-			[($objet_lien == $objet_source ? $objet : $objet_source) => $id_objet]
-		))
-	) {
-		return false;
-	}
-
-	// squelettes de vue et de d'association
-	// ils sont différents si des rôles sont définis.
-	$skel_vue = $table_source . '_lies';
-	$skel_ajout = $table_source . '_associer';
-
-	// description des roles
-	include_spip('inc/roles');
-	if ($roles = roles_presents($objet_source, $objet)) {
-		// on demande de nouveaux squelettes en conséquence
-		$skel_vue = $table_source . '_roles_lies';
-		$skel_ajout = $table_source . '_roles_associer';
-	}
-
-	$oups = '';
-	if ($editable) {
-		$oups = lien_gerer__oups('editer_liens', 'hash');
-	}
-	$valeurs = [
-		'id' => "$table_source-$objet-$id_objet-$objet_lien", // identifiant unique pour les id du form
-		'_vue_liee' => $skel_vue,
-		'_vue_ajout' => $skel_ajout,
-		'_objet_lien' => $objet_lien,
-		'id_lien_ajoute' => _request('id_lien_ajoute'),
-		'objet' => $objet,
-		'id_objet' => $id_objet,
-		'objet_source' => $objet_source,
-		'table_source' => $table_source,
-		'recherche' => '',
-		'visible' => 0,
-		'ajouter_lien' => '',
-		'supprimer_lien' => '',
-		'qualifier_lien' => '',
-		'ordonner_lien' => '',
-		'desordonner_liens' => '',
-		'_roles' => $roles, # description des roles
-		'_oups' => entites_html($oups),
-		'editable' => $editable,
-	];
-
-	// les options non definies dans $valeurs sont passees telles quelles au formulaire html
-	$valeurs = array_merge($options, $valeurs);
-
-	return $valeurs;
+    // compat avec ancienne signature ou le 4eme argument est $editable
+    if (!is_array($options)) {
+        $options = ['editable' => $options];
+    } elseif (!isset($options['editable'])) {
+        $options['editable'] = true;
+    }
+
+    $editable = $options['editable'];
+
+    [$table_source, $objet, $id_objet, $objet_lien] = determine_source_lien_objet($a, $b, $c);
+    if (!$table_source or !$objet or !$objet_lien or !$id_objet) {
+        return false;
+    }
+
+    $objet_source = objet_type($table_source);
+    $table_sql_source = table_objet_sql($objet_source);
+
+    // verifier existence de la table xxx_liens
+    include_spip('action/editer_liens');
+    if (!objet_associable($objet_lien)) {
+        return false;
+    }
+
+    // L'éditabilité :) est définie par un test permanent (par exemple "associermots") ET le 4ème argument
+    include_spip('inc/autoriser');
+    $editable = ($editable and autoriser('associer' . $table_source, $objet, $id_objet)
+        and autoriser('modifier', $objet, $id_objet));
+
+    if (
+        !$editable and !count(objet_trouver_liens(
+            [$objet_lien => '*'],
+            [($objet_lien == $objet_source ? $objet : $objet_source) => $id_objet]
+        ))
+    ) {
+        return false;
+    }
+
+    // squelettes de vue et de d'association
+    // ils sont différents si des rôles sont définis.
+    $skel_vue = $table_source . '_lies';
+    $skel_ajout = $table_source . '_associer';
+
+    // description des roles
+    include_spip('inc/roles');
+    if ($roles = roles_presents($objet_source, $objet)) {
+        // on demande de nouveaux squelettes en conséquence
+        $skel_vue = $table_source . '_roles_lies';
+        $skel_ajout = $table_source . '_roles_associer';
+    }
+
+    $oups = '';
+    if ($editable) {
+        $oups = lien_gerer__oups('editer_liens', 'hash');
+    }
+    $valeurs = [
+        'id' => "$table_source-$objet-$id_objet-$objet_lien", // identifiant unique pour les id du form
+        '_vue_liee' => $skel_vue,
+        '_vue_ajout' => $skel_ajout,
+        '_objet_lien' => $objet_lien,
+        'id_lien_ajoute' => _request('id_lien_ajoute'),
+        'objet' => $objet,
+        'id_objet' => $id_objet,
+        'objet_source' => $objet_source,
+        'table_source' => $table_source,
+        'recherche' => '',
+        'visible' => 0,
+        'ajouter_lien' => '',
+        'supprimer_lien' => '',
+        'qualifier_lien' => '',
+        'ordonner_lien' => '',
+        'desordonner_liens' => '',
+        '_roles' => $roles, # description des roles
+        '_oups' => entites_html($oups),
+        'editable' => $editable,
+    ];
+
+    // les options non definies dans $valeurs sont passees telles quelles au formulaire html
+    $valeurs = array_merge($options, $valeurs);
+
+    return $valeurs;
 }
 
 /**
@@ -203,170 +203,170 @@ 
  * @return array
  */
 function formulaires_editer_liens_traiter_dist($a, $b, $c, $options = []) {
-	// compat avec ancienne signature ou le 4eme argument est $editable
-	if (!is_array($options)) {
-		$options = ['editable' => $options];
-	} elseif (!isset($options['editable'])) {
-		$options['editable'] = true;
-	}
-
-	$editable = $options['editable'];
-
-	$res = ['editable' => $editable ? true : false];
-	[$table_source, $objet, $id_objet, $objet_lien] = determine_source_lien_objet($a, $b, $c);
-	if (!$table_source or !$objet or !$objet_lien) {
-		return $res;
-	}
-
-
-	if (_request('tout_voir')) {
-		set_request('recherche', '');
-	}
-
-	include_spip('inc/autoriser');
-	if (autoriser('modifier', $objet, $id_objet)) {
-		// recuperer le oups du coup d'avant pour le propager à charger() si on ne fait rien par exemple
-		lien_gerer__oups('editer_liens','request');
-
-		// annuler les suppressions du coup d'avant ?
-		if (
-			_request('annuler_oups')
-			and $oups = lien_gerer__oups('editer_liens','get')
-		) {
-			if ($oups_objets = charger_fonction("editer_liens_oups_{$table_source}_{$objet}_{$objet_lien}", 'action', true)) {
-				$oups_objets($oups);
-			} else {
-				$objet_source = objet_type($table_source);
-				include_spip('action/editer_liens');
-				foreach ($oups as $oup) {
-					if ($objet_lien == $objet_source) {
-						objet_associer([$objet_source => $oup[$objet_source]], [$objet => $oup[$objet]], $oup);
-					} else {
-						objet_associer([$objet => $oup[$objet]], [$objet_source => $oup[$objet_source]], $oup);
-					}
-				}
-			}
-			# oups ne persiste que pour la derniere action, si suppression
-			lien_gerer__oups('editer_liens','reset');
-		}
-
-		$supprimer = _request('supprimer_lien');
-		$ajouter = _request('ajouter_lien');
-		$ordonner = _request('ordonner_lien');
-
-		if (_request('desordonner_liens')) {
-			include_spip('action/editer_liens');
-			objet_qualifier_liens([$objet_lien => '*'], [$objet => $id_objet], ['rang_lien' => 0]);
-		}
-
-		// il est possible de preciser dans une seule variable un remplacement :
-		// remplacer_lien[old][new]
-		if ($remplacer = _request('remplacer_lien')) {
-			foreach ($remplacer as $k => $v) {
-				if ($old = lien_verifier_action($k, '')) {
-					foreach (is_array($v) ? $v : [$v] as $kn => $vn) {
-						if ($new = lien_verifier_action($kn, $vn)) {
-							$supprimer[$old] = 'x';
-							$ajouter[$new] = '+';
-						}
-					}
-				}
-			}
-		}
-
-		if ($supprimer) {
-			if (
-				$supprimer_objets = charger_fonction(
-					"editer_liens_supprimer_{$table_source}_{$objet}_{$objet_lien}",
-					'action',
-					true
-				)
-			) {
-				$oups = $supprimer_objets($supprimer);
-			} else {
-				include_spip('action/editer_liens');
-				$oups = [];
-
-				foreach ($supprimer as $k => $v) {
-					if ($lien = lien_verifier_action($k, $v)) {
-						$lien = explode('-', $lien);
-						[$objet_source, $ids, $objet_lie, $idl, $role] = array_pad($lien, 5, null);
-						// appliquer une condition sur le rôle si défini ('*' pour tous les roles)
-						$cond = (!is_null($role) ? ['role' => $role] : []);
-						if ($objet_lien == $objet_source) {
-							$oups = array_merge(
-								$oups,
-								objet_trouver_liens([$objet_source => $ids], [$objet_lie => $idl], $cond)
-							);
-							objet_dissocier([$objet_source => $ids], [$objet_lie => $idl], $cond);
-						} else {
-							$oups = array_merge(
-								$oups,
-								objet_trouver_liens([$objet_lie => $idl], [$objet_source => $ids], $cond)
-							);
-							objet_dissocier([$objet_lie => $idl], [$objet_source => $ids], $cond);
-						}
-					}
-				}
-			}
-			if (!empty($oups)) {
-				lien_gerer__oups('editer_liens','set', $oups);
-			} else {
-				lien_gerer__oups('editer_liens','reset');
-			}
-		}
-
-		if ($ajouter) {
-			if (
-				$ajouter_objets = charger_fonction("editer_liens_ajouter_{$table_source}_{$objet}_{$objet_lien}", 'action', true)
-			) {
-				$ajout_ok = $ajouter_objets($ajouter);
-			} else {
-				$ajout_ok = false;
-				include_spip('action/editer_liens');
-				foreach ($ajouter as $k => $v) {
-					if ($lien = lien_verifier_action($k, $v)) {
-						$ajout_ok = true;
-						[$objet1, $ids, $objet2, $idl] = explode('-', $lien);
-						$qualifs = lien_retrouver_qualif($objet_lien, $lien);
-						if ($objet_lien == $objet1) {
-							lien_ajouter_liaisons($objet1, $ids, $objet2, $idl, $qualifs);
-						} else {
-							lien_ajouter_liaisons($objet2, $idl, $objet1, $ids, $qualifs);
-						}
-						set_request('id_lien_ajoute', $ids);
-					}
-				}
-			}
-			# oups ne persiste que pour la derniere action, si suppression
-			# une suppression suivie d'un ajout dans le meme hit est un remplacement
-			# non annulable !
-			if ($ajout_ok) {
-				lien_gerer__oups('editer_liens','reset');
-			}
-		}
-
-		if ($ordonner) {
-			include_spip('action/editer_liens');
-			foreach ($ordonner as $k => $rang_lien) {
-				if ($lien = lien_verifier_action($k, '')) {
-					[$objet1, $ids, $objet2, $idl] = explode('-', $lien);
-					$qualif = ['rang_lien' => $rang_lien];
-
-					if ($objet_lien == $objet1) {
-						objet_qualifier_liens([$objet1 => $ids], [$objet2 => $idl], $qualif);
-					} else {
-						objet_qualifier_liens([$objet2 => $idl], [$objet1 => $ids], $qualif);
-					}
-					set_request('id_lien_ajoute', $ids);
-					lien_gerer__oups('editer_liens','reset');
-				}
-			}
-		}
-	}
-
-
-	return $res;
+    // compat avec ancienne signature ou le 4eme argument est $editable
+    if (!is_array($options)) {
+        $options = ['editable' => $options];
+    } elseif (!isset($options['editable'])) {
+        $options['editable'] = true;
+    }
+
+    $editable = $options['editable'];
+
+    $res = ['editable' => $editable ? true : false];
+    [$table_source, $objet, $id_objet, $objet_lien] = determine_source_lien_objet($a, $b, $c);
+    if (!$table_source or !$objet or !$objet_lien) {
+        return $res;
+    }
+
+
+    if (_request('tout_voir')) {
+        set_request('recherche', '');
+    }
+
+    include_spip('inc/autoriser');
+    if (autoriser('modifier', $objet, $id_objet)) {
+        // recuperer le oups du coup d'avant pour le propager à charger() si on ne fait rien par exemple
+        lien_gerer__oups('editer_liens','request');
+
+        // annuler les suppressions du coup d'avant ?
+        if (
+            _request('annuler_oups')
+            and $oups = lien_gerer__oups('editer_liens','get')
+        ) {
+            if ($oups_objets = charger_fonction("editer_liens_oups_{$table_source}_{$objet}_{$objet_lien}", 'action', true)) {
+                $oups_objets($oups);
+            } else {
+                $objet_source = objet_type($table_source);
+                include_spip('action/editer_liens');
+                foreach ($oups as $oup) {
+                    if ($objet_lien == $objet_source) {
+                        objet_associer([$objet_source => $oup[$objet_source]], [$objet => $oup[$objet]], $oup);
+                    } else {
+                        objet_associer([$objet => $oup[$objet]], [$objet_source => $oup[$objet_source]], $oup);
+                    }
+                }
+            }
+            # oups ne persiste que pour la derniere action, si suppression
+            lien_gerer__oups('editer_liens','reset');
+        }
+
+        $supprimer = _request('supprimer_lien');
+        $ajouter = _request('ajouter_lien');
+        $ordonner = _request('ordonner_lien');
+
+        if (_request('desordonner_liens')) {
+            include_spip('action/editer_liens');
+            objet_qualifier_liens([$objet_lien => '*'], [$objet => $id_objet], ['rang_lien' => 0]);
+        }
+
+        // il est possible de preciser dans une seule variable un remplacement :
+        // remplacer_lien[old][new]
+        if ($remplacer = _request('remplacer_lien')) {
+            foreach ($remplacer as $k => $v) {
+                if ($old = lien_verifier_action($k, '')) {
+                    foreach (is_array($v) ? $v : [$v] as $kn => $vn) {
+                        if ($new = lien_verifier_action($kn, $vn)) {
+                            $supprimer[$old] = 'x';
+                            $ajouter[$new] = '+';
+                        }
+                    }
+                }
+            }
+        }
+
+        if ($supprimer) {
+            if (
+                $supprimer_objets = charger_fonction(
+                    "editer_liens_supprimer_{$table_source}_{$objet}_{$objet_lien}",
+                    'action',
+                    true
+                )
+            ) {
+                $oups = $supprimer_objets($supprimer);
+            } else {
+                include_spip('action/editer_liens');
+                $oups = [];
+
+                foreach ($supprimer as $k => $v) {
+                    if ($lien = lien_verifier_action($k, $v)) {
+                        $lien = explode('-', $lien);
+                        [$objet_source, $ids, $objet_lie, $idl, $role] = array_pad($lien, 5, null);
+                        // appliquer une condition sur le rôle si défini ('*' pour tous les roles)
+                        $cond = (!is_null($role) ? ['role' => $role] : []);
+                        if ($objet_lien == $objet_source) {
+                            $oups = array_merge(
+                                $oups,
+                                objet_trouver_liens([$objet_source => $ids], [$objet_lie => $idl], $cond)
+                            );
+                            objet_dissocier([$objet_source => $ids], [$objet_lie => $idl], $cond);
+                        } else {
+                            $oups = array_merge(
+                                $oups,
+                                objet_trouver_liens([$objet_lie => $idl], [$objet_source => $ids], $cond)
+                            );
+                            objet_dissocier([$objet_lie => $idl], [$objet_source => $ids], $cond);
+                        }
+                    }
+                }
+            }
+            if (!empty($oups)) {
+                lien_gerer__oups('editer_liens','set', $oups);
+            } else {
+                lien_gerer__oups('editer_liens','reset');
+            }
+        }
+
+        if ($ajouter) {
+            if (
+                $ajouter_objets = charger_fonction("editer_liens_ajouter_{$table_source}_{$objet}_{$objet_lien}", 'action', true)
+            ) {
+                $ajout_ok = $ajouter_objets($ajouter);
+            } else {
+                $ajout_ok = false;
+                include_spip('action/editer_liens');
+                foreach ($ajouter as $k => $v) {
+                    if ($lien = lien_verifier_action($k, $v)) {
+                        $ajout_ok = true;
+                        [$objet1, $ids, $objet2, $idl] = explode('-', $lien);
+                        $qualifs = lien_retrouver_qualif($objet_lien, $lien);
+                        if ($objet_lien == $objet1) {
+                            lien_ajouter_liaisons($objet1, $ids, $objet2, $idl, $qualifs);
+                        } else {
+                            lien_ajouter_liaisons($objet2, $idl, $objet1, $ids, $qualifs);
+                        }
+                        set_request('id_lien_ajoute', $ids);
+                    }
+                }
+            }
+            # oups ne persiste que pour la derniere action, si suppression
+            # une suppression suivie d'un ajout dans le meme hit est un remplacement
+            # non annulable !
+            if ($ajout_ok) {
+                lien_gerer__oups('editer_liens','reset');
+            }
+        }
+
+        if ($ordonner) {
+            include_spip('action/editer_liens');
+            foreach ($ordonner as $k => $rang_lien) {
+                if ($lien = lien_verifier_action($k, '')) {
+                    [$objet1, $ids, $objet2, $idl] = explode('-', $lien);
+                    $qualif = ['rang_lien' => $rang_lien];
+
+                    if ($objet_lien == $objet1) {
+                        objet_qualifier_liens([$objet1 => $ids], [$objet2 => $idl], $qualif);
+                    } else {
+                        objet_qualifier_liens([$objet2 => $idl], [$objet1 => $ids], $qualif);
+                    }
+                    set_request('id_lien_ajoute', $ids);
+                    lien_gerer__oups('editer_liens','reset');
+                }
+            }
+        }
+    }
+
+
+    return $res;
 }
 
 
@@ -389,24 +389,24 @@ 
  * @return string Action demandée si trouvée, sinon ''
  */
 function lien_verifier_action($k, $v) {
-	$action = '';
-	if (preg_match(',^\w+-[\w*]+-[\w*]+-[\w*]+(-[\w*])?,', $k)) {
-		$action = $k;
-	}
-	if (preg_match(',^\w+-[\w*]+-[\w*]+-[\w*]+(-[\w*])?,', $v)) {
-		if (is_numeric($k)) {
-			$action = $v;
-		}
-		if (_request($k)) {
-			$action = $v;
-		}
-	}
-	// ajout un role null fictif (plus pratique) si pas défini
-	if ($action and count(explode('-', $action)) == 4) {
-		$action .= '-';
-	}
-
-	return $action;
+    $action = '';
+    if (preg_match(',^\w+-[\w*]+-[\w*]+-[\w*]+(-[\w*])?,', $k)) {
+        $action = $k;
+    }
+    if (preg_match(',^\w+-[\w*]+-[\w*]+-[\w*]+(-[\w*])?,', $v)) {
+        if (is_numeric($k)) {
+            $action = $v;
+        }
+        if (_request($k)) {
+            $action = $v;
+        }
+    }
+    // ajout un role null fictif (plus pratique) si pas défini
+    if ($action and count(explode('-', $action)) == 4) {
+        $action .= '-';
+    }
+
+    return $action;
 }
 
 
@@ -422,66 +422,66 @@ 
  *   Liste des qualifs pour chaque lien. Tableau vide s'il n'y en a pas.
  **/
 function lien_retrouver_qualif($objet_lien, $lien) {
-	// un role est défini dans la liaison
-	$defs = explode('-', $lien);
-	[$objet1, , $objet2, , $role] = array_pad($defs, 5, null);
-	if ($objet_lien == $objet1) {
-		$colonne_role = roles_colonne($objet1, $objet2);
-	} else {
-		$colonne_role = roles_colonne($objet2, $objet1);
-	}
-
-	// cas ou le role est defini en 5e argument de l'action sur le lien (suppression, ajout rapide sans autre attribut)
-	if ($role) {
-		return [
-			// un seul lien avec ce role
-			[$colonne_role => $role]
-		];
-	}
-
-	// retrouver les rôles postés pour cette liaison, s'il y en a.
-	$qualifier_lien = _request('qualifier_lien');
-	if (!$qualifier_lien or !is_array($qualifier_lien)) {
-		return [];
-	}
-
-	// pas avec l'action complete (incluant le role)
-	$qualif = [];
-	if (
-		(!isset($qualifier_lien[$lien]) or !$qualif = $qualifier_lien[$lien])
-		and count($defs) == 5
-	) {
-		// on tente avec l'action sans le role
-		array_pop($defs);
-		$lien = implode('-', $defs);
-		if (!isset($qualifier_lien[$lien]) or !$qualif = $qualifier_lien[$lien]) {
-			$qualif = [];
-		}
-	}
-
-	// $qualif de la forme array(role=>array(...),valeur=>array(...),....)
-	// on le reforme en array(array(role=>..,valeur=>..,..),array(role=>..,valeur=>..,..),...)
-	$qualifs = [];
-	while (is_countable($qualif) ? count($qualif) : 0) {
-		$q = [];
-		foreach ($qualif as $att => $values) {
-			if (is_array($values)) {
-				$q[$att] = array_shift($qualif[$att]);
-				if (!(is_countable($qualif[$att]) ? count($qualif[$att]) : 0)) {
-					unset($qualif[$att]);
-				}
-			} else {
-				$q[$att] = $values;
-				unset($qualif[$att]);
-			}
-		}
-		// pas de rôle vide
-		if (!$colonne_role or !isset($q[$colonne_role]) or $q[$colonne_role]) {
-			$qualifs[] = $q;
-		}
-	}
-
-	return $qualifs;
+    // un role est défini dans la liaison
+    $defs = explode('-', $lien);
+    [$objet1, , $objet2, , $role] = array_pad($defs, 5, null);
+    if ($objet_lien == $objet1) {
+        $colonne_role = roles_colonne($objet1, $objet2);
+    } else {
+        $colonne_role = roles_colonne($objet2, $objet1);
+    }
+
+    // cas ou le role est defini en 5e argument de l'action sur le lien (suppression, ajout rapide sans autre attribut)
+    if ($role) {
+        return [
+            // un seul lien avec ce role
+            [$colonne_role => $role]
+        ];
+    }
+
+    // retrouver les rôles postés pour cette liaison, s'il y en a.
+    $qualifier_lien = _request('qualifier_lien');
+    if (!$qualifier_lien or !is_array($qualifier_lien)) {
+        return [];
+    }
+
+    // pas avec l'action complete (incluant le role)
+    $qualif = [];
+    if (
+        (!isset($qualifier_lien[$lien]) or !$qualif = $qualifier_lien[$lien])
+        and count($defs) == 5
+    ) {
+        // on tente avec l'action sans le role
+        array_pop($defs);
+        $lien = implode('-', $defs);
+        if (!isset($qualifier_lien[$lien]) or !$qualif = $qualifier_lien[$lien]) {
+            $qualif = [];
+        }
+    }
+
+    // $qualif de la forme array(role=>array(...),valeur=>array(...),....)
+    // on le reforme en array(array(role=>..,valeur=>..,..),array(role=>..,valeur=>..,..),...)
+    $qualifs = [];
+    while (is_countable($qualif) ? count($qualif) : 0) {
+        $q = [];
+        foreach ($qualif as $att => $values) {
+            if (is_array($values)) {
+                $q[$att] = array_shift($qualif[$att]);
+                if (!(is_countable($qualif[$att]) ? count($qualif[$att]) : 0)) {
+                    unset($qualif[$att]);
+                }
+            } else {
+                $q[$att] = $values;
+                unset($qualif[$att]);
+            }
+        }
+        // pas de rôle vide
+        if (!$colonne_role or !isset($q[$colonne_role]) or $q[$colonne_role]) {
+            $qualifs[] = $q;
+        }
+    }
+
+    return $qualifs;
 }
 
 /**
@@ -500,14 +500,14 @@ 
  **/
 function lien_ajouter_liaisons($objet_source, $ids, $objet_lien, $idl, $qualifs) {
 
-	// retrouver la colonne de roles s'il y en a a lier
-	if (is_array($qualifs) and count($qualifs)) {
-		foreach ($qualifs as $qualif) {
-			objet_associer([$objet_source => $ids], [$objet_lien => $idl], $qualif);
-		}
-	} else {
-		objet_associer([$objet_source => $ids], [$objet_lien => $idl]);
-	}
+    // retrouver la colonne de roles s'il y en a a lier
+    if (is_array($qualifs) and count($qualifs)) {
+        foreach ($qualifs as $qualif) {
+            objet_associer([$objet_source => $ids], [$objet_lien => $idl], $qualif);
+        }
+    } else {
+        objet_associer([$objet_source => $ids], [$objet_lien => $idl]);
+    }
 }
 
 
@@ -519,79 +519,79 @@ 
  * @return array|string|null
  */
 function lien_gerer__oups(string $form, string $action, ?array $valeur = null) {
-	static $_oups_value;
-
-	switch ($action) {
-		case 'reset':
-			$res = (empty($_oups_value) ? false : true);
-			$_oups_value = null;
-			return $res;
-
-		case 'get':
-			return $_oups_value ?: null;
-
-		case 'set':
-			$_oups_value = $valeur;
-			return true;
-
-		case 'request':
-			$_oups_value = null;
-			if ($oups = _request('_oups')) {
-				include_spip('inc/filtres');
-				// on accepte uniquement une valeur signée
-				if ($oups = decoder_contexte_ajax($oups, $form)) {
-					if (!is_array($oups)
-						or empty($oups['id_auteur'])
-						or $oups['id_auteur'] !== $GLOBALS['visiteur_session']['id_auteur']
-						or empty($oups['time'])
-						or $oups['time'] < $_SERVER['REQUEST_TIME'] - 86400
-						or empty($oups['args'])
-						or $oups['args'] !== lien_gerer__oups_collecter_args($form, debug_backtrace(null, 5))
-						or empty($oups['oups_value'])) {
-						$oups = null;
-					}
-					else {
-						$oups = $oups['oups_value'];
-						// controler le contenu
-						foreach ($oups as $k => $oup) {
-							if (!is_array($oup)) {
-								unset($oups[$k]);
-							}
-							else {
-								foreach ($oup as $champ => $valeur) {
-									if (!is_scalar($champ)
-										or !is_scalar($valeur)
-										or preg_match(',\W,', $champ)
-									) {
-										unset($oups[$k][$champ]);
-									}
-								}
-								if (empty($oups[$k])) {
-									unset($oups[$k]);
-								}
-							}
-						}
-					}
-					$_oups_value = $oups;
-					return $_oups_value;
-				}
-			}
-			break;
-
-		case 'hash':
-			if (!$_oups_value) {
-				return '';
-			}
-
-			include_spip('inc/filtres');
-			$oups = [
-				'id_auteur' => $GLOBALS['visiteur_session']['id_auteur'] ?? 0,
-				'time' => strtotime(date('Y-m-d H:00:00')),
-				'args' => lien_gerer__oups_collecter_args($form, debug_backtrace(null, 5)),
-				'oups_value' => $_oups_value,
-			];
-			return encoder_contexte_ajax($oups, $form);
-	}
+    static $_oups_value;
+
+    switch ($action) {
+        case 'reset':
+            $res = (empty($_oups_value) ? false : true);
+            $_oups_value = null;
+            return $res;
+
+        case 'get':
+            return $_oups_value ?: null;
+
+        case 'set':
+            $_oups_value = $valeur;
+            return true;
+
+        case 'request':
+            $_oups_value = null;
+            if ($oups = _request('_oups')) {
+                include_spip('inc/filtres');
+                // on accepte uniquement une valeur signée
+                if ($oups = decoder_contexte_ajax($oups, $form)) {
+                    if (!is_array($oups)
+                        or empty($oups['id_auteur'])
+                        or $oups['id_auteur'] !== $GLOBALS['visiteur_session']['id_auteur']
+                        or empty($oups['time'])
+                        or $oups['time'] < $_SERVER['REQUEST_TIME'] - 86400
+                        or empty($oups['args'])
+                        or $oups['args'] !== lien_gerer__oups_collecter_args($form, debug_backtrace(null, 5))
+                        or empty($oups['oups_value'])) {
+                        $oups = null;
+                    }
+                    else {
+                        $oups = $oups['oups_value'];
+                        // controler le contenu
+                        foreach ($oups as $k => $oup) {
+                            if (!is_array($oup)) {
+                                unset($oups[$k]);
+                            }
+                            else {
+                                foreach ($oup as $champ => $valeur) {
+                                    if (!is_scalar($champ)
+                                        or !is_scalar($valeur)
+                                        or preg_match(',\W,', $champ)
+                                    ) {
+                                        unset($oups[$k][$champ]);
+                                    }
+                                }
+                                if (empty($oups[$k])) {
+                                    unset($oups[$k]);
+                                }
+                            }
+                        }
+                    }
+                    $_oups_value = $oups;
+                    return $_oups_value;
+                }
+            }
+            break;
+
+        case 'hash':
+            if (!$_oups_value) {
+                return '';
+            }
+
+            include_spip('inc/filtres');
+            $oups = [
+                'id_auteur' => $GLOBALS['visiteur_session']['id_auteur'] ?? 0,
+                'time' => strtotime(date('Y-m-d H:00:00')),
+                'args' => lien_gerer__oups_collecter_args($form, debug_backtrace(null, 5)),
+                'oups_value' => $_oups_value,
+            ];
+            return encoder_contexte_ajax($oups, $form);
+    }
 }
 
 /**
@@ -600,19 +600,19 @@ 
  * @return false|float|int|mixed|Services_JSON_Error|string
  */
 function lien_gerer__oups_collecter_args($form, $trace) {
-	$args = '';
-	if (!empty($trace)) {
-		do {
-			$t = array_shift($trace);
-			$function = $t['function'] ?? '';
-			if (strpos($function, 'formulaires_'. $form) === 0) {
-				if (isset($t['args'])) {
-					$args = json_encode($t['args']);
-				}
-				break;
-			}
-		}
-		while (count($trace));
-	}
-	return $args;
+    $args = '';
+    if (!empty($trace)) {
+        do {
+            $t = array_shift($trace);
+            $function = $t['function'] ?? '';
+            if (strpos($function, 'formulaires_'. $form) === 0) {
+                if (isset($t['args'])) {
+                    $args = json_encode($t['args']);
+                }
+                break;
+            }
+        }
+        while (count($trace));
+    }
+    return $args;
 }

ecrire/maj/2021.php

Indentation +17 added lines, -17 removed lines

@@ -19,21 +19,21 @@ 
  * @package SPIP\Core\SQL\Upgrade
  **/
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 $GLOBALS['maj'][2021_02_18_00] = [
-	['sql_alter', "TABLE spip_auteurs CHANGE imessage imessage VARCHAR(3) DEFAULT '' NOT NULL" ],
-	['sql_updateq', 'spip_auteurs', ['imessage' => 'oui'], "imessage != 'non' OR imessage IS NULL" ],
+    ['sql_alter', "TABLE spip_auteurs CHANGE imessage imessage VARCHAR(3) DEFAULT '' NOT NULL" ],
+    ['sql_updateq', 'spip_auteurs', ['imessage' => 'oui'], "imessage != 'non' OR imessage IS NULL" ],
 ];
 
 $GLOBALS['maj'][2022_02_23_02] = [
-	['sql_alter', "TABLE spip_auteurs ADD backup_cles mediumtext DEFAULT '' NOT NULL" ],
-	['sql_delete', 'spip_meta', "nom='secret_du_site'" ],
+    ['sql_alter', "TABLE spip_auteurs ADD backup_cles mediumtext DEFAULT '' NOT NULL" ],
+    ['sql_delete', 'spip_meta', "nom='secret_du_site'" ],
 ];
 
 $GLOBALS['maj'][2022_02_23_03] = [
-	['maj2021_supprimer_toutes_sessions_si_aucun_backup_cles'],
+    ['maj2021_supprimer_toutes_sessions_si_aucun_backup_cles'],
 ];
 
 /**
@@ -44,15 +44,15 @@ 
  * - les autres auteurs vont tous regénérer un mot de passe plus sécure au premier login
  **/
 function maj2021_supprimer_toutes_sessions_si_aucun_backup_cles() {
-	if (!sql_countsel('spip_auteurs', "webmestre='oui' AND backup_cles!=''")) {
-		spip_log('supprimer sessions auteur', 'maj');
-		if ($dir = opendir(_DIR_SESSIONS)) {
-			while (($f = readdir($dir)) !== false) {
-				spip_unlink(_DIR_SESSIONS . $f);
-				if (time() >= _TIME_OUT) {
-					return;
-				}
-			}
-		}
-	}
+    if (!sql_countsel('spip_auteurs', "webmestre='oui' AND backup_cles!=''")) {
+        spip_log('supprimer sessions auteur', 'maj');
+        if ($dir = opendir(_DIR_SESSIONS)) {
+            while (($f = readdir($dir)) !== false) {
+                spip_unlink(_DIR_SESSIONS . $f);
+                if (time() >= _TIME_OUT) {
+                    return;
+                }
+            }
+        }
+    }
 }

ecrire/action/api_transmettre.php

Indentation +80 added lines, -80 removed lines

@@ -17,92 +17,92 @@
  **/
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 
 function action_api_transmettre_dist($arg = null) {
 
-	// Obtenir l'argument 'id_auteur/cle/format/fond'
-	if (is_null($arg)) {
-		$arg = _request('arg');
-	}
-
-	$args = explode('/', $arg);
-
-	if (count($args) !== 4) {
-		action_api_transmettre_fail($arg);
-	}
-
-	[$id_auteur, $cle, $format, $fond] = $args;
-	$id_auteur = intval($id_auteur);
-
-	if (preg_match(',[^\w\\.-],', $format)) {
-		action_api_transmettre_fail("format $format ??");
-	}
-	if (preg_match(',[^\w\\.-],', $fond)) {
-		action_api_transmettre_fail("fond $fond ??");
-	}
-
-	// verifier la cle
-	//[(#ENV{id,0}|securiser_acces{#ENV{cle}, voirstats, #ENV{op}, #ENV{args}}|?{1,0})]
-	//[(#ENV{id,0}|securiser_acces{#ENV{cle}, voirstats, #ENV{op}, #ENV{args}}|?{1,0})]
-
-	$qs = $_SERVER['QUERY_STRING'];
-	// retirer action et arg de la qs
-	$contexte = [];
-	parse_str($qs, $contexte);
-	foreach ($contexte as $k => $v) {
-		if (in_array($k, ['action', 'arg', 'var_mode'])) {
-			unset($contexte[$k]);
-		}
-	}
-	$qs = http_build_query($contexte);
-	include_spip('inc/acces');
-	if (!securiser_acces_low_sec(intval($id_auteur), $cle, "transmettre/$format", $fond, $qs)) {
-		// si le autoriser low_sec n'est pas bon, on peut valider l'appel si l'auteur est identifie
-		include_spip('inc/autoriser');
-		$autoriser_type = preg_replace(',\W+,', '', "_{$format}{$fond}");
-		if (
-			!$id_auteur
-			or empty($GLOBALS['visiteur_session']['id_auteur'])
-			or $GLOBALS['visiteur_session']['id_auteur'] != $id_auteur
-			or !autoriser('transmettre', $autoriser_type, $id_auteur)
-		) {
-			action_api_transmettre_fail("auth QS $qs ??");
-		}
-	}
-
-	$contexte['id_auteur'] = $id_auteur;
-
-	$fond = "transmettre/$format/$fond";
-
-	if (!trouver_fond($fond)) {
-		$fond = "prive/$fond";
-	}
-
-	if (!trouver_fond($fond)) {
-		action_api_transmettre_fail("fond $fond ??");
-	}
-
-	$res = recuperer_fond($fond, $contexte, ['raw' => true]);
-	if (!empty($res['entetes'])) {
-		foreach ($res['entetes'] as $h => $v) {
-			header("$h: $v");
-		}
-	}
-
-	$res = ltrim($res['texte']);
-	if (empty($res)) {
-		spip_log("$arg $qs resultat vide", 'transmettre' . _LOG_INFO_IMPORTANTE);
-	}
-
-	echo $res;
-	exit();
+    // Obtenir l'argument 'id_auteur/cle/format/fond'
+    if (is_null($arg)) {
+        $arg = _request('arg');
+    }
+
+    $args = explode('/', $arg);
+
+    if (count($args) !== 4) {
+        action_api_transmettre_fail($arg);
+    }
+
+    [$id_auteur, $cle, $format, $fond] = $args;
+    $id_auteur = intval($id_auteur);
+
+    if (preg_match(',[^\w\\.-],', $format)) {
+        action_api_transmettre_fail("format $format ??");
+    }
+    if (preg_match(',[^\w\\.-],', $fond)) {
+        action_api_transmettre_fail("fond $fond ??");
+    }
+
+    // verifier la cle
+    //[(#ENV{id,0}|securiser_acces{#ENV{cle}, voirstats, #ENV{op}, #ENV{args}}|?{1,0})]
+    //[(#ENV{id,0}|securiser_acces{#ENV{cle}, voirstats, #ENV{op}, #ENV{args}}|?{1,0})]
+
+    $qs = $_SERVER['QUERY_STRING'];
+    // retirer action et arg de la qs
+    $contexte = [];
+    parse_str($qs, $contexte);
+    foreach ($contexte as $k => $v) {
+        if (in_array($k, ['action', 'arg', 'var_mode'])) {
+            unset($contexte[$k]);
+        }
+    }
+    $qs = http_build_query($contexte);
+    include_spip('inc/acces');
+    if (!securiser_acces_low_sec(intval($id_auteur), $cle, "transmettre/$format", $fond, $qs)) {
+        // si le autoriser low_sec n'est pas bon, on peut valider l'appel si l'auteur est identifie
+        include_spip('inc/autoriser');
+        $autoriser_type = preg_replace(',\W+,', '', "_{$format}{$fond}");
+        if (
+            !$id_auteur
+            or empty($GLOBALS['visiteur_session']['id_auteur'])
+            or $GLOBALS['visiteur_session']['id_auteur'] != $id_auteur
+            or !autoriser('transmettre', $autoriser_type, $id_auteur)
+        ) {
+            action_api_transmettre_fail("auth QS $qs ??");
+        }
+    }
+
+    $contexte['id_auteur'] = $id_auteur;
+
+    $fond = "transmettre/$format/$fond";
+
+    if (!trouver_fond($fond)) {
+        $fond = "prive/$fond";
+    }
+
+    if (!trouver_fond($fond)) {
+        action_api_transmettre_fail("fond $fond ??");
+    }
+
+    $res = recuperer_fond($fond, $contexte, ['raw' => true]);
+    if (!empty($res['entetes'])) {
+        foreach ($res['entetes'] as $h => $v) {
+            header("$h: $v");
+        }
+    }
+
+    $res = ltrim($res['texte']);
+    if (empty($res)) {
+        spip_log("$arg $qs resultat vide", 'transmettre' . _LOG_INFO_IMPORTANTE);
+    }
+
+    echo $res;
+    exit();
 }
 
 function action_api_transmettre_fail($arg) {
-	include_spip('inc/minipres');
-	echo minipres(_T('info_acces_interdit'), $arg);
-	exit;
+    include_spip('inc/minipres');
+    echo minipres(_T('info_acces_interdit'), $arg);
+    exit;
 }

ecrire/src/Texte/Collecteur/AbstractCollecteur.php

Indentation +149 added lines, -149 removed lines

@@ -14,154 +14,154 @@
 
 abstract class AbstractCollecteur {
 
-	protected static string $markPrefix = 'COLLECT';
-	protected string $markId;
-
-	/**
-	 * Collecteur générique des occurences d'une preg dans un texte avec leurs positions et longueur
-	 * @param string $texte
-	 *   texte à analyser pour la collecte
-	 * @param string $if_chars
-	 *   caractere(s) à tester avant de tenter la preg
-	 * @param string $start_with
-	 *   caractere(s) par lesquels commencent l'expression recherchée (permet de démarrer la preg à la prochaine occurence de cette chaine)
-	 * @param string $preg
-	 *   preg utilisée pour la collecte
-	 * @param int $max_items
-	 *   pour limiter le nombre de preg collectée (pour la detection simple de présence par exemple)
-	 * @return array
-	 */
-	protected static function collecteur(string $texte, string $if_chars, string $start_with, string $preg, int $max_items = 0): array {
-
-		$collection = [];
-		$pos = 0;
-		while (
-			(!$if_chars || strpos($texte, $if_chars, $pos) !== false)
-			and ($next = ($start_with ? strpos($texte, $start_with, $pos) : $pos)) !== false
-			and preg_match($preg, $texte, $r, PREG_OFFSET_CAPTURE, $next)) {
-
-			$found_pos = $r[0][1];
-			$found_length = strlen($r[0][0]);
-			$match = [
-				'raw' => $r[0][0],
-				'match' => array_column($r, 0),
-				'pos' => $found_pos,
-				'length' => $found_length
-			];
-
-			$collection[] = $match;
-
-			if ($max_items and count($collection) === $max_items) {
-				break;
-			}
-
-			$pos = $match['pos'] + $match['length'];
-		}
-
-		return $collection;
-	}
-
-	/**
-	 * Sanitizer une collection d'occurences
-	 *
-	 * @param array $collection
-	 * @param string $sanitize_callback
-	 * @return array
-	 */
-	protected function sanitizer_collection(array $collection, string $sanitize_callback): array {
-		foreach ($collection as &$c) {
-			$c['raw'] = $sanitize_callback($c['raw']);
-		}
-
-		return $collection;
-	}
-
-	/**
-	 * @param string $texte
-	 * @param array $options
-	 * @return array
-	 */
-	public function collecter(string $texte, array $options = []): array {
-		$collection = [];
-		return $collection;
-	}
-
-	public function detecter($texte): bool {
-		if (!empty($this->markId) and strpos($texte, $this->markId) !== false) {
-			return true;
-		}
-		return !empty($this->collecter($texte, ['detecter_presence' => true]));
-	}
-
-	/**
-	 * Echapper les occurences de la collecte par un texte neutre du point de vue HTML
-	 *
-	 * @see retablir()
-	 * @param string $texte
-	 * @param array $options
-	 *   string $sanitize_callback
-	 * @return array
-	 *   texte, marqueur utilise pour echapper les modeles
-	 */
-	public function echapper(string $texte, array $options = []): string {
-		if (!function_exists('creer_uniqid')) {
-			include_spip('inc/acces');
-		}
-
-		$collection = $this->collecter($texte, $options);
-		if (!empty($options['sanitize_callback']) and is_callable($options['sanitize_callback'])) {
-			$collection = $this->sanitizer_collection($collection, $options['sanitize_callback']);
-		}
-
-		if (!empty($collection)) {
-			if (empty($this->markId)) {
-				// generer un marqueur qui n'existe pas dans le texte
-				do {
-					$this->markId = substr(md5(uniqid(static::class, 1)), 0, 7);
-					$this->markId = "@|".static::$markPrefix . $this->markId . "|";
-				} while (strpos($texte, $this->markId) !== false);
-			}
-
-			$offset_pos = 0;
-			foreach ($collection as $c) {
-				$rempl = $this->markId . base64_encode($c['raw']) . '|@';
-				$texte = substr_replace($texte, $rempl, $c['pos'] + $offset_pos, $c['length']);
-				$offset_pos += strlen($rempl) - $c['length'];
-			}
-		}
-
-		return $texte;
-	}
-
-
-	/**
-	 * Retablir les occurences échappées précédemment
-	 *
-	 * @see echapper()
-	 * @param string $texte
-	 * @return string
-	 */
-	function retablir(string $texte): string {
-
-		if (!empty($this->markId)) {
-			$lm = strlen($this->markId);
-			$pos = 0;
-			while (
-				($p = strpos($texte, $this->markId, $pos)) !== false
-				and $end = strpos($texte, '|@', $p + $lm)
-			) {
-				$base64 = substr($texte, $p + $lm, $end - ($p + $lm));
-				if ($c = base64_decode($base64, true)) {
-					$texte = substr_replace($texte, $c, $p, $end + 2 - $p);
-					$pos = $p + strlen($c);
-				}
-				else {
-					$pos = $end;
-				}
-			}
-		}
-
-		return $texte;
-	}
+    protected static string $markPrefix = 'COLLECT';
+    protected string $markId;
+
+    /**
+     * Collecteur générique des occurences d'une preg dans un texte avec leurs positions et longueur
+     * @param string $texte
+     *   texte à analyser pour la collecte
+     * @param string $if_chars
+     *   caractere(s) à tester avant de tenter la preg
+     * @param string $start_with
+     *   caractere(s) par lesquels commencent l'expression recherchée (permet de démarrer la preg à la prochaine occurence de cette chaine)
+     * @param string $preg
+     *   preg utilisée pour la collecte
+     * @param int $max_items
+     *   pour limiter le nombre de preg collectée (pour la detection simple de présence par exemple)
+     * @return array
+     */
+    protected static function collecteur(string $texte, string $if_chars, string $start_with, string $preg, int $max_items = 0): array {
+
+        $collection = [];
+        $pos = 0;
+        while (
+            (!$if_chars || strpos($texte, $if_chars, $pos) !== false)
+            and ($next = ($start_with ? strpos($texte, $start_with, $pos) : $pos)) !== false
+            and preg_match($preg, $texte, $r, PREG_OFFSET_CAPTURE, $next)) {
+
+            $found_pos = $r[0][1];
+            $found_length = strlen($r[0][0]);
+            $match = [
+                'raw' => $r[0][0],
+                'match' => array_column($r, 0),
+                'pos' => $found_pos,
+                'length' => $found_length
+            ];
+
+            $collection[] = $match;
+
+            if ($max_items and count($collection) === $max_items) {
+                break;
+            }
+
+            $pos = $match['pos'] + $match['length'];
+        }
+
+        return $collection;
+    }
+
+    /**
+     * Sanitizer une collection d'occurences
+     *
+     * @param array $collection
+     * @param string $sanitize_callback
+     * @return array
+     */
+    protected function sanitizer_collection(array $collection, string $sanitize_callback): array {
+        foreach ($collection as &$c) {
+            $c['raw'] = $sanitize_callback($c['raw']);
+        }
+
+        return $collection;
+    }
+
+    /**
+     * @param string $texte
+     * @param array $options
+     * @return array
+     */
+    public function collecter(string $texte, array $options = []): array {
+        $collection = [];
+        return $collection;
+    }
+
+    public function detecter($texte): bool {
+        if (!empty($this->markId) and strpos($texte, $this->markId) !== false) {
+            return true;
+        }
+        return !empty($this->collecter($texte, ['detecter_presence' => true]));
+    }
+
+    /**
+     * Echapper les occurences de la collecte par un texte neutre du point de vue HTML
+     *
+     * @see retablir()
+     * @param string $texte
+     * @param array $options
+     *   string $sanitize_callback
+     * @return array
+     *   texte, marqueur utilise pour echapper les modeles
+     */
+    public function echapper(string $texte, array $options = []): string {
+        if (!function_exists('creer_uniqid')) {
+            include_spip('inc/acces');
+        }
+
+        $collection = $this->collecter($texte, $options);
+        if (!empty($options['sanitize_callback']) and is_callable($options['sanitize_callback'])) {
+            $collection = $this->sanitizer_collection($collection, $options['sanitize_callback']);
+        }
+
+        if (!empty($collection)) {
+            if (empty($this->markId)) {
+                // generer un marqueur qui n'existe pas dans le texte
+                do {
+                    $this->markId = substr(md5(uniqid(static::class, 1)), 0, 7);
+                    $this->markId = "@|".static::$markPrefix . $this->markId . "|";
+                } while (strpos($texte, $this->markId) !== false);
+            }
+
+            $offset_pos = 0;
+            foreach ($collection as $c) {
+                $rempl = $this->markId . base64_encode($c['raw']) . '|@';
+                $texte = substr_replace($texte, $rempl, $c['pos'] + $offset_pos, $c['length']);
+                $offset_pos += strlen($rempl) - $c['length'];
+            }
+        }
+
+        return $texte;
+    }
+
+
+    /**
+     * Retablir les occurences échappées précédemment
+     *
+     * @see echapper()
+     * @param string $texte
+     * @return string
+     */
+    function retablir(string $texte): string {
+
+        if (!empty($this->markId)) {
+            $lm = strlen($this->markId);
+            $pos = 0;
+            while (
+                ($p = strpos($texte, $this->markId, $pos)) !== false
+                and $end = strpos($texte, '|@', $p + $lm)
+            ) {
+                $base64 = substr($texte, $p + $lm, $end - ($p + $lm));
+                if ($c = base64_decode($base64, true)) {
+                    $texte = substr_replace($texte, $c, $p, $end + 2 - $p);
+                    $pos = $p + strlen($c);
+                }
+                else {
+                    $pos = $end;
+                }
+            }
+        }
+
+        return $texte;
+    }
 
 }