spip / SPIP

prive/formulaires/instituer_objet.php

Indentation +108 added lines, -108 removed lines

@@ -17,7 +17,7 @@ 
  **/
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 include_spip('inc/editer');
@@ -32,17 +32,17 @@ 
  * @return array
  */
 function lister_statuts_proposes($desc, $publiable = true) {
-	if (!isset($desc['statut_textes_instituer'])) {
-		return false;
-	}
+    if (!isset($desc['statut_textes_instituer'])) {
+        return false;
+    }
 
-	$l = $desc['statut_textes_instituer'];
-	if (!$publiable) {
-		unset($l['publie']);
-		unset($l['refuse']);
-	}
+    $l = $desc['statut_textes_instituer'];
+    if (!$publiable) {
+        unset($l['publie']);
+        unset($l['refuse']);
+    }
 
-	return $l;
+    return $l;
 }
 
 /**
@@ -64,54 +64,54 @@ 
  *     Environnement du formulaire ou false si aucun affichage à faire.
  */
 function formulaires_instituer_objet_charger_dist($objet, $id_objet, $retour = '', $editable = true) {
-	$editable = ($editable ? true : false);
-
-	$table = table_objet_sql($objet);
-	$desc = lister_tables_objets_sql($table);
-
-	if (!isset($desc['statut_textes_instituer'])) {
-		return false;
-	}
-
-	if (!autoriser('modifier', $objet, $id_objet)) {
-		$editable = false;
-	}
-
-	// charger le contenu de l'objet
-	// dont son champ statut
-	$v = formulaires_editer_objet_charger($objet, $id_objet, 0, 0, '', '');
-
-	$publiable = true;
-	$statuts = lister_statuts_proposes($desc);
-	// tester si on a le droit de publier, si un statut publie existe
-	if (isset($statuts['publie'])) {
-		if (!autoriser('instituer', $objet, $id_objet, null, ['statut' => 'publie'])) {
-			if ($v['statut'] == 'publie') {
-				$editable = false;
-			} else {
-				$publiable = false;
-			}
-		}
-	}
-	$statuts = lister_statuts_proposes($desc, $editable ? $publiable : true);
-	if (count($statuts) == 1 and isset($statuts[$v['statut']])) {
-		$editable = false;
-	}
-
-	$valeurs = [
-		'editable' => $editable,
-		'statut' => $v['statut'],
-		'_objet' => $objet,
-		'_id_objet' => $id_objet,
-		'_statuts' => $statuts,
-		'_publiable' => $publiable,
-		'_label' => $desc['texte_changer_statut'] ?? 'texte_article_statut',
-		'_aide' => $desc['aide_changer_statut'] ?? '',
-		'_hidden' => "<input type='hidden' name='statut_old' value='" . $v['statut'] . "' />",
-	];
-
-	#if (!count($valeurs['statuts']))
-	return $valeurs;
+    $editable = ($editable ? true : false);
+
+    $table = table_objet_sql($objet);
+    $desc = lister_tables_objets_sql($table);
+
+    if (!isset($desc['statut_textes_instituer'])) {
+        return false;
+    }
+
+    if (!autoriser('modifier', $objet, $id_objet)) {
+        $editable = false;
+    }
+
+    // charger le contenu de l'objet
+    // dont son champ statut
+    $v = formulaires_editer_objet_charger($objet, $id_objet, 0, 0, '', '');
+
+    $publiable = true;
+    $statuts = lister_statuts_proposes($desc);
+    // tester si on a le droit de publier, si un statut publie existe
+    if (isset($statuts['publie'])) {
+        if (!autoriser('instituer', $objet, $id_objet, null, ['statut' => 'publie'])) {
+            if ($v['statut'] == 'publie') {
+                $editable = false;
+            } else {
+                $publiable = false;
+            }
+        }
+    }
+    $statuts = lister_statuts_proposes($desc, $editable ? $publiable : true);
+    if (count($statuts) == 1 and isset($statuts[$v['statut']])) {
+        $editable = false;
+    }
+
+    $valeurs = [
+        'editable' => $editable,
+        'statut' => $v['statut'],
+        '_objet' => $objet,
+        '_id_objet' => $id_objet,
+        '_statuts' => $statuts,
+        '_publiable' => $publiable,
+        '_label' => $desc['texte_changer_statut'] ?? 'texte_article_statut',
+        '_aide' => $desc['aide_changer_statut'] ?? '',
+        '_hidden' => "<input type='hidden' name='statut_old' value='" . $v['statut'] . "' />",
+    ];
+
+    #if (!count($valeurs['statuts']))
+    return $valeurs;
 }
 
 /**
@@ -131,35 +131,35 @@ 
  *     Tableau des erreurs
  */
 function formulaires_instituer_objet_verifier_dist($objet, $id_objet, $retour = '', $editable = true) {
-	$erreurs = [];
-	// charger le contenu de l'objet
-	// dont son champ statut
-	$v = formulaires_editer_objet_charger($objet, $id_objet, 0, 0, '', '');
-
-	if ($v['statut'] !== _request('statut_old')) {
-		$erreurs['statut'] = _T('instituer_erreur_statut_a_change');
-	} else {
-		$table = table_objet_sql($objet);
-		$desc = lister_tables_objets_sql($table);
-
-		$publiable = true;
-		if (
-			isset($v['id_rubrique'])
-			and !autoriser('publierdans', 'rubrique', $v['id_rubrique'])
-		) {
-			$publiable = false;
-		}
-		$l = lister_statuts_proposes($desc, $publiable);
-		$statut = _request('statut');
-		if (
-			!isset($l[$statut])
-			or !autoriser('instituer', $objet, $id_objet, '', ['statut' => $statut])
-		) {
-			$erreurs['statut'] = _T('instituer_erreur_statut_non_autorise');
-		}
-	}
-
-	return $erreurs;
+    $erreurs = [];
+    // charger le contenu de l'objet
+    // dont son champ statut
+    $v = formulaires_editer_objet_charger($objet, $id_objet, 0, 0, '', '');
+
+    if ($v['statut'] !== _request('statut_old')) {
+        $erreurs['statut'] = _T('instituer_erreur_statut_a_change');
+    } else {
+        $table = table_objet_sql($objet);
+        $desc = lister_tables_objets_sql($table);
+
+        $publiable = true;
+        if (
+            isset($v['id_rubrique'])
+            and !autoriser('publierdans', 'rubrique', $v['id_rubrique'])
+        ) {
+            $publiable = false;
+        }
+        $l = lister_statuts_proposes($desc, $publiable);
+        $statut = _request('statut');
+        if (
+            !isset($l[$statut])
+            or !autoriser('instituer', $objet, $id_objet, '', ['statut' => $statut])
+        ) {
+            $erreurs['statut'] = _T('instituer_erreur_statut_non_autorise');
+        }
+    }
+
+    return $erreurs;
 }
 
 /**
@@ -178,25 +178,25 @@ 
  */
 function formulaires_instituer_objet_traiter_dist($objet, $id_objet, $retour = '', $editable = true) {
 
-	$c = ['statut' => _request('statut')];
-	// si on a envoye une 'date_posterieure', l'enregistrer
-	// todo dans le HTML
-	if ($d = _request('date_posterieure')) {
-		$c['date'] = $d;
-	}
-
-
-	include_spip('action/editer_objet');
-	if ($err = objet_instituer($objet, $id_objet, $c)) {
-		$res = ['message_erreur' => $err];
-	} else {
-		$res = ['message_ok' => _T('info_modification_enregistree')];
-		if ($retour) {
-			$res['redirect'] = $retour;
-		}
-		set_request('statut');
-		set_request('date_posterieure');
-	}
-
-	return $res;
+    $c = ['statut' => _request('statut')];
+    // si on a envoye une 'date_posterieure', l'enregistrer
+    // todo dans le HTML
+    if ($d = _request('date_posterieure')) {
+        $c['date'] = $d;
+    }
+
+
+    include_spip('action/editer_objet');
+    if ($err = objet_instituer($objet, $id_objet, $c)) {
+        $res = ['message_erreur' => $err];
+    } else {
+        $res = ['message_ok' => _T('info_modification_enregistree')];
+        if ($retour) {
+            $res['redirect'] = $retour;
+        }
+        set_request('statut');
+        set_request('date_posterieure');
+    }
+
+    return $res;
 }

Spacing +1 added lines, -1 removed lines

@@ -107,7 +107,7 @@
 		'_publiable' => $publiable,
 		'_label' => $desc['texte_changer_statut'] ?? 'texte_article_statut',
 		'_aide' => $desc['aide_changer_statut'] ?? '',
-		'_hidden' => "<input type='hidden' name='statut_old' value='" . $v['statut'] . "' />",
+		'_hidden' => "<input type='hidden' name='statut_old' value='".$v['statut']."' />",
 	];
 
 	#if (!count($valeurs['statuts']))

prive/formulaires/editer_liens.php

Indentation +352 added lines, -352 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,93 +80,93 @@ 
  */
 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 = _request('_oups') ?? '';
-	if ($oups) {
-		if (unserialize(base64_decode($oups))) {
-			// on est bon, rien a faire
-		} elseif (unserialize($oups)) {
-			// il faut encoder
-			$oups = base64_encode($oups);
-		} else {
-			$oups = '';
-		}
-	}
-	$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' => $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 = _request('_oups') ?? '';
+    if ($oups) {
+        if (unserialize(base64_decode($oups))) {
+            // on est bon, rien a faire
+        } elseif (unserialize($oups)) {
+            // il faut encoder
+            $oups = base64_encode($oups);
+        } else {
+            $oups = '';
+        }
+    }
+    $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' => $oups,
+        'editable' => $editable,
+    ];
+
+    // les options non definies dans $valeurs sont passees telles quelles au formulaire html
+    $valeurs = array_merge($options, $valeurs);
+
+    return $valeurs;
 }
 
 /**
@@ -210,165 +210,165 @@ 
  * @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)) {
-		// annuler les suppressions du coup d'avant !
-		if (
-			_request('annuler_oups')
-			and $oups = _request('_oups')
-			and $oups = base64_decode($oups)
-			and $oups = unserialize($oups)
-		) {
-			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
-			set_request('_oups');
-		}
-
-		$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);
-						}
-					}
-				}
-			}
-			set_request('_oups', $oups ? base64_encode(serialize($oups)) : null);
-		}
-
-		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) {
-				set_request('_oups');
-			}
-		}
-
-		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);
-					set_request('_oups');
-				}
-			}
-		}
-	}
-
-
-	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)) {
+        // annuler les suppressions du coup d'avant !
+        if (
+            _request('annuler_oups')
+            and $oups = _request('_oups')
+            and $oups = base64_decode($oups)
+            and $oups = unserialize($oups)
+        ) {
+            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
+            set_request('_oups');
+        }
+
+        $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);
+                        }
+                    }
+                }
+            }
+            set_request('_oups', $oups ? base64_encode(serialize($oups)) : null);
+        }
+
+        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) {
+                set_request('_oups');
+            }
+        }
+
+        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);
+                    set_request('_oups');
+                }
+            }
+        }
+    }
+
+
+    return $res;
 }
 
 
@@ -391,24 +391,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;
 }
 
 
@@ -424,66 +424,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;
 }
 
 /**
@@ -502,12 +502,12 @@ 
  **/
 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]);
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -105,7 +105,7 @@ 
 
 	// 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)
+	$editable = ($editable and autoriser('associer'.$table_source, $objet, $id_objet)
 		and autoriser('modifier', $objet, $id_objet));
 
 	if (
@@ -119,15 +119,15 @@ 
 
 	// 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';
+	$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';
+		$skel_vue = $table_source.'_roles_lies';
+		$skel_ajout = $table_source.'_roles_associer';
 	}
 
 	$oups = _request('_oups') ?? '';
@@ -426,7 +426,7 @@ 
 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);
+	[$objet1,, $objet2,, $role] = array_pad($defs, 5, null);
 	if ($objet_lien == $objet1) {
 		$colonne_role = roles_colonne($objet1, $objet2);
 	} else {

prive/formulaires/dater.php

Indentation +266 added lines, -266 removed lines

@@ -17,7 +17,7 @@ 
  **/
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 
@@ -45,136 +45,136 @@ 
  **/
 function formulaires_dater_charger_dist($objet, $id_objet, $retour = '', $options = []) {
 
-	$jour = null;
-	$mois = null;
-	$annee = null;
-	$heure = null;
-	$minute = null;
-	$objet = objet_type($objet);
-	if (!$objet or !intval($id_objet)) {
-		return false;
-	}
-
-	if (!is_array($options)) {
-		$options = unserialize($options);
-	}
-
-	$_id_objet = id_table_objet($objet);
-	$table = table_objet($objet);
-	$trouver_table = charger_fonction('trouver_table', 'base');
-	$desc = $trouver_table($table);
-
-	if (!$desc) {
-		return false;
-	}
-
-	$champ_date = $desc['date'] ?: 'date';
-	if (isset($options['champ_date']) and $options['champ_date']) {
-		$champ_date = $options['champ_date'];
-	}
-	if (!isset($desc['field'][$champ_date])) {
-		return false;
-	}
-
-	$valeurs = [
-		'objet' => $objet,
-		'id_objet' => $id_objet,
-		'id' => $id_objet,
-	];
-
-
-	$select = "$champ_date as date";
-	$champ_date_redac = 'date_redac';
-	if (isset($options['champ_date_redac']) and $options['champ_date_redac']) {
-		$champ_date_redac = $options['champ_date_redac'];
-	}
-	if (isset($desc['field'][$champ_date_redac])) {
-		$select .= ",$champ_date_redac as date_redac";
-	}
-	if (isset($desc['field']['statut'])) {
-		$select .= ',statut';
-	}
-
-
-	$row = sql_fetsel($select, $desc['table'], "$_id_objet=" . intval($id_objet));
-	$statut = $row['statut'] ?? 'publie'; // pas de statut => publie
-
-	$valeurs['editable'] = autoriser('dater', $objet, $id_objet, null, ['statut' => $statut]);
-
-	$possedeDateRedac = false;
-
-	if (
-		isset($row['date_redac']) and
-		$regs = recup_date($row['date_redac'], false)
-	) {
-		$annee_redac = $regs[0];
-		$mois_redac = $regs[1];
-		$jour_redac = $regs[2];
-		$heure_redac = $regs[3];
-		$minute_redac = $regs[4];
-		$possedeDateRedac = true;
-		// attention : les vrai dates de l'annee 1 sont stockee avec +9000 => 9001
-		// mais reviennent ici en annee 1 par recup_date
-		// on verifie donc que le intval($row['date_redac']) qui ressort l'annee
-		// est bien lui aussi <=1 : dans ce cas c'est une date sql 'nulle' ou presque, selon
-		// le gestionnnaire sql utilise (0001-01-01 pour PG par exemple)
-		if (intval($row['date_redac']) <= 1 and ($annee_redac <= 1) and ($mois_redac <= 1) and ($jour_redac <= 1)) {
-			$possedeDateRedac = false;
-		}
-	} else {
-		$annee_redac = $mois_redac = $jour_redac = $heure_redac = $minute_redac = 0;
-	}
-
-	if ($regs = recup_date($row['date'], false)) {
-		$annee = $regs[0];
-		$mois = $regs[1];
-		$jour = $regs[2];
-		$heure = $regs[3];
-		$minute = $regs[4];
-	}
-
-	// attention, si la variable s'appelle date ou date_redac, le compilo va
-	// la normaliser, ce qu'on ne veut pas ici.
-	$valeurs['afficher_date_redac'] = ($possedeDateRedac ? $row['date_redac'] : '');
-	$valeurs['date_redac_jour'] = dater_formater_saisie_jour($jour_redac, $mois_redac, $annee_redac);
-	$valeurs['date_redac_heure'] = "$heure_redac:$minute_redac";
-
-	$valeurs['afficher_date'] = $row['date'];
-	$valeurs['date_jour'] = dater_formater_saisie_jour($jour, $mois, $annee);
-	$valeurs['date_heure'] = "$heure:$minute";
-
-	$valeurs['sans_redac'] = !$possedeDateRedac;
-
-	if (isset($options['date_redac'])) {
-		$valeurs['_editer_date_anterieure'] = $options['date_redac'];
-	} else {
-		$valeurs['_editer_date_anterieure'] = ($objet == 'article' and ($GLOBALS['meta']['articles_redac'] != 'non' or $possedeDateRedac));
-	}
-	$valeurs['_label_date'] = (($statut == 'publie') ?
-		_T('texte_date_publication_objet') : _T('texte_date_creation_objet'));
-	if (isset($options['label_date']) and $options['label_date']) {
-		$valeurs['_label_date'] = $options['label_date'];
-	}
-	if (isset($options['label_date_redac']) and $options['label_date_redac']) {
-		$valeurs['_label_date_redac'] = $options['label_date_redac'];
-	}
-	if (isset($options['texte_sans_date_redac']) and $options['texte_sans_date_redac']) {
-		$valeurs['_texte_sans_date_redac'] = $options['texte_sans_date_redac'];
-	}
-	if (isset($options['class']) and $options['class']) {
-		$valeurs['_class'] = $options['class'];
-	}
-
-	$valeurs['_saisie_en_cours'] = (_request('_saisie_en_cours') !== null or _request('date_jour') !== null);
-
-	// cas ou l'on ne peut pas dater mais on peut modifier la date de redac anterieure
-	// https://core.spip.net/issues/3494
-	$valeurs['_editer_date'] = $valeurs['editable'];
-	if ($valeurs['_editer_date_anterieure'] and !$valeurs['editable']) {
-		$valeurs['editable'] = autoriser('modifier', $objet, $id_objet);
-	}
-
-	return $valeurs;
+    $jour = null;
+    $mois = null;
+    $annee = null;
+    $heure = null;
+    $minute = null;
+    $objet = objet_type($objet);
+    if (!$objet or !intval($id_objet)) {
+        return false;
+    }
+
+    if (!is_array($options)) {
+        $options = unserialize($options);
+    }
+
+    $_id_objet = id_table_objet($objet);
+    $table = table_objet($objet);
+    $trouver_table = charger_fonction('trouver_table', 'base');
+    $desc = $trouver_table($table);
+
+    if (!$desc) {
+        return false;
+    }
+
+    $champ_date = $desc['date'] ?: 'date';
+    if (isset($options['champ_date']) and $options['champ_date']) {
+        $champ_date = $options['champ_date'];
+    }
+    if (!isset($desc['field'][$champ_date])) {
+        return false;
+    }
+
+    $valeurs = [
+        'objet' => $objet,
+        'id_objet' => $id_objet,
+        'id' => $id_objet,
+    ];
+
+
+    $select = "$champ_date as date";
+    $champ_date_redac = 'date_redac';
+    if (isset($options['champ_date_redac']) and $options['champ_date_redac']) {
+        $champ_date_redac = $options['champ_date_redac'];
+    }
+    if (isset($desc['field'][$champ_date_redac])) {
+        $select .= ",$champ_date_redac as date_redac";
+    }
+    if (isset($desc['field']['statut'])) {
+        $select .= ',statut';
+    }
+
+
+    $row = sql_fetsel($select, $desc['table'], "$_id_objet=" . intval($id_objet));
+    $statut = $row['statut'] ?? 'publie'; // pas de statut => publie
+
+    $valeurs['editable'] = autoriser('dater', $objet, $id_objet, null, ['statut' => $statut]);
+
+    $possedeDateRedac = false;
+
+    if (
+        isset($row['date_redac']) and
+        $regs = recup_date($row['date_redac'], false)
+    ) {
+        $annee_redac = $regs[0];
+        $mois_redac = $regs[1];
+        $jour_redac = $regs[2];
+        $heure_redac = $regs[3];
+        $minute_redac = $regs[4];
+        $possedeDateRedac = true;
+        // attention : les vrai dates de l'annee 1 sont stockee avec +9000 => 9001
+        // mais reviennent ici en annee 1 par recup_date
+        // on verifie donc que le intval($row['date_redac']) qui ressort l'annee
+        // est bien lui aussi <=1 : dans ce cas c'est une date sql 'nulle' ou presque, selon
+        // le gestionnnaire sql utilise (0001-01-01 pour PG par exemple)
+        if (intval($row['date_redac']) <= 1 and ($annee_redac <= 1) and ($mois_redac <= 1) and ($jour_redac <= 1)) {
+            $possedeDateRedac = false;
+        }
+    } else {
+        $annee_redac = $mois_redac = $jour_redac = $heure_redac = $minute_redac = 0;
+    }
+
+    if ($regs = recup_date($row['date'], false)) {
+        $annee = $regs[0];
+        $mois = $regs[1];
+        $jour = $regs[2];
+        $heure = $regs[3];
+        $minute = $regs[4];
+    }
+
+    // attention, si la variable s'appelle date ou date_redac, le compilo va
+    // la normaliser, ce qu'on ne veut pas ici.
+    $valeurs['afficher_date_redac'] = ($possedeDateRedac ? $row['date_redac'] : '');
+    $valeurs['date_redac_jour'] = dater_formater_saisie_jour($jour_redac, $mois_redac, $annee_redac);
+    $valeurs['date_redac_heure'] = "$heure_redac:$minute_redac";
+
+    $valeurs['afficher_date'] = $row['date'];
+    $valeurs['date_jour'] = dater_formater_saisie_jour($jour, $mois, $annee);
+    $valeurs['date_heure'] = "$heure:$minute";
+
+    $valeurs['sans_redac'] = !$possedeDateRedac;
+
+    if (isset($options['date_redac'])) {
+        $valeurs['_editer_date_anterieure'] = $options['date_redac'];
+    } else {
+        $valeurs['_editer_date_anterieure'] = ($objet == 'article' and ($GLOBALS['meta']['articles_redac'] != 'non' or $possedeDateRedac));
+    }
+    $valeurs['_label_date'] = (($statut == 'publie') ?
+        _T('texte_date_publication_objet') : _T('texte_date_creation_objet'));
+    if (isset($options['label_date']) and $options['label_date']) {
+        $valeurs['_label_date'] = $options['label_date'];
+    }
+    if (isset($options['label_date_redac']) and $options['label_date_redac']) {
+        $valeurs['_label_date_redac'] = $options['label_date_redac'];
+    }
+    if (isset($options['texte_sans_date_redac']) and $options['texte_sans_date_redac']) {
+        $valeurs['_texte_sans_date_redac'] = $options['texte_sans_date_redac'];
+    }
+    if (isset($options['class']) and $options['class']) {
+        $valeurs['_class'] = $options['class'];
+    }
+
+    $valeurs['_saisie_en_cours'] = (_request('_saisie_en_cours') !== null or _request('date_jour') !== null);
+
+    // cas ou l'on ne peut pas dater mais on peut modifier la date de redac anterieure
+    // https://core.spip.net/issues/3494
+    $valeurs['_editer_date'] = $valeurs['editable'];
+    if ($valeurs['_editer_date_anterieure'] and !$valeurs['editable']) {
+        $valeurs['editable'] = autoriser('modifier', $objet, $id_objet);
+    }
+
+    return $valeurs;
 }
 
 /**
@@ -192,20 +192,20 @@ 
  *     Date formatée tel que `02/10/2012`
  **/
 function dater_formater_saisie_jour($jour, $mois, $annee, $sep = '/') {
-	$annee = str_pad($annee, 4, '0', STR_PAD_LEFT);
-	if (intval($jour)) {
-		$jour = str_pad($jour, 2, '0', STR_PAD_LEFT);
-		$mois = str_pad($mois, 2, '0', STR_PAD_LEFT);
+    $annee = str_pad($annee, 4, '0', STR_PAD_LEFT);
+    if (intval($jour)) {
+        $jour = str_pad($jour, 2, '0', STR_PAD_LEFT);
+        $mois = str_pad($mois, 2, '0', STR_PAD_LEFT);
 
-		return "$jour$sep$mois$sep$annee";
-	}
-	if (intval($mois)) {
-		$mois = str_pad($mois, 2, '0', STR_PAD_LEFT);
+        return "$jour$sep$mois$sep$annee";
+    }
+    if (intval($mois)) {
+        $mois = str_pad($mois, 2, '0', STR_PAD_LEFT);
 
-		return "$mois$sep$annee";
-	}
+        return "$mois$sep$annee";
+    }
 
-	return $annee;
+    return $annee;
 }
 
 /**
@@ -224,7 +224,7 @@ 
  *     Hash du formulaire
  **/
 function formulaires_dater_identifier_dist($objet, $id_objet, $retour = '', $options = []) {
-	return serialize([$objet, $id_objet]);
+    return serialize([$objet, $id_objet]);
 }
 
 /**
@@ -242,30 +242,30 @@ 
  *     Tableau des erreurs
  */
 function formulaires_dater_verifier_dist($objet, $id_objet, $retour = '', $options = []) {
-	$erreurs = [];
-
-	// ouvrir le formulaire en edition ?
-	if (_request('_saisie_en_cours')) {
-		$erreurs['message_erreur'] = '';
-
-		return $erreurs;
-	}
-
-	if (_request('changer')) {
-		foreach (['date', 'date_redac'] as $k) {
-			if ($v = _request($k . '_jour') and !dater_recuperer_date_saisie($v, $k)) {
-				$erreurs[$k] = _T('format_date_incorrecte');
-			} elseif ($v = _request($k . '_heure') and !dater_recuperer_heure_saisie($v)) {
-				$erreurs[$k] = _T('format_heure_incorrecte');
-			}
-		}
-
-		if (!_request('date_jour')) {
-			$erreurs['date'] = _T('info_obligatoire');
-		}
-	}
-
-	return $erreurs;
+    $erreurs = [];
+
+    // ouvrir le formulaire en edition ?
+    if (_request('_saisie_en_cours')) {
+        $erreurs['message_erreur'] = '';
+
+        return $erreurs;
+    }
+
+    if (_request('changer')) {
+        foreach (['date', 'date_redac'] as $k) {
+            if ($v = _request($k . '_jour') and !dater_recuperer_date_saisie($v, $k)) {
+                $erreurs[$k] = _T('format_date_incorrecte');
+            } elseif ($v = _request($k . '_heure') and !dater_recuperer_heure_saisie($v)) {
+                $erreurs[$k] = _T('format_heure_incorrecte');
+            }
+        }
+
+        if (!_request('date_jour')) {
+            $erreurs['date'] = _T('info_obligatoire');
+        }
+    }
+
+    return $erreurs;
 }
 
 /**
@@ -283,79 +283,79 @@ 
  *     Retours des traitements
  */
 function formulaires_dater_traiter_dist($objet, $id_objet, $retour = '', $options = []) {
-	$res = ['editable' => ' '];
-
-	if (_request('changer')) {
-		$table = table_objet($objet);
-		$trouver_table = charger_fonction('trouver_table', 'base');
-		$desc = $trouver_table($table);
-
-		if (!$desc) {
-			return ['message_erreur' => _L('erreur')];
-		} #impossible en principe
-
-		$champ_date = $desc['date'] ?: 'date';
-		if (isset($options['champ_date']) and $options['champ_date']) {
-			$champ_date = $options['champ_date'];
-		}
-
-		$set = [];
-
-		$charger = charger_fonction('charger', 'formulaires/dater/');
-		$v = $charger($objet, $id_objet, $retour, $options);
-
-		if ($v['_editer_date']) {
-			if (!$d = dater_recuperer_date_saisie(_request('date_jour'))) {
-				$d = [date('Y'), date('m'), date('d')];
-			}
-			if (!$h = dater_recuperer_heure_saisie(_request('date_heure'))) {
-				$h = [0, 0];
-			}
-
-			$set[$champ_date] = sql_format_date($d[0], $d[1], $d[2], $h[0], $h[1]);
-		}
-
-		$champ_date_redac = 'date_redac';
-		if (isset($options['champ_date_redac']) and $options['champ_date_redac']) {
-			$champ_date_redac = $options['champ_date_redac'];
-		}
-		if (isset($desc['field'][$champ_date_redac]) and $v['_editer_date_anterieure']) {
-			if (!_request('date_redac_jour') or _request('sans_redac')) {
-				$set[$champ_date_redac] = sql_format_date(0, 0, 0, 0, 0, 0);
-			} else {
-				if (!$d = dater_recuperer_date_saisie(_request('date_redac_jour'), 'date_redac')) {
-					$d = [date('Y'), date('m'), date('d')];
-				}
-				if (!$h = dater_recuperer_heure_saisie(_request('date_redac_heure'))) {
-					$h = [0, 0];
-				}
-				$set[$champ_date_redac] = sql_format_date($d[0], $d[1], $d[2], $h[0], $h[1]);
-			}
-		}
-
-		if (count($set)) {
-			$publie_avant = objet_test_si_publie($objet, $id_objet);
-			include_spip('action/editer_objet');
-			objet_modifier($objet, $id_objet, $set);
-			$publie_apres = objet_test_si_publie($objet, $id_objet);
-			if ($publie_avant !== $publie_apres) {
-				// on refuse ajax pour forcer le rechargement de la page ici
-				// on refera traiter une 2eme fois, mais c'est sans consequence
-				refuser_traiter_formulaire_ajax();
-			}
-		}
-	}
-
-	if ($retour) {
-		$res['redirect'] = $retour;
-	}
-
-	set_request('date_jour');
-	set_request('date_redac_jour');
-	set_request('date_heure');
-	set_request('date_redac_heure');
-
-	return $res;
+    $res = ['editable' => ' '];
+
+    if (_request('changer')) {
+        $table = table_objet($objet);
+        $trouver_table = charger_fonction('trouver_table', 'base');
+        $desc = $trouver_table($table);
+
+        if (!$desc) {
+            return ['message_erreur' => _L('erreur')];
+        } #impossible en principe
+
+        $champ_date = $desc['date'] ?: 'date';
+        if (isset($options['champ_date']) and $options['champ_date']) {
+            $champ_date = $options['champ_date'];
+        }
+
+        $set = [];
+
+        $charger = charger_fonction('charger', 'formulaires/dater/');
+        $v = $charger($objet, $id_objet, $retour, $options);
+
+        if ($v['_editer_date']) {
+            if (!$d = dater_recuperer_date_saisie(_request('date_jour'))) {
+                $d = [date('Y'), date('m'), date('d')];
+            }
+            if (!$h = dater_recuperer_heure_saisie(_request('date_heure'))) {
+                $h = [0, 0];
+            }
+
+            $set[$champ_date] = sql_format_date($d[0], $d[1], $d[2], $h[0], $h[1]);
+        }
+
+        $champ_date_redac = 'date_redac';
+        if (isset($options['champ_date_redac']) and $options['champ_date_redac']) {
+            $champ_date_redac = $options['champ_date_redac'];
+        }
+        if (isset($desc['field'][$champ_date_redac]) and $v['_editer_date_anterieure']) {
+            if (!_request('date_redac_jour') or _request('sans_redac')) {
+                $set[$champ_date_redac] = sql_format_date(0, 0, 0, 0, 0, 0);
+            } else {
+                if (!$d = dater_recuperer_date_saisie(_request('date_redac_jour'), 'date_redac')) {
+                    $d = [date('Y'), date('m'), date('d')];
+                }
+                if (!$h = dater_recuperer_heure_saisie(_request('date_redac_heure'))) {
+                    $h = [0, 0];
+                }
+                $set[$champ_date_redac] = sql_format_date($d[0], $d[1], $d[2], $h[0], $h[1]);
+            }
+        }
+
+        if (count($set)) {
+            $publie_avant = objet_test_si_publie($objet, $id_objet);
+            include_spip('action/editer_objet');
+            objet_modifier($objet, $id_objet, $set);
+            $publie_apres = objet_test_si_publie($objet, $id_objet);
+            if ($publie_avant !== $publie_apres) {
+                // on refuse ajax pour forcer le rechargement de la page ici
+                // on refera traiter une 2eme fois, mais c'est sans consequence
+                refuser_traiter_formulaire_ajax();
+            }
+        }
+    }
+
+    if ($retour) {
+        $res['redirect'] = $retour;
+    }
+
+    set_request('date_jour');
+    set_request('date_redac_jour');
+    set_request('date_heure');
+    set_request('date_redac_heure');
+
+    return $res;
 }
 
 /**
@@ -366,24 +366,24 @@ 
  * @return array|string Chaîne vide si date invalide, tableau (année, mois, jour) sinon.
  */
 function dater_recuperer_date_saisie($post, $quoi = 'date') {
-	if (!preg_match('#^(?:(?:([0-9]{1,2})[/-])?([0-9]{1,2})[/-])?([0-9]{4}|[0-9]{1,2})#', $post, $regs)) {
-		return '';
-	}
-	if ($quoi == 'date_redac') {
-		if ($regs[3] <> '' and $regs[3] < 1001) {
-			$regs[3] += 9000;
-		}
-
-		return [$regs[3], $regs[2], $regs[1]];
-	} else {
-		if (
-			checkdate(intval($regs[2]), intval($regs[1]), intval($regs[3]))
-			and $t = mktime(0, 0, 0, $regs[2], $regs[1], $regs[3])
-		) {
-			return [date('Y', $t), date('m', $t), date('d', $t)];
-		}
-		return '';
-	}
+    if (!preg_match('#^(?:(?:([0-9]{1,2})[/-])?([0-9]{1,2})[/-])?([0-9]{4}|[0-9]{1,2})#', $post, $regs)) {
+        return '';
+    }
+    if ($quoi == 'date_redac') {
+        if ($regs[3] <> '' and $regs[3] < 1001) {
+            $regs[3] += 9000;
+        }
+
+        return [$regs[3], $regs[2], $regs[1]];
+    } else {
+        if (
+            checkdate(intval($regs[2]), intval($regs[1]), intval($regs[3]))
+            and $t = mktime(0, 0, 0, $regs[2], $regs[1], $regs[3])
+        ) {
+            return [date('Y', $t), date('m', $t), date('d', $t)];
+        }
+        return '';
+    }
 }
 
 /**
@@ -393,12 +393,12 @@ 
  * @return array
  */
 function dater_recuperer_heure_saisie($post) {
-	if (!preg_match('#([0-9]{1,2})(?:[h:](?:([0-9]{1,2}))?)?#', $post, $regs)) {
-		return '';
-	}
-	if ($regs[1] > 23 or $regs[2] > 59) {
-		return '';
-	}
-
-	return [$regs[1], $regs[2]];
+    if (!preg_match('#([0-9]{1,2})(?:[h:](?:([0-9]{1,2}))?)?#', $post, $regs)) {
+        return '';
+    }
+    if ($regs[1] > 23 or $regs[2] > 59) {
+        return '';
+    }
+
+    return [$regs[1], $regs[2]];
 }

Spacing +3 added lines, -3 removed lines

@@ -96,7 +96,7 @@ 
 	}
 
 
-	$row = sql_fetsel($select, $desc['table'], "$_id_objet=" . intval($id_objet));
+	$row = sql_fetsel($select, $desc['table'], "$_id_objet=".intval($id_objet));
 	$statut = $row['statut'] ?? 'publie'; // pas de statut => publie
 
 	$valeurs['editable'] = autoriser('dater', $objet, $id_objet, null, ['statut' => $statut]);
@@ -253,9 +253,9 @@ 
 
 	if (_request('changer')) {
 		foreach (['date', 'date_redac'] as $k) {
-			if ($v = _request($k . '_jour') and !dater_recuperer_date_saisie($v, $k)) {
+			if ($v = _request($k.'_jour') and !dater_recuperer_date_saisie($v, $k)) {
 				$erreurs[$k] = _T('format_date_incorrecte');
-			} elseif ($v = _request($k . '_heure') and !dater_recuperer_heure_saisie($v)) {
+			} elseif ($v = _request($k.'_heure') and !dater_recuperer_heure_saisie($v)) {
 				$erreurs[$k] = _T('format_heure_incorrecte');
 			}
 		}

ecrire/inc/filtres_selecteur_generique.php

Spacing +4 added lines, -4 removed lines

@@ -158,7 +158,7 @@ 
 
 	// si id numerique et un seul objet possible, pas d'ambiguite
 	if (is_numeric($ref) and count($objets) === 1) {
-		$ref = reset($objets) . $ref;
+		$ref = reset($objets).$ref;
 	}
 
 	// Si la référence ne correspond à rien, c'est fini
@@ -166,7 +166,7 @@ 
 		return json_export(false);
 	}
 	// Sinon on récupère les infos utiles
-	[$type, , $id, , , , ] = array_pad($match, 7, null);
+	[$type,, $id,,,,] = array_pad($match, 7, null);
 
 	// On regarde si le type trouvé fait partie des objets sélectionnables
 	if (!in_array(table_objet($type), $objets)) {
@@ -211,8 +211,8 @@ 
 		$types = (is_array($types) ? array_filter($types) : []);
 
 		// recuperer tous les freres et soeurs de la rubrique visee
-		$id_parent = sql_getfetsel('id_parent', 'spip_rubriques', 'id_rubrique=' . intval($id_rubrique));
-		$fratrie = sql_allfetsel('id_rubrique', 'spip_rubriques', 'id_parent=' . intval($id_parent));
+		$id_parent = sql_getfetsel('id_parent', 'spip_rubriques', 'id_rubrique='.intval($id_rubrique));
+		$fratrie = sql_allfetsel('id_rubrique', 'spip_rubriques', 'id_parent='.intval($id_parent));
 		$fratrie = array_column($fratrie, 'id_rubrique');
 		$has = sql_allfetsel('DISTINCT id_parent', 'spip_rubriques', sql_in('id_parent', $fratrie));
 		$has = array_column($has, 'id_parent');

Indentation +144 added lines, -144 removed lines

@@ -7,7 +7,7 @@ 
  **/
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 /**
@@ -28,51 +28,51 @@ 
  *     - afficher : tableau des objets à afficher (mais pas forcément sélectionnables)
  */
 function selecteur_lister_objets($includelist = [], $excludelist = []) {
-	static $liste_selecteurs, $liste_parents;
-
-	if (!$liste_selecteurs) {
-		$liste_selecteurs = find_all_in_path('formulaires/selecteur/', 'hierarchie-[\w]+[.]html$');
-	}
-	$objets_selectionner = [];
-	foreach ($liste_selecteurs as $fichier => $chemin) {
-		$objets_selectionner[] = preg_replace('/^hierarchie-([\w]+)[.]html$/', '$1', $fichier);
-	}
-
-	// S'il y a une whitelist on ne garde que ce qui est dedans
-	if (!empty($includelist)) {
-		$includelist = array_map('table_objet', $includelist);
-		$objets_selectionner = array_intersect($objets_selectionner, $includelist);
-	}
-	// On supprime ce qui est dans la liste d’exclusion
-	$excludelist = array_map('table_objet', $excludelist);
-	// On enlève toujours la racine
-	$excludelist[] = 'racine';
-	$objets_selectionner = array_diff($objets_selectionner, $excludelist);
-
-	// Ensuite on cherche ce qu'on doit afficher : au moins ceux qu'on peut sélectionner
-	$objets_afficher = $objets_selectionner;
-
-	// Il faut alors chercher d'éventuels parents obligatoires en plus :
-	// lister-trucs-bidules.html => on doit afficher des "trucs" pour trouver des "bidules"
-	if (!$liste_parents) {
-		$liste_parents = find_all_in_path('formulaires/selecteur/', 'lister-[\w]+-[\w]+[.]html$');
-	}
-	foreach ($liste_parents as $fichier => $chemin) {
-		preg_match('/^lister-([\w]+)-([\w]+)[.]html$/', $fichier, $captures);
-		$parent = $captures[1];
-		$type = $captures[2];
-		// Si le type fait partie de ce qu'on doit afficher alors on ajoute aussi le parent à l'affichage
-		if (in_array($type, $objets_afficher)) {
-			$objets_afficher[] = $parent;
-		}
-	}
-
-	$objets = [
-		'selectionner' => array_unique($objets_selectionner),
-		'afficher' => array_unique($objets_afficher),
-	];
-
-	return $objets;
+    static $liste_selecteurs, $liste_parents;
+
+    if (!$liste_selecteurs) {
+        $liste_selecteurs = find_all_in_path('formulaires/selecteur/', 'hierarchie-[\w]+[.]html$');
+    }
+    $objets_selectionner = [];
+    foreach ($liste_selecteurs as $fichier => $chemin) {
+        $objets_selectionner[] = preg_replace('/^hierarchie-([\w]+)[.]html$/', '$1', $fichier);
+    }
+
+    // S'il y a une whitelist on ne garde que ce qui est dedans
+    if (!empty($includelist)) {
+        $includelist = array_map('table_objet', $includelist);
+        $objets_selectionner = array_intersect($objets_selectionner, $includelist);
+    }
+    // On supprime ce qui est dans la liste d’exclusion
+    $excludelist = array_map('table_objet', $excludelist);
+    // On enlève toujours la racine
+    $excludelist[] = 'racine';
+    $objets_selectionner = array_diff($objets_selectionner, $excludelist);
+
+    // Ensuite on cherche ce qu'on doit afficher : au moins ceux qu'on peut sélectionner
+    $objets_afficher = $objets_selectionner;
+
+    // Il faut alors chercher d'éventuels parents obligatoires en plus :
+    // lister-trucs-bidules.html => on doit afficher des "trucs" pour trouver des "bidules"
+    if (!$liste_parents) {
+        $liste_parents = find_all_in_path('formulaires/selecteur/', 'lister-[\w]+-[\w]+[.]html$');
+    }
+    foreach ($liste_parents as $fichier => $chemin) {
+        preg_match('/^lister-([\w]+)-([\w]+)[.]html$/', $fichier, $captures);
+        $parent = $captures[1];
+        $type = $captures[2];
+        // Si le type fait partie de ce qu'on doit afficher alors on ajoute aussi le parent à l'affichage
+        if (in_array($type, $objets_afficher)) {
+            $objets_afficher[] = $parent;
+        }
+    }
+
+    $objets = [
+        'selectionner' => array_unique($objets_selectionner),
+        'afficher' => array_unique($objets_afficher),
+    ];
+
+    return $objets;
 }
 
 /**
@@ -99,31 +99,31 @@ 
  *     liste des couples (objets => id_objet) ou liste des identifiants d'un type d'objet.
  **/
 function picker_selected($selected, $type = '') {
-	$select = [];
-	$type = preg_replace(',\W,', '', $type);
-
-	if ($selected and !is_array($selected)) {
-		$selected = explode(',', $selected);
-	}
-
-	if (is_array($selected)) {
-		foreach ($selected as $value) {
-			// Si c'est le bon format déjà
-			if (preg_match('/^([\w]+)[|]([0-9]+)$/', $value, $captures)) {
-				$objet = $captures[1];
-				$id_objet = intval($captures[2]);
-
-				// Si on cherche un type et que c'est le bon, on renvoit un tableau que d'identifiants
-				if (is_string($type) and $type == $objet and ($id_objet or in_array($objet, ['racine', 'rubrique']))) {
-					$select[] = $id_objet;
-				} elseif (!$type and ($id_objet or in_array($objet, ['racine', 'rubrique']))) {
-					$select[] = ['objet' => $objet, 'id_objet' => $id_objet];
-				}
-			}
-		}
-	}
-
-	return $select;
+    $select = [];
+    $type = preg_replace(',\W,', '', $type);
+
+    if ($selected and !is_array($selected)) {
+        $selected = explode(',', $selected);
+    }
+
+    if (is_array($selected)) {
+        foreach ($selected as $value) {
+            // Si c'est le bon format déjà
+            if (preg_match('/^([\w]+)[|]([0-9]+)$/', $value, $captures)) {
+                $objet = $captures[1];
+                $id_objet = intval($captures[2]);
+
+                // Si on cherche un type et que c'est le bon, on renvoit un tableau que d'identifiants
+                if (is_string($type) and $type == $objet and ($id_objet or in_array($objet, ['racine', 'rubrique']))) {
+                    $select[] = $id_objet;
+                } elseif (!$type and ($id_objet or in_array($objet, ['racine', 'rubrique']))) {
+                    $select[] = ['objet' => $objet, 'id_objet' => $id_objet];
+                }
+            }
+        }
+    }
+
+    return $select;
 }
 
 /**
@@ -140,49 +140,49 @@ 
  *     Booléen indiquant si les articles sont sélectionnables
  */
 function picker_identifie_id_rapide($ref, $rubriques_ou_objets = false, $articles = false) {
-	include_spip('inc/json');
-	include_spip('inc/lien');
-
-	// On construit un tableau des objets sélectionnables suivant les paramètres
-	$objets = [];
-	if ($rubriques_ou_objets and is_array($rubriques_ou_objets)) {
-		$objets = $rubriques_ou_objets;
-	} else {
-		if ($rubriques_ou_objets) {
-			$objets[] = 'rubriques';
-		}
-		if ($articles) {
-			$objets[] = 'articles';
-		}
-	}
-
-	// si id numerique et un seul objet possible, pas d'ambiguite
-	if (is_numeric($ref) and count($objets) === 1) {
-		$ref = reset($objets) . $ref;
-	}
-
-	// Si la référence ne correspond à rien, c'est fini
-	if (!($match = typer_raccourci($ref))) {
-		return json_export(false);
-	}
-	// Sinon on récupère les infos utiles
-	[$type, , $id, , , , ] = array_pad($match, 7, null);
-
-	// On regarde si le type trouvé fait partie des objets sélectionnables
-	if (!in_array(table_objet($type), $objets)) {
-		return json_export(false);
-	}
-
-	// Maintenant que tout est bon, on cherche les informations sur cet objet
-	include_spip('inc/filtres');
-	if (!$titre = generer_objet_info($id, $type, 'titre')) {
-		return json_export(false);
-	}
-
-	// On simplifie le texte
-	$titre = attribut_html($titre);
-
-	return json_export(['type' => $type, 'id' => "$type|$id", 'titre' => $titre]);
+    include_spip('inc/json');
+    include_spip('inc/lien');
+
+    // On construit un tableau des objets sélectionnables suivant les paramètres
+    $objets = [];
+    if ($rubriques_ou_objets and is_array($rubriques_ou_objets)) {
+        $objets = $rubriques_ou_objets;
+    } else {
+        if ($rubriques_ou_objets) {
+            $objets[] = 'rubriques';
+        }
+        if ($articles) {
+            $objets[] = 'articles';
+        }
+    }
+
+    // si id numerique et un seul objet possible, pas d'ambiguite
+    if (is_numeric($ref) and count($objets) === 1) {
+        $ref = reset($objets) . $ref;
+    }
+
+    // Si la référence ne correspond à rien, c'est fini
+    if (!($match = typer_raccourci($ref))) {
+        return json_export(false);
+    }
+    // Sinon on récupère les infos utiles
+    [$type, , $id, , , , ] = array_pad($match, 7, null);
+
+    // On regarde si le type trouvé fait partie des objets sélectionnables
+    if (!in_array(table_objet($type), $objets)) {
+        return json_export(false);
+    }
+
+    // Maintenant que tout est bon, on cherche les informations sur cet objet
+    include_spip('inc/filtres');
+    if (!$titre = generer_objet_info($id, $type, 'titre')) {
+        return json_export(false);
+    }
+
+    // On simplifie le texte
+    $titre = attribut_html($titre);
+
+    return json_export(['type' => $type, 'id' => "$type|$id", 'titre' => $titre]);
 }
 
 /**
@@ -205,34 +205,34 @@ 
  *     Comme le filtre `oui` : espace (` `) si rubrique à afficher, chaîne vide sinon.
  */
 function test_enfants_rubrique($id_rubrique, $types = []) {
-	static $has_child = [];
-
-	if (!isset($has_child[$id_rubrique])) {
-		$types = (is_array($types) ? array_filter($types) : []);
-
-		// recuperer tous les freres et soeurs de la rubrique visee
-		$id_parent = sql_getfetsel('id_parent', 'spip_rubriques', 'id_rubrique=' . intval($id_rubrique));
-		$fratrie = sql_allfetsel('id_rubrique', 'spip_rubriques', 'id_parent=' . intval($id_parent));
-		$fratrie = array_column($fratrie, 'id_rubrique');
-		$has = sql_allfetsel('DISTINCT id_parent', 'spip_rubriques', sql_in('id_parent', $fratrie));
-		$has = array_column($has, 'id_parent');
-		$fratrie = array_diff($fratrie, $has);
-
-		while (count($fratrie) and is_array($types) and count($types)) {
-			$type = array_shift($types);
-			$h = sql_allfetsel('DISTINCT id_rubrique', table_objet_sql($type), sql_in('id_rubrique', $fratrie));
-			$h = array_column($h, 'id_rubrique');
-			$has = array_merge($has, $h);
-			$fratrie = array_diff($fratrie, $h);
-		}
-
-		if (count($has)) {
-			$has_child = $has_child + array_combine($has, array_pad([], count($has), true));
-		}
-		if (count($fratrie)) {
-			$has_child = $has_child + array_combine($fratrie, array_pad([], count($fratrie), false));
-		}
-	}
-
-	return $has_child[$id_rubrique] ? ' ' : '';
+    static $has_child = [];
+
+    if (!isset($has_child[$id_rubrique])) {
+        $types = (is_array($types) ? array_filter($types) : []);
+
+        // recuperer tous les freres et soeurs de la rubrique visee
+        $id_parent = sql_getfetsel('id_parent', 'spip_rubriques', 'id_rubrique=' . intval($id_rubrique));
+        $fratrie = sql_allfetsel('id_rubrique', 'spip_rubriques', 'id_parent=' . intval($id_parent));
+        $fratrie = array_column($fratrie, 'id_rubrique');
+        $has = sql_allfetsel('DISTINCT id_parent', 'spip_rubriques', sql_in('id_parent', $fratrie));
+        $has = array_column($has, 'id_parent');
+        $fratrie = array_diff($fratrie, $has);
+
+        while (count($fratrie) and is_array($types) and count($types)) {
+            $type = array_shift($types);
+            $h = sql_allfetsel('DISTINCT id_rubrique', table_objet_sql($type), sql_in('id_rubrique', $fratrie));
+            $h = array_column($h, 'id_rubrique');
+            $has = array_merge($has, $h);
+            $fratrie = array_diff($fratrie, $h);
+        }
+
+        if (count($has)) {
+            $has_child = $has_child + array_combine($has, array_pad([], count($has), true));
+        }
+        if (count($fratrie)) {
+            $has_child = $has_child + array_combine($fratrie, array_pad([], count($fratrie), false));
+        }
+    }
+
+    return $has_child[$id_rubrique] ? ' ' : '';
 }

ecrire/lang/ecrire_en.php

Indentation +836 added lines, -836 removed lines

@@ -4,429 +4,429 @@ 
 // ** 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_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_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_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_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_js' => 'A line of javascript allows you to easily display the most recent articles published on this site on any other site belonging to you.',
-	'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_js' => 'A line of javascript allows you to easily display the most recent articles published on this site on any other site belonging to you.',
+    '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.',
-	'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
@@ -434,403 +434,403 @@ 
   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_version' => 'This version of PHP @version@ is too old (minimum = @minimum@)',
-	'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_version' => 'This version of PHP @version@ is too old (minimum = @minimum@)',
+    '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_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_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_infinie' => 'This site does not have any fixed limit for the size of the cache.',
-	'taille_cache_maxi' => 'SPIP will try to limit the size of the cache directory to approximately <b>@octets@</b>.',
-	'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_infinie' => 'This site does not have any fixed limit for the size of the cache.',
+    'taille_cache_maxi' => 'SPIP will try to limit the size of the cache directory to approximately <b>@octets@</b>.',
+    '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>
@@ -841,87 +841,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/notifications/instituerarticle.php

Indentation +44 added lines, -44 removed lines

@@ -11,53 +11,53 @@
 \***************************************************************************/
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 // Fonction appelee par divers pipelines
 function notifications_instituerarticle_dist($quoi, $id_article, $options) {
 
-	// ne devrait jamais se produire
-	if ($options['statut'] == $options['statut_ancien']) {
-		spip_log('statut inchange', 'notifications');
-
-		return;
-	}
-
-	include_spip('inc/texte');
-
-	$modele = '';
-	if ($options['statut'] == 'publie') {
-		if (
-			$GLOBALS['meta']['post_dates'] == 'non'
-			and strtotime($options['date']) > time()
-		) {
-			$modele = 'notifications/article_valide';
-		} else {
-			$modele = 'notifications/article_publie';
-		}
-	}
-
-	if ($options['statut'] == 'prop' and $options['statut_ancien'] != 'publie') {
-		$modele = 'notifications/article_propose';
-	}
-
-	if ($modele) {
-		$destinataires = [];
-		if ($GLOBALS['meta']['suivi_edito'] == 'oui') {
-			$destinataires = explode(',', $GLOBALS['meta']['adresse_suivi']);
-		}
-
-
-		$destinataires = pipeline(
-			'notifications_destinataires',
-			[
-				'args' => ['quoi' => $quoi, 'id' => $id_article, 'options' => $options],
-				'data' => $destinataires
-			]
-		);
-
-		$texte = email_notification_article($id_article, $modele);
-		notifications_envoyer_mails($destinataires, $texte);
-	}
+    // ne devrait jamais se produire
+    if ($options['statut'] == $options['statut_ancien']) {
+        spip_log('statut inchange', 'notifications');
+
+        return;
+    }
+
+    include_spip('inc/texte');
+
+    $modele = '';
+    if ($options['statut'] == 'publie') {
+        if (
+            $GLOBALS['meta']['post_dates'] == 'non'
+            and strtotime($options['date']) > time()
+        ) {
+            $modele = 'notifications/article_valide';
+        } else {
+            $modele = 'notifications/article_publie';
+        }
+    }
+
+    if ($options['statut'] == 'prop' and $options['statut_ancien'] != 'publie') {
+        $modele = 'notifications/article_propose';
+    }
+
+    if ($modele) {
+        $destinataires = [];
+        if ($GLOBALS['meta']['suivi_edito'] == 'oui') {
+            $destinataires = explode(',', $GLOBALS['meta']['adresse_suivi']);
+        }
+
+
+        $destinataires = pipeline(
+            'notifications_destinataires',
+            [
+                'args' => ['quoi' => $quoi, 'id' => $id_article, 'options' => $options],
+                'data' => $destinataires
+            ]
+        );
+
+        $texte = email_notification_article($id_article, $modele);
+        notifications_envoyer_mails($destinataires, $texte);
+    }
 }

ecrire/req/sqlite3.php

Indentation +8 added lines, -8 removed lines

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

ecrire/req/pg.exp.php

Indentation +1179 added lines, -1179 removed lines

@@ -18,7 +18,7 @@ 
  */
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 define('_DEFAULT_DB', 'spip');
@@ -31,159 +31,159 @@ 
 // si ca ne marche toujours pas, echec.
 
 function req_pg_dist($addr, $port, $login, $pass, $db = '', $prefixe = '') {
-	static $last_connect = [];
-	if (!extension_loaded('pgsql')) {
-		return false;
-	}
-
-	// si provient de selectdb
-	if (empty($addr) && empty($port) && empty($login) && empty($pass)) {
-		foreach (['addr', 'port', 'login', 'pass', 'prefixe'] as $a) {
-			${$a} = $last_connect[$a];
-		}
-	}
-	[$host, $p] = array_pad(explode(';', $addr), 2, null);
-	if ($p > 0) {
-		$port = " port=$p";
-	} else {
-		$port = '';
-	}
-	$erreurs = [];
-	if ($db) {
-		@$link = pg_connect("host=$host$port dbname=$db user=$login password='$pass'", PGSQL_CONNECT_FORCE_NEW);
-	} elseif (!@$link = pg_connect("host=$host$port user=$login password='$pass'", PGSQL_CONNECT_FORCE_NEW)) {
-		$erreurs[] = pg_last_error();
-		if (@$link = pg_connect("host=$host$port dbname=$login user=$login password='$pass'", PGSQL_CONNECT_FORCE_NEW)) {
-			$db = $login;
-		} else {
-			$erreurs[] = pg_last_error();
-			$db = _DEFAULT_DB;
-			$link = pg_connect("host=$host$port dbname=$db user=$login password='$pass'", PGSQL_CONNECT_FORCE_NEW);
-		}
-	}
-	if (!$link) {
-		$erreurs[] = pg_last_error();
-		foreach ($erreurs as $e) {
-			spip_log('Echec pg_connect. Erreur : ' . $e, 'pg.' . _LOG_HS);
-		}
-
-		return false;
-	}
-
-	if ($link) {
-		$last_connect = [
-			'addr' => $addr,
-			'port' => $port,
-			'login' => $login,
-			'pass' => $pass,
-			'db' => $db,
-			'prefixe' => $prefixe,
-		];
-	}
-
-	spip_log(
-		"Connexion vers $host, base $db, prefixe $prefixe " . ($link ? 'operationnelle' : 'impossible'),
-		'pg.' . _LOG_DEBUG
-	);
-
-	return !$link ? false : [
-		'db' => $db,
-		'prefixe' => $prefixe ?: $db,
-		'link' => $link,
-	];
+    static $last_connect = [];
+    if (!extension_loaded('pgsql')) {
+        return false;
+    }
+
+    // si provient de selectdb
+    if (empty($addr) && empty($port) && empty($login) && empty($pass)) {
+        foreach (['addr', 'port', 'login', 'pass', 'prefixe'] as $a) {
+            ${$a} = $last_connect[$a];
+        }
+    }
+    [$host, $p] = array_pad(explode(';', $addr), 2, null);
+    if ($p > 0) {
+        $port = " port=$p";
+    } else {
+        $port = '';
+    }
+    $erreurs = [];
+    if ($db) {
+        @$link = pg_connect("host=$host$port dbname=$db user=$login password='$pass'", PGSQL_CONNECT_FORCE_NEW);
+    } elseif (!@$link = pg_connect("host=$host$port user=$login password='$pass'", PGSQL_CONNECT_FORCE_NEW)) {
+        $erreurs[] = pg_last_error();
+        if (@$link = pg_connect("host=$host$port dbname=$login user=$login password='$pass'", PGSQL_CONNECT_FORCE_NEW)) {
+            $db = $login;
+        } else {
+            $erreurs[] = pg_last_error();
+            $db = _DEFAULT_DB;
+            $link = pg_connect("host=$host$port dbname=$db user=$login password='$pass'", PGSQL_CONNECT_FORCE_NEW);
+        }
+    }
+    if (!$link) {
+        $erreurs[] = pg_last_error();
+        foreach ($erreurs as $e) {
+            spip_log('Echec pg_connect. Erreur : ' . $e, 'pg.' . _LOG_HS);
+        }
+
+        return false;
+    }
+
+    if ($link) {
+        $last_connect = [
+            'addr' => $addr,
+            'port' => $port,
+            'login' => $login,
+            'pass' => $pass,
+            'db' => $db,
+            'prefixe' => $prefixe,
+        ];
+    }
+
+    spip_log(
+        "Connexion vers $host, base $db, prefixe $prefixe " . ($link ? 'operationnelle' : 'impossible'),
+        'pg.' . _LOG_DEBUG
+    );
+
+    return !$link ? false : [
+        'db' => $db,
+        'prefixe' => $prefixe ?: $db,
+        'link' => $link,
+    ];
 }
 
 $GLOBALS['spip_pg_functions_1'] = [
-	'alter' => 'spip_pg_alter',
-	'count' => 'spip_pg_count',
-	'countsel' => 'spip_pg_countsel',
-	'create' => 'spip_pg_create',
-	'create_base' => 'spip_pg_create_base',
-	'create_view' => 'spip_pg_create_view',
-	'date_proche' => 'spip_pg_date_proche',
-	'delete' => 'spip_pg_delete',
-	'drop_table' => 'spip_pg_drop_table',
-	'drop_view' => 'spip_pg_drop_view',
-	'errno' => 'spip_pg_errno',
-	'error' => 'spip_pg_error',
-	'explain' => 'spip_pg_explain',
-	'fetch' => 'spip_pg_fetch',
-	'seek' => 'spip_pg_seek',
-	'free' => 'spip_pg_free',
-	'hex' => 'spip_pg_hex',
-	'in' => 'spip_pg_in',
-	'insert' => 'spip_pg_insert',
-	'insertq' => 'spip_pg_insertq',
-	'insertq_multi' => 'spip_pg_insertq_multi',
-	'listdbs' => 'spip_pg_listdbs',
-	'multi' => 'spip_pg_multi',
-	'optimize' => 'spip_pg_optimize',
-	'query' => 'spip_pg_query',
-	'quote' => 'spip_pg_quote',
-	'replace' => 'spip_pg_replace',
-	'replace_multi' => 'spip_pg_replace_multi',
-	'select' => 'spip_pg_select',
-	'selectdb' => 'spip_pg_selectdb',
-	'set_connect_charset' => 'spip_pg_set_connect_charset',
-	'showbase' => 'spip_pg_showbase',
-	'showtable' => 'spip_pg_showtable',
-	'update' => 'spip_pg_update',
-	'updateq' => 'spip_pg_updateq',
+    'alter' => 'spip_pg_alter',
+    'count' => 'spip_pg_count',
+    'countsel' => 'spip_pg_countsel',
+    'create' => 'spip_pg_create',
+    'create_base' => 'spip_pg_create_base',
+    'create_view' => 'spip_pg_create_view',
+    'date_proche' => 'spip_pg_date_proche',
+    'delete' => 'spip_pg_delete',
+    'drop_table' => 'spip_pg_drop_table',
+    'drop_view' => 'spip_pg_drop_view',
+    'errno' => 'spip_pg_errno',
+    'error' => 'spip_pg_error',
+    'explain' => 'spip_pg_explain',
+    'fetch' => 'spip_pg_fetch',
+    'seek' => 'spip_pg_seek',
+    'free' => 'spip_pg_free',
+    'hex' => 'spip_pg_hex',
+    'in' => 'spip_pg_in',
+    'insert' => 'spip_pg_insert',
+    'insertq' => 'spip_pg_insertq',
+    'insertq_multi' => 'spip_pg_insertq_multi',
+    'listdbs' => 'spip_pg_listdbs',
+    'multi' => 'spip_pg_multi',
+    'optimize' => 'spip_pg_optimize',
+    'query' => 'spip_pg_query',
+    'quote' => 'spip_pg_quote',
+    'replace' => 'spip_pg_replace',
+    'replace_multi' => 'spip_pg_replace_multi',
+    'select' => 'spip_pg_select',
+    'selectdb' => 'spip_pg_selectdb',
+    'set_connect_charset' => 'spip_pg_set_connect_charset',
+    'showbase' => 'spip_pg_showbase',
+    'showtable' => 'spip_pg_showtable',
+    'update' => 'spip_pg_update',
+    'updateq' => 'spip_pg_updateq',
 ];
 
 // Par ou ca passe une fois les traductions faites
 function spip_pg_trace_query($query, $serveur = '') {
-	$connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0];
-	$prefixe = $connexion['prefixe'];
-	$link = $connexion['link'];
-	$db = $connexion['db'];
-
-	if (isset($_GET['var_profile'])) {
-		include_spip('public/tracer');
-		$t = trace_query_start();
-		$e = '';
-	} else {
-		$t = 0;
-	}
-
-	$connexion['last'] = $query;
-	$r = spip_pg_query_simple($link, $query);
-
-	// Log de l'erreur eventuelle
-	if ($e = spip_pg_errno($serveur)) {
-		$e .= spip_pg_error($query, $serveur);
-	} // et du fautif
-	return $t ? trace_query_end($query, $t, $r, $e, $serveur) : $r;
+    $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0];
+    $prefixe = $connexion['prefixe'];
+    $link = $connexion['link'];
+    $db = $connexion['db'];
+
+    if (isset($_GET['var_profile'])) {
+        include_spip('public/tracer');
+        $t = trace_query_start();
+        $e = '';
+    } else {
+        $t = 0;
+    }
+
+    $connexion['last'] = $query;
+    $r = spip_pg_query_simple($link, $query);
+
+    // Log de l'erreur eventuelle
+    if ($e = spip_pg_errno($serveur)) {
+        $e .= spip_pg_error($query, $serveur);
+    } // et du fautif
+    return $t ? trace_query_end($query, $t, $r, $e, $serveur) : $r;
 }
 
 // Fonction de requete generale quand on est sur que c'est SQL standard.
 // Elle change juste le noms des tables ($table_prefix) dans le FROM etc
 
 function spip_pg_query($query, $serveur = '', $requeter = true) {
-	$connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0];
-	$prefixe = $connexion['prefixe'];
-	$link = $connexion['link'];
-	$db = $connexion['db'];
-
-	if (preg_match('/\s(SET|VALUES|WHERE|DATABASE)\s/i', $query, $regs)) {
-		$suite = strstr($query, (string) $regs[0]);
-		$query = substr($query, 0, -strlen($suite));
-	} else {
-		$suite = '';
-	}
-	$query = preg_replace('/([,\s])spip_/', '\1' . $prefixe . '_', $query) . $suite;
-
-	// renvoyer la requete inerte si demandee
-	if (!$requeter) {
-		return $query;
-	}
-
-	return spip_pg_trace_query($query, $serveur);
+    $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0];
+    $prefixe = $connexion['prefixe'];
+    $link = $connexion['link'];
+    $db = $connexion['db'];
+
+    if (preg_match('/\s(SET|VALUES|WHERE|DATABASE)\s/i', $query, $regs)) {
+        $suite = strstr($query, (string) $regs[0]);
+        $query = substr($query, 0, -strlen($suite));
+    } else {
+        $suite = '';
+    }
+    $query = preg_replace('/([,\s])spip_/', '\1' . $prefixe . '_', $query) . $suite;
+
+    // renvoyer la requete inerte si demandee
+    if (!$requeter) {
+        return $query;
+    }
+
+    return spip_pg_trace_query($query, $serveur);
 }
 
 function spip_pg_query_simple($link, $query) {
-	#spip_log(var_export($query,true), 'pg.'._LOG_DEBUG);
-	return pg_query($link, $query);
+    #spip_log(var_export($query,true), 'pg.'._LOG_DEBUG);
+    return pg_query($link, $query);
 }
 
 /*
@@ -195,196 +195,196 @@ 
  * de requetes showtable intempestives
  */
 function spip_pg_ajouter_champs_timestamp($table, $couples, $desc = '', $serveur = '') {
-	static $tables = [];
-
-	if (!isset($tables[$table])) {
-		if (!$desc) {
-			$trouver_table = charger_fonction('trouver_table', 'base');
-			$desc = $trouver_table($table, $serveur);
-			// si pas de description, on ne fait rien, ou on die() ?
-			if (!$desc) {
-				return $couples;
-			}
-		}
-
-		// recherche des champs avec simplement 'TIMESTAMP'
-		// cependant, il faudra peut etre etendre
-		// avec la gestion de DEFAULT et ON UPDATE
-		// mais ceux-ci ne sont pas utilises dans le core
-		$tables[$table] = [];
-		foreach ($desc['field'] as $k => $v) {
-			$v = strtolower(ltrim($v));
-			// ne pas ajouter de timestamp now() si un default est specifie
-			if (strpos($v, 'timestamp') === 0 and strpos($v, 'default') === false) {
-				$tables[$table][] = $k;
-			}
-		}
-	}
-
-	// ajout des champs type 'timestamp' absents
-	foreach ($tables[$table] as $maj) {
-		if (!array_key_exists($maj, $couples)) {
-			$couples[$maj] = 'NOW()';
-		}
-	}
-
-	return $couples;
+    static $tables = [];
+
+    if (!isset($tables[$table])) {
+        if (!$desc) {
+            $trouver_table = charger_fonction('trouver_table', 'base');
+            $desc = $trouver_table($table, $serveur);
+            // si pas de description, on ne fait rien, ou on die() ?
+            if (!$desc) {
+                return $couples;
+            }
+        }
+
+        // recherche des champs avec simplement 'TIMESTAMP'
+        // cependant, il faudra peut etre etendre
+        // avec la gestion de DEFAULT et ON UPDATE
+        // mais ceux-ci ne sont pas utilises dans le core
+        $tables[$table] = [];
+        foreach ($desc['field'] as $k => $v) {
+            $v = strtolower(ltrim($v));
+            // ne pas ajouter de timestamp now() si un default est specifie
+            if (strpos($v, 'timestamp') === 0 and strpos($v, 'default') === false) {
+                $tables[$table][] = $k;
+            }
+        }
+    }
+
+    // ajout des champs type 'timestamp' absents
+    foreach ($tables[$table] as $maj) {
+        if (!array_key_exists($maj, $couples)) {
+            $couples[$maj] = 'NOW()';
+        }
+    }
+
+    return $couples;
 }
 
 
 // Alter en PG ne traite pas les index
 function spip_pg_alter($query, $serveur = '', $requeter = true) {
-	// il faudrait une regexp pour eviter de spliter ADD PRIMARY KEY (colA, colB)
-	// tout en cassant en deux alter distincts "ADD PRIMARY KEY (colA, colB), ADD INDEX (chose)"...
-	// ou revoir l'api de sql_alter en creant un
-	// sql_alter_table($table,array($actions));
-	if (!preg_match('/\s*((\s*IGNORE)?\s*TABLE\s*([^\s]*))\s*(.*)?/is', $query, $regs)) {
-		spip_log("$query mal comprise", 'pg.' . _LOG_ERREUR);
-
-		return false;
-	}
-	$debut = $regs[1];
-	$table = $regs[3];
-	$suite = $regs[4];
-	$todo = explode(',', $suite);
-	// on remet les morceaux dechires ensembles... que c'est laid !
-	$todo2 = [];
-	$i = 0;
-	$ouverte = false;
-	while ($do = array_shift($todo)) {
-		$todo2[$i] = isset($todo2[$i]) ? $todo2[$i] . ',' . $do : $do;
-		$o = (false !== strpos($do, '('));
-		$f = (false !== strpos($do, ')'));
-		if ($o and !$f) {
-			$ouverte = true;
-		} elseif ($f) {
-			$ouverte = false;
-		}
-		if (!$ouverte) {
-			$i++;
-		}
-	}
-	$todo = $todo2;
-	$query = $debut . ' ' . array_shift($todo);
-
-	if (!preg_match('/^\s*(IGNORE\s*)?TABLE\s+(\w+)\s+(ADD|DROP|CHANGE|MODIFY|RENAME)\s*(.*)$/is', $query, $r)) {
-		spip_log("$query incompris", 'pg.' . _LOG_ERREUR);
-	} else {
-		if ($r[1]) {
-			spip_log("j'ignore IGNORE dans $query", 'pg.' . _LOG_AVERTISSEMENT);
-		}
-		$f = 'spip_pg_alter_' . strtolower($r[3]);
-		if (function_exists($f)) {
-			$f($r[2], $r[4], $serveur, $requeter);
-		} else {
-			spip_log("$query non prevu", 'pg.' . _LOG_ERREUR);
-		}
-	}
-	// Alter a plusieurs args. Faudrait optimiser.
-	if ($todo) {
-		spip_pg_alter("TABLE $table " . join(',', $todo));
-	}
+    // il faudrait une regexp pour eviter de spliter ADD PRIMARY KEY (colA, colB)
+    // tout en cassant en deux alter distincts "ADD PRIMARY KEY (colA, colB), ADD INDEX (chose)"...
+    // ou revoir l'api de sql_alter en creant un
+    // sql_alter_table($table,array($actions));
+    if (!preg_match('/\s*((\s*IGNORE)?\s*TABLE\s*([^\s]*))\s*(.*)?/is', $query, $regs)) {
+        spip_log("$query mal comprise", 'pg.' . _LOG_ERREUR);
+
+        return false;
+    }
+    $debut = $regs[1];
+    $table = $regs[3];
+    $suite = $regs[4];
+    $todo = explode(',', $suite);
+    // on remet les morceaux dechires ensembles... que c'est laid !
+    $todo2 = [];
+    $i = 0;
+    $ouverte = false;
+    while ($do = array_shift($todo)) {
+        $todo2[$i] = isset($todo2[$i]) ? $todo2[$i] . ',' . $do : $do;
+        $o = (false !== strpos($do, '('));
+        $f = (false !== strpos($do, ')'));
+        if ($o and !$f) {
+            $ouverte = true;
+        } elseif ($f) {
+            $ouverte = false;
+        }
+        if (!$ouverte) {
+            $i++;
+        }
+    }
+    $todo = $todo2;
+    $query = $debut . ' ' . array_shift($todo);
+
+    if (!preg_match('/^\s*(IGNORE\s*)?TABLE\s+(\w+)\s+(ADD|DROP|CHANGE|MODIFY|RENAME)\s*(.*)$/is', $query, $r)) {
+        spip_log("$query incompris", 'pg.' . _LOG_ERREUR);
+    } else {
+        if ($r[1]) {
+            spip_log("j'ignore IGNORE dans $query", 'pg.' . _LOG_AVERTISSEMENT);
+        }
+        $f = 'spip_pg_alter_' . strtolower($r[3]);
+        if (function_exists($f)) {
+            $f($r[2], $r[4], $serveur, $requeter);
+        } else {
+            spip_log("$query non prevu", 'pg.' . _LOG_ERREUR);
+        }
+    }
+    // Alter a plusieurs args. Faudrait optimiser.
+    if ($todo) {
+        spip_pg_alter("TABLE $table " . join(',', $todo));
+    }
 }
 
 function spip_pg_alter_change($table, $arg, $serveur = '', $requeter = true) {
-	if (!preg_match('/^`?(\w+)`?\s+`?(\w+)`?\s+(.*?)\s*(DEFAULT .*?)?(NOT\s+NULL)?\s*(DEFAULT .*?)?$/i', $arg, $r)) {
-		spip_log("alter change: $arg  incompris", 'pg.' . _LOG_ERREUR);
-	} else {
-		[, $old, $new, $type, $default, $null, $def2] = $r;
-		$actions = ["ALTER $old TYPE " . mysql2pg_type($type)];
-		if ($null) {
-			$actions[] = "ALTER $old SET NOT NULL";
-		} else {
-			$actions[] = "ALTER $old DROP NOT NULL";
-		}
-
-		if ($d = ($default ?: $def2)) {
-			$actions[] = "ALTER $old SET $d";
-		} else {
-			$actions[] = "ALTER $old DROP DEFAULT";
-		}
-
-		spip_pg_query("ALTER TABLE $table " . join(', ', $actions));
-
-		if ($old != $new) {
-			spip_pg_query("ALTER TABLE $table RENAME $old TO $new", $serveur);
-		}
-	}
+    if (!preg_match('/^`?(\w+)`?\s+`?(\w+)`?\s+(.*?)\s*(DEFAULT .*?)?(NOT\s+NULL)?\s*(DEFAULT .*?)?$/i', $arg, $r)) {
+        spip_log("alter change: $arg  incompris", 'pg.' . _LOG_ERREUR);
+    } else {
+        [, $old, $new, $type, $default, $null, $def2] = $r;
+        $actions = ["ALTER $old TYPE " . mysql2pg_type($type)];
+        if ($null) {
+            $actions[] = "ALTER $old SET NOT NULL";
+        } else {
+            $actions[] = "ALTER $old DROP NOT NULL";
+        }
+
+        if ($d = ($default ?: $def2)) {
+            $actions[] = "ALTER $old SET $d";
+        } else {
+            $actions[] = "ALTER $old DROP DEFAULT";
+        }
+
+        spip_pg_query("ALTER TABLE $table " . join(', ', $actions));
+
+        if ($old != $new) {
+            spip_pg_query("ALTER TABLE $table RENAME $old TO $new", $serveur);
+        }
+    }
 }
 
 function spip_pg_alter_add($table, $arg, $serveur = '', $requeter = true) {
-	$nom_index = null;
-	if (!preg_match('/^(COLUMN|INDEX|KEY|PRIMARY\s+KEY|)\s*(.*)$/', $arg, $r)) {
-		spip_log("alter add $arg  incompris", 'pg.' . _LOG_ERREUR);
-
-		return null;
-	}
-	if (!$r[1] or $r[1] == 'COLUMN') {
-		preg_match('/`?(\w+)`?(.*)/', $r[2], $m);
-		if (preg_match('/^(.*)(BEFORE|AFTER|FIRST)(.*)$/is', $m[2], $n)) {
-			$m[2] = $n[1];
-		}
-
-		return spip_pg_query("ALTER TABLE $table ADD " . $m[1] . ' ' . mysql2pg_type($m[2]), $serveur, $requeter);
-	} elseif ($r[1][0] == 'P') {
-		// la primary peut etre sur plusieurs champs
-		$r[2] = trim(str_replace('`', '', $r[2]));
-		$m = ($r[2][0] == '(') ? substr($r[2], 1, -1) : $r[2];
-
-		return spip_pg_query(
-			"ALTER TABLE $table ADD CONSTRAINT $table" . '_pkey PRIMARY KEY (' . $m . ')',
-			$serveur,
-			$requeter
-		);
-	} else {
-		preg_match('/([^\s,]*)\s*(.*)?/', $r[2], $m);
-		// peut etre "(colonne)" ou "nom_index (colonnes)"
-		// bug potentiel si qqn met "(colonne, colonne)"
-		//
-		// nom_index (colonnes)
-		if ($m[2]) {
-			$colonnes = substr($m[2], 1, -1);
-			$nom_index = $m[1];
-		} else {
-			// (colonne)
-			if ($m[1][0] == '(') {
-				$colonnes = substr($m[1], 1, -1);
-				if (false !== strpos(',', $colonnes)) {
-					spip_log('PG : Erreur, impossible de creer un index sur plusieurs colonnes'
-						. " sans qu'il ait de nom ($table, ($colonnes))", 'pg.' . _LOG_ERREUR);
-				} else {
-					$nom_index = $colonnes;
-				}
-			} // nom_index
-			else {
-				$nom_index = $colonnes = $m[1];
-			}
-		}
-
-		return spip_pg_create_index($nom_index, $table, $colonnes, $serveur, $requeter);
-	}
+    $nom_index = null;
+    if (!preg_match('/^(COLUMN|INDEX|KEY|PRIMARY\s+KEY|)\s*(.*)$/', $arg, $r)) {
+        spip_log("alter add $arg  incompris", 'pg.' . _LOG_ERREUR);
+
+        return null;
+    }
+    if (!$r[1] or $r[1] == 'COLUMN') {
+        preg_match('/`?(\w+)`?(.*)/', $r[2], $m);
+        if (preg_match('/^(.*)(BEFORE|AFTER|FIRST)(.*)$/is', $m[2], $n)) {
+            $m[2] = $n[1];
+        }
+
+        return spip_pg_query("ALTER TABLE $table ADD " . $m[1] . ' ' . mysql2pg_type($m[2]), $serveur, $requeter);
+    } elseif ($r[1][0] == 'P') {
+        // la primary peut etre sur plusieurs champs
+        $r[2] = trim(str_replace('`', '', $r[2]));
+        $m = ($r[2][0] == '(') ? substr($r[2], 1, -1) : $r[2];
+
+        return spip_pg_query(
+            "ALTER TABLE $table ADD CONSTRAINT $table" . '_pkey PRIMARY KEY (' . $m . ')',
+            $serveur,
+            $requeter
+        );
+    } else {
+        preg_match('/([^\s,]*)\s*(.*)?/', $r[2], $m);
+        // peut etre "(colonne)" ou "nom_index (colonnes)"
+        // bug potentiel si qqn met "(colonne, colonne)"
+        //
+        // nom_index (colonnes)
+        if ($m[2]) {
+            $colonnes = substr($m[2], 1, -1);
+            $nom_index = $m[1];
+        } else {
+            // (colonne)
+            if ($m[1][0] == '(') {
+                $colonnes = substr($m[1], 1, -1);
+                if (false !== strpos(',', $colonnes)) {
+                    spip_log('PG : Erreur, impossible de creer un index sur plusieurs colonnes'
+                        . " sans qu'il ait de nom ($table, ($colonnes))", 'pg.' . _LOG_ERREUR);
+                } else {
+                    $nom_index = $colonnes;
+                }
+            } // nom_index
+            else {
+                $nom_index = $colonnes = $m[1];
+            }
+        }
+
+        return spip_pg_create_index($nom_index, $table, $colonnes, $serveur, $requeter);
+    }
 }
 
 function spip_pg_alter_drop($table, $arg, $serveur = '', $requeter = true) {
-	if (!preg_match('/^(COLUMN|INDEX|KEY|PRIMARY\s+KEY|)\s*`?(\w*)`?/', $arg, $r)) {
-		spip_log("alter drop: $arg  incompris", 'pg.' . _LOG_ERREUR);
-	} else {
-		if (!$r[1] or $r[1] == 'COLUMN') {
-			return spip_pg_query("ALTER TABLE $table DROP " . $r[2], $serveur);
-		} elseif ($r[1][0] == 'P') {
-			return spip_pg_query("ALTER TABLE $table DROP CONSTRAINT $table" . '_pkey', $serveur);
-		} else {
-			return spip_pg_query('DROP INDEX ' . $table . '_' . $r[2], $serveur);
-		}
-	}
+    if (!preg_match('/^(COLUMN|INDEX|KEY|PRIMARY\s+KEY|)\s*`?(\w*)`?/', $arg, $r)) {
+        spip_log("alter drop: $arg  incompris", 'pg.' . _LOG_ERREUR);
+    } else {
+        if (!$r[1] or $r[1] == 'COLUMN') {
+            return spip_pg_query("ALTER TABLE $table DROP " . $r[2], $serveur);
+        } elseif ($r[1][0] == 'P') {
+            return spip_pg_query("ALTER TABLE $table DROP CONSTRAINT $table" . '_pkey', $serveur);
+        } else {
+            return spip_pg_query('DROP INDEX ' . $table . '_' . $r[2], $serveur);
+        }
+    }
 }
 
 function spip_pg_alter_modify($table, $arg, $serveur = '', $requeter = true) {
-	if (!preg_match('/^`?(\w+)`?\s+(.*)$/', $arg, $r)) {
-		spip_log("alter modify: $arg  incompris", 'pg.' . _LOG_ERREUR);
-	} else {
-		return spip_pg_alter_change($table, $r[1] . ' ' . $arg, $serveur = '', $requeter = true);
-	}
+    if (!preg_match('/^`?(\w+)`?\s+(.*)$/', $arg, $r)) {
+        spip_log("alter modify: $arg  incompris", 'pg.' . _LOG_ERREUR);
+    } else {
+        return spip_pg_alter_change($table, $r[1] . ' ' . $arg, $serveur = '', $requeter = true);
+    }
 }
 
 // attention (en pg) :
@@ -392,17 +392,17 @@ 
 // - alter table A rename X to Y = changer le nom de la colonne X en Y
 // pour l'instant, traiter simplement RENAME TO X
 function spip_pg_alter_rename($table, $arg, $serveur = '', $requeter = true) {
-	$rename = '';
-	// si TO, mais pas au debut
-	if (!stripos($arg, 'TO ')) {
-		$rename = $arg;
-	} elseif (preg_match('/^(TO)\s*`?(\w*)`?/', $arg, $r)) {
-		$rename = $r[2];
-	} else {
-		spip_log("alter rename: $arg  incompris", 'pg.' . _LOG_ERREUR);
-	}
-
-	return $rename ? spip_pg_query("ALTER TABLE $table RENAME TO $rename") : false;
+    $rename = '';
+    // si TO, mais pas au debut
+    if (!stripos($arg, 'TO ')) {
+        $rename = $arg;
+    } elseif (preg_match('/^(TO)\s*`?(\w*)`?/', $arg, $r)) {
+        $rename = $r[2];
+    } else {
+        spip_log("alter rename: $arg  incompris", 'pg.' . _LOG_ERREUR);
+    }
+
+    return $rename ? spip_pg_query("ALTER TABLE $table RENAME TO $rename") : false;
 }
 
 
@@ -418,59 +418,59 @@ 
  * @return bool ou requete
  */
 function spip_pg_create_index($nom, $table, $champs, $serveur = '', $requeter = true) {
-	if (!($nom or $table or $champs)) {
-		spip_log(
-			"Champ manquant pour creer un index pg ($nom, $table, (" . @join(',', $champs) . '))',
-			'pg.' . _LOG_ERREUR
-		);
-
-		return false;
-	}
-
-	$nom = str_replace('`', '', $nom);
-	$champs = str_replace('`', '', $champs);
-
-	// PG ne differentie pas noms des index en fonction des tables
-	// il faut donc creer des noms uniques d'index pour une base pg
-	$nom = $table . '_' . $nom;
-	// enlever d'eventuelles parentheses deja presentes sur champs
-	if (!is_array($champs)) {
-		if ($champs[0] == '(') {
-			$champs = substr($champs, 1, -1);
-		}
-		$champs = [$champs];
-	}
-	$query = "CREATE INDEX $nom ON $table (" . join(',', $champs) . ')';
-	if (!$requeter) {
-		return $query;
-	}
-	$res = spip_pg_query($query, $serveur, $requeter);
-
-	return $res;
+    if (!($nom or $table or $champs)) {
+        spip_log(
+            "Champ manquant pour creer un index pg ($nom, $table, (" . @join(',', $champs) . '))',
+            'pg.' . _LOG_ERREUR
+        );
+
+        return false;
+    }
+
+    $nom = str_replace('`', '', $nom);
+    $champs = str_replace('`', '', $champs);
+
+    // PG ne differentie pas noms des index en fonction des tables
+    // il faut donc creer des noms uniques d'index pour une base pg
+    $nom = $table . '_' . $nom;
+    // enlever d'eventuelles parentheses deja presentes sur champs
+    if (!is_array($champs)) {
+        if ($champs[0] == '(') {
+            $champs = substr($champs, 1, -1);
+        }
+        $champs = [$champs];
+    }
+    $query = "CREATE INDEX $nom ON $table (" . join(',', $champs) . ')';
+    if (!$requeter) {
+        return $query;
+    }
+    $res = spip_pg_query($query, $serveur, $requeter);
+
+    return $res;
 }
 
 
 function spip_pg_explain($query, $serveur = '', $requeter = true) {
-	if (strpos(ltrim($query), 'SELECT') !== 0) {
-		return [];
-	}
-	$connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0];
-	$prefixe = $connexion['prefixe'];
-	$link = $connexion['link'];
-	if (preg_match('/\s(SET|VALUES|WHERE)\s/i', $query, $regs)) {
-		$suite = strstr($query, (string) $regs[0]);
-		$query = substr($query, 0, -strlen($suite));
-	} else {
-		$suite = '';
-	}
-	$query = 'EXPLAIN ' . preg_replace('/([,\s])spip_/', '\1' . $prefixe . '_', $query) . $suite;
-
-	if (!$requeter) {
-		return $query;
-	}
-	$r = spip_pg_query_simple($link, $query);
-
-	return spip_pg_fetch($r, null, $serveur);
+    if (strpos(ltrim($query), 'SELECT') !== 0) {
+        return [];
+    }
+    $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0];
+    $prefixe = $connexion['prefixe'];
+    $link = $connexion['link'];
+    if (preg_match('/\s(SET|VALUES|WHERE)\s/i', $query, $regs)) {
+        $suite = strstr($query, (string) $regs[0]);
+        $query = substr($query, 0, -strlen($suite));
+    } else {
+        $suite = '';
+    }
+    $query = 'EXPLAIN ' . preg_replace('/([,\s])spip_/', '\1' . $prefixe . '_', $query) . $suite;
+
+    if (!$requeter) {
+        return $query;
+    }
+    $r = spip_pg_query_simple($link, $query);
+
+    return spip_pg_fetch($r, null, $serveur);
 }
 
 
@@ -489,92 +489,92 @@ 
  *     - False en cas d'erreur.
  **/
 function spip_pg_selectdb($db, $serveur = '', $requeter = true) {
-	// se connecter a la base indiquee
-	// avec les identifiants connus
-	$index = $serveur ? strtolower($serveur) : 0;
-
-	if ($link = spip_connect_db('', '', '', '', $db, 'pg', '', '')) {
-		if (($db == $link['db']) && $GLOBALS['connexions'][$index] = $link) {
-			return $db;
-		}
-	} else {
-		return false;
-	}
+    // se connecter a la base indiquee
+    // avec les identifiants connus
+    $index = $serveur ? strtolower($serveur) : 0;
+
+    if ($link = spip_connect_db('', '', '', '', $db, 'pg', '', '')) {
+        if (($db == $link['db']) && $GLOBALS['connexions'][$index] = $link) {
+            return $db;
+        }
+    } else {
+        return false;
+    }
 }
 
 // Qu'une seule base pour le moment
 
 function spip_pg_listdbs($serveur) {
-	$connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0];
-	$link = $connexion['link'];
-	$dbs = [];
-	$res = spip_pg_query_simple($link, 'select * From pg_database');
-	while ($row = pg_fetch_array($res, null, PGSQL_NUM)) {
-		$dbs[] = reset($row);
-	}
-
-	return $dbs;
+    $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0];
+    $link = $connexion['link'];
+    $dbs = [];
+    $res = spip_pg_query_simple($link, 'select * From pg_database');
+    while ($row = pg_fetch_array($res, null, PGSQL_NUM)) {
+        $dbs[] = reset($row);
+    }
+
+    return $dbs;
 }
 
 function spip_pg_select(
-	$select,
-	$from,
-	$where = '',
-	$groupby = [],
-	$orderby = '',
-	$limit = '',
-	$having = '',
-	$serveur = '',
-	$requeter = true
+    $select,
+    $from,
+    $where = '',
+    $groupby = [],
+    $orderby = '',
+    $limit = '',
+    $having = '',
+    $serveur = '',
+    $requeter = true
 ) {
 
-	$connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0];
-	$prefixe = $connexion['prefixe'];
-	$link = $connexion['link'];
-	$db = $connexion['db'];
-
-	$limit = preg_match('/^\s*(([0-9]+),)?\s*([0-9]+)\s*$/', $limit, $limatch);
-	if ($limit) {
-		$offset = $limatch[2];
-		$count = $limatch[3];
-	}
-
-	$select = spip_pg_frommysql($select);
-
-	// si pas de tri explicitement demande, le GROUP BY ne
-	// contient que la clef primaire.
-	// lui ajouter alors le champ de tri par defaut
-	if (preg_match('/FIELD\(([a-z]+\.[a-z]+),/i', $orderby[0], $groupbyplus)) {
-		$groupby[] = $groupbyplus[1];
-	}
-
-	$orderby = spip_pg_orderby($orderby, $select);
-
-	if ($having) {
-		if (is_array($having)) {
-			$having = join("\n\tAND ", array_map('calculer_pg_where', $having));
-		}
-	}
-	$from = spip_pg_from($from, $prefixe);
-	$query = 'SELECT ' . $select
-		. (!$from ? '' : "\nFROM $from")
-		. (!$where ? '' : ("\nWHERE " . (!is_array($where) ? calculer_pg_where($where) : (join(
-			"\n\tAND ",
-			array_map('calculer_pg_where', $where)
-		)))))
-		. spip_pg_groupby($groupby, $from, $select)
-		. (!$having ? '' : "\nHAVING $having")
-		. ($orderby ? ("\nORDER BY $orderby") : '')
-		. (!$limit ? '' : (" LIMIT $count" . (!$offset ? '' : " OFFSET $offset")));
-
-	// renvoyer la requete inerte si demandee
-	if ($requeter === false) {
-		return $query;
-	}
-
-	$r = spip_pg_trace_query($query, $serveur);
-
-	return $r ?: $query;
+    $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0];
+    $prefixe = $connexion['prefixe'];
+    $link = $connexion['link'];
+    $db = $connexion['db'];
+
+    $limit = preg_match('/^\s*(([0-9]+),)?\s*([0-9]+)\s*$/', $limit, $limatch);
+    if ($limit) {
+        $offset = $limatch[2];
+        $count = $limatch[3];
+    }
+
+    $select = spip_pg_frommysql($select);
+
+    // si pas de tri explicitement demande, le GROUP BY ne
+    // contient que la clef primaire.
+    // lui ajouter alors le champ de tri par defaut
+    if (preg_match('/FIELD\(([a-z]+\.[a-z]+),/i', $orderby[0], $groupbyplus)) {
+        $groupby[] = $groupbyplus[1];
+    }
+
+    $orderby = spip_pg_orderby($orderby, $select);
+
+    if ($having) {
+        if (is_array($having)) {
+            $having = join("\n\tAND ", array_map('calculer_pg_where', $having));
+        }
+    }
+    $from = spip_pg_from($from, $prefixe);
+    $query = 'SELECT ' . $select
+        . (!$from ? '' : "\nFROM $from")
+        . (!$where ? '' : ("\nWHERE " . (!is_array($where) ? calculer_pg_where($where) : (join(
+            "\n\tAND ",
+            array_map('calculer_pg_where', $where)
+        )))))
+        . spip_pg_groupby($groupby, $from, $select)
+        . (!$having ? '' : "\nHAVING $having")
+        . ($orderby ? ("\nORDER BY $orderby") : '')
+        . (!$limit ? '' : (" LIMIT $count" . (!$offset ? '' : " OFFSET $offset")));
+
+    // renvoyer la requete inerte si demandee
+    if ($requeter === false) {
+        return $query;
+    }
+
+    $r = spip_pg_trace_query($query, $serveur);
+
+    return $r ?: $query;
 ;
 }
 
@@ -582,26 +582,26 @@ 
 // car le reste de la requete utilise les alias (AS) systematiquement
 
 function spip_pg_from($from, $prefixe) {
-	if (is_array($from)) {
-		$from = spip_pg_select_as($from);
-	}
+    if (is_array($from)) {
+        $from = spip_pg_select_as($from);
+    }
 
-	return !$prefixe ? $from : preg_replace('/(\b)spip_/', '\1' . $prefixe . '_', $from);
+    return !$prefixe ? $from : preg_replace('/(\b)spip_/', '\1' . $prefixe . '_', $from);
 }
 
 function spip_pg_orderby($order, $select) {
-	$res = [];
-	$arg = (is_array($order) ? $order : preg_split('/\s*,\s*/', $order));
-
-	foreach ($arg as $v) {
-		if (preg_match('/(case\s+.*?else\s+0\s+end)\s*AS\s+' . $v . '/', $select, $m)) {
-			$res[] = $m[1];
-		} else {
-			$res[] = $v;
-		}
-	}
-
-	return spip_pg_frommysql(join(',', $res));
+    $res = [];
+    $arg = (is_array($order) ? $order : preg_split('/\s*,\s*/', $order));
+
+    foreach ($arg as $v) {
+        if (preg_match('/(case\s+.*?else\s+0\s+end)\s*AS\s+' . $v . '/', $select, $m)) {
+            $res[] = $m[1];
+        } else {
+            $res[] = $v;
+        }
+    }
+
+    return spip_pg_frommysql(join(',', $res));
 }
 
 // Conversion a l'arrach' des jointures MySQL en jointures PG
@@ -609,56 +609,56 @@ 
 // et pour enlever les repetitions (sans incidence de perf, mais ca fait sale)
 
 function spip_pg_groupby($groupby, $from, $select) {
-	$join = strpos($from, ',');
-	// ismplifier avant de decouper
-	if (is_string($select)) { // fct SQL sur colonne et constante apostrophee ==> la colonne
-	$select = preg_replace('/\w+\(\s*([^(),\']*),\s*\'[^\']*\'[^)]*\)/', '\\1', $select);
-	}
-
-	if ($join or $groupby) {
-		$join = is_array($select) ? $select : explode(', ', $select);
-	}
-	if ($join) {
-		// enlever les 0 as points, '', ...
-		foreach ($join as $k => $v) {
-			$v = str_replace('DISTINCT ', '', $v);
-			// fct SQL sur colonne et constante apostrophee ==> la colonne
-			$v = preg_replace('/\w+\(\s*([^(),\']*),\s*\'[^\']*\'[^)]*\)/', '\\1', $v);
-			$v = preg_replace('/CAST\(\s*([^(),\' ]*\s+)as\s*\w+\)/', '\\1', $v);
-			// resultat d'agregat ne sont pas a mettre dans le groupby
-			$v = preg_replace('/(SUM|COUNT|MAX|MIN|UPPER)\([^)]+\)(\s*AS\s+\w+)\s*,?/i', '', $v);
-			// idem sans AS (fetch numerique)
-			$v = preg_replace('/(SUM|COUNT|MAX|MIN|UPPER)\([^)]+\)\s*,?/i', '', $v);
-			// des AS simples : on garde le cote droit du AS
-			$v = preg_replace('/^.*\sAS\s+(\w+)\s*$/i', '\\1', $v);
-			// ne reste plus que les vrais colonnes, ou des constantes a virer
-			if (preg_match(',^[\'"],', $v) or is_numeric($v)) {
-				unset($join[$k]);
-			} else {
-				$join[$k] = trim($v);
-			}
-		}
-		$join = array_diff($join, ['']);
-		$join = implode(',', $join);
-	}
-	if (is_array($groupby)) {
-		$groupby = join(',', $groupby);
-	}
-	if ($join) {
-		$groupby = $groupby ? "$groupby, $join" : $join;
-	}
-	if (!$groupby) {
-		return '';
-	}
-
-	$groupby = spip_pg_frommysql($groupby);
-	// Ne pas mettre dans le Group-By des valeurs numeriques
-	// issue de prepare_recherche
-	$groupby = preg_replace('/^\s*\d+\s+AS\s+\w+\s*,?\s*/i', '', $groupby);
-	$groupby = preg_replace('/,\s*\d+\s+AS\s+\w+\s*/i', '', $groupby);
-	$groupby = preg_replace('/\s+AS\s+\w+\s*/i', '', $groupby);
-
-	return "\nGROUP BY $groupby";
+    $join = strpos($from, ',');
+    // ismplifier avant de decouper
+    if (is_string($select)) { // fct SQL sur colonne et constante apostrophee ==> la colonne
+    $select = preg_replace('/\w+\(\s*([^(),\']*),\s*\'[^\']*\'[^)]*\)/', '\\1', $select);
+    }
+
+    if ($join or $groupby) {
+        $join = is_array($select) ? $select : explode(', ', $select);
+    }
+    if ($join) {
+        // enlever les 0 as points, '', ...
+        foreach ($join as $k => $v) {
+            $v = str_replace('DISTINCT ', '', $v);
+            // fct SQL sur colonne et constante apostrophee ==> la colonne
+            $v = preg_replace('/\w+\(\s*([^(),\']*),\s*\'[^\']*\'[^)]*\)/', '\\1', $v);
+            $v = preg_replace('/CAST\(\s*([^(),\' ]*\s+)as\s*\w+\)/', '\\1', $v);
+            // resultat d'agregat ne sont pas a mettre dans le groupby
+            $v = preg_replace('/(SUM|COUNT|MAX|MIN|UPPER)\([^)]+\)(\s*AS\s+\w+)\s*,?/i', '', $v);
+            // idem sans AS (fetch numerique)
+            $v = preg_replace('/(SUM|COUNT|MAX|MIN|UPPER)\([^)]+\)\s*,?/i', '', $v);
+            // des AS simples : on garde le cote droit du AS
+            $v = preg_replace('/^.*\sAS\s+(\w+)\s*$/i', '\\1', $v);
+            // ne reste plus que les vrais colonnes, ou des constantes a virer
+            if (preg_match(',^[\'"],', $v) or is_numeric($v)) {
+                unset($join[$k]);
+            } else {
+                $join[$k] = trim($v);
+            }
+        }
+        $join = array_diff($join, ['']);
+        $join = implode(',', $join);
+    }
+    if (is_array($groupby)) {
+        $groupby = join(',', $groupby);
+    }
+    if ($join) {
+        $groupby = $groupby ? "$groupby, $join" : $join;
+    }
+    if (!$groupby) {
+        return '';
+    }
+
+    $groupby = spip_pg_frommysql($groupby);
+    // Ne pas mettre dans le Group-By des valeurs numeriques
+    // issue de prepare_recherche
+    $groupby = preg_replace('/^\s*\d+\s+AS\s+\w+\s*,?\s*/i', '', $groupby);
+    $groupby = preg_replace('/,\s*\d+\s+AS\s+\w+\s*/i', '', $groupby);
+    $groupby = preg_replace('/\s+AS\s+\w+\s*/i', '', $groupby);
+
+    return "\nGROUP BY $groupby";
 }
 
 // Conversion des operateurs MySQL en PG
@@ -669,492 +669,492 @@ 
 // A ameliorer.
 
 function spip_pg_frommysql($arg) {
-	if (is_array($arg)) {
-		$arg = join(', ', $arg);
-	}
-
-	$res = spip_pg_fromfield($arg);
-
-	$res = preg_replace('/\brand[(][)]/i', 'random()', $res);
-
-	$res = preg_replace(
-		'/\b0\.0[+]([a-zA-Z0-9_.]+)\s*/',
-		'CAST(substring(\1, \'^ *[0-9.]+\') as float)',
-		$res
-	);
-	$res = preg_replace(
-		'/\b0[+]([a-zA-Z0-9_.]+)\s*/',
-		'CAST(substring(\1, \'^ *[0-9]+\') as int)',
-		$res
-	);
-	$res = preg_replace(
-		'/\bconv[(]([^,]*)[^)]*[)]/i',
-		'CAST(substring(\1, \'^ *[0-9]+\') as int)',
-		$res
-	);
-
-	$res = preg_replace(
-		'/UNIX_TIMESTAMP\s*[(]\s*[)]/',
-		' EXTRACT(epoch FROM NOW())',
-		$res
-	);
-
-	// la fonction md5(integer) n'est pas connu en pg
-	// il faut donc forcer les types en text (cas de md5(id_article))
-	$res = preg_replace(
-		'/md5\s*[(]([^)]*)[)]/i',
-		'MD5(CAST(\1 AS text))',
-		$res
-	);
-
-	$res = preg_replace(
-		'/UNIX_TIMESTAMP\s*[(]([^)]*)[)]/',
-		' EXTRACT(epoch FROM \1)',
-		$res
-	);
-
-	$res = preg_replace(
-		'/\bDAYOFMONTH\s*[(]([^()]*([(][^()]*[)][^()]*)*[^)]*)[)]/',
-		' EXTRACT(day FROM \1)',
-		$res
-	);
-
-	$res = preg_replace(
-		'/\bMONTH\s*[(]([^()]*([(][^)]*[)][^()]*)*[^)]*)[)]/',
-		' EXTRACT(month FROM \1)',
-		$res
-	);
-
-	$res = preg_replace(
-		'/\bYEAR\s*[(]([^()]*([(][^)]*[)][^()]*)*[^)]*)[)]/',
-		' EXTRACT(year FROM \1)',
-		$res
-	);
-
-	$res = preg_replace(
-		'/TO_DAYS\s*[(]([^()]*([(][^)]*[)][()]*)*)[)]/',
-		' EXTRACT(day FROM \1 - \'0001-01-01\')',
-		$res
-	);
-
-	$res = preg_replace('/(EXTRACT[(][^ ]* FROM *)"([^"]*)"/', '\1\'\2\'', $res);
-
-	$res = preg_replace('/DATE_FORMAT\s*[(]([^,]*),\s*\'%Y%m%d\'[)]/', 'to_char(\1, \'YYYYMMDD\')', $res);
-
-	$res = preg_replace('/DATE_FORMAT\s*[(]([^,]*),\s*\'%Y%m\'[)]/', 'to_char(\1, \'YYYYMM\')', $res);
-
-	$res = preg_replace('/DATE_SUB\s*[(]([^,]*),/', '(\1 -', $res);
-	$res = preg_replace('/DATE_ADD\s*[(]([^,]*),/', '(\1 +', $res);
-	$res = preg_replace('/INTERVAL\s+(\d+\s+\w+)/', 'INTERVAL \'\1\'', $res);
-	$res = preg_replace('/([+<>-]=?)\s*(\'\d+-\d+-\d+\s+\d+:\d+(:\d+)\')/', '\1 timestamp \2', $res);
-	$res = preg_replace('/(\'\d+-\d+-\d+\s+\d+:\d+:\d+\')\s*([+<>-]=?)/', 'timestamp \1 \2', $res);
-
-	$res = preg_replace('/([+<>-]=?)\s*(\'\d+-\d+-\d+\')/', '\1 timestamp \2', $res);
-	$res = preg_replace('/(\'\d+-\d+-\d+\')\s*([+<>-]=?)/', 'timestamp \1 \2', $res);
-
-	$res = preg_replace('/(timestamp .\d+)-00-/', '\1-01-', $res);
-	$res = preg_replace('/(timestamp .\d+-\d+)-00/', '\1-01', $res);
+    if (is_array($arg)) {
+        $arg = join(', ', $arg);
+    }
+
+    $res = spip_pg_fromfield($arg);
+
+    $res = preg_replace('/\brand[(][)]/i', 'random()', $res);
+
+    $res = preg_replace(
+        '/\b0\.0[+]([a-zA-Z0-9_.]+)\s*/',
+        'CAST(substring(\1, \'^ *[0-9.]+\') as float)',
+        $res
+    );
+    $res = preg_replace(
+        '/\b0[+]([a-zA-Z0-9_.]+)\s*/',
+        'CAST(substring(\1, \'^ *[0-9]+\') as int)',
+        $res
+    );
+    $res = preg_replace(
+        '/\bconv[(]([^,]*)[^)]*[)]/i',
+        'CAST(substring(\1, \'^ *[0-9]+\') as int)',
+        $res
+    );
+
+    $res = preg_replace(
+        '/UNIX_TIMESTAMP\s*[(]\s*[)]/',
+        ' EXTRACT(epoch FROM NOW())',
+        $res
+    );
+
+    // la fonction md5(integer) n'est pas connu en pg
+    // il faut donc forcer les types en text (cas de md5(id_article))
+    $res = preg_replace(
+        '/md5\s*[(]([^)]*)[)]/i',
+        'MD5(CAST(\1 AS text))',
+        $res
+    );
+
+    $res = preg_replace(
+        '/UNIX_TIMESTAMP\s*[(]([^)]*)[)]/',
+        ' EXTRACT(epoch FROM \1)',
+        $res
+    );
+
+    $res = preg_replace(
+        '/\bDAYOFMONTH\s*[(]([^()]*([(][^()]*[)][^()]*)*[^)]*)[)]/',
+        ' EXTRACT(day FROM \1)',
+        $res
+    );
+
+    $res = preg_replace(
+        '/\bMONTH\s*[(]([^()]*([(][^)]*[)][^()]*)*[^)]*)[)]/',
+        ' EXTRACT(month FROM \1)',
+        $res
+    );
+
+    $res = preg_replace(
+        '/\bYEAR\s*[(]([^()]*([(][^)]*[)][^()]*)*[^)]*)[)]/',
+        ' EXTRACT(year FROM \1)',
+        $res
+    );
+
+    $res = preg_replace(
+        '/TO_DAYS\s*[(]([^()]*([(][^)]*[)][()]*)*)[)]/',
+        ' EXTRACT(day FROM \1 - \'0001-01-01\')',
+        $res
+    );
+
+    $res = preg_replace('/(EXTRACT[(][^ ]* FROM *)"([^"]*)"/', '\1\'\2\'', $res);
+
+    $res = preg_replace('/DATE_FORMAT\s*[(]([^,]*),\s*\'%Y%m%d\'[)]/', 'to_char(\1, \'YYYYMMDD\')', $res);
+
+    $res = preg_replace('/DATE_FORMAT\s*[(]([^,]*),\s*\'%Y%m\'[)]/', 'to_char(\1, \'YYYYMM\')', $res);
+
+    $res = preg_replace('/DATE_SUB\s*[(]([^,]*),/', '(\1 -', $res);
+    $res = preg_replace('/DATE_ADD\s*[(]([^,]*),/', '(\1 +', $res);
+    $res = preg_replace('/INTERVAL\s+(\d+\s+\w+)/', 'INTERVAL \'\1\'', $res);
+    $res = preg_replace('/([+<>-]=?)\s*(\'\d+-\d+-\d+\s+\d+:\d+(:\d+)\')/', '\1 timestamp \2', $res);
+    $res = preg_replace('/(\'\d+-\d+-\d+\s+\d+:\d+:\d+\')\s*([+<>-]=?)/', 'timestamp \1 \2', $res);
+
+    $res = preg_replace('/([+<>-]=?)\s*(\'\d+-\d+-\d+\')/', '\1 timestamp \2', $res);
+    $res = preg_replace('/(\'\d+-\d+-\d+\')\s*([+<>-]=?)/', 'timestamp \1 \2', $res);
+
+    $res = preg_replace('/(timestamp .\d+)-00-/', '\1-01-', $res);
+    $res = preg_replace('/(timestamp .\d+-\d+)-00/', '\1-01', $res);
 # correct en theorie mais produit des debordements arithmetiques
 #	$res = preg_replace("/(EXTRACT[(][^ ]* FROM *)(timestamp *'[^']*' *[+-] *timestamp *'[^']*') *[)]/", '\2', $res);
-	$res = preg_replace("/(EXTRACT[(][^ ]* FROM *)('[^']*')/", '\1 timestamp \2', $res);
-	$res = preg_replace('/\sLIKE\s+/', ' ILIKE ', $res);
+    $res = preg_replace("/(EXTRACT[(][^ ]* FROM *)('[^']*')/", '\1 timestamp \2', $res);
+    $res = preg_replace('/\sLIKE\s+/', ' ILIKE ', $res);
 
-	return str_replace('REGEXP', '~', $res);
+    return str_replace('REGEXP', '~', $res);
 }
 
 function spip_pg_fromfield($arg) {
-	while (preg_match('/^(.*?)FIELD\s*\(([^,]*)((,[^,)]*)*)\)/', $arg, $m)) {
-		preg_match_all('/,([^,]*)/', $m[3], $r, PREG_PATTERN_ORDER);
-		$res = '';
-		$n = 0;
-		$index = $m[2];
-		foreach ($r[1] as $v) {
-			$n++;
-			$res .= "\nwhen $index=$v then $n";
-		}
-		$arg = $m[1] . "case $res else 0 end "
-			. substr($arg, strlen($m[0]));
-	}
-
-	return $arg;
+    while (preg_match('/^(.*?)FIELD\s*\(([^,]*)((,[^,)]*)*)\)/', $arg, $m)) {
+        preg_match_all('/,([^,]*)/', $m[3], $r, PREG_PATTERN_ORDER);
+        $res = '';
+        $n = 0;
+        $index = $m[2];
+        foreach ($r[1] as $v) {
+            $n++;
+            $res .= "\nwhen $index=$v then $n";
+        }
+        $arg = $m[1] . "case $res else 0 end "
+            . substr($arg, strlen($m[0]));
+    }
+
+    return $arg;
 }
 
 function calculer_pg_where($v) {
-	if (!is_array($v)) {
-		return spip_pg_frommysql($v);
-	}
-
-	$op = str_replace('REGEXP', '~', array_shift($v));
-	if (!($n = count($v))) {
-		return $op;
-	} else {
-		$arg = calculer_pg_where(array_shift($v));
-		if ($n == 1) {
-			return "$op($arg)";
-		} else {
-			$arg2 = calculer_pg_where(array_shift($v));
-			if ($n == 2) {
-				return "($arg $op $arg2)";
-			} else {
-				return "($arg $op ($arg2) : $v[0])";
-			}
-		}
-	}
+    if (!is_array($v)) {
+        return spip_pg_frommysql($v);
+    }
+
+    $op = str_replace('REGEXP', '~', array_shift($v));
+    if (!($n = count($v))) {
+        return $op;
+    } else {
+        $arg = calculer_pg_where(array_shift($v));
+        if ($n == 1) {
+            return "$op($arg)";
+        } else {
+            $arg2 = calculer_pg_where(array_shift($v));
+            if ($n == 2) {
+                return "($arg $op $arg2)";
+            } else {
+                return "($arg $op ($arg2) : $v[0])";
+            }
+        }
+    }
 }
 
 
 function calculer_pg_expression($expression, $v, $join = 'AND') {
-	if (empty($v)) {
-		return '';
-	}
+    if (empty($v)) {
+        return '';
+    }
 
-	$exp = "\n$expression ";
+    $exp = "\n$expression ";
 
-	if (!is_array($v)) {
-		$v = [$v];
-	}
+    if (!is_array($v)) {
+        $v = [$v];
+    }
 
-	if (strtoupper($join) === 'AND') {
-		return $exp . join("\n\t$join ", array_map('calculer_pg_where', $v));
-	} else {
-		return $exp . join($join, $v);
-	}
+    if (strtoupper($join) === 'AND') {
+        return $exp . join("\n\t$join ", array_map('calculer_pg_where', $v));
+    } else {
+        return $exp . join($join, $v);
+    }
 }
 
 function spip_pg_select_as($args) {
-	$argsas = '';
-	foreach ($args as $k => $v) {
-		if (substr($k, -1) == '@') {
-			// c'est une jointure qui se refere au from precedent
-			// pas de virgule
-			$argsas .= '  ' . $v;
-		} else {
-			$as = '';
-			//  spip_log("$k : $v", _LOG_DEBUG);
-			if (!is_numeric($k)) {
-				if (preg_match('/\.(.*)$/', $k, $r)) {
-					$v = $k;
-				} elseif ($v != $k) {
-					$p = strpos($v, ' ');
-					if ($p) {
-						$v = substr($v, 0, $p) . " AS $k" . substr($v, $p);
-					} else {
-						$as = " AS $k";
-					}
-				}
-			}
-			// spip_log("subs $k : $v avec $as", _LOG_DEBUG);
-			// if (strpos($v, 'JOIN') === false)  $argsas .= ', ';
-			$argsas .= ', ' . $v . $as;
-		}
-	}
-
-	return substr($argsas, 2);
+    $argsas = '';
+    foreach ($args as $k => $v) {
+        if (substr($k, -1) == '@') {
+            // c'est une jointure qui se refere au from precedent
+            // pas de virgule
+            $argsas .= '  ' . $v;
+        } else {
+            $as = '';
+            //  spip_log("$k : $v", _LOG_DEBUG);
+            if (!is_numeric($k)) {
+                if (preg_match('/\.(.*)$/', $k, $r)) {
+                    $v = $k;
+                } elseif ($v != $k) {
+                    $p = strpos($v, ' ');
+                    if ($p) {
+                        $v = substr($v, 0, $p) . " AS $k" . substr($v, $p);
+                    } else {
+                        $as = " AS $k";
+                    }
+                }
+            }
+            // spip_log("subs $k : $v avec $as", _LOG_DEBUG);
+            // if (strpos($v, 'JOIN') === false)  $argsas .= ', ';
+            $argsas .= ', ' . $v . $as;
+        }
+    }
+
+    return substr($argsas, 2);
 }
 
 function spip_pg_fetch($res, $t = '', $serveur = '', $requeter = true) {
 
-	if ($res) {
-		$res = pg_fetch_array($res, null, PGSQL_ASSOC);
-	}
+    if ($res) {
+        $res = pg_fetch_array($res, null, PGSQL_ASSOC);
+    }
 
-	return $res;
+    return $res;
 }
 
 function spip_pg_seek($r, $row_number, $serveur = '', $requeter = true) {
-	if ($r) {
-		return pg_result_seek($r, $row_number);
-	}
+    if ($r) {
+        return pg_result_seek($r, $row_number);
+    }
 }
 
 
 function spip_pg_countsel(
-	$from = [],
-	$where = [],
-	$groupby = [],
-	$having = [],
-	$serveur = '',
-	$requeter = true
+    $from = [],
+    $where = [],
+    $groupby = [],
+    $having = [],
+    $serveur = '',
+    $requeter = true
 ) {
-	$c = !$groupby ? '*' : ('DISTINCT ' . (is_string($groupby) ? $groupby : join(',', $groupby)));
-	$r = spip_pg_select("COUNT($c)", $from, $where, '', '', '', $having, $serveur, $requeter);
-	if (!$requeter) {
-		return $r;
-	}
-	if (!is_resource($r)) {
-		return 0;
-	}
-	[$c] = pg_fetch_array($r, null, PGSQL_NUM);
-
-	return $c;
+    $c = !$groupby ? '*' : ('DISTINCT ' . (is_string($groupby) ? $groupby : join(',', $groupby)));
+    $r = spip_pg_select("COUNT($c)", $from, $where, '', '', '', $having, $serveur, $requeter);
+    if (!$requeter) {
+        return $r;
+    }
+    if (!is_resource($r)) {
+        return 0;
+    }
+    [$c] = pg_fetch_array($r, null, PGSQL_NUM);
+
+    return $c;
 }
 
 function spip_pg_count($res, $serveur = '', $requeter = true) {
-	return !$res ? 0 : pg_numrows($res);
+    return !$res ? 0 : pg_numrows($res);
 }
 
 function spip_pg_free($res, $serveur = '', $requeter = true) {
-	// rien a faire en postgres
+    // rien a faire en postgres
 }
 
 function spip_pg_delete($table, $where = '', $serveur = '', $requeter = true) {
 
-	$connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0];
-	$table = prefixer_table_spip($table, $connexion['prefixe']);
+    $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0];
+    $table = prefixer_table_spip($table, $connexion['prefixe']);
 
-	$query = calculer_pg_expression('DELETE FROM', $table, ',')
-		. calculer_pg_expression('WHERE', $where, 'AND');
+    $query = calculer_pg_expression('DELETE FROM', $table, ',')
+        . calculer_pg_expression('WHERE', $where, 'AND');
 
-	// renvoyer la requete inerte si demandee
-	if (!$requeter) {
-		return $query;
-	}
+    // renvoyer la requete inerte si demandee
+    if (!$requeter) {
+        return $query;
+    }
 
-	$res = spip_pg_trace_query($query, $serveur);
-	if ($res) {
-		return pg_affected_rows($res);
-	} else {
-		return false;
-	}
+    $res = spip_pg_trace_query($query, $serveur);
+    if ($res) {
+        return pg_affected_rows($res);
+    } else {
+        return false;
+    }
 }
 
 function spip_pg_insert($table, $champs, $valeurs, $desc = [], $serveur = '', $requeter = true) {
-	$connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0];
-	$prefixe = $connexion['prefixe'];
-	$link = $connexion['link'];
-
-	if (!$desc) {
-		$desc = description_table($table, $serveur);
-	}
-	$seq = spip_pg_sequence($table, true);
-	// si pas de cle primaire dans l'insertion, renvoyer curval
-	if (!preg_match(",\b$seq\b,", $champs)) {
-		$seq = spip_pg_sequence($table);
-		$seq = prefixer_table_spip($seq, $prefixe);
-		$seq = "currval('$seq')";
-	}
-
-	$table = prefixer_table_spip($table, $prefixe);
-	$ret = !$seq ? '' : (" RETURNING $seq");
-	$ins = (strlen($champs) < 3)
-		? ' DEFAULT VALUES'
-		: "$champs VALUES $valeurs";
-	$q = "INSERT INTO $table $ins $ret";
-	if (!$requeter) {
-		return $q;
-	}
-	$connexion['last'] = $q;
-	$r = spip_pg_query_simple($link, $q);
+    $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0];
+    $prefixe = $connexion['prefixe'];
+    $link = $connexion['link'];
+
+    if (!$desc) {
+        $desc = description_table($table, $serveur);
+    }
+    $seq = spip_pg_sequence($table, true);
+    // si pas de cle primaire dans l'insertion, renvoyer curval
+    if (!preg_match(",\b$seq\b,", $champs)) {
+        $seq = spip_pg_sequence($table);
+        $seq = prefixer_table_spip($seq, $prefixe);
+        $seq = "currval('$seq')";
+    }
+
+    $table = prefixer_table_spip($table, $prefixe);
+    $ret = !$seq ? '' : (" RETURNING $seq");
+    $ins = (strlen($champs) < 3)
+        ? ' DEFAULT VALUES'
+        : "$champs VALUES $valeurs";
+    $q = "INSERT INTO $table $ins $ret";
+    if (!$requeter) {
+        return $q;
+    }
+    $connexion['last'] = $q;
+    $r = spip_pg_query_simple($link, $q);
 #	spip_log($q,'pg.'._LOG_DEBUG);
-	if ($r) {
-		if (!$ret) {
-			return 0;
-		}
-		if ($r2 = pg_fetch_array($r, null, PGSQL_NUM)) {
-			return $r2[0];
-		}
-	}
-
-	return false;
+    if ($r) {
+        if (!$ret) {
+            return 0;
+        }
+        if ($r2 = pg_fetch_array($r, null, PGSQL_NUM)) {
+            return $r2[0];
+        }
+    }
+
+    return false;
 }
 
 function spip_pg_insertq($table, $couples = [], $desc = [], $serveur = '', $requeter = true) {
 
-	if (!$desc) {
-		$desc = description_table($table, $serveur);
-	}
-	if (!$desc) {
-		die("$table insertion sans description");
-	}
-	$fields = $desc['field'];
-
-	foreach ($couples as $champ => $val) {
-		$couples[$champ] = spip_pg_cite($val, $fields[$champ]);
-	}
-
-	// recherche de champs 'timestamp' pour mise a jour auto de ceux-ci
-	$couples = spip_pg_ajouter_champs_timestamp($table, $couples, $desc, $serveur);
-
-	return spip_pg_insert(
-		$table,
-		'(' . join(',', array_keys($couples)) . ')',
-		'(' . join(',', $couples) . ')',
-		$desc,
-		$serveur,
-		$requeter
-	);
+    if (!$desc) {
+        $desc = description_table($table, $serveur);
+    }
+    if (!$desc) {
+        die("$table insertion sans description");
+    }
+    $fields = $desc['field'];
+
+    foreach ($couples as $champ => $val) {
+        $couples[$champ] = spip_pg_cite($val, $fields[$champ]);
+    }
+
+    // recherche de champs 'timestamp' pour mise a jour auto de ceux-ci
+    $couples = spip_pg_ajouter_champs_timestamp($table, $couples, $desc, $serveur);
+
+    return spip_pg_insert(
+        $table,
+        '(' . join(',', array_keys($couples)) . ')',
+        '(' . join(',', $couples) . ')',
+        $desc,
+        $serveur,
+        $requeter
+    );
 }
 
 
 function spip_pg_insertq_multi($table, $tab_couples = [], $desc = [], $serveur = '', $requeter = true) {
 
-	if (!$desc) {
-		$desc = description_table($table, $serveur);
-	}
-	if (!$desc) {
-		die("$table insertion sans description");
-	}
-	$fields = $desc['field'] ?? [];
-
-	// recherche de champs 'timestamp' pour mise a jour auto de ceux-ci
-	// une premiere fois pour ajouter maj dans les cles
-	$c = $tab_couples[0] ?? [];
-	$les_cles = spip_pg_ajouter_champs_timestamp($table, $c, $desc, $serveur);
-
-	$cles = '(' . join(',', array_keys($les_cles)) . ')';
-	$valeurs = [];
-	foreach ($tab_couples as $couples) {
-		foreach ($couples as $champ => $val) {
-			$couples[$champ] = spip_pg_cite($val, $fields[$champ]);
-		}
-		// recherche de champs 'timestamp' pour mise a jour auto de ceux-ci
-		$couples = spip_pg_ajouter_champs_timestamp($table, $couples, $desc, $serveur);
-
-		$valeurs[] = '(' . join(',', $couples) . ')';
-	}
-	$valeurs = implode(', ', $valeurs);
-
-	return spip_pg_insert($table, $cles, $valeurs, $desc, $serveur, $requeter);
+    if (!$desc) {
+        $desc = description_table($table, $serveur);
+    }
+    if (!$desc) {
+        die("$table insertion sans description");
+    }
+    $fields = $desc['field'] ?? [];
+
+    // recherche de champs 'timestamp' pour mise a jour auto de ceux-ci
+    // une premiere fois pour ajouter maj dans les cles
+    $c = $tab_couples[0] ?? [];
+    $les_cles = spip_pg_ajouter_champs_timestamp($table, $c, $desc, $serveur);
+
+    $cles = '(' . join(',', array_keys($les_cles)) . ')';
+    $valeurs = [];
+    foreach ($tab_couples as $couples) {
+        foreach ($couples as $champ => $val) {
+            $couples[$champ] = spip_pg_cite($val, $fields[$champ]);
+        }
+        // recherche de champs 'timestamp' pour mise a jour auto de ceux-ci
+        $couples = spip_pg_ajouter_champs_timestamp($table, $couples, $desc, $serveur);
+
+        $valeurs[] = '(' . join(',', $couples) . ')';
+    }
+    $valeurs = implode(', ', $valeurs);
+
+    return spip_pg_insert($table, $cles, $valeurs, $desc, $serveur, $requeter);
 }
 
 
 function spip_pg_update($table, $couples, $where = '', $desc = '', $serveur = '', $requeter = true) {
 
-	if (!$couples) {
-		return;
-	}
-	$connexion = $GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0];
-	$table = prefixer_table_spip($table, $connexion['prefixe']);
+    if (!$couples) {
+        return;
+    }
+    $connexion = $GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0];
+    $table = prefixer_table_spip($table, $connexion['prefixe']);
 
-	// recherche de champs 'timestamp' pour mise a jour auto de ceux-ci
-	$couples = spip_pg_ajouter_champs_timestamp($table, $couples, $desc, $serveur);
+    // recherche de champs 'timestamp' pour mise a jour auto de ceux-ci
+    $couples = spip_pg_ajouter_champs_timestamp($table, $couples, $desc, $serveur);
 
-	$set = [];
-	foreach ($couples as $champ => $val) {
-		$set[] = $champ . '=' . $val;
-	}
+    $set = [];
+    foreach ($couples as $champ => $val) {
+        $set[] = $champ . '=' . $val;
+    }
 
-	$query = calculer_pg_expression('UPDATE', $table, ',')
-		. calculer_pg_expression('SET', $set, ',')
-		. calculer_pg_expression('WHERE', $where, 'AND');
+    $query = calculer_pg_expression('UPDATE', $table, ',')
+        . calculer_pg_expression('SET', $set, ',')
+        . calculer_pg_expression('WHERE', $where, 'AND');
 
-	// renvoyer la requete inerte si demandee
-	if (!$requeter) {
-		return $query;
-	}
+    // renvoyer la requete inerte si demandee
+    if (!$requeter) {
+        return $query;
+    }
 
-	return spip_pg_trace_query($query, $serveur);
+    return spip_pg_trace_query($query, $serveur);
 }
 
 // idem, mais les valeurs sont des constantes a mettre entre apostrophes
 // sauf les expressions de date lorsqu'il s'agit de fonctions SQL (NOW etc)
 function spip_pg_updateq($table, $couples, $where = '', $desc = [], $serveur = '', $requeter = true) {
-	if (!$couples) {
-		return;
-	}
-	if (!$desc) {
-		$desc = description_table($table, $serveur);
-	}
-	$fields = $desc['field'];
-	foreach ($couples as $k => $val) {
-		$couples[$k] = spip_pg_cite($val, $fields[$k]);
-	}
-
-	return spip_pg_update($table, $couples, $where, $desc, $serveur, $requeter);
+    if (!$couples) {
+        return;
+    }
+    if (!$desc) {
+        $desc = description_table($table, $serveur);
+    }
+    $fields = $desc['field'];
+    foreach ($couples as $k => $val) {
+        $couples[$k] = spip_pg_cite($val, $fields[$k]);
+    }
+
+    return spip_pg_update($table, $couples, $where, $desc, $serveur, $requeter);
 }
 
 
 function spip_pg_replace($table, $values, $desc, $serveur = '', $requeter = true) {
-	if (!$values) {
-		spip_log("replace vide $table", 'pg.' . _LOG_AVERTISSEMENT);
-
-		return 0;
-	}
-	$connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0];
-	$prefixe = $connexion['prefixe'];
-	$link = $connexion['link'];
-
-	if (!$desc) {
-		$desc = description_table($table, $serveur);
-	}
-	if (!$desc) {
-		die("$table insertion sans description");
-	}
-	$prim = $desc['key']['PRIMARY KEY'];
-	$ids = preg_split('/,\s*/', $prim);
-	$noprims = $prims = [];
-	foreach ($values as $k => $v) {
-		$values[$k] = $v = spip_pg_cite($v, $desc['field'][$k]);
-
-		if (!in_array($k, $ids)) {
-			$noprims[$k] = "$k=$v";
-		} else {
-			$prims[$k] = "$k=$v";
-		}
-	}
-
-	// recherche de champs 'timestamp' pour mise a jour auto de ceux-ci
-	$values = spip_pg_ajouter_champs_timestamp($table, $values, $desc, $serveur);
-
-	$where = join(' AND ', $prims);
-	if (!$where) {
-		return spip_pg_insert(
-			$table,
-			'(' . join(',', array_keys($values)) . ')',
-			'(' . join(',', $values) . ')',
-			$desc,
-			$serveur
-		);
-	}
-	$couples = join(',', $noprims);
-
-	$seq = spip_pg_sequence($table);
-	$table = prefixer_table_spip($table, $prefixe);
-	$seq = prefixer_table_spip($seq, $prefixe);
-
-	$connexion['last'] = $q = "UPDATE $table SET $couples WHERE $where";
-	if ($couples) {
-		$couples = spip_pg_query_simple($link, $q);
+    if (!$values) {
+        spip_log("replace vide $table", 'pg.' . _LOG_AVERTISSEMENT);
+
+        return 0;
+    }
+    $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0];
+    $prefixe = $connexion['prefixe'];
+    $link = $connexion['link'];
+
+    if (!$desc) {
+        $desc = description_table($table, $serveur);
+    }
+    if (!$desc) {
+        die("$table insertion sans description");
+    }
+    $prim = $desc['key']['PRIMARY KEY'];
+    $ids = preg_split('/,\s*/', $prim);
+    $noprims = $prims = [];
+    foreach ($values as $k => $v) {
+        $values[$k] = $v = spip_pg_cite($v, $desc['field'][$k]);
+
+        if (!in_array($k, $ids)) {
+            $noprims[$k] = "$k=$v";
+        } else {
+            $prims[$k] = "$k=$v";
+        }
+    }
+
+    // recherche de champs 'timestamp' pour mise a jour auto de ceux-ci
+    $values = spip_pg_ajouter_champs_timestamp($table, $values, $desc, $serveur);
+
+    $where = join(' AND ', $prims);
+    if (!$where) {
+        return spip_pg_insert(
+            $table,
+            '(' . join(',', array_keys($values)) . ')',
+            '(' . join(',', $values) . ')',
+            $desc,
+            $serveur
+        );
+    }
+    $couples = join(',', $noprims);
+
+    $seq = spip_pg_sequence($table);
+    $table = prefixer_table_spip($table, $prefixe);
+    $seq = prefixer_table_spip($seq, $prefixe);
+
+    $connexion['last'] = $q = "UPDATE $table SET $couples WHERE $where";
+    if ($couples) {
+        $couples = spip_pg_query_simple($link, $q);
 #	  spip_log($q,'pg.'._LOG_DEBUG);
-		if (!$couples) {
-			return false;
-		}
-		$couples = pg_affected_rows($couples);
-	}
-	if (!$couples) {
-		$ret = !$seq ? '' :
-			(" RETURNING nextval('$seq') < $prim");
-		$connexion['last'] = $q = "INSERT INTO $table (" . join(',', array_keys($values)) . ') VALUES (' . join(
-			',',
-			$values
-		) . ")$ret";
-		$couples = spip_pg_query_simple($link, $q);
-		if (!$couples) {
-			return false;
-		} elseif ($ret) {
-			$r = pg_fetch_array($couples, null, PGSQL_NUM);
-			if ($r[0]) {
-				$connexion['last'] = $q = "SELECT setval('$seq', $prim) from $table";
-				// Le code de SPIP met parfois la sequence a 0 (dans l'import)
-				// MySQL n'en dit rien, on fait pareil pour PG
-				$r = @pg_query($link, $q);
-			}
-		}
-	}
-
-	return $couples;
+        if (!$couples) {
+            return false;
+        }
+        $couples = pg_affected_rows($couples);
+    }
+    if (!$couples) {
+        $ret = !$seq ? '' :
+            (" RETURNING nextval('$seq') < $prim");
+        $connexion['last'] = $q = "INSERT INTO $table (" . join(',', array_keys($values)) . ') VALUES (' . join(
+            ',',
+            $values
+        ) . ")$ret";
+        $couples = spip_pg_query_simple($link, $q);
+        if (!$couples) {
+            return false;
+        } elseif ($ret) {
+            $r = pg_fetch_array($couples, null, PGSQL_NUM);
+            if ($r[0]) {
+                $connexion['last'] = $q = "SELECT setval('$seq', $prim) from $table";
+                // Le code de SPIP met parfois la sequence a 0 (dans l'import)
+                // MySQL n'en dit rien, on fait pareil pour PG
+                $r = @pg_query($link, $q);
+            }
+        }
+    }
+
+    return $couples;
 }
 
 
 function spip_pg_replace_multi($table, $tab_couples, $desc = [], $serveur = '', $requeter = true) {
-	$retour = null;
-	// boucler pour traiter chaque requete independemment
-	foreach ($tab_couples as $couples) {
-		$retour = spip_pg_replace($table, $couples, $desc, $serveur, $requeter);
-	}
-
-	// renvoie le dernier id
-	return $retour;
+    $retour = null;
+    // boucler pour traiter chaque requete independemment
+    foreach ($tab_couples as $couples) {
+        $retour = spip_pg_replace($table, $couples, $desc, $serveur, $requeter);
+    }
+
+    // renvoie le dernier id
+    return $retour;
 }
 
 
@@ -1163,149 +1163,149 @@ 
 
 function spip_pg_sequence($table, $raw = false) {
 
-	include_spip('base/serial');
-	if (!isset($GLOBALS['tables_principales'][$table])) {
-		return false;
-	}
-	$desc = $GLOBALS['tables_principales'][$table];
-	$prim = @$desc['key']['PRIMARY KEY'];
-	if (
-		!preg_match('/^\w+$/', $prim)
-		or strpos($desc['field'][$prim], 'int') === false
-	) {
-		return '';
-	} else {
-		return $raw ? $prim : $table . '_' . $prim . '_seq';
-	}
+    include_spip('base/serial');
+    if (!isset($GLOBALS['tables_principales'][$table])) {
+        return false;
+    }
+    $desc = $GLOBALS['tables_principales'][$table];
+    $prim = @$desc['key']['PRIMARY KEY'];
+    if (
+        !preg_match('/^\w+$/', $prim)
+        or strpos($desc['field'][$prim], 'int') === false
+    ) {
+        return '';
+    } else {
+        return $raw ? $prim : $table . '_' . $prim . '_seq';
+    }
 }
 
 // Explicite les conversions de Mysql d'une valeur $v de type $t
 // Dans le cas d'un champ date, pas d'apostrophe, c'est une syntaxe ad hoc
 
 function spip_pg_cite($v, $t) {
-	if (is_null($v)) {
-		return 'NULL';
-	} // null php se traduit en NULL SQL
-
-	if (sql_test_date($t)) {
-		if ($v and (strpos('0123456789', (string) $v[0]) === false)) {
-			return spip_pg_frommysql($v);
-		} else {
-			if (strncmp($v, '0000', 4) == 0) {
-				$v = '0001' . substr($v, 4);
-			}
-			if (strpos($v, '-00-00') === 4) {
-				$v = substr($v, 0, 4) . '-01-01' . substr($v, 10);
-			}
-
-			return "timestamp '$v'";
-		}
-	} elseif (!sql_test_int($t)) {
-		return ("'" . pg_escape_string($v) . "'");
-	} elseif (is_numeric($v) or (strpos($v, 'CAST(') === 0)) {
-		return $v;
-	} elseif ($v[0] == '0' and $v[1] !== 'x' and ctype_xdigit(substr($v, 1))) {
-		return substr($v, 1);
-	} else {
-		spip_log("Warning: '$v'  n'est pas de type $t", 'pg.' . _LOG_AVERTISSEMENT);
-
-		return intval($v);
-	}
+    if (is_null($v)) {
+        return 'NULL';
+    } // null php se traduit en NULL SQL
+
+    if (sql_test_date($t)) {
+        if ($v and (strpos('0123456789', (string) $v[0]) === false)) {
+            return spip_pg_frommysql($v);
+        } else {
+            if (strncmp($v, '0000', 4) == 0) {
+                $v = '0001' . substr($v, 4);
+            }
+            if (strpos($v, '-00-00') === 4) {
+                $v = substr($v, 0, 4) . '-01-01' . substr($v, 10);
+            }
+
+            return "timestamp '$v'";
+        }
+    } elseif (!sql_test_int($t)) {
+        return ("'" . pg_escape_string($v) . "'");
+    } elseif (is_numeric($v) or (strpos($v, 'CAST(') === 0)) {
+        return $v;
+    } elseif ($v[0] == '0' and $v[1] !== 'x' and ctype_xdigit(substr($v, 1))) {
+        return substr($v, 1);
+    } else {
+        spip_log("Warning: '$v'  n'est pas de type $t", 'pg.' . _LOG_AVERTISSEMENT);
+
+        return intval($v);
+    }
 }
 
 function spip_pg_hex($v) {
-	return "CAST(x'" . $v . "' as bigint)";
+    return "CAST(x'" . $v . "' as bigint)";
 }
 
 function spip_pg_quote($v, $type = '') {
-	if (!is_array($v)) {
-		return spip_pg_cite($v, $type);
-	}
-	// si c'est un tableau, le parcourir en propageant le type
-	foreach ($v as $k => $r) {
-		$v[$k] = spip_pg_quote($r, $type);
-	}
-
-	return join(',', $v);
+    if (!is_array($v)) {
+        return spip_pg_cite($v, $type);
+    }
+    // si c'est un tableau, le parcourir en propageant le type
+    foreach ($v as $k => $r) {
+        $v[$k] = spip_pg_quote($r, $type);
+    }
+
+    return join(',', $v);
 }
 
 function spip_pg_date_proche($champ, $interval, $unite) {
-	return '('
-	. $champ
-	. (($interval <= 0) ? '>' : '<')
-	. (($interval <= 0) ? 'DATE_SUB' : 'DATE_ADD')
-	. '('
-	. sql_quote(date('Y-m-d H:i:s'))
-	. ', INTERVAL '
-	. (($interval > 0) ? $interval : (0 - $interval))
-	. ' '
-	. $unite
-	. '))';
+    return '('
+    . $champ
+    . (($interval <= 0) ? '>' : '<')
+    . (($interval <= 0) ? 'DATE_SUB' : 'DATE_ADD')
+    . '('
+    . sql_quote(date('Y-m-d H:i:s'))
+    . ', INTERVAL '
+    . (($interval > 0) ? $interval : (0 - $interval))
+    . ' '
+    . $unite
+    . '))';
 }
 
 function spip_pg_in($val, $valeurs, $not = '', $serveur = '') {
 //
 // IN (...) souvent limite a 255  elements, d'ou cette fonction assistante
 //
-	// s'il n'y a pas de valeur, eviter de produire un IN vide: PG rale.
-	if (!$valeurs) {
-		return $not ? '0=0' : '0=1';
-	}
-	if (strpos($valeurs, "CAST(x'") !== false) {
-		return "($val=" . join("OR $val=", explode(',', $valeurs)) . ')';
-	}
-	$n = $i = 0;
-	$in_sql = '';
-	while ($n = strpos($valeurs, ',', $n + 1)) {
-		if ((++$i) >= 255) {
-			$in_sql .= "($val $not IN (" .
-				substr($valeurs, 0, $n) .
-				"))\n" .
-				($not ? "AND\t" : "OR\t");
-			$valeurs = substr($valeurs, $n + 1);
-			$i = $n = 0;
-		}
-	}
-	$in_sql .= "($val $not IN ($valeurs))";
-
-	return "($in_sql)";
+    // s'il n'y a pas de valeur, eviter de produire un IN vide: PG rale.
+    if (!$valeurs) {
+        return $not ? '0=0' : '0=1';
+    }
+    if (strpos($valeurs, "CAST(x'") !== false) {
+        return "($val=" . join("OR $val=", explode(',', $valeurs)) . ')';
+    }
+    $n = $i = 0;
+    $in_sql = '';
+    while ($n = strpos($valeurs, ',', $n + 1)) {
+        if ((++$i) >= 255) {
+            $in_sql .= "($val $not IN (" .
+                substr($valeurs, 0, $n) .
+                "))\n" .
+                ($not ? "AND\t" : "OR\t");
+            $valeurs = substr($valeurs, $n + 1);
+            $i = $n = 0;
+        }
+    }
+    $in_sql .= "($val $not IN ($valeurs))";
+
+    return "($in_sql)";
 }
 
 function spip_pg_error($query = '', $serveur = '', $requeter = true) {
-	$link = $GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]['link'];
-	$s = $link ? pg_last_error($link) : pg_last_error();
-	if ($s) {
-		$s = str_replace('ERROR', 'errcode: 1000 ', $s);
-		spip_log("$s - $query", 'pg.' . _LOG_ERREUR);
-	}
-
-	return $s;
+    $link = $GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]['link'];
+    $s = $link ? pg_last_error($link) : pg_last_error();
+    if ($s) {
+        $s = str_replace('ERROR', 'errcode: 1000 ', $s);
+        spip_log("$s - $query", 'pg.' . _LOG_ERREUR);
+    }
+
+    return $s;
 }
 
 function spip_pg_errno($serveur = '') {
-	// il faudrait avoir la derniere ressource retournee et utiliser
-	// http://fr2.php.net/manual/fr/function.pg-result-error.php
-	return 0;
+    // il faudrait avoir la derniere ressource retournee et utiliser
+    // http://fr2.php.net/manual/fr/function.pg-result-error.php
+    return 0;
 }
 
 function spip_pg_drop_table($table, $exist = '', $serveur = '', $requeter = true) {
-	if ($exist) {
-		$exist = ' IF EXISTS';
-	}
-	if (spip_pg_query("DROP TABLE$exist $table", $serveur, $requeter)) {
-		return true;
-	} else {
-		return false;
-	}
+    if ($exist) {
+        $exist = ' IF EXISTS';
+    }
+    if (spip_pg_query("DROP TABLE$exist $table", $serveur, $requeter)) {
+        return true;
+    } else {
+        return false;
+    }
 }
 
 // supprime une vue
 function spip_pg_drop_view($view, $exist = '', $serveur = '', $requeter = true) {
-	if ($exist) {
-		$exist = ' IF EXISTS';
-	}
+    if ($exist) {
+        $exist = ' IF EXISTS';
+    }
 
-	return spip_pg_query("DROP VIEW$exist $view", $serveur, $requeter);
+    return spip_pg_query("DROP VIEW$exist $view", $serveur, $requeter);
 }
 
 /**
@@ -1322,40 +1322,40 @@ 
  *     Ressource à utiliser avec sql_fetch()
  **/
 function spip_pg_showbase($match, $serveur = '', $requeter = true) {
-	$connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0];
-	$link = $connexion['link'];
-	$connexion['last'] = $q = 'SELECT tablename FROM pg_tables WHERE tablename ILIKE ' . _q($match);
+    $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0];
+    $link = $connexion['link'];
+    $connexion['last'] = $q = 'SELECT tablename FROM pg_tables WHERE tablename ILIKE ' . _q($match);
 
-	return spip_pg_query_simple($link, $q);
+    return spip_pg_query_simple($link, $q);
 }
 
 function spip_pg_showtable($nom_table, $serveur = '', $requeter = true) {
-	$connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0];
-	$link = $connexion['link'];
-	$connexion['last'] = $q = 'SELECT column_name, column_default, data_type FROM information_schema.columns WHERE table_name ILIKE ' . _q($nom_table);
-
-	$res = spip_pg_query_simple($link, $q);
-	if (!$res) {
-		return false;
-	}
-
-	// etrangement, $res peut ne rien contenir, mais arriver ici...
-	// il faut en tenir compte dans le return
-	$fields = [];
-	while ($field = pg_fetch_array($res, null, PGSQL_NUM)) {
-		$fields[$field[0]] = $field[2] . (!$field[1] ? '' : (' DEFAULT ' . $field[1]));
-	}
-	$connexion['last'] = $q = 'SELECT indexdef FROM pg_indexes WHERE tablename ILIKE ' . _q($nom_table);
-	$res = spip_pg_query_simple($link, $q);
-	$keys = [];
-	while ($index = pg_fetch_array($res, null, PGSQL_NUM)) {
-		if (preg_match('/CREATE\s+(UNIQUE\s+)?INDEX\s([^\s]+).*\((.*)\)$/', $index[0], $r)) {
-			$nom = str_replace($nom_table . '_', '', $r[2]);
-			$keys[($r[1] ? 'PRIMARY KEY' : ('KEY ' . $nom))] = $r[3];
-		}
-	}
-
-	return count($fields) ? ['field' => $fields, 'key' => $keys] : false;
+    $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0];
+    $link = $connexion['link'];
+    $connexion['last'] = $q = 'SELECT column_name, column_default, data_type FROM information_schema.columns WHERE table_name ILIKE ' . _q($nom_table);
+
+    $res = spip_pg_query_simple($link, $q);
+    if (!$res) {
+        return false;
+    }
+
+    // etrangement, $res peut ne rien contenir, mais arriver ici...
+    // il faut en tenir compte dans le return
+    $fields = [];
+    while ($field = pg_fetch_array($res, null, PGSQL_NUM)) {
+        $fields[$field[0]] = $field[2] . (!$field[1] ? '' : (' DEFAULT ' . $field[1]));
+    }
+    $connexion['last'] = $q = 'SELECT indexdef FROM pg_indexes WHERE tablename ILIKE ' . _q($nom_table);
+    $res = spip_pg_query_simple($link, $q);
+    $keys = [];
+    while ($index = pg_fetch_array($res, null, PGSQL_NUM)) {
+        if (preg_match('/CREATE\s+(UNIQUE\s+)?INDEX\s([^\s]+).*\((.*)\)$/', $index[0], $r)) {
+            $nom = str_replace($nom_table . '_', '', $r[2]);
+            $keys[($r[1] ? 'PRIMARY KEY' : ('KEY ' . $nom))] = $r[3];
+        }
+    }
+
+    return count($fields) ? ['field' => $fields, 'key' => $keys] : false;
 }
 
 // Fonction de creation d'une table SQL nommee $nom
@@ -1366,116 +1366,116 @@ 
 // Le nom des index est prefixe par celui de la table pour eviter les conflits
 function spip_pg_create($nom, $champs, $cles, $autoinc = false, $temporary = false, $serveur = '', $requeter = true) {
 
-	$connexion = $GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0];
-	$link = $connexion['link'];
-	$nom = prefixer_table_spip($nom, $connexion['prefixe']);
-
-	$query = $prim = $prim_name = $v = $s = $p = '';
-	$keys = [];
-
-	// certains plugins declarent les tables  (permet leur inclusion dans le dump)
-	// sans les renseigner (laisse le compilo recuperer la description)
-	if (!is_array($champs) || !is_array($cles)) {
-		return;
-	}
-
-	foreach ($cles as $k => $v) {
-		if (strpos($k, 'KEY ') === 0) {
-			$n = str_replace('`', '', $k);
-			$v = str_replace('`', '"', $v);
-			$i = $nom . preg_replace('/KEY +/', '_', $n);
-			if ($k != $n) {
-				$i = "\"$i\"";
-			}
-			$keys[] = "CREATE INDEX $i ON $nom ($v);";
-		} elseif (strpos($k, 'UNIQUE ') === 0) {
-			$k = preg_replace('/^UNIQUE +/', '', $k);
-			$prim .= "$s\n\t\tCONSTRAINT " . str_replace('`', '"', $k) . " UNIQUE ($v)";
-		} else {
-			$prim .= "$s\n\t\t" . str_replace('`', '"', $k) . " ($v)";
-		}
-		if ($k == 'PRIMARY KEY') {
-			$prim_name = $v;
-		}
-		$s = ',';
-	}
-	$s = '';
-
-	$character_set = '';
-	if (@$GLOBALS['meta']['charset_sql_base']) {
-		$character_set .= ' CHARACTER SET ' . $GLOBALS['meta']['charset_sql_base'];
-	}
-	if (@$GLOBALS['meta']['charset_collation_sql_base']) {
-		$character_set .= ' COLLATE ' . $GLOBALS['meta']['charset_collation_sql_base'];
-	}
-
-	foreach ($champs as $k => $v) {
-		$k = str_replace('`', '"', $k);
-		if (preg_match(',([a-z]*\s*(\(\s*[0-9]*\s*\))?(\s*binary)?),i', $v, $defs)) {
-			if (preg_match(',(char|text),i', $defs[1]) and !preg_match(',binary,i', $defs[1])) {
-				$v = $defs[1] . $character_set . ' ' . substr($v, strlen($defs[1]));
-			}
-		}
-
-		$query .= "$s\n\t\t$k "
-			. (($autoinc && ($prim_name == $k) && preg_match(',\b(big|small|medium|tiny)?int\b,i', $v))
-				? ' bigserial'
-				: mysql2pg_type($v)
-			);
-		$s = ',';
-	}
-	$temporary = $temporary ? 'TEMPORARY' : '';
-
-	// En l'absence de "if not exists" en PG, on neutralise les erreurs
-
-	$q = "CREATE $temporary TABLE $nom ($query" . ($prim ? ",$prim" : '') . ')' .
-		($character_set ? " DEFAULT $character_set" : '')
-		. "\n";
-
-	if (!$requeter) {
-		return $q;
-	}
-	$connexion['last'] = $q;
-	$r = @pg_query($link, $q);
-
-	if (!$r) {
-		spip_log("Impossible de creer cette table: $q", 'pg.' . _LOG_ERREUR);
-	} else {
-		foreach ($keys as $index) {
-			pg_query($link, $index);
-		}
-	}
-
-	return $r;
+    $connexion = $GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0];
+    $link = $connexion['link'];
+    $nom = prefixer_table_spip($nom, $connexion['prefixe']);
+
+    $query = $prim = $prim_name = $v = $s = $p = '';
+    $keys = [];
+
+    // certains plugins declarent les tables  (permet leur inclusion dans le dump)
+    // sans les renseigner (laisse le compilo recuperer la description)
+    if (!is_array($champs) || !is_array($cles)) {
+        return;
+    }
+
+    foreach ($cles as $k => $v) {
+        if (strpos($k, 'KEY ') === 0) {
+            $n = str_replace('`', '', $k);
+            $v = str_replace('`', '"', $v);
+            $i = $nom . preg_replace('/KEY +/', '_', $n);
+            if ($k != $n) {
+                $i = "\"$i\"";
+            }
+            $keys[] = "CREATE INDEX $i ON $nom ($v);";
+        } elseif (strpos($k, 'UNIQUE ') === 0) {
+            $k = preg_replace('/^UNIQUE +/', '', $k);
+            $prim .= "$s\n\t\tCONSTRAINT " . str_replace('`', '"', $k) . " UNIQUE ($v)";
+        } else {
+            $prim .= "$s\n\t\t" . str_replace('`', '"', $k) . " ($v)";
+        }
+        if ($k == 'PRIMARY KEY') {
+            $prim_name = $v;
+        }
+        $s = ',';
+    }
+    $s = '';
+
+    $character_set = '';
+    if (@$GLOBALS['meta']['charset_sql_base']) {
+        $character_set .= ' CHARACTER SET ' . $GLOBALS['meta']['charset_sql_base'];
+    }
+    if (@$GLOBALS['meta']['charset_collation_sql_base']) {
+        $character_set .= ' COLLATE ' . $GLOBALS['meta']['charset_collation_sql_base'];
+    }
+
+    foreach ($champs as $k => $v) {
+        $k = str_replace('`', '"', $k);
+        if (preg_match(',([a-z]*\s*(\(\s*[0-9]*\s*\))?(\s*binary)?),i', $v, $defs)) {
+            if (preg_match(',(char|text),i', $defs[1]) and !preg_match(',binary,i', $defs[1])) {
+                $v = $defs[1] . $character_set . ' ' . substr($v, strlen($defs[1]));
+            }
+        }
+
+        $query .= "$s\n\t\t$k "
+            . (($autoinc && ($prim_name == $k) && preg_match(',\b(big|small|medium|tiny)?int\b,i', $v))
+                ? ' bigserial'
+                : mysql2pg_type($v)
+            );
+        $s = ',';
+    }
+    $temporary = $temporary ? 'TEMPORARY' : '';
+
+    // En l'absence de "if not exists" en PG, on neutralise les erreurs
+
+    $q = "CREATE $temporary TABLE $nom ($query" . ($prim ? ",$prim" : '') . ')' .
+        ($character_set ? " DEFAULT $character_set" : '')
+        . "\n";
+
+    if (!$requeter) {
+        return $q;
+    }
+    $connexion['last'] = $q;
+    $r = @pg_query($link, $q);
+
+    if (!$r) {
+        spip_log("Impossible de creer cette table: $q", 'pg.' . _LOG_ERREUR);
+    } else {
+        foreach ($keys as $index) {
+            pg_query($link, $index);
+        }
+    }
+
+    return $r;
 }
 
 
 function spip_pg_create_base($nom, $serveur = '', $requeter = true) {
-	return spip_pg_query("CREATE DATABASE $nom", $serveur, $requeter);
+    return spip_pg_query("CREATE DATABASE $nom", $serveur, $requeter);
 }
 
 // Fonction de creation d'une vue SQL nommee $nom
 function spip_pg_create_view($nom, $query_select, $serveur = '', $requeter = true) {
-	if (!$query_select) {
-		return false;
-	}
-	// vue deja presente
-	if (sql_showtable($nom, false, $serveur)) {
-		if ($requeter) {
-			spip_log("Echec creation d'une vue sql ($nom) car celle-ci existe deja (serveur:$serveur)", 'pg.' . _LOG_ERREUR);
-		}
+    if (!$query_select) {
+        return false;
+    }
+    // vue deja presente
+    if (sql_showtable($nom, false, $serveur)) {
+        if ($requeter) {
+            spip_log("Echec creation d'une vue sql ($nom) car celle-ci existe deja (serveur:$serveur)", 'pg.' . _LOG_ERREUR);
+        }
 
-		return false;
-	}
+        return false;
+    }
 
-	$query = "CREATE VIEW $nom AS " . $query_select;
+    $query = "CREATE VIEW $nom AS " . $query_select;
 
-	return spip_pg_query($query, $serveur, $requeter);
+    return spip_pg_query($query, $serveur, $requeter);
 }
 
 
 function spip_pg_set_connect_charset($charset, $serveur = '', $requeter = true) {
-	spip_log('changement de charset sql a ecrire en PG', 'pg.' . _LOG_ERREUR);
+    spip_log('changement de charset sql a ecrire en PG', 'pg.' . _LOG_ERREUR);
 }
 
 
@@ -1488,50 +1488,50 @@ 
  * @return bool|string true / false / requete
  **/
 function spip_pg_optimize($table, $serveur = '', $requeter = true) {
-	return spip_pg_query('VACUUM ' . $table, $serveur, $requeter);
+    return spip_pg_query('VACUUM ' . $table, $serveur, $requeter);
 }
 
 // Selectionner la sous-chaine dans $objet
 // correspondant a $lang. Cf balise Multi de Spip
 
 function spip_pg_multi($objet, $lang) {
-	$r = 'regexp_replace('
-		. $objet
-		. ",'<multi>.*[[]"
-		. $lang
-		. "[]]([^[]*).*</multi>', E'\\\\1') AS multi";
+    $r = 'regexp_replace('
+        . $objet
+        . ",'<multi>.*[[]"
+        . $lang
+        . "[]]([^[]*).*</multi>', E'\\\\1') AS multi";
 
-	return $r;
+    return $r;
 }
 
 // Palanquee d'idiosyncrasies MySQL dans les creations de table
 // A completer par les autres, mais essayer de reduire en amont.
 
 function mysql2pg_type($v) {
-	$remplace = [
-		'/auto_increment/i' => '', // non reconnu
-		'/bigint/i' => 'bigint',
-		'/mediumint/i' => 'mediumint',
-		'/smallint/i' => 'smallint',
-		'/tinyint/i' => 'int',
-		'/int\s*[(]\s*\d+\s*[)]/i' => 'int',
-		'/longtext/i' => 'text',
-		'/mediumtext/i' => 'text',
-		'/tinytext/i' => 'text',
-		'/longblob/i' => 'text',
-		'/0000-00-00/' => '0001-01-01',
-		'/datetime/i' => 'timestamp',
-		'/unsigned/i' => '',
-		'/double/i' => 'double precision',
-		'/VARCHAR\((\d+)\)\s+BINARY/i' => 'varchar(\1)',
-		'/ENUM *[(][^)]*[)]/i' => 'varchar(255)',
-		'/(timestamp .* )ON .*$/is' => '\\1',
-	];
-
-	return preg_replace(array_keys($remplace), array_values($remplace), $v);
+    $remplace = [
+        '/auto_increment/i' => '', // non reconnu
+        '/bigint/i' => 'bigint',
+        '/mediumint/i' => 'mediumint',
+        '/smallint/i' => 'smallint',
+        '/tinyint/i' => 'int',
+        '/int\s*[(]\s*\d+\s*[)]/i' => 'int',
+        '/longtext/i' => 'text',
+        '/mediumtext/i' => 'text',
+        '/tinytext/i' => 'text',
+        '/longblob/i' => 'text',
+        '/0000-00-00/' => '0001-01-01',
+        '/datetime/i' => 'timestamp',
+        '/unsigned/i' => '',
+        '/double/i' => 'double precision',
+        '/VARCHAR\((\d+)\)\s+BINARY/i' => 'varchar(\1)',
+        '/ENUM *[(][^)]*[)]/i' => 'varchar(255)',
+        '/(timestamp .* )ON .*$/is' => '\\1',
+    ];
+
+    return preg_replace(array_keys($remplace), array_values($remplace), $v);
 }
 
 // Renvoie false si on n'a pas les fonctions pg (pour l'install)
 function spip_versions_pg() {
-	return function_exists('pg_connect');
+    return function_exists('pg_connect');
 }

Spacing +83 added lines, -84 removed lines

@@ -64,7 +64,7 @@ 
 	if (!$link) {
 		$erreurs[] = pg_last_error();
 		foreach ($erreurs as $e) {
-			spip_log('Echec pg_connect. Erreur : ' . $e, 'pg.' . _LOG_HS);
+			spip_log('Echec pg_connect. Erreur : '.$e, 'pg.'._LOG_HS);
 		}
 
 		return false;
@@ -82,8 +82,8 @@ 
 	}
 
 	spip_log(
-		"Connexion vers $host, base $db, prefixe $prefixe " . ($link ? 'operationnelle' : 'impossible'),
-		'pg.' . _LOG_DEBUG
+		"Connexion vers $host, base $db, prefixe $prefixe ".($link ? 'operationnelle' : 'impossible'),
+		'pg.'._LOG_DEBUG
 	);
 
 	return !$link ? false : [
@@ -171,7 +171,7 @@ 
 	} else {
 		$suite = '';
 	}
-	$query = preg_replace('/([,\s])spip_/', '\1' . $prefixe . '_', $query) . $suite;
+	$query = preg_replace('/([,\s])spip_/', '\1'.$prefixe.'_', $query).$suite;
 
 	// renvoyer la requete inerte si demandee
 	if (!$requeter) {
@@ -239,7 +239,7 @@ 
 	// ou revoir l'api de sql_alter en creant un
 	// sql_alter_table($table,array($actions));
 	if (!preg_match('/\s*((\s*IGNORE)?\s*TABLE\s*([^\s]*))\s*(.*)?/is', $query, $regs)) {
-		spip_log("$query mal comprise", 'pg.' . _LOG_ERREUR);
+		spip_log("$query mal comprise", 'pg.'._LOG_ERREUR);
 
 		return false;
 	}
@@ -252,7 +252,7 @@ 
 	$i = 0;
 	$ouverte = false;
 	while ($do = array_shift($todo)) {
-		$todo2[$i] = isset($todo2[$i]) ? $todo2[$i] . ',' . $do : $do;
+		$todo2[$i] = isset($todo2[$i]) ? $todo2[$i].','.$do : $do;
 		$o = (false !== strpos($do, '('));
 		$f = (false !== strpos($do, ')'));
 		if ($o and !$f) {
@@ -265,33 +265,33 @@ 
 		}
 	}
 	$todo = $todo2;
-	$query = $debut . ' ' . array_shift($todo);
+	$query = $debut.' '.array_shift($todo);
 
 	if (!preg_match('/^\s*(IGNORE\s*)?TABLE\s+(\w+)\s+(ADD|DROP|CHANGE|MODIFY|RENAME)\s*(.*)$/is', $query, $r)) {
-		spip_log("$query incompris", 'pg.' . _LOG_ERREUR);
+		spip_log("$query incompris", 'pg.'._LOG_ERREUR);
 	} else {
 		if ($r[1]) {
-			spip_log("j'ignore IGNORE dans $query", 'pg.' . _LOG_AVERTISSEMENT);
+			spip_log("j'ignore IGNORE dans $query", 'pg.'._LOG_AVERTISSEMENT);
 		}
-		$f = 'spip_pg_alter_' . strtolower($r[3]);
+		$f = 'spip_pg_alter_'.strtolower($r[3]);
 		if (function_exists($f)) {
 			$f($r[2], $r[4], $serveur, $requeter);
 		} else {
-			spip_log("$query non prevu", 'pg.' . _LOG_ERREUR);
+			spip_log("$query non prevu", 'pg.'._LOG_ERREUR);
 		}
 	}
 	// Alter a plusieurs args. Faudrait optimiser.
 	if ($todo) {
-		spip_pg_alter("TABLE $table " . join(',', $todo));
+		spip_pg_alter("TABLE $table ".join(',', $todo));
 	}
 }
 
 function spip_pg_alter_change($table, $arg, $serveur = '', $requeter = true) {
 	if (!preg_match('/^`?(\w+)`?\s+`?(\w+)`?\s+(.*?)\s*(DEFAULT .*?)?(NOT\s+NULL)?\s*(DEFAULT .*?)?$/i', $arg, $r)) {
-		spip_log("alter change: $arg  incompris", 'pg.' . _LOG_ERREUR);
+		spip_log("alter change: $arg  incompris", 'pg.'._LOG_ERREUR);
 	} else {
 		[, $old, $new, $type, $default, $null, $def2] = $r;
-		$actions = ["ALTER $old TYPE " . mysql2pg_type($type)];
+		$actions = ["ALTER $old TYPE ".mysql2pg_type($type)];
 		if ($null) {
 			$actions[] = "ALTER $old SET NOT NULL";
 		} else {
@@ -304,7 +304,7 @@ 
 			$actions[] = "ALTER $old DROP DEFAULT";
 		}
 
-		spip_pg_query("ALTER TABLE $table " . join(', ', $actions));
+		spip_pg_query("ALTER TABLE $table ".join(', ', $actions));
 
 		if ($old != $new) {
 			spip_pg_query("ALTER TABLE $table RENAME $old TO $new", $serveur);
@@ -315,7 +315,7 @@ 
 function spip_pg_alter_add($table, $arg, $serveur = '', $requeter = true) {
 	$nom_index = null;
 	if (!preg_match('/^(COLUMN|INDEX|KEY|PRIMARY\s+KEY|)\s*(.*)$/', $arg, $r)) {
-		spip_log("alter add $arg  incompris", 'pg.' . _LOG_ERREUR);
+		spip_log("alter add $arg  incompris", 'pg.'._LOG_ERREUR);
 
 		return null;
 	}
@@ -325,14 +325,14 @@ 
 			$m[2] = $n[1];
 		}
 
-		return spip_pg_query("ALTER TABLE $table ADD " . $m[1] . ' ' . mysql2pg_type($m[2]), $serveur, $requeter);
+		return spip_pg_query("ALTER TABLE $table ADD ".$m[1].' '.mysql2pg_type($m[2]), $serveur, $requeter);
 	} elseif ($r[1][0] == 'P') {
 		// la primary peut etre sur plusieurs champs
 		$r[2] = trim(str_replace('`', '', $r[2]));
 		$m = ($r[2][0] == '(') ? substr($r[2], 1, -1) : $r[2];
 
 		return spip_pg_query(
-			"ALTER TABLE $table ADD CONSTRAINT $table" . '_pkey PRIMARY KEY (' . $m . ')',
+			"ALTER TABLE $table ADD CONSTRAINT $table".'_pkey PRIMARY KEY ('.$m.')',
 			$serveur,
 			$requeter
 		);
@@ -351,7 +351,7 @@ 
 				$colonnes = substr($m[1], 1, -1);
 				if (false !== strpos(',', $colonnes)) {
 					spip_log('PG : Erreur, impossible de creer un index sur plusieurs colonnes'
-						. " sans qu'il ait de nom ($table, ($colonnes))", 'pg.' . _LOG_ERREUR);
+						. " sans qu'il ait de nom ($table, ($colonnes))", 'pg.'._LOG_ERREUR);
 				} else {
 					$nom_index = $colonnes;
 				}
@@ -367,23 +367,23 @@ 
 
 function spip_pg_alter_drop($table, $arg, $serveur = '', $requeter = true) {
 	if (!preg_match('/^(COLUMN|INDEX|KEY|PRIMARY\s+KEY|)\s*`?(\w*)`?/', $arg, $r)) {
-		spip_log("alter drop: $arg  incompris", 'pg.' . _LOG_ERREUR);
+		spip_log("alter drop: $arg  incompris", 'pg.'._LOG_ERREUR);
 	} else {
 		if (!$r[1] or $r[1] == 'COLUMN') {
-			return spip_pg_query("ALTER TABLE $table DROP " . $r[2], $serveur);
+			return spip_pg_query("ALTER TABLE $table DROP ".$r[2], $serveur);
 		} elseif ($r[1][0] == 'P') {
-			return spip_pg_query("ALTER TABLE $table DROP CONSTRAINT $table" . '_pkey', $serveur);
+			return spip_pg_query("ALTER TABLE $table DROP CONSTRAINT $table".'_pkey', $serveur);
 		} else {
-			return spip_pg_query('DROP INDEX ' . $table . '_' . $r[2], $serveur);
+			return spip_pg_query('DROP INDEX '.$table.'_'.$r[2], $serveur);
 		}
 	}
 }
 
 function spip_pg_alter_modify($table, $arg, $serveur = '', $requeter = true) {
 	if (!preg_match('/^`?(\w+)`?\s+(.*)$/', $arg, $r)) {
-		spip_log("alter modify: $arg  incompris", 'pg.' . _LOG_ERREUR);
+		spip_log("alter modify: $arg  incompris", 'pg.'._LOG_ERREUR);
 	} else {
-		return spip_pg_alter_change($table, $r[1] . ' ' . $arg, $serveur = '', $requeter = true);
+		return spip_pg_alter_change($table, $r[1].' '.$arg, $serveur = '', $requeter = true);
 	}
 }
 
@@ -399,7 +399,7 @@ 
 	} elseif (preg_match('/^(TO)\s*`?(\w*)`?/', $arg, $r)) {
 		$rename = $r[2];
 	} else {
-		spip_log("alter rename: $arg  incompris", 'pg.' . _LOG_ERREUR);
+		spip_log("alter rename: $arg  incompris", 'pg.'._LOG_ERREUR);
 	}
 
 	return $rename ? spip_pg_query("ALTER TABLE $table RENAME TO $rename") : false;
@@ -420,8 +420,8 @@ 
 function spip_pg_create_index($nom, $table, $champs, $serveur = '', $requeter = true) {
 	if (!($nom or $table or $champs)) {
 		spip_log(
-			"Champ manquant pour creer un index pg ($nom, $table, (" . @join(',', $champs) . '))',
-			'pg.' . _LOG_ERREUR
+			"Champ manquant pour creer un index pg ($nom, $table, (".@join(',', $champs).'))',
+			'pg.'._LOG_ERREUR
 		);
 
 		return false;
@@ -432,7 +432,7 @@ 
 
 	// PG ne differentie pas noms des index en fonction des tables
 	// il faut donc creer des noms uniques d'index pour une base pg
-	$nom = $table . '_' . $nom;
+	$nom = $table.'_'.$nom;
 	// enlever d'eventuelles parentheses deja presentes sur champs
 	if (!is_array($champs)) {
 		if ($champs[0] == '(') {
@@ -440,7 +440,7 @@ 
 		}
 		$champs = [$champs];
 	}
-	$query = "CREATE INDEX $nom ON $table (" . join(',', $champs) . ')';
+	$query = "CREATE INDEX $nom ON $table (".join(',', $champs).')';
 	if (!$requeter) {
 		return $query;
 	}
@@ -463,7 +463,7 @@ 
 	} else {
 		$suite = '';
 	}
-	$query = 'EXPLAIN ' . preg_replace('/([,\s])spip_/', '\1' . $prefixe . '_', $query) . $suite;
+	$query = 'EXPLAIN '.preg_replace('/([,\s])spip_/', '\1'.$prefixe.'_', $query).$suite;
 
 	if (!$requeter) {
 		return $query;
@@ -556,16 +556,16 @@ 
 		}
 	}
 	$from = spip_pg_from($from, $prefixe);
-	$query = 'SELECT ' . $select
+	$query = 'SELECT '.$select
 		. (!$from ? '' : "\nFROM $from")
-		. (!$where ? '' : ("\nWHERE " . (!is_array($where) ? calculer_pg_where($where) : (join(
+		. (!$where ? '' : ("\nWHERE ".(!is_array($where) ? calculer_pg_where($where) : (join(
 			"\n\tAND ",
 			array_map('calculer_pg_where', $where)
 		)))))
 		. spip_pg_groupby($groupby, $from, $select)
 		. (!$having ? '' : "\nHAVING $having")
 		. ($orderby ? ("\nORDER BY $orderby") : '')
-		. (!$limit ? '' : (" LIMIT $count" . (!$offset ? '' : " OFFSET $offset")));
+		. (!$limit ? '' : (" LIMIT $count".(!$offset ? '' : " OFFSET $offset")));
 
 	// renvoyer la requete inerte si demandee
 	if ($requeter === false) {
@@ -586,7 +586,7 @@ 
 		$from = spip_pg_select_as($from);
 	}
 
-	return !$prefixe ? $from : preg_replace('/(\b)spip_/', '\1' . $prefixe . '_', $from);
+	return !$prefixe ? $from : preg_replace('/(\b)spip_/', '\1'.$prefixe.'_', $from);
 }
 
 function spip_pg_orderby($order, $select) {
@@ -594,7 +594,7 @@ 
 	$arg = (is_array($order) ? $order : preg_split('/\s*,\s*/', $order));
 
 	foreach ($arg as $v) {
-		if (preg_match('/(case\s+.*?else\s+0\s+end)\s*AS\s+' . $v . '/', $select, $m)) {
+		if (preg_match('/(case\s+.*?else\s+0\s+end)\s*AS\s+'.$v.'/', $select, $m)) {
 			$res[] = $m[1];
 		} else {
 			$res[] = $v;
@@ -772,7 +772,7 @@ 
 			$n++;
 			$res .= "\nwhen $index=$v then $n";
 		}
-		$arg = $m[1] . "case $res else 0 end "
+		$arg = $m[1]."case $res else 0 end "
 			. substr($arg, strlen($m[0]));
 	}
 
@@ -815,9 +815,9 @@ 
 	}
 
 	if (strtoupper($join) === 'AND') {
-		return $exp . join("\n\t$join ", array_map('calculer_pg_where', $v));
+		return $exp.join("\n\t$join ", array_map('calculer_pg_where', $v));
 	} else {
-		return $exp . join($join, $v);
+		return $exp.join($join, $v);
 	}
 }
 
@@ -827,7 +827,7 @@ 
 		if (substr($k, -1) == '@') {
 			// c'est une jointure qui se refere au from precedent
 			// pas de virgule
-			$argsas .= '  ' . $v;
+			$argsas .= '  '.$v;
 		} else {
 			$as = '';
 			//  spip_log("$k : $v", _LOG_DEBUG);
@@ -837,7 +837,7 @@ 
 				} elseif ($v != $k) {
 					$p = strpos($v, ' ');
 					if ($p) {
-						$v = substr($v, 0, $p) . " AS $k" . substr($v, $p);
+						$v = substr($v, 0, $p)." AS $k".substr($v, $p);
 					} else {
 						$as = " AS $k";
 					}
@@ -845,7 +845,7 @@ 
 			}
 			// spip_log("subs $k : $v avec $as", _LOG_DEBUG);
 			// if (strpos($v, 'JOIN') === false)  $argsas .= ', ';
-			$argsas .= ', ' . $v . $as;
+			$argsas .= ', '.$v.$as;
 		}
 	}
 
@@ -876,7 +876,7 @@ 
 	$serveur = '',
 	$requeter = true
 ) {
-	$c = !$groupby ? '*' : ('DISTINCT ' . (is_string($groupby) ? $groupby : join(',', $groupby)));
+	$c = !$groupby ? '*' : ('DISTINCT '.(is_string($groupby) ? $groupby : join(',', $groupby)));
 	$r = spip_pg_select("COUNT($c)", $from, $where, '', '', '', $having, $serveur, $requeter);
 	if (!$requeter) {
 		return $r;
@@ -977,8 +977,8 @@ 
 
 	return spip_pg_insert(
 		$table,
-		'(' . join(',', array_keys($couples)) . ')',
-		'(' . join(',', $couples) . ')',
+		'('.join(',', array_keys($couples)).')',
+		'('.join(',', $couples).')',
 		$desc,
 		$serveur,
 		$requeter
@@ -1001,7 +1001,7 @@ 
 	$c = $tab_couples[0] ?? [];
 	$les_cles = spip_pg_ajouter_champs_timestamp($table, $c, $desc, $serveur);
 
-	$cles = '(' . join(',', array_keys($les_cles)) . ')';
+	$cles = '('.join(',', array_keys($les_cles)).')';
 	$valeurs = [];
 	foreach ($tab_couples as $couples) {
 		foreach ($couples as $champ => $val) {
@@ -1010,7 +1010,7 @@ 
 		// recherche de champs 'timestamp' pour mise a jour auto de ceux-ci
 		$couples = spip_pg_ajouter_champs_timestamp($table, $couples, $desc, $serveur);
 
-		$valeurs[] = '(' . join(',', $couples) . ')';
+		$valeurs[] = '('.join(',', $couples).')';
 	}
 	$valeurs = implode(', ', $valeurs);
 
@@ -1031,7 +1031,7 @@ 
 
 	$set = [];
 	foreach ($couples as $champ => $val) {
-		$set[] = $champ . '=' . $val;
+		$set[] = $champ.'='.$val;
 	}
 
 	$query = calculer_pg_expression('UPDATE', $table, ',')
@@ -1066,7 +1066,7 @@ 
 
 function spip_pg_replace($table, $values, $desc, $serveur = '', $requeter = true) {
 	if (!$values) {
-		spip_log("replace vide $table", 'pg.' . _LOG_AVERTISSEMENT);
+		spip_log("replace vide $table", 'pg.'._LOG_AVERTISSEMENT);
 
 		return 0;
 	}
@@ -1100,8 +1100,8 @@ 
 	if (!$where) {
 		return spip_pg_insert(
 			$table,
-			'(' . join(',', array_keys($values)) . ')',
-			'(' . join(',', $values) . ')',
+			'('.join(',', array_keys($values)).')',
+			'('.join(',', $values).')',
 			$desc,
 			$serveur
 		);
@@ -1122,12 +1122,11 @@ 
 		$couples = pg_affected_rows($couples);
 	}
 	if (!$couples) {
-		$ret = !$seq ? '' :
-			(" RETURNING nextval('$seq') < $prim");
-		$connexion['last'] = $q = "INSERT INTO $table (" . join(',', array_keys($values)) . ') VALUES (' . join(
+		$ret = !$seq ? '' : (" RETURNING nextval('$seq') < $prim");
+		$connexion['last'] = $q = "INSERT INTO $table (".join(',', array_keys($values)).') VALUES ('.join(
 			',',
 			$values
-		) . ")$ret";
+		).")$ret";
 		$couples = spip_pg_query_simple($link, $q);
 		if (!$couples) {
 			return false;
@@ -1175,7 +1174,7 @@ 
 	) {
 		return '';
 	} else {
-		return $raw ? $prim : $table . '_' . $prim . '_seq';
+		return $raw ? $prim : $table.'_'.$prim.'_seq';
 	}
 }
 
@@ -1192,29 +1191,29 @@ 
 			return spip_pg_frommysql($v);
 		} else {
 			if (strncmp($v, '0000', 4) == 0) {
-				$v = '0001' . substr($v, 4);
+				$v = '0001'.substr($v, 4);
 			}
 			if (strpos($v, '-00-00') === 4) {
-				$v = substr($v, 0, 4) . '-01-01' . substr($v, 10);
+				$v = substr($v, 0, 4).'-01-01'.substr($v, 10);
 			}
 
 			return "timestamp '$v'";
 		}
 	} elseif (!sql_test_int($t)) {
-		return ("'" . pg_escape_string($v) . "'");
+		return ("'".pg_escape_string($v)."'");
 	} elseif (is_numeric($v) or (strpos($v, 'CAST(') === 0)) {
 		return $v;
 	} elseif ($v[0] == '0' and $v[1] !== 'x' and ctype_xdigit(substr($v, 1))) {
 		return substr($v, 1);
 	} else {
-		spip_log("Warning: '$v'  n'est pas de type $t", 'pg.' . _LOG_AVERTISSEMENT);
+		spip_log("Warning: '$v'  n'est pas de type $t", 'pg.'._LOG_AVERTISSEMENT);
 
 		return intval($v);
 	}
 }
 
 function spip_pg_hex($v) {
-	return "CAST(x'" . $v . "' as bigint)";
+	return "CAST(x'".$v."' as bigint)";
 }
 
 function spip_pg_quote($v, $type = '') {
@@ -1252,15 +1251,15 @@ 
 		return $not ? '0=0' : '0=1';
 	}
 	if (strpos($valeurs, "CAST(x'") !== false) {
-		return "($val=" . join("OR $val=", explode(',', $valeurs)) . ')';
+		return "($val=".join("OR $val=", explode(',', $valeurs)).')';
 	}
 	$n = $i = 0;
 	$in_sql = '';
 	while ($n = strpos($valeurs, ',', $n + 1)) {
 		if ((++$i) >= 255) {
-			$in_sql .= "($val $not IN (" .
-				substr($valeurs, 0, $n) .
-				"))\n" .
+			$in_sql .= "($val $not IN (".
+				substr($valeurs, 0, $n).
+				"))\n".
 				($not ? "AND\t" : "OR\t");
 			$valeurs = substr($valeurs, $n + 1);
 			$i = $n = 0;
@@ -1276,7 +1275,7 @@ 
 	$s = $link ? pg_last_error($link) : pg_last_error();
 	if ($s) {
 		$s = str_replace('ERROR', 'errcode: 1000 ', $s);
-		spip_log("$s - $query", 'pg.' . _LOG_ERREUR);
+		spip_log("$s - $query", 'pg.'._LOG_ERREUR);
 	}
 
 	return $s;
@@ -1324,7 +1323,7 @@ 
 function spip_pg_showbase($match, $serveur = '', $requeter = true) {
 	$connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0];
 	$link = $connexion['link'];
-	$connexion['last'] = $q = 'SELECT tablename FROM pg_tables WHERE tablename ILIKE ' . _q($match);
+	$connexion['last'] = $q = 'SELECT tablename FROM pg_tables WHERE tablename ILIKE '._q($match);
 
 	return spip_pg_query_simple($link, $q);
 }
@@ -1332,7 +1331,7 @@ 
 function spip_pg_showtable($nom_table, $serveur = '', $requeter = true) {
 	$connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0];
 	$link = $connexion['link'];
-	$connexion['last'] = $q = 'SELECT column_name, column_default, data_type FROM information_schema.columns WHERE table_name ILIKE ' . _q($nom_table);
+	$connexion['last'] = $q = 'SELECT column_name, column_default, data_type FROM information_schema.columns WHERE table_name ILIKE '._q($nom_table);
 
 	$res = spip_pg_query_simple($link, $q);
 	if (!$res) {
@@ -1343,15 +1342,15 @@ 
 	// il faut en tenir compte dans le return
 	$fields = [];
 	while ($field = pg_fetch_array($res, null, PGSQL_NUM)) {
-		$fields[$field[0]] = $field[2] . (!$field[1] ? '' : (' DEFAULT ' . $field[1]));
+		$fields[$field[0]] = $field[2].(!$field[1] ? '' : (' DEFAULT '.$field[1]));
 	}
-	$connexion['last'] = $q = 'SELECT indexdef FROM pg_indexes WHERE tablename ILIKE ' . _q($nom_table);
+	$connexion['last'] = $q = 'SELECT indexdef FROM pg_indexes WHERE tablename ILIKE '._q($nom_table);
 	$res = spip_pg_query_simple($link, $q);
 	$keys = [];
 	while ($index = pg_fetch_array($res, null, PGSQL_NUM)) {
 		if (preg_match('/CREATE\s+(UNIQUE\s+)?INDEX\s([^\s]+).*\((.*)\)$/', $index[0], $r)) {
-			$nom = str_replace($nom_table . '_', '', $r[2]);
-			$keys[($r[1] ? 'PRIMARY KEY' : ('KEY ' . $nom))] = $r[3];
+			$nom = str_replace($nom_table.'_', '', $r[2]);
+			$keys[($r[1] ? 'PRIMARY KEY' : ('KEY '.$nom))] = $r[3];
 		}
 	}
 
@@ -1383,16 +1382,16 @@ 
 		if (strpos($k, 'KEY ') === 0) {
 			$n = str_replace('`', '', $k);
 			$v = str_replace('`', '"', $v);
-			$i = $nom . preg_replace('/KEY +/', '_', $n);
+			$i = $nom.preg_replace('/KEY +/', '_', $n);
 			if ($k != $n) {
 				$i = "\"$i\"";
 			}
 			$keys[] = "CREATE INDEX $i ON $nom ($v);";
 		} elseif (strpos($k, 'UNIQUE ') === 0) {
 			$k = preg_replace('/^UNIQUE +/', '', $k);
-			$prim .= "$s\n\t\tCONSTRAINT " . str_replace('`', '"', $k) . " UNIQUE ($v)";
+			$prim .= "$s\n\t\tCONSTRAINT ".str_replace('`', '"', $k)." UNIQUE ($v)";
 		} else {
-			$prim .= "$s\n\t\t" . str_replace('`', '"', $k) . " ($v)";
+			$prim .= "$s\n\t\t".str_replace('`', '"', $k)." ($v)";
 		}
 		if ($k == 'PRIMARY KEY') {
 			$prim_name = $v;
@@ -1403,17 +1402,17 @@ 
 
 	$character_set = '';
 	if (@$GLOBALS['meta']['charset_sql_base']) {
-		$character_set .= ' CHARACTER SET ' . $GLOBALS['meta']['charset_sql_base'];
+		$character_set .= ' CHARACTER SET '.$GLOBALS['meta']['charset_sql_base'];
 	}
 	if (@$GLOBALS['meta']['charset_collation_sql_base']) {
-		$character_set .= ' COLLATE ' . $GLOBALS['meta']['charset_collation_sql_base'];
+		$character_set .= ' COLLATE '.$GLOBALS['meta']['charset_collation_sql_base'];
 	}
 
 	foreach ($champs as $k => $v) {
 		$k = str_replace('`', '"', $k);
 		if (preg_match(',([a-z]*\s*(\(\s*[0-9]*\s*\))?(\s*binary)?),i', $v, $defs)) {
 			if (preg_match(',(char|text),i', $defs[1]) and !preg_match(',binary,i', $defs[1])) {
-				$v = $defs[1] . $character_set . ' ' . substr($v, strlen($defs[1]));
+				$v = $defs[1].$character_set.' '.substr($v, strlen($defs[1]));
 			}
 		}
 
@@ -1428,7 +1427,7 @@ 
 
 	// En l'absence de "if not exists" en PG, on neutralise les erreurs
 
-	$q = "CREATE $temporary TABLE $nom ($query" . ($prim ? ",$prim" : '') . ')' .
+	$q = "CREATE $temporary TABLE $nom ($query".($prim ? ",$prim" : '').')'.
 		($character_set ? " DEFAULT $character_set" : '')
 		. "\n";
 
@@ -1439,7 +1438,7 @@ 
 	$r = @pg_query($link, $q);
 
 	if (!$r) {
-		spip_log("Impossible de creer cette table: $q", 'pg.' . _LOG_ERREUR);
+		spip_log("Impossible de creer cette table: $q", 'pg.'._LOG_ERREUR);
 	} else {
 		foreach ($keys as $index) {
 			pg_query($link, $index);
@@ -1462,20 +1461,20 @@ 
 	// vue deja presente
 	if (sql_showtable($nom, false, $serveur)) {
 		if ($requeter) {
-			spip_log("Echec creation d'une vue sql ($nom) car celle-ci existe deja (serveur:$serveur)", 'pg.' . _LOG_ERREUR);
+			spip_log("Echec creation d'une vue sql ($nom) car celle-ci existe deja (serveur:$serveur)", 'pg.'._LOG_ERREUR);
 		}
 
 		return false;
 	}
 
-	$query = "CREATE VIEW $nom AS " . $query_select;
+	$query = "CREATE VIEW $nom AS ".$query_select;
 
 	return spip_pg_query($query, $serveur, $requeter);
 }
 
 
 function spip_pg_set_connect_charset($charset, $serveur = '', $requeter = true) {
-	spip_log('changement de charset sql a ecrire en PG', 'pg.' . _LOG_ERREUR);
+	spip_log('changement de charset sql a ecrire en PG', 'pg.'._LOG_ERREUR);
 }
 
 
@@ -1488,7 +1487,7 @@ 
  * @return bool|string true / false / requete
  **/
 function spip_pg_optimize($table, $serveur = '', $requeter = true) {
-	return spip_pg_query('VACUUM ' . $table, $serveur, $requeter);
+	return spip_pg_query('VACUUM '.$table, $serveur, $requeter);
 }
 
 // Selectionner la sous-chaine dans $objet

ecrire/plugins/afficher_plugin.php

Spacing +34 added lines, -35 removed lines

@@ -63,9 +63,9 @@ 
 			" class='picto_err'",
 			_T('plugin_info_erreur_xml')
 		)
-			. "<div class='erreur'>" . join('<br >', $info['erreur']) . '</div>';
+			. "<div class='erreur'>".join('<br >', $info['erreur']).'</div>';
 		$checkable = false;
-	} elseif (isset($GLOBALS['erreurs_activation_raw'][$dir_plugins . $plug_file])) {
+	} elseif (isset($GLOBALS['erreurs_activation_raw'][$dir_plugins.$plug_file])) {
 		$class_li .= ' error';
 		$erreur = http_img_pack(
 			'plugin-err-32.png',
@@ -73,10 +73,10 @@ 
 			" class='picto_err'",
 			_T('plugin_impossible_activer', ['plugin' => $nom])
 		)
-			. "<div class='erreur'>" . implode(
+			. "<div class='erreur'>".implode(
 				'<br />',
-				$GLOBALS['erreurs_activation_raw'][$dir_plugins . $plug_file]
-			) . '</div>';
+				$GLOBALS['erreurs_activation_raw'][$dir_plugins.$plug_file]
+			).'</div>';
 	} else {
 		$cfg = $actif ? plugin_bouton_config($plug_file, $info, $dir_plugins) : '';
 		if (defined('_DEV_VERSION_SPIP_COMPAT') and !plugin_version_compatible($info['compatibilite'], $GLOBALS['spip_version_branche'])) {
@@ -93,11 +93,11 @@ 
 	// numerotons les occurrences d'un meme prefix
 	$versions[$prefix] = $id = isset($versions[$prefix]) ? intval($versions[$prefix]) + 1 : '';
 
-	$class_li .= ($actif ? ' actif' : '') . ($expose ? ' on' : '');
+	$class_li .= ($actif ? ' actif' : '').($expose ? ' on' : '');
 
 	return "<li id='$prefix$id' class='$class_li'>"
 	. ((!$checkable and !$checked)
-		? '' : plugin_checkbox(++$id_input, $dir_plugins . $plug_file, $checked))
+		? '' : plugin_checkbox(++$id_input, $dir_plugins.$plug_file, $checked))
 	. plugin_resume($info, $dir_plugins, $plug_file, $url_page)
 	. $cfg
 	. $erreur
@@ -116,9 +116,9 @@ 
 	// si paquet.xml fournit un squelette, le prendre
 	if (isset($infos['config']) and $infos['config']) {
 		return recuperer_fond(
-			"$dir$nom/" . $infos['config'],
+			"$dir$nom/".$infos['config'],
 			[
-				'script' => 'configurer_' . $prefix,
+				'script' => 'configurer_'.$prefix,
 				'nom' => $nom
 			]
 		);
@@ -137,7 +137,7 @@ 
 	return recuperer_fond(
 		'prive/squelettes/inclure/cfg',
 		[
-			'script' => 'configurer_' . $prefix,
+			'script' => 'configurer_'.$prefix,
 			'nom' => $nom
 		]
 	);
@@ -153,7 +153,7 @@ 
 	. "<input type='checkbox' name='s$name' id='label_$id_input'"
 	. ($actif ? " checked='checked'" : '')
 	. " class='checkbox'  value='O' />"
-	. "\n<label for='label_$id_input'>" . _T('activer_plugin') . '</label>'
+	. "\n<label for='label_$id_input'>"._T('activer_plugin').'</label>'
 	. '</div>';
 }
 
@@ -208,11 +208,11 @@ 
 	. "<h3><a href='$url' rel='info'>"
 	. $nom
 	. '</a></h3>'
-	. " <span class='version'>" . $info['version'] . '</span>'
+	. " <span class='version'>".$info['version'].'</span>'
 	. " <span class='etat'> - "
 	. plugin_etat_en_clair($info['etat'])
 	. '</span>'
-	. "<div class='short'>" . $slogan . '</div>'
+	. "<div class='short'>".$slogan.'</div>'
 	. $i
 	. '</div>';
 }
@@ -227,7 +227,7 @@ 
 	$text2 = _T('info_desinstaller_plugin');
 	$file = basename($plug_file);
 
-	return "<div class='actions'>[" .
+	return "<div class='actions'>[".
 	"<a href='$action'
 		onclick='return confirm(\"$text $nom ?\\n$text2\")'>"
 	. $text
@@ -249,7 +249,7 @@ 
 		$etat = 'developpement';
 	}
 
-	return _T('plugin_etat_' . $etat);
+	return _T('plugin_etat_'.$etat);
 }
 
 function plugin_propre($texte, $module = '', $propre = 'propre') {
@@ -258,7 +258,7 @@ 
 		$module = substr($module, strlen(_DIR_RACINE));
 	}
 	if (preg_match('|^\w+_[\w_]+$|', $texte)) {
-		$texte = _T(($module ? "$module:" : '') . $texte, [], ['force' => false]);
+		$texte = _T(($module ? "$module:" : '').$texte, [], ['force' => false]);
 	}
 
 	return $propre($texte);
@@ -291,9 +291,9 @@ 
 		isset($info['documentation'])
 		and $lien = $info['documentation']
 	) {
-		$description .= "<p><em class='site'><a href='$lien' class='spip_out'>" . _T('en_savoir_plus') . '</a></em></p>';
+		$description .= "<p><em class='site'><a href='$lien' class='spip_out'>"._T('en_savoir_plus').'</a></em></p>';
 	}
-	$s .= "<dd class='desc'>" . $description . "</dd>\n";
+	$s .= "<dd class='desc'>".$description."</dd>\n";
 
 	if (isset($info['auteur'])) {
 		if (is_array($info['auteur'])) {
@@ -303,19 +303,19 @@ 
 			$a = trim($info['auteur']);
 		}
 		if ($a) {
-			$s .= "<dt class='auteurs'>" . _T('public:par_auteur') . "</dt><dd class='auteurs'>" . PtoBR(propre(
+			$s .= "<dt class='auteurs'>"._T('public:par_auteur')."</dt><dd class='auteurs'>".PtoBR(propre(
 				$a,
 				$dir
-			)) . "</dd>\n";
+			))."</dd>\n";
 		}
 	}
 
 	if (isset($info['credit'])) {
 		if ($a = formater_credits($info['credit'], ', ')) {
-			$s .= "<dt class='credits'>" . _T('plugin_info_credit') . "</dt><dd class='credits'>" . PtoBR(propre(
+			$s .= "<dt class='credits'>"._T('plugin_info_credit')."</dt><dd class='credits'>".PtoBR(propre(
 				$a,
 				$dir
-			)) . "</dd>\n";
+			))."</dd>\n";
 		}
 	}
 
@@ -327,10 +327,10 @@ 
 			$a = trim($info['licence']);
 		}
 		if ($a) {
-			$s .= "<dt class='licence'>" . _T('intitule_licence') . "</dt><dd class='licence'>" . PtoBR(propre(
+			$s .= "<dt class='licence'>"._T('intitule_licence')."</dt><dd class='licence'>".PtoBR(propre(
 				$a,
 				$dir
-			)) . "</dd>\n";
+			))."</dd>\n";
 		}
 	}
 
@@ -341,25 +341,24 @@ 
 	//
 	$infotech = [];
 
-	$version = '<dt>' . _T('version') . '</dt><dd>' . $info['version'];
+	$version = '<dt>'._T('version').'</dt><dd>'.$info['version'];
 	// Version VCS
-	if ($vcs = version_vcs_courante($dir_plugins . $plug_file)) {
-		$version .= ' ' . $vcs;
+	if ($vcs = version_vcs_courante($dir_plugins.$plug_file)) {
+		$version .= ' '.$vcs;
 	}
 	$version .= '</dd>';
 	$infotech[] = $version;
-	$infotech[] = '<dt>' . _T('repertoire_plugins') . '</dt><dd>' . joli_repertoire("$dir_plugins$plug_file") . '</dd>';
+	$infotech[] = '<dt>'._T('repertoire_plugins').'</dt><dd>'.joli_repertoire("$dir_plugins$plug_file").'</dd>';
 	// source zip le cas echeant
-	$infotech[] = (lire_fichier($dir_plugins . $plug_file . '/install.log', $log)
+	$infotech[] = (lire_fichier($dir_plugins.$plug_file.'/install.log', $log)
 		and preg_match(',^source:(.*)$,m', $log, $r))
-		? '<dt>' . _T('plugin_source') . '</dt><dd>' . trim($r[1]) . '</dd>'
+		? '<dt>'._T('plugin_source').'</dt><dd>'.trim($r[1]).'</dd>'
 		: '';
 
-	$infotech[] = !$info['necessite'] ? '' :
-		('<dt>' . _T('plugin_info_necessite') . '</dt><dd>' . join(
+	$infotech[] = !$info['necessite'] ? '' : ('<dt>'._T('plugin_info_necessite').'</dt><dd>'.join(
 			' ',
 			array_map('array_shift', $info['necessite'])
-		) . '</dd>');
+		).'</dd>');
 
 	$s .= "<dl class='tech'>"
 		. join('', $infotech)
@@ -380,8 +379,8 @@ 
 		$texte .=
 			(!is_array($_credit))
 				? PtoBR(propre($_credit))
-				: ($_credit['url'] ? '<a href="' . $_credit['url'] . '">' : '') .
-				$_credit['nom'] .
+				: ($_credit['url'] ? '<a href="'.$_credit['url'].'">' : '').
+				$_credit['nom'].
 				($_credit['url'] ? '</a>' : '');
 	}
 

Indentation +303 added lines, -303 removed lines

@@ -17,212 +17,212 @@ 
  **/
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 include_spip('inc/charsets');
 include_spip('inc/texte');
 include_spip('inc/plugin'); // pour plugin_est_installe
 
 function plugins_afficher_plugin_dist(
-	$url_page,
-	$plug_file,
-	$checked,
-	$actif,
-	$expose = false,
-	$class_li = 'item',
-	$dir_plugins = _DIR_PLUGINS
+    $url_page,
+    $plug_file,
+    $checked,
+    $actif,
+    $expose = false,
+    $class_li = 'item',
+    $dir_plugins = _DIR_PLUGINS
 ) {
 
-	static $id_input = 0;
-	static $versions = [];
-
-	$force_reload = (_request('var_mode') == 'recalcul');
-	$get_infos = charger_fonction('get_infos', 'plugins');
-	$info = $get_infos($plug_file, $force_reload, $dir_plugins);
-	$prefix = $info['prefix'];
-	$cfg = '';
-	$checkable = ($dir_plugins !== _DIR_PLUGINS_DIST);
-	$nom = plugin_nom($info, $dir_plugins, $plug_file);
-	$erreur = '';
-
-	if (!plugin_version_compatible($info['compatibilite'], $GLOBALS['spip_version_branche'], 'spip')) {
-		$info['slogan'] = _T('plugin_info_non_compatible_spip');
-		$erreur = http_img_pack(
-			'plugin-dis-32.png',
-			_T('plugin_info_non_compatible_spip'),
-			" class='picto_err'",
-			_T('plugin_info_non_compatible_spip')
-		);
-		$class_li .= ' disabled';
-		$checkable = false;
-	} elseif (isset($info['erreur'])) {
-		$class_li .= ' error';
-		$erreur = http_img_pack(
-			'plugin-err-32.png',
-			_T('plugin_info_erreur_xml'),
-			" class='picto_err'",
-			_T('plugin_info_erreur_xml')
-		)
-			. "<div class='erreur'>" . join('<br >', $info['erreur']) . '</div>';
-		$checkable = false;
-	} elseif (isset($GLOBALS['erreurs_activation_raw'][$dir_plugins . $plug_file])) {
-		$class_li .= ' error';
-		$erreur = http_img_pack(
-			'plugin-err-32.png',
-			_T('plugin_impossible_activer', ['plugin' => $nom]),
-			" class='picto_err'",
-			_T('plugin_impossible_activer', ['plugin' => $nom])
-		)
-			. "<div class='erreur'>" . implode(
-				'<br />',
-				$GLOBALS['erreurs_activation_raw'][$dir_plugins . $plug_file]
-			) . '</div>';
-	} else {
-		$cfg = $actif ? plugin_bouton_config($plug_file, $info, $dir_plugins) : '';
-		if (defined('_DEV_VERSION_SPIP_COMPAT') and !plugin_version_compatible($info['compatibilite'], $GLOBALS['spip_version_branche'])) {
-			//$info['slogan'] = _T('plugin_info_non_compatible_spip');
-			$erreur = http_img_pack(
-				'plugin-dis-32.png',
-				_T('plugin_info_non_compatible_spip'),
-				" class='picto_err picto_compat_forcee'",
-				_L('Version incompatible : compatibilité forcée')
-			);
-		}
-	}
-
-	// numerotons les occurrences d'un meme prefix
-	$versions[$prefix] = $id = isset($versions[$prefix]) ? intval($versions[$prefix]) + 1 : '';
-
-	$class_li .= ($actif ? ' actif' : '') . ($expose ? ' on' : '');
-
-	return "<li id='$prefix$id' class='$class_li'>"
-	. ((!$checkable and !$checked)
-		? '' : plugin_checkbox(++$id_input, $dir_plugins . $plug_file, $checked))
-	. plugin_resume($info, $dir_plugins, $plug_file, $url_page)
-	. $cfg
-	. $erreur
-	. (($dir_plugins !== _DIR_PLUGINS_DIST and plugin_est_installe($plug_file))
-		? plugin_desintalle($plug_file, $nom, $dir_plugins) : '')
-	. "<div class='details'>" // pour l'ajax de exec/info_plugin
-	. (!$expose ? '' : affiche_bloc_plugin($plug_file, $info, $dir_plugins))
-	. '</div>'
-	. '</li>';
+    static $id_input = 0;
+    static $versions = [];
+
+    $force_reload = (_request('var_mode') == 'recalcul');
+    $get_infos = charger_fonction('get_infos', 'plugins');
+    $info = $get_infos($plug_file, $force_reload, $dir_plugins);
+    $prefix = $info['prefix'];
+    $cfg = '';
+    $checkable = ($dir_plugins !== _DIR_PLUGINS_DIST);
+    $nom = plugin_nom($info, $dir_plugins, $plug_file);
+    $erreur = '';
+
+    if (!plugin_version_compatible($info['compatibilite'], $GLOBALS['spip_version_branche'], 'spip')) {
+        $info['slogan'] = _T('plugin_info_non_compatible_spip');
+        $erreur = http_img_pack(
+            'plugin-dis-32.png',
+            _T('plugin_info_non_compatible_spip'),
+            " class='picto_err'",
+            _T('plugin_info_non_compatible_spip')
+        );
+        $class_li .= ' disabled';
+        $checkable = false;
+    } elseif (isset($info['erreur'])) {
+        $class_li .= ' error';
+        $erreur = http_img_pack(
+            'plugin-err-32.png',
+            _T('plugin_info_erreur_xml'),
+            " class='picto_err'",
+            _T('plugin_info_erreur_xml')
+        )
+            . "<div class='erreur'>" . join('<br >', $info['erreur']) . '</div>';
+        $checkable = false;
+    } elseif (isset($GLOBALS['erreurs_activation_raw'][$dir_plugins . $plug_file])) {
+        $class_li .= ' error';
+        $erreur = http_img_pack(
+            'plugin-err-32.png',
+            _T('plugin_impossible_activer', ['plugin' => $nom]),
+            " class='picto_err'",
+            _T('plugin_impossible_activer', ['plugin' => $nom])
+        )
+            . "<div class='erreur'>" . implode(
+                '<br />',
+                $GLOBALS['erreurs_activation_raw'][$dir_plugins . $plug_file]
+            ) . '</div>';
+    } else {
+        $cfg = $actif ? plugin_bouton_config($plug_file, $info, $dir_plugins) : '';
+        if (defined('_DEV_VERSION_SPIP_COMPAT') and !plugin_version_compatible($info['compatibilite'], $GLOBALS['spip_version_branche'])) {
+            //$info['slogan'] = _T('plugin_info_non_compatible_spip');
+            $erreur = http_img_pack(
+                'plugin-dis-32.png',
+                _T('plugin_info_non_compatible_spip'),
+                " class='picto_err picto_compat_forcee'",
+                _L('Version incompatible : compatibilité forcée')
+            );
+        }
+    }
+
+    // numerotons les occurrences d'un meme prefix
+    $versions[$prefix] = $id = isset($versions[$prefix]) ? intval($versions[$prefix]) + 1 : '';
+
+    $class_li .= ($actif ? ' actif' : '') . ($expose ? ' on' : '');
+
+    return "<li id='$prefix$id' class='$class_li'>"
+    . ((!$checkable and !$checked)
+        ? '' : plugin_checkbox(++$id_input, $dir_plugins . $plug_file, $checked))
+    . plugin_resume($info, $dir_plugins, $plug_file, $url_page)
+    . $cfg
+    . $erreur
+    . (($dir_plugins !== _DIR_PLUGINS_DIST and plugin_est_installe($plug_file))
+        ? plugin_desintalle($plug_file, $nom, $dir_plugins) : '')
+    . "<div class='details'>" // pour l'ajax de exec/info_plugin
+    . (!$expose ? '' : affiche_bloc_plugin($plug_file, $info, $dir_plugins))
+    . '</div>'
+    . '</li>';
 }
 
 function plugin_bouton_config($nom, $infos, $dir) {
-	// la verification se base sur le filesystem
-	// il faut donc n'utiliser que des minuscules, par convention
-	$prefix = strtolower($infos['prefix']);
-	// si paquet.xml fournit un squelette, le prendre
-	if (isset($infos['config']) and $infos['config']) {
-		return recuperer_fond(
-			"$dir$nom/" . $infos['config'],
-			[
-				'script' => 'configurer_' . $prefix,
-				'nom' => $nom
-			]
-		);
-	}
-
-	// sinon prendre le squelette std sur le nom std
-	return recuperer_fond(
-		'prive/squelettes/inclure/cfg',
-		[
-			'script' => 'configurer_' . $prefix,
-			'nom' => $nom
-		]
-	);
+    // la verification se base sur le filesystem
+    // il faut donc n'utiliser que des minuscules, par convention
+    $prefix = strtolower($infos['prefix']);
+    // si paquet.xml fournit un squelette, le prendre
+    if (isset($infos['config']) and $infos['config']) {
+        return recuperer_fond(
+            "$dir$nom/" . $infos['config'],
+            [
+                'script' => 'configurer_' . $prefix,
+                'nom' => $nom
+            ]
+        );
+    }
+
+    // sinon prendre le squelette std sur le nom std
+    return recuperer_fond(
+        'prive/squelettes/inclure/cfg',
+        [
+            'script' => 'configurer_' . $prefix,
+            'nom' => $nom
+        ]
+    );
 }
 
 // checkbox pour activer ou desactiver
 // si ce n'est pas une extension
 
 function plugin_checkbox($id_input, $file, $actif) {
-	$name = substr(md5($file), 0, 16);
-
-	return "<div class='check'>\n"
-	. "<input type='checkbox' name='s$name' id='label_$id_input'"
-	. ($actif ? " checked='checked'" : '')
-	. " class='checkbox'  value='O' />"
-	. "\n<label for='label_$id_input'>" . _T('activer_plugin') . '</label>'
-	. '</div>';
+    $name = substr(md5($file), 0, 16);
+
+    return "<div class='check'>\n"
+    . "<input type='checkbox' name='s$name' id='label_$id_input'"
+    . ($actif ? " checked='checked'" : '')
+    . " class='checkbox'  value='O' />"
+    . "\n<label for='label_$id_input'>" . _T('activer_plugin') . '</label>'
+    . '</div>';
 }
 
 function plugin_nom($info, $dir_plugins, $plug_file) {
-	$prefix = $info['prefix'];
-	$dir = "$dir_plugins$plug_file";
-	// Si dtd paquet, on traite le nom soit par son item de langue soit par sa valeur immediate a l'index "nom"
-	if ($info['dtd'] == 'paquet') {
-		$nom = plugin_typo("{$prefix}_nom", "$dir/lang/paquet-$prefix");
-		if (!$nom) {
-			$nom = typo($info['nom']);
-		}
-	} else {
-		$nom = typo(attribut_html($info['nom']));
-	}
-
-	return trim($nom);
+    $prefix = $info['prefix'];
+    $dir = "$dir_plugins$plug_file";
+    // Si dtd paquet, on traite le nom soit par son item de langue soit par sa valeur immediate a l'index "nom"
+    if ($info['dtd'] == 'paquet') {
+        $nom = plugin_typo("{$prefix}_nom", "$dir/lang/paquet-$prefix");
+        if (!$nom) {
+            $nom = typo($info['nom']);
+        }
+    } else {
+        $nom = typo(attribut_html($info['nom']));
+    }
+
+    return trim($nom);
 }
 
 // Cartouche Resume
 function plugin_resume($info, $dir_plugins, $plug_file, $url_page) {
-	$prefix = $info['prefix'];
-	$dir = "$dir_plugins$plug_file";
-	$slogan = PtoBR(plugin_propre($info['slogan'], "$dir/lang/paquet-$prefix"));
-	// une seule ligne dans le slogan : couper si besoin
-	if (($p = strpos($slogan, '<br />')) !== false) {
-		$slogan = substr($slogan, 0, $p);
-	}
-	// couper par securite
-	$slogan = couper($slogan, 80);
-
-	$nom = plugin_nom($info, $dir_plugins, $plug_file);
-
-	$url = parametre_url($url_page, 'plugin', substr($dir, strlen(_DIR_RACINE)));
-
-	$icon_class = 'icon';
-	$img = '';
-	if (isset($info['logo']) and $i = trim($info['logo'])) {
-		$img = http_img_pack("$dir/$i", '', " width='32' height='32'", '', ['variante_svg_si_possible' => true, 'chemin_image' => false]);
-		if (!extraire_attribut($img, 'src')) {
-			$img = '';
-		}
-	}
-	if (!$img) {
-		$img = http_img_pack('plugin-xx.svg', '', " width='32' height='32'");
-		$icon_class .= ' no-logo';
-	}
-
-	$i = "<div class='$icon_class'><a href='$url' rel='info'>$img</a></div>";
-
-	return "<div class='resume'>"
-	. "<h3><a href='$url' rel='info'>"
-	. $nom
-	. '</a></h3>'
-	. " <span class='version'>" . $info['version'] . '</span>'
-	. " <span class='etat'> - "
-	. plugin_etat_en_clair($info['etat'])
-	. '</span>'
-	. "<div class='short'>" . $slogan . '</div>'
-	. $i
-	. '</div>';
+    $prefix = $info['prefix'];
+    $dir = "$dir_plugins$plug_file";
+    $slogan = PtoBR(plugin_propre($info['slogan'], "$dir/lang/paquet-$prefix"));
+    // une seule ligne dans le slogan : couper si besoin
+    if (($p = strpos($slogan, '<br />')) !== false) {
+        $slogan = substr($slogan, 0, $p);
+    }
+    // couper par securite
+    $slogan = couper($slogan, 80);
+
+    $nom = plugin_nom($info, $dir_plugins, $plug_file);
+
+    $url = parametre_url($url_page, 'plugin', substr($dir, strlen(_DIR_RACINE)));
+
+    $icon_class = 'icon';
+    $img = '';
+    if (isset($info['logo']) and $i = trim($info['logo'])) {
+        $img = http_img_pack("$dir/$i", '', " width='32' height='32'", '', ['variante_svg_si_possible' => true, 'chemin_image' => false]);
+        if (!extraire_attribut($img, 'src')) {
+            $img = '';
+        }
+    }
+    if (!$img) {
+        $img = http_img_pack('plugin-xx.svg', '', " width='32' height='32'");
+        $icon_class .= ' no-logo';
+    }
+
+    $i = "<div class='$icon_class'><a href='$url' rel='info'>$img</a></div>";
+
+    return "<div class='resume'>"
+    . "<h3><a href='$url' rel='info'>"
+    . $nom
+    . '</a></h3>'
+    . " <span class='version'>" . $info['version'] . '</span>'
+    . " <span class='etat'> - "
+    . plugin_etat_en_clair($info['etat'])
+    . '</span>'
+    . "<div class='short'>" . $slogan . '</div>'
+    . $i
+    . '</div>';
 }
 
 function plugin_desintalle($plug_file, $nom, $dir_plugins = null) {
-	if (!$dir_plugins) {
-		$dir_plugins = _DIR_PLUGINS;
-	}
+    if (!$dir_plugins) {
+        $dir_plugins = _DIR_PLUGINS;
+    }
 
-	$action = redirige_action_auteur('desinstaller_plugin', "$dir_plugins::$plug_file", 'admin_plugin');
-	$text = _T('bouton_desinstaller');
-	$text2 = _T('info_desinstaller_plugin');
-	$file = basename($plug_file);
+    $action = redirige_action_auteur('desinstaller_plugin', "$dir_plugins::$plug_file", 'admin_plugin');
+    $text = _T('bouton_desinstaller');
+    $text2 = _T('info_desinstaller_plugin');
+    $file = basename($plug_file);
 
-	return "<div class='actions'>[" .
-	"<a href='$action'
+    return "<div class='actions'>[" .
+    "<a href='$action'
 		onclick='return confirm(\"$text $nom ?\\n$text2\")'>"
-	. $text
-	. '</a>]</div>';
+    . $text
+    . '</a>]</div>';
 }
 
 /**
@@ -236,145 +236,145 @@ 
  *     Traduction de l'état dans la langue en cours
  **/
 function plugin_etat_en_clair($etat) {
-	if (!in_array($etat, ['stable', 'test', 'experimental'])) {
-		$etat = 'developpement';
-	}
+    if (!in_array($etat, ['stable', 'test', 'experimental'])) {
+        $etat = 'developpement';
+    }
 
-	return _T('plugin_etat_' . $etat);
+    return _T('plugin_etat_' . $etat);
 }
 
 function plugin_propre($texte, $module = '', $propre = 'propre') {
-	// retirer le retour a la racine du module, car le find_in_path se fait depuis la racine
-	if (_DIR_RACINE and strncmp($module, _DIR_RACINE, strlen(_DIR_RACINE)) == 0) {
-		$module = substr($module, strlen(_DIR_RACINE));
-	}
-	if (preg_match('|^\w+_[\w_]+$|', $texte)) {
-		$texte = _T(($module ? "$module:" : '') . $texte, [], ['force' => false]);
-	}
-
-	return $propre($texte);
+    // retirer le retour a la racine du module, car le find_in_path se fait depuis la racine
+    if (_DIR_RACINE and strncmp($module, _DIR_RACINE, strlen(_DIR_RACINE)) == 0) {
+        $module = substr($module, strlen(_DIR_RACINE));
+    }
+    if (preg_match('|^\w+_[\w_]+$|', $texte)) {
+        $texte = _T(($module ? "$module:" : '') . $texte, [], ['force' => false]);
+    }
+
+    return $propre($texte);
 }
 
 function plugin_typo($texte, $module = '') {
-	return plugin_propre($texte, $module, 'typo');
+    return plugin_propre($texte, $module, 'typo');
 }
 
 
 function affiche_bloc_plugin($plug_file, $info, $dir_plugins = null) {
-	$log = null;
-	if (!$dir_plugins) {
-		$dir_plugins = _DIR_PLUGINS;
-	}
-
-	$prefix = $info['prefix'];
-	$dir = "$dir_plugins$plug_file/lang/paquet-$prefix";
-
-	$s = '';
-	// TODO: le traiter_multi ici n'est pas beau
-	// cf. description du plugin/_stable_/ortho/plugin.xml
-	// concerne les anciens plugin.xml donc on devrait plus en avoir besoin
-	$description = '';
-	if (isset($info['description'])) {
-		$description = plugin_propre($info['description'], $dir);
-	}
-
-	if (
-		isset($info['documentation'])
-		and $lien = $info['documentation']
-	) {
-		$description .= "<p><em class='site'><a href='$lien' class='spip_out'>" . _T('en_savoir_plus') . '</a></em></p>';
-	}
-	$s .= "<dd class='desc'>" . $description . "</dd>\n";
-
-	if (isset($info['auteur'])) {
-		if (is_array($info['auteur'])) {
-			$a = formater_credits($info['auteur'], ', ');
-		} // pour compat mais ne doit plus arriver
-		else {
-			$a = trim($info['auteur']);
-		}
-		if ($a) {
-			$s .= "<dt class='auteurs'>" . _T('public:par_auteur') . "</dt><dd class='auteurs'>" . PtoBR(propre(
-				$a,
-				$dir
-			)) . "</dd>\n";
-		}
-	}
-
-	if (isset($info['credit'])) {
-		if ($a = formater_credits($info['credit'], ', ')) {
-			$s .= "<dt class='credits'>" . _T('plugin_info_credit') . "</dt><dd class='credits'>" . PtoBR(propre(
-				$a,
-				$dir
-			)) . "</dd>\n";
-		}
-	}
-
-	if (isset($info['licence'])) {
-		if (is_array($info['licence'])) {
-			$a = formater_credits($info['licence'], ', ');
-		} // pour compat mais ne doit plus arriver
-		else {
-			$a = trim($info['licence']);
-		}
-		if ($a) {
-			$s .= "<dt class='licence'>" . _T('intitule_licence') . "</dt><dd class='licence'>" . PtoBR(propre(
-				$a,
-				$dir
-			)) . "</dd>\n";
-		}
-	}
-
-	$s = "<dl class='description'>$s</dl>";
-
-	//
-	// Ajouter les infos techniques
-	//
-	$infotech = [];
-
-	$version = '<dt>' . _T('version') . '</dt><dd>' . $info['version'];
-	// Version VCS
-	if ($vcs = version_vcs_courante($dir_plugins . $plug_file)) {
-		$version .= ' ' . $vcs;
-	}
-	$version .= '</dd>';
-	$infotech[] = $version;
-	$infotech[] = '<dt>' . _T('repertoire_plugins') . '</dt><dd>' . joli_repertoire("$dir_plugins$plug_file") . '</dd>';
-	// source zip le cas echeant
-	$infotech[] = (lire_fichier($dir_plugins . $plug_file . '/install.log', $log)
-		and preg_match(',^source:(.*)$,m', $log, $r))
-		? '<dt>' . _T('plugin_source') . '</dt><dd>' . trim($r[1]) . '</dd>'
-		: '';
-
-	$infotech[] = !$info['necessite'] ? '' :
-		('<dt>' . _T('plugin_info_necessite') . '</dt><dd>' . join(
-			' ',
-			array_map('array_shift', $info['necessite'])
-		) . '</dd>');
-
-	$s .= "<dl class='tech'>"
-		. join('', $infotech)
-		. '</dl>';
-
-
-	return $s;
+    $log = null;
+    if (!$dir_plugins) {
+        $dir_plugins = _DIR_PLUGINS;
+    }
+
+    $prefix = $info['prefix'];
+    $dir = "$dir_plugins$plug_file/lang/paquet-$prefix";
+
+    $s = '';
+    // TODO: le traiter_multi ici n'est pas beau
+    // cf. description du plugin/_stable_/ortho/plugin.xml
+    // concerne les anciens plugin.xml donc on devrait plus en avoir besoin
+    $description = '';
+    if (isset($info['description'])) {
+        $description = plugin_propre($info['description'], $dir);
+    }
+
+    if (
+        isset($info['documentation'])
+        and $lien = $info['documentation']
+    ) {
+        $description .= "<p><em class='site'><a href='$lien' class='spip_out'>" . _T('en_savoir_plus') . '</a></em></p>';
+    }
+    $s .= "<dd class='desc'>" . $description . "</dd>\n";
+
+    if (isset($info['auteur'])) {
+        if (is_array($info['auteur'])) {
+            $a = formater_credits($info['auteur'], ', ');
+        } // pour compat mais ne doit plus arriver
+        else {
+            $a = trim($info['auteur']);
+        }
+        if ($a) {
+            $s .= "<dt class='auteurs'>" . _T('public:par_auteur') . "</dt><dd class='auteurs'>" . PtoBR(propre(
+                $a,
+                $dir
+            )) . "</dd>\n";
+        }
+    }
+
+    if (isset($info['credit'])) {
+        if ($a = formater_credits($info['credit'], ', ')) {
+            $s .= "<dt class='credits'>" . _T('plugin_info_credit') . "</dt><dd class='credits'>" . PtoBR(propre(
+                $a,
+                $dir
+            )) . "</dd>\n";
+        }
+    }
+
+    if (isset($info['licence'])) {
+        if (is_array($info['licence'])) {
+            $a = formater_credits($info['licence'], ', ');
+        } // pour compat mais ne doit plus arriver
+        else {
+            $a = trim($info['licence']);
+        }
+        if ($a) {
+            $s .= "<dt class='licence'>" . _T('intitule_licence') . "</dt><dd class='licence'>" . PtoBR(propre(
+                $a,
+                $dir
+            )) . "</dd>\n";
+        }
+    }
+
+    $s = "<dl class='description'>$s</dl>";
+
+    //
+    // Ajouter les infos techniques
+    //
+    $infotech = [];
+
+    $version = '<dt>' . _T('version') . '</dt><dd>' . $info['version'];
+    // Version VCS
+    if ($vcs = version_vcs_courante($dir_plugins . $plug_file)) {
+        $version .= ' ' . $vcs;
+    }
+    $version .= '</dd>';
+    $infotech[] = $version;
+    $infotech[] = '<dt>' . _T('repertoire_plugins') . '</dt><dd>' . joli_repertoire("$dir_plugins$plug_file") . '</dd>';
+    // source zip le cas echeant
+    $infotech[] = (lire_fichier($dir_plugins . $plug_file . '/install.log', $log)
+        and preg_match(',^source:(.*)$,m', $log, $r))
+        ? '<dt>' . _T('plugin_source') . '</dt><dd>' . trim($r[1]) . '</dd>'
+        : '';
+
+    $infotech[] = !$info['necessite'] ? '' :
+        ('<dt>' . _T('plugin_info_necessite') . '</dt><dd>' . join(
+            ' ',
+            array_map('array_shift', $info['necessite'])
+        ) . '</dd>');
+
+    $s .= "<dl class='tech'>"
+        . join('', $infotech)
+        . '</dl>';
+
+
+    return $s;
 }
 
 function formater_credits($infos, $sep = ', ') {
-	$texte = '';
-
-	foreach ($infos as $_credit) {
-		if ($texte) {
-			$texte .= $sep;
-		}
-		// Si le credit en cours n'est pas un array c'est donc un copyright
-		$texte .=
-			(!is_array($_credit))
-				? PtoBR(propre($_credit))
-				: ($_credit['url'] ? '<a href="' . $_credit['url'] . '">' : '') .
-				$_credit['nom'] .
-				($_credit['url'] ? '</a>' : '');
-	}
-
-	return $texte;
+    $texte = '';
+
+    foreach ($infos as $_credit) {
+        if ($texte) {
+            $texte .= $sep;
+        }
+        // Si le credit en cours n'est pas un array c'est donc un copyright
+        $texte .=
+            (!is_array($_credit))
+                ? PtoBR(propre($_credit))
+                : ($_credit['url'] ? '<a href="' . $_credit['url'] . '">' : '') .
+                $_credit['nom'] .
+                ($_credit['url'] ? '</a>' : '');
+    }
+
+    return $texte;
 }