spip / SPIP

ecrire/action/logout.php

Indentation +73 added lines, -73 removed lines

@@ -16,7 +16,7 @@ 
  */
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 include_spip('inc/cookie');
@@ -33,70 +33,70 @@ 
  *
  */
 function action_logout_dist() {
-	$logout = _request('logout');
-	$url = securiser_redirect_action(_request('url'));
-	// cas particulier, logout dans l'espace public
-	if ($logout == 'public' && !$url) {
-		$url = url_de_base();
-	}
+    $logout = _request('logout');
+    $url = securiser_redirect_action(_request('url'));
+    // cas particulier, logout dans l'espace public
+    if ($logout == 'public' && !$url) {
+        $url = url_de_base();
+    }
 
-	// seul le loge peut se deloger (mais id_auteur peut valoir 0 apres une restauration avortee)
-	if (
-		isset($GLOBALS['visiteur_session']['id_auteur'])
-		&& is_numeric($GLOBALS['visiteur_session']['id_auteur'])
-		&& isset($GLOBALS['visiteur_session']['statut'])
-	) {
-		// il faut un jeton pour fermer la session (eviter les CSRF)
-		if (
-			!($jeton = _request('jeton'))
-			|| !verifier_jeton_logout($jeton, $GLOBALS['visiteur_session'])
-		) {
-			$jeton = generer_jeton_logout($GLOBALS['visiteur_session']);
-			$action = generer_url_action('logout', "jeton=$jeton");
-			$action = parametre_url($action, 'logout', _request('logout'));
-			$action = parametre_url($action, 'url', _request('url'));
-			include_spip('inc/minipres');
-			include_spip('inc/filtres');
-			$texte = bouton_action(_T('spip:icone_deconnecter'), $action);
-			$texte = "<div class='boutons'>$texte</div>";
-			$texte .= '<script type="text/javascript">document.write("<style>body{visibility:hidden;}</style>");window.document.forms[0].submit();</script>';
-			$res = minipres(_T('spip:icone_deconnecter'), $texte, ['all_inline' => true]);
-			echo $res;
+    // seul le loge peut se deloger (mais id_auteur peut valoir 0 apres une restauration avortee)
+    if (
+        isset($GLOBALS['visiteur_session']['id_auteur'])
+        && is_numeric($GLOBALS['visiteur_session']['id_auteur'])
+        && isset($GLOBALS['visiteur_session']['statut'])
+    ) {
+        // il faut un jeton pour fermer la session (eviter les CSRF)
+        if (
+            !($jeton = _request('jeton'))
+            || !verifier_jeton_logout($jeton, $GLOBALS['visiteur_session'])
+        ) {
+            $jeton = generer_jeton_logout($GLOBALS['visiteur_session']);
+            $action = generer_url_action('logout', "jeton=$jeton");
+            $action = parametre_url($action, 'logout', _request('logout'));
+            $action = parametre_url($action, 'url', _request('url'));
+            include_spip('inc/minipres');
+            include_spip('inc/filtres');
+            $texte = bouton_action(_T('spip:icone_deconnecter'), $action);
+            $texte = "<div class='boutons'>$texte</div>";
+            $texte .= '<script type="text/javascript">document.write("<style>body{visibility:hidden;}</style>");window.document.forms[0].submit();</script>';
+            $res = minipres(_T('spip:icone_deconnecter'), $texte, ['all_inline' => true]);
+            echo $res;
 
-			return;
-		}
+            return;
+        }
 
-		include_spip('inc/auth');
-		auth_trace($GLOBALS['visiteur_session'], '0000-00-00 00:00:00');
-		// le logout explicite vaut destruction de toutes les sessions
-		if (isset($_COOKIE['spip_session'])) {
-			$session = charger_fonction('session', 'inc');
-			$session($GLOBALS['visiteur_session']['id_auteur']);
-			effacer_cookie_session();
-		}
-		// si authentification http, et que la personne est loge,
-		// pour se deconnecter, il faut proposer un nouveau formulaire de connexion http
-		if (
-			isset($_SERVER['PHP_AUTH_USER'])
-			&& !$GLOBALS['ignore_auth_http']
-			&& $GLOBALS['auth_can_disconnect']
-		) {
-			ask_php_auth(
-				_T('login_deconnexion_ok'),
-				_T('login_verifiez_navigateur'),
-				_T('login_retour_public'),
-				'redirect=' . _DIR_RESTREINT_ABS,
-				_T('login_test_navigateur'),
-				true
-			);
-		}
-	}
+        include_spip('inc/auth');
+        auth_trace($GLOBALS['visiteur_session'], '0000-00-00 00:00:00');
+        // le logout explicite vaut destruction de toutes les sessions
+        if (isset($_COOKIE['spip_session'])) {
+            $session = charger_fonction('session', 'inc');
+            $session($GLOBALS['visiteur_session']['id_auteur']);
+            effacer_cookie_session();
+        }
+        // si authentification http, et que la personne est loge,
+        // pour se deconnecter, il faut proposer un nouveau formulaire de connexion http
+        if (
+            isset($_SERVER['PHP_AUTH_USER'])
+            && !$GLOBALS['ignore_auth_http']
+            && $GLOBALS['auth_can_disconnect']
+        ) {
+            ask_php_auth(
+                _T('login_deconnexion_ok'),
+                _T('login_verifiez_navigateur'),
+                _T('login_retour_public'),
+                'redirect=' . _DIR_RESTREINT_ABS,
+                _T('login_test_navigateur'),
+                true
+            );
+        }
+    }
 
-	// Rediriger en contrant le cache navigateur (Safari3)
-	include_spip('inc/headers');
-	redirige_par_entete($url
-		? parametre_url($url, 'var_hasard', uniqid(random_int(0, mt_getrandmax())), '&')
-		: generer_url_public('login'));
+    // Rediriger en contrant le cache navigateur (Safari3)
+    include_spip('inc/headers');
+    redirige_par_entete($url
+        ? parametre_url($url, 'var_hasard', uniqid(random_int(0, mt_getrandmax())), '&')
+        : generer_url_public('login'));
 }
 
 /**
@@ -107,15 +107,15 @@ 
  * @return string
  */
 function generer_jeton_logout($session, $alea = null) {
-	if (is_null($alea)) {
-		include_spip('inc/acces');
-		$alea = charger_aleas();
-	}
+    if (is_null($alea)) {
+        include_spip('inc/acces');
+        $alea = charger_aleas();
+    }
 
-	return md5($session['date_session']
-		. $session['id_auteur']
-		. $session['statut']
-		. $alea);
+    return md5($session['date_session']
+        . $session['id_auteur']
+        . $session['statut']
+        . $alea);
 }
 
 /**
@@ -129,8 +129,8 @@ 
  * @return bool
  */
 function verifier_jeton_logout($jeton, $session) {
-	if (generer_jeton_logout($session) === $jeton) {
-		return true;
-	}
-	return generer_jeton_logout($session, $GLOBALS['meta']['alea_ephemere_ancien']) === $jeton;
+    if (generer_jeton_logout($session) === $jeton) {
+        return true;
+    }
+    return generer_jeton_logout($session, $GLOBALS['meta']['alea_ephemere_ancien']) === $jeton;
 }

ecrire/install/etape_4.php

Indentation +60 added lines, -60 removed lines

@@ -12,70 +12,70 @@
 \***************************************************************************/
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 include_spip('inc/headers');
 
 function install_etape_4_dist() {
 
-	// creer le repertoire cache, qui sert partout !
-	if (!@file_exists(_DIR_CACHE)) {
-		$rep = preg_replace(',' . _DIR_TMP . ',', '', (string) _DIR_CACHE);
-		$rep = sous_repertoire(_DIR_TMP, $rep, true, true);
-	}
-
-	$minipage = new Installation();
-	echo $minipage->installDebutPage(['onload' => 'document.getElementById(\'suivant\').focus();return false;']);
-
-	echo info_progression_etape(4, 'etape_', 'install/');
-
-	echo "<div class='success'><b>"
-		. _T('info_derniere_etape')
-		. '</b><p>'
-		. _T('info_utilisation_spip')
-		. '</p></div>';
-
-
-	echo '<p>'
-		. _T(
-			'plugin_info_plugins_dist_1',
-			['plugins_dist' => '<tt>' . joli_repertoire(_DIR_PLUGINS_DIST) . '</tt>']
-		)
-		. '</p>';
-
-	// installer les extensions
-	include_spip('inc/plugin');
-	$afficher = charger_fonction('afficher_liste', 'plugins');
-	echo $afficher(
-		self(),
-		liste_plugin_files(_DIR_PLUGINS_DIST),
-		[],
-		[],
-		_DIR_PLUGINS_DIST,
-		'afficher_nom_plugin'
-	);
-
-	// si la base de SPIP est up, on peut installer les plugins, sinon on passe cette etape
-	// car les plugins supposent que la base de SPIP est dans son etat normal (mise a jour)
-	// au premier passage dans l'espace prive on aura une demande d'upgrade qui se poursuit sur la page plugin
-	// et procede alors a l'installation
-	if (
-		!isset($GLOBALS['meta']['version_installee'])
-		|| $GLOBALS['spip_version_base'] == (str_replace(',', '.', (string) $GLOBALS['meta']['version_installee']))
-	) {
-		plugin_installes_meta();
-	}
-
-	// mettre a jour si necessaire l'adresse du site
-	// securite si on arrive plus a se loger
-	include_spip('inc/config');
-	appliquer_adresse_site('');
-
-	// aller a la derniere etape qui clos l'install et redirige
-	$suite = "\n<input type='hidden' name='etape' value='fin' />"
-		. bouton_suivant(_T('login_espace_prive'));
-
-	echo generer_form_ecrire('install', $suite);
-	echo $minipage->installFinPage();
+    // creer le repertoire cache, qui sert partout !
+    if (!@file_exists(_DIR_CACHE)) {
+        $rep = preg_replace(',' . _DIR_TMP . ',', '', (string) _DIR_CACHE);
+        $rep = sous_repertoire(_DIR_TMP, $rep, true, true);
+    }
+
+    $minipage = new Installation();
+    echo $minipage->installDebutPage(['onload' => 'document.getElementById(\'suivant\').focus();return false;']);
+
+    echo info_progression_etape(4, 'etape_', 'install/');
+
+    echo "<div class='success'><b>"
+        . _T('info_derniere_etape')
+        . '</b><p>'
+        . _T('info_utilisation_spip')
+        . '</p></div>';
+
+
+    echo '<p>'
+        . _T(
+            'plugin_info_plugins_dist_1',
+            ['plugins_dist' => '<tt>' . joli_repertoire(_DIR_PLUGINS_DIST) . '</tt>']
+        )
+        . '</p>';
+
+    // installer les extensions
+    include_spip('inc/plugin');
+    $afficher = charger_fonction('afficher_liste', 'plugins');
+    echo $afficher(
+        self(),
+        liste_plugin_files(_DIR_PLUGINS_DIST),
+        [],
+        [],
+        _DIR_PLUGINS_DIST,
+        'afficher_nom_plugin'
+    );
+
+    // si la base de SPIP est up, on peut installer les plugins, sinon on passe cette etape
+    // car les plugins supposent que la base de SPIP est dans son etat normal (mise a jour)
+    // au premier passage dans l'espace prive on aura une demande d'upgrade qui se poursuit sur la page plugin
+    // et procede alors a l'installation
+    if (
+        !isset($GLOBALS['meta']['version_installee'])
+        || $GLOBALS['spip_version_base'] == (str_replace(',', '.', (string) $GLOBALS['meta']['version_installee']))
+    ) {
+        plugin_installes_meta();
+    }
+
+    // mettre a jour si necessaire l'adresse du site
+    // securite si on arrive plus a se loger
+    include_spip('inc/config');
+    appliquer_adresse_site('');
+
+    // aller a la derniere etape qui clos l'install et redirige
+    $suite = "\n<input type='hidden' name='etape' value='fin' />"
+        . bouton_suivant(_T('login_espace_prive'));
+
+    echo generer_form_ecrire('install', $suite);
+    echo $minipage->installFinPage();
 }

ecrire/install/etape_ldap2.php

Indentation +81 added lines, -81 removed lines

@@ -12,88 +12,88 @@
 \***************************************************************************/
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 function install_etape_ldap2_dist() {
-	$minipage = new Installation();
-	echo $minipage->installDebutPage(['onload' => 'document.getElementById(\'suivant\').focus();return false;']);
-
-	$adresse_ldap = _request('adresse_ldap');
-
-	$port_ldap = _request('port_ldap');
-
-	$tls_ldap = _request('tls_ldap');
-
-	$protocole_ldap = _request('protocole_ldap');
-
-	$login_ldap = _request('login_ldap');
-
-	$pass_ldap = _request('pass_ldap');
-
-	$port_ldap = (int) $port_ldap;
-
-	$tls = false;
-
-	if ($tls_ldap == 'oui') {
-		if ($port_ldap == 636) {
-			$adresse_ldap = "ldaps://$adresse_ldap";
-		} else {
-			$tls = true;
-		}
-	}
-	else {
-		$tls_ldap == 'non';
-	}
-
-	// Verifions que l'adresse demandee est valide
-	$adresse_ldap = filter_var($adresse_ldap, FILTER_SANITIZE_URL) ?: '';
-
-	$ldap_link = ldap_connect($adresse_ldap, $port_ldap);
-	$erreur = 'ldap_connect(' . spip_htmlspecialchars($adresse_ldap) . ', ' . spip_htmlspecialchars($port_ldap) . ')';
-
-	if ($ldap_link) {
-		if (!ldap_set_option($ldap_link, LDAP_OPT_PROTOCOL_VERSION, $protocole_ldap)) {
-			$protocole_ldap = 2;
-			ldap_set_option($ldap_link, LDAP_OPT_PROTOCOL_VERSION, $protocole_ldap);
-		}
-		if ($tls && !ldap_start_tls($ldap_link)) {
-			$erreur = 'ldap_start_tls(' . spip_htmlspecialchars($ldap_link)
-				. ' ' . spip_htmlspecialchars($adresse_ldap)
-				. ', ' . spip_htmlspecialchars($port_ldap) . ')';
-			$ldap_link = false;
-		}
-		if ($ldap_link) {
-			$ldap_link = ldap_bind($ldap_link, $login_ldap, $pass_ldap);
-			$erreur = "ldap_bind('" . spip_htmlspecialchars($ldap_link)
-				. "', '" . spip_htmlspecialchars($login_ldap)
-				. "', '" . spip_htmlspecialchars($pass_ldap)
-				. "'): " . spip_htmlspecialchars($adresse_ldap)
-				. ', ' . spip_htmlspecialchars($port_ldap);
-		}
-	}
-
-	if ($ldap_link) {
-		echo info_etape(
-			_T('titre_connexion_ldap'),
-			info_progression_etape(2, 'etape_ldap', 'install/')
-		),  _T('info_connexion_ldap_ok');
-		echo generer_form_ecrire('install', (
-			"\n<input type='hidden' name='etape' value='ldap3' />"
-			. "\n<input type='hidden' name='adresse_ldap' value=\"" . spip_htmlspecialchars($adresse_ldap) . '" />'
-			. "\n<input type='hidden' name='port_ldap' value=\"" . spip_htmlspecialchars($port_ldap) . '" />'
-			. "\n<input type='hidden' name='login_ldap' value=\"" . spip_htmlspecialchars($login_ldap) . '" />'
-			. "\n<input type='hidden' name='pass_ldap' value=\"" . spip_htmlspecialchars($pass_ldap) . '" />'
-			. "\n<input type='hidden' name='protocole_ldap' value=\"" . spip_htmlspecialchars($protocole_ldap) . '" />'
-			. "\n<input type='hidden' name='tls_ldap' value=\"" . spip_htmlspecialchars($tls_ldap) . '" />'
-			. bouton_suivant()));
-	} else {
-		echo info_etape(_T('titre_connexion_ldap')), info_progression_etape(1, 'etape_ldap', 'install/', true),
-			"<div class='error'><p>" . _T('avis_connexion_ldap_echec_1') . '</p>',
-			'<p>' . _T('avis_connexion_ldap_echec_2') .
-			"<br />\n" . _T('avis_connexion_ldap_echec_3') .
-			'<br /><br />' . $erreur . '<b> ?</b></p></div>';
-	}
-
-	echo $minipage->installFinPage();
+    $minipage = new Installation();
+    echo $minipage->installDebutPage(['onload' => 'document.getElementById(\'suivant\').focus();return false;']);
+
+    $adresse_ldap = _request('adresse_ldap');
+
+    $port_ldap = _request('port_ldap');
+
+    $tls_ldap = _request('tls_ldap');
+
+    $protocole_ldap = _request('protocole_ldap');
+
+    $login_ldap = _request('login_ldap');
+
+    $pass_ldap = _request('pass_ldap');
+
+    $port_ldap = (int) $port_ldap;
+
+    $tls = false;
+
+    if ($tls_ldap == 'oui') {
+        if ($port_ldap == 636) {
+            $adresse_ldap = "ldaps://$adresse_ldap";
+        } else {
+            $tls = true;
+        }
+    }
+    else {
+        $tls_ldap == 'non';
+    }
+
+    // Verifions que l'adresse demandee est valide
+    $adresse_ldap = filter_var($adresse_ldap, FILTER_SANITIZE_URL) ?: '';
+
+    $ldap_link = ldap_connect($adresse_ldap, $port_ldap);
+    $erreur = 'ldap_connect(' . spip_htmlspecialchars($adresse_ldap) . ', ' . spip_htmlspecialchars($port_ldap) . ')';
+
+    if ($ldap_link) {
+        if (!ldap_set_option($ldap_link, LDAP_OPT_PROTOCOL_VERSION, $protocole_ldap)) {
+            $protocole_ldap = 2;
+            ldap_set_option($ldap_link, LDAP_OPT_PROTOCOL_VERSION, $protocole_ldap);
+        }
+        if ($tls && !ldap_start_tls($ldap_link)) {
+            $erreur = 'ldap_start_tls(' . spip_htmlspecialchars($ldap_link)
+                . ' ' . spip_htmlspecialchars($adresse_ldap)
+                . ', ' . spip_htmlspecialchars($port_ldap) . ')';
+            $ldap_link = false;
+        }
+        if ($ldap_link) {
+            $ldap_link = ldap_bind($ldap_link, $login_ldap, $pass_ldap);
+            $erreur = "ldap_bind('" . spip_htmlspecialchars($ldap_link)
+                . "', '" . spip_htmlspecialchars($login_ldap)
+                . "', '" . spip_htmlspecialchars($pass_ldap)
+                . "'): " . spip_htmlspecialchars($adresse_ldap)
+                . ', ' . spip_htmlspecialchars($port_ldap);
+        }
+    }
+
+    if ($ldap_link) {
+        echo info_etape(
+            _T('titre_connexion_ldap'),
+            info_progression_etape(2, 'etape_ldap', 'install/')
+        ),  _T('info_connexion_ldap_ok');
+        echo generer_form_ecrire('install', (
+            "\n<input type='hidden' name='etape' value='ldap3' />"
+            . "\n<input type='hidden' name='adresse_ldap' value=\"" . spip_htmlspecialchars($adresse_ldap) . '" />'
+            . "\n<input type='hidden' name='port_ldap' value=\"" . spip_htmlspecialchars($port_ldap) . '" />'
+            . "\n<input type='hidden' name='login_ldap' value=\"" . spip_htmlspecialchars($login_ldap) . '" />'
+            . "\n<input type='hidden' name='pass_ldap' value=\"" . spip_htmlspecialchars($pass_ldap) . '" />'
+            . "\n<input type='hidden' name='protocole_ldap' value=\"" . spip_htmlspecialchars($protocole_ldap) . '" />'
+            . "\n<input type='hidden' name='tls_ldap' value=\"" . spip_htmlspecialchars($tls_ldap) . '" />'
+            . bouton_suivant()));
+    } else {
+        echo info_etape(_T('titre_connexion_ldap')), info_progression_etape(1, 'etape_ldap', 'install/', true),
+            "<div class='error'><p>" . _T('avis_connexion_ldap_echec_1') . '</p>',
+            '<p>' . _T('avis_connexion_ldap_echec_2') .
+            "<br />\n" . _T('avis_connexion_ldap_echec_3') .
+            '<br /><br />' . $erreur . '<b> ?</b></p></div>';
+    }
+
+    echo $minipage->installFinPage();
 }

ecrire/install/etape_1.php

Indentation +30 added lines, -30 removed lines

@@ -19,7 +19,7 @@ 
  */
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 /**
@@ -36,45 +36,45 @@ 
  */
 function install_etape_1_dist() {
 
-	$minipage = new Installation();
-	echo $minipage->installDebutPage();
+    $minipage = new Installation();
+    echo $minipage->installDebutPage();
 
-	// stopper en cas de grosse incompatibilite de l'hebergement
-	tester_compatibilite_hebergement();
+    // stopper en cas de grosse incompatibilite de l'hebergement
+    tester_compatibilite_hebergement();
 
-	// Recuperer les anciennes donnees pour plus de facilite (si presentes)
-	$s = @is_readable(_FILE_CONNECT_TMP) ? analyse_fichier_connection(_FILE_CONNECT_TMP) : '';
+    // Recuperer les anciennes donnees pour plus de facilite (si presentes)
+    $s = @is_readable(_FILE_CONNECT_TMP) ? analyse_fichier_connection(_FILE_CONNECT_TMP) : '';
 
-	[$adresse_db, $login_db] = $s ?: ['localhost', ''];
+    [$adresse_db, $login_db] = $s ?: ['localhost', ''];
 
-	$chmod = (isset($_GET['chmod']) && preg_match(',^\d+$,', (string) $_GET['chmod'])) ?
-		sprintf('%04o', $_GET['chmod']) : '0777';
+    $chmod = (isset($_GET['chmod']) && preg_match(',^\d+$,', (string) $_GET['chmod'])) ?
+        sprintf('%04o', $_GET['chmod']) : '0777';
 
-	if (@is_readable(_FILE_CHMOD_TMP)) {
-		$s = @implode('', @file(_FILE_CHMOD_TMP));
-		if (preg_match("#define\('_SPIP_CHMOD', (.*)\)#", $s, $regs)) {
-			$chmod = $regs[1];
-		}
-	}
+    if (@is_readable(_FILE_CHMOD_TMP)) {
+        $s = @implode('', @file(_FILE_CHMOD_TMP));
+        if (preg_match("#define\('_SPIP_CHMOD', (.*)\)#", $s, $regs)) {
+            $chmod = $regs[1];
+        }
+    }
 
 
-	$db = [$adresse_db, _T('entree_base_donnee_2')];
-	$login = [$login_db, _T('entree_login_connexion_2')];
-	$pass = ['', _T('entree_mot_passe_2')];
+    $db = [$adresse_db, _T('entree_base_donnee_2')];
+    $login = [$login_db, _T('entree_login_connexion_2')];
+    $pass = ['', _T('entree_mot_passe_2')];
 
-	$predef = [
-		defined('_INSTALL_SERVER_DB') ? _INSTALL_SERVER_DB : '',
-		defined('_INSTALL_HOST_DB'),
-		defined('_INSTALL_USER_DB'),
-		defined('_INSTALL_PASS_DB')
-	];
+    $predef = [
+        defined('_INSTALL_SERVER_DB') ? _INSTALL_SERVER_DB : '',
+        defined('_INSTALL_HOST_DB'),
+        defined('_INSTALL_USER_DB'),
+        defined('_INSTALL_PASS_DB')
+    ];
 
 
-	echo info_progression_etape(1, 'etape_', 'install/');
+    echo info_progression_etape(1, 'etape_', 'install/');
 
-	// ces deux chaines de langues doivent etre reecrites
+    // ces deux chaines de langues doivent etre reecrites
 #	echo info_etape(_T('info_connexion_mysql'), _T('texte_connexion_mysql').aide ("install1", true));
-	echo info_etape(_T('info_connexion_base_donnee'));
-	echo install_connexion_form($db, $login, $pass, $predef, "\n<input type='hidden' name='chmod' value='$chmod' />", 2);
-	echo $minipage->installFinPage();
+    echo info_etape(_T('info_connexion_base_donnee'));
+    echo install_connexion_form($db, $login, $pass, $predef, "\n<input type='hidden' name='chmod' value='$chmod' />", 2);
+    echo $minipage->installFinPage();
 }

ecrire/install/etape_ldap5.php

Indentation +67 added lines, -67 removed lines

@@ -12,85 +12,85 @@
 \***************************************************************************/
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 include_spip('inc/headers');
 include_spip('auth/ldap');
 
 function install_etape_ldap5_dist() {
-	etape_ldap5_save();
-	etape_ldap5_suite();
+    etape_ldap5_save();
+    etape_ldap5_suite();
 }
 
 function etape_ldap5_save() {
-	$conn = null;
-	if (!@file_exists(_FILE_CONNECT_TMP)) {
-		redirige_url_ecrire('install');
-	}
-
-	ecrire_meta('ldap_statut_import', _request('statut_ldap'));
-
-	lire_fichier(_FILE_CONNECT_TMP, $conn);
-
-	if ($p = strpos((string) $conn, "'');")) {
-		ecrire_fichier(
-			_FILE_CONNECT_TMP,
-			substr((string) $conn, 0, $p + 1)
-			. _FILE_LDAP
-			. substr((string) $conn, $p + 1)
-		);
-	}
-
-	$adresse_ldap = addcslashes((string) _request('adresse_ldap'), "'\\");
-	$login_ldap = addcslashes((string) _request('login_ldap'), "'\\");
-	$pass_ldap = addcslashes((string) _request('pass_ldap'), "'\\");
-	$port_ldap = addcslashes((string) _request('port_ldap'), "'\\");
-	$tls_ldap = addcslashes((string) _request('tls_ldap'), "'\\");
-	$protocole_ldap = addcslashes((string) _request('protocole_ldap'), "'\\");
-	$base_ldap = addcslashes((string) _request('base_ldap'), "'\\");
-	$base_ldap_text = addcslashes((string) _request('base_ldap_text'), "'\\");
-
-	$conn = "\$GLOBALS['ldap_base'] = '$base_ldap';\n"
-		. "\$GLOBALS['ldap_link'] = @ldap_connect('$adresse_ldap','$port_ldap');\n"
-		. "@ldap_set_option(\$GLOBALS['ldap_link'],LDAP_OPT_PROTOCOL_VERSION,'$protocole_ldap');\n"
-		. (($tls_ldap != 'oui') ? '' :
-			"@ldap_start_tls(\$GLOBALS['ldap_link']);\n")
-		. "@ldap_bind(\$GLOBALS['ldap_link'],'$login_ldap','$pass_ldap');\n";
-
-	$champs = is_array($GLOBALS['ldap_attributes']) ? $GLOBALS['ldap_attributes'] : [];
-	$res = '';
-	foreach (array_keys($champs) as $champ) {
-		$nom = 'ldap_' . $champ;
-		$val = trim((string) _request($nom));
-		if (preg_match('/^\w*$/', $val)) {
-			if ($val) {
-				$val = _q($val);
-			}
-		} else {
-			$val = 'array(' . _q(preg_split('/\W+/', $val)) . ')';
-		};
-		if ($val) {
-			$res .= "'$champ' => " . $val . ',';
-		}
-	}
-	$conn .= "\$GLOBALS['ldap_champs'] = array($res);\n";
-
-	install_fichier_connexion(_DIR_CONNECT . _FILE_LDAP, $conn);
+    $conn = null;
+    if (!@file_exists(_FILE_CONNECT_TMP)) {
+        redirige_url_ecrire('install');
+    }
+
+    ecrire_meta('ldap_statut_import', _request('statut_ldap'));
+
+    lire_fichier(_FILE_CONNECT_TMP, $conn);
+
+    if ($p = strpos((string) $conn, "'');")) {
+        ecrire_fichier(
+            _FILE_CONNECT_TMP,
+            substr((string) $conn, 0, $p + 1)
+            . _FILE_LDAP
+            . substr((string) $conn, $p + 1)
+        );
+    }
+
+    $adresse_ldap = addcslashes((string) _request('adresse_ldap'), "'\\");
+    $login_ldap = addcslashes((string) _request('login_ldap'), "'\\");
+    $pass_ldap = addcslashes((string) _request('pass_ldap'), "'\\");
+    $port_ldap = addcslashes((string) _request('port_ldap'), "'\\");
+    $tls_ldap = addcslashes((string) _request('tls_ldap'), "'\\");
+    $protocole_ldap = addcslashes((string) _request('protocole_ldap'), "'\\");
+    $base_ldap = addcslashes((string) _request('base_ldap'), "'\\");
+    $base_ldap_text = addcslashes((string) _request('base_ldap_text'), "'\\");
+
+    $conn = "\$GLOBALS['ldap_base'] = '$base_ldap';\n"
+        . "\$GLOBALS['ldap_link'] = @ldap_connect('$adresse_ldap','$port_ldap');\n"
+        . "@ldap_set_option(\$GLOBALS['ldap_link'],LDAP_OPT_PROTOCOL_VERSION,'$protocole_ldap');\n"
+        . (($tls_ldap != 'oui') ? '' :
+            "@ldap_start_tls(\$GLOBALS['ldap_link']);\n")
+        . "@ldap_bind(\$GLOBALS['ldap_link'],'$login_ldap','$pass_ldap');\n";
+
+    $champs = is_array($GLOBALS['ldap_attributes']) ? $GLOBALS['ldap_attributes'] : [];
+    $res = '';
+    foreach (array_keys($champs) as $champ) {
+        $nom = 'ldap_' . $champ;
+        $val = trim((string) _request($nom));
+        if (preg_match('/^\w*$/', $val)) {
+            if ($val) {
+                $val = _q($val);
+            }
+        } else {
+            $val = 'array(' . _q(preg_split('/\W+/', $val)) . ')';
+        };
+        if ($val) {
+            $res .= "'$champ' => " . $val . ',';
+        }
+    }
+    $conn .= "\$GLOBALS['ldap_champs'] = array($res);\n";
+
+    install_fichier_connexion(_DIR_CONNECT . _FILE_LDAP, $conn);
 }
 
 function etape_ldap5_suite() {
-	$minipage = new Installation();
-	echo $minipage->installDebutPage(['onload' => 'document.getElementById(\'suivant\').focus();return false;']);
+    $minipage = new Installation();
+    echo $minipage->installDebutPage(['onload' => 'document.getElementById(\'suivant\').focus();return false;']);
 
-	echo info_etape(
-		_T('info_ldap_ok'),
-		info_progression_etape(5, 'etape_ldap', 'install/')
-	);
+    echo info_etape(
+        _T('info_ldap_ok'),
+        info_progression_etape(5, 'etape_ldap', 'install/')
+    );
 
-	echo generer_form_ecrire('install', (
-		"<input type='hidden' name='etape' value='3' />" .
-		"<input type='hidden' name='ldap_present' value='true' />"
-		. bouton_suivant()));
+    echo generer_form_ecrire('install', (
+        "<input type='hidden' name='etape' value='3' />" .
+        "<input type='hidden' name='ldap_present' value='true' />"
+        . bouton_suivant()));
 
-	echo $minipage->installFinPage();
+    echo $minipage->installFinPage();
 }

ecrire/install/etape_ldap1.php

Indentation +72 added lines, -72 removed lines

@@ -12,89 +12,89 @@
 \***************************************************************************/
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 function install_etape_ldap1_dist() {
-	$adresse_ldap = defined('_INSTALL_HOST_LDAP')
-		? _INSTALL_HOST_LDAP
-		: 'localhost';
+    $adresse_ldap = defined('_INSTALL_HOST_LDAP')
+        ? _INSTALL_HOST_LDAP
+        : 'localhost';
 
-	$port_ldap = defined('_INSTALL_PORT_LDAP')
-		? _INSTALL_PORT_LDAP
-		: 389;
+    $port_ldap = defined('_INSTALL_PORT_LDAP')
+        ? _INSTALL_PORT_LDAP
+        : 389;
 
-	$tls_ldap = defined('_INSTALL_TLS_LDAP')
-		? _INSTALL_TLS_LDAP
-		: 'non';
+    $tls_ldap = defined('_INSTALL_TLS_LDAP')
+        ? _INSTALL_TLS_LDAP
+        : 'non';
 
-	$protocole_ldap = defined('_INSTALL_PROTOCOLE_LDAP')
-		? _INSTALL_PROTOCOLE_LDAP
-		: 3; // on essaie 2 en cas d'echec
+    $protocole_ldap = defined('_INSTALL_PROTOCOLE_LDAP')
+        ? _INSTALL_PROTOCOLE_LDAP
+        : 3; // on essaie 2 en cas d'echec
 
-	$login_ldap = defined('_INSTALL_USER_LDAP')
-		? _INSTALL_USER_LDAP
-		: '';
+    $login_ldap = defined('_INSTALL_USER_LDAP')
+        ? _INSTALL_USER_LDAP
+        : '';
 
-	$pass_ldap = defined('_INSTALL_PASS_LDAP')
-		? _INSTALL_PASS_LDAP
-		: '';
+    $pass_ldap = defined('_INSTALL_PASS_LDAP')
+        ? _INSTALL_PASS_LDAP
+        : '';
 
-	$minipage = new Installation();
-	echo $minipage->installDebutPage(['onload' => 'document.getElementById(\'suivant\').focus();return false;']);
+    $minipage = new Installation();
+    echo $minipage->installDebutPage(['onload' => 'document.getElementById(\'suivant\').focus();return false;']);
 
-	echo info_etape(
-		_T('titre_connexion_ldap'),
-		info_progression_etape(1, 'etape_ldap', 'install/')
-	);
+    echo info_etape(
+        _T('titre_connexion_ldap'),
+        info_progression_etape(1, 'etape_ldap', 'install/')
+    );
 
-	echo generer_form_ecrire('install', (
-		"\n<input type='hidden' name='etape' value='ldap2' />"
-		. fieldset(
-			_T('entree_adresse_annuaire'),
-			[
-				'adresse_ldap' => [
-					'label' => _T('texte_adresse_annuaire_1'),
-					'valeur' => $adresse_ldap
-				],
-				'port_ldap' => [
-					'label' => _T('entree_port_annuaire') . '<br />' . _T('texte_port_annuaire'),
-					'valeur' => $port_ldap
-				],
-				'tls_ldap' => [
-					'label' => '<b>' . _T('tls_ldap') . '</b>',
-					'valeur' => $tls_ldap,
-					'alternatives' => [
-						'non' => _T('item_non'),
-						'oui' => _T('item_oui')
-					]
-				],
-				'protocole_ldap' => [
-					'label' => _T('protocole_ldap'),
-					'valeur' => $protocole_ldap,
-					'alternatives' => [
-						'3' => '3',
-						'2' => '2'
-					]
-				]
-			]
-		)
+    echo generer_form_ecrire('install', (
+        "\n<input type='hidden' name='etape' value='ldap2' />"
+        . fieldset(
+            _T('entree_adresse_annuaire'),
+            [
+                'adresse_ldap' => [
+                    'label' => _T('texte_adresse_annuaire_1'),
+                    'valeur' => $adresse_ldap
+                ],
+                'port_ldap' => [
+                    'label' => _T('entree_port_annuaire') . '<br />' . _T('texte_port_annuaire'),
+                    'valeur' => $port_ldap
+                ],
+                'tls_ldap' => [
+                    'label' => '<b>' . _T('tls_ldap') . '</b>',
+                    'valeur' => $tls_ldap,
+                    'alternatives' => [
+                        'non' => _T('item_non'),
+                        'oui' => _T('item_oui')
+                    ]
+                ],
+                'protocole_ldap' => [
+                    'label' => _T('protocole_ldap'),
+                    'valeur' => $protocole_ldap,
+                    'alternatives' => [
+                        '3' => '3',
+                        '2' => '2'
+                    ]
+                ]
+            ]
+        )
 
-		. "\n<p>" . _T('texte_acces_ldap_anonyme_1') . '</p>'
-		. fieldset(
-			_T('connexion_ldap'),
-			[
-				'login_ldap' => [
-					'label' => _T('texte_login_ldap_1'),
-					'valeur' => $login_ldap
-				],
-				'pass_ldap' => [
-					'label' => _T('entree_passe_ldap'),
-					'valeur' => $pass_ldap
-				]
-			]
-		)
-		. bouton_suivant()));
+        . "\n<p>" . _T('texte_acces_ldap_anonyme_1') . '</p>'
+        . fieldset(
+            _T('connexion_ldap'),
+            [
+                'login_ldap' => [
+                    'label' => _T('texte_login_ldap_1'),
+                    'valeur' => $login_ldap
+                ],
+                'pass_ldap' => [
+                    'label' => _T('entree_passe_ldap'),
+                    'valeur' => $pass_ldap
+                ]
+            ]
+        )
+        . bouton_suivant()));
 
-	echo $minipage->installFinPage();
+    echo $minipage->installFinPage();
 }

ecrire/install/etape_.php

Indentation +15 added lines, -15 removed lines

@@ -18,7 +18,7 @@ 
  */
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 /**
@@ -27,20 +27,20 @@ 
  * @uses info_copyright()
  **/
 function install_etape__dist() {
-	utiliser_langue_visiteur();
-	$menu_langues = menu_langues('var_lang_ecrire');
-	if (!$menu_langues) {
-		redirige_url_ecrire('install', 'etape=chmod');
-	} else {
-		include_spip('inc/presentation'); // pour info_copyright
+    utiliser_langue_visiteur();
+    $menu_langues = menu_langues('var_lang_ecrire');
+    if (!$menu_langues) {
+        redirige_url_ecrire('install', 'etape=chmod');
+    } else {
+        include_spip('inc/presentation'); // pour info_copyright
 
-		$res = "<div class='petit-centre'><img alt='SPIP' class='logo' src='" . chemin_image('logo-spip.png') . "' />\n" .
-			"<p class='small'>" . info_copyright() . "</p></div>\n" .
-			'<p>' . _T('install_select_langue') . '</p>' .
-			'<div>' . $menu_langues . "</div>\n" .
-			generer_form_ecrire('install', "<input type='hidden' name='etape' value='chmod' />" . bouton_suivant());
+        $res = "<div class='petit-centre'><img alt='SPIP' class='logo' src='" . chemin_image('logo-spip.png') . "' />\n" .
+            "<p class='small'>" . info_copyright() . "</p></div>\n" .
+            '<p>' . _T('install_select_langue') . '</p>' .
+            '<div>' . $menu_langues . "</div>\n" .
+            generer_form_ecrire('install', "<input type='hidden' name='etape' value='chmod' />" . bouton_suivant());
 
-		$minipage = new Installation();
-		echo $minipage->page($res);
-	}
+        $minipage = new Installation();
+        echo $minipage->page($res);
+    }
 }

ecrire/install/etape_ldap4.php

Indentation +81 added lines, -81 removed lines

@@ -12,96 +12,96 @@
 \***************************************************************************/
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 include_spip('auth/ldap');
 
 function install_etape_ldap4_dist() {
-	$adresse_ldap = _request('adresse_ldap');
-	$login_ldap = _request('login_ldap');
-	$pass_ldap = _request('pass_ldap');
-	$port_ldap = _request('port_ldap');
-	$base_ldap = _request('base_ldap');
-	$base_ldap_text = _request('base_ldap_text');
-	if (!$base_ldap) {
-		$base_ldap = $base_ldap_text;
-	}
-
-	$minipage = new Installation();
-	echo $minipage->installDebutPage(['onload' => 'document.getElementById(\'suivant\').focus();return false;']);
-
-	$ldap_link = ldap_connect($adresse_ldap, $port_ldap);
-	@ldap_bind($ldap_link, $login_ldap, $pass_ldap);
-
-	// Essayer de verifier le chemin fourni
-	$r = @ldap_compare($ldap_link, $base_ldap, 'objectClass', '');
-	$fail = (ldap_errno($ldap_link) == 32);
-
-	if ($fail) {
-		echo info_etape(_T('info_chemin_acces_annuaire')),
-		info_progression_etape(3, 'etape_ldap', 'install/', true),
-			"<div class='error'><p><b>" . _T('avis_operation_echec') . '</b></p><p>' . _T('avis_chemin_invalide_1'),
-			' (<tt>' . spip_htmlspecialchars($base_ldap) . '</tt>) ' . _T('avis_chemin_invalide_2') . '</p></div>';
-	} else {
-		info_etape(_T('info_reglage_ldap'));
-		echo info_progression_etape(4, 'etape_ldap', 'install/');
-
-		$statuts = liste_statuts_ldap();
-		$statut_ldap = defined('_INSTALL_STATUT_LDAP')
-			? _INSTALL_STATUT_LDAP
-			: $GLOBALS['liste_des_statuts']['info_redacteurs'];
-
-
-		$res = install_propager(['adresse_ldap', 'port_ldap', 'login_ldap', 'pass_ldap', 'protocole_ldap', 'tls_ldap'])
-			. "<input type='hidden' name='etape' value='ldap5' />"
-			. "<input type='hidden' name='base_ldap' value='" . spip_htmlentities($base_ldap) . "' />"
-			. fieldset(
-				_T('info_statut_utilisateurs_1'),
-				[
-					'statut_ldap' => [
-						'label' => _T('info_statut_utilisateurs_2') . '<br />',
-						'valeur' => $statut_ldap,
-						'alternatives' => $statuts
-					]
-				]
-			)
-			. install_ldap_correspondances()
-			. bouton_suivant();
-
-		echo generer_form_ecrire('install', $res);
-	}
-
-	echo $minipage->installFinPage();
+    $adresse_ldap = _request('adresse_ldap');
+    $login_ldap = _request('login_ldap');
+    $pass_ldap = _request('pass_ldap');
+    $port_ldap = _request('port_ldap');
+    $base_ldap = _request('base_ldap');
+    $base_ldap_text = _request('base_ldap_text');
+    if (!$base_ldap) {
+        $base_ldap = $base_ldap_text;
+    }
+
+    $minipage = new Installation();
+    echo $minipage->installDebutPage(['onload' => 'document.getElementById(\'suivant\').focus();return false;']);
+
+    $ldap_link = ldap_connect($adresse_ldap, $port_ldap);
+    @ldap_bind($ldap_link, $login_ldap, $pass_ldap);
+
+    // Essayer de verifier le chemin fourni
+    $r = @ldap_compare($ldap_link, $base_ldap, 'objectClass', '');
+    $fail = (ldap_errno($ldap_link) == 32);
+
+    if ($fail) {
+        echo info_etape(_T('info_chemin_acces_annuaire')),
+        info_progression_etape(3, 'etape_ldap', 'install/', true),
+            "<div class='error'><p><b>" . _T('avis_operation_echec') . '</b></p><p>' . _T('avis_chemin_invalide_1'),
+            ' (<tt>' . spip_htmlspecialchars($base_ldap) . '</tt>) ' . _T('avis_chemin_invalide_2') . '</p></div>';
+    } else {
+        info_etape(_T('info_reglage_ldap'));
+        echo info_progression_etape(4, 'etape_ldap', 'install/');
+
+        $statuts = liste_statuts_ldap();
+        $statut_ldap = defined('_INSTALL_STATUT_LDAP')
+            ? _INSTALL_STATUT_LDAP
+            : $GLOBALS['liste_des_statuts']['info_redacteurs'];
+
+
+        $res = install_propager(['adresse_ldap', 'port_ldap', 'login_ldap', 'pass_ldap', 'protocole_ldap', 'tls_ldap'])
+            . "<input type='hidden' name='etape' value='ldap5' />"
+            . "<input type='hidden' name='base_ldap' value='" . spip_htmlentities($base_ldap) . "' />"
+            . fieldset(
+                _T('info_statut_utilisateurs_1'),
+                [
+                    'statut_ldap' => [
+                        'label' => _T('info_statut_utilisateurs_2') . '<br />',
+                        'valeur' => $statut_ldap,
+                        'alternatives' => $statuts
+                    ]
+                ]
+            )
+            . install_ldap_correspondances()
+            . bouton_suivant();
+
+        echo generer_form_ecrire('install', $res);
+    }
+
+    echo $minipage->installFinPage();
 }
 
 function liste_statuts_ldap() {
-	$recom = [
-		'info_administrateurs' => ('<b>' . _T('info_administrateur_1') . '</b> ' . _T('info_administrateur_2') . '<br />'),
-		'info_redacteurs' => ('<b>' . _T('info_redacteur_1') . '</b> ' . _T('info_redacteur_2') . '<br />'),
-		'info_visiteurs' => ('<b>' . _T('info_visiteur_1') . '</b> ' . _T('info_visiteur_2') . '<br />')
-	];
-
-	$res = [];
-	foreach ($GLOBALS['liste_des_statuts'] as $k => $v) {
-		if (isset($recom[$k])) {
-			$res[$v] = $recom[$k];
-		}
-	}
-
-	return $res;
+    $recom = [
+        'info_administrateurs' => ('<b>' . _T('info_administrateur_1') . '</b> ' . _T('info_administrateur_2') . '<br />'),
+        'info_redacteurs' => ('<b>' . _T('info_redacteur_1') . '</b> ' . _T('info_redacteur_2') . '<br />'),
+        'info_visiteurs' => ('<b>' . _T('info_visiteur_1') . '</b> ' . _T('info_visiteur_2') . '<br />')
+    ];
+
+    $res = [];
+    foreach ($GLOBALS['liste_des_statuts'] as $k => $v) {
+        if (isset($recom[$k])) {
+            $res[$v] = $recom[$k];
+        }
+    }
+
+    return $res;
 }
 
 function install_ldap_correspondances() {
-	$champs = [];
-	foreach (is_array($GLOBALS['ldap_attributes']) ? $GLOBALS['ldap_attributes'] : [] as $champ => $v) {
-		$nom = 'ldap_' . $champ;
-		$val = is_array($v) ? implode(',', $v) : (string) $v;
-		$champs[$nom] = [
-			'label' => _T('ldap_correspondance', ['champ' => "<tt>$champ</tt>"]) . '<br />',
-			'valeur' => $val
-		];
-	}
-
-	return $champs ? fieldset(_T('ldap_correspondance_1'), $champs, '', _T('ldap_correspondance_2') . '<br /><br />') : '';
+    $champs = [];
+    foreach (is_array($GLOBALS['ldap_attributes']) ? $GLOBALS['ldap_attributes'] : [] as $champ => $v) {
+        $nom = 'ldap_' . $champ;
+        $val = is_array($v) ? implode(',', $v) : (string) $v;
+        $champs[$nom] = [
+            'label' => _T('ldap_correspondance', ['champ' => "<tt>$champ</tt>"]) . '<br />',
+            'valeur' => $val
+        ];
+    }
+
+    return $champs ? fieldset(_T('ldap_correspondance_1'), $champs, '', _T('ldap_correspondance_2') . '<br /><br />') : '';
 }

ecrire/install/etape_2.php

Indentation +121 added lines, -121 removed lines

@@ -12,167 +12,167 @@
 \***************************************************************************/
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 include_spip('base/abstract_sql');
 
 function install_etape_2_dist() {
-	$adresse_db = defined('_INSTALL_HOST_DB')
-		? _INSTALL_HOST_DB
-		: _request('adresse_db');
+    $adresse_db = defined('_INSTALL_HOST_DB')
+        ? _INSTALL_HOST_DB
+        : _request('adresse_db');
 
-	if (preg_match(',(.*):(.*),', (string) $adresse_db, $r)) {
-		[, $adresse_db, $port] = $r;
-	} else {
-		$port = '';
-	}
+    if (preg_match(',(.*):(.*),', (string) $adresse_db, $r)) {
+        [, $adresse_db, $port] = $r;
+    } else {
+        $port = '';
+    }
 
-	$login_db = defined('_INSTALL_USER_DB')
-		? _INSTALL_USER_DB
-		: _request('login_db');
+    $login_db = defined('_INSTALL_USER_DB')
+        ? _INSTALL_USER_DB
+        : _request('login_db');
 
-	$pass_db = defined('_INSTALL_PASS_DB')
-		? _INSTALL_PASS_DB
-		: _request('pass_db');
+    $pass_db = defined('_INSTALL_PASS_DB')
+        ? _INSTALL_PASS_DB
+        : _request('pass_db');
 
-	$server_db = defined('_INSTALL_SERVER_DB')
-		? _INSTALL_SERVER_DB
-		: _request('server_db');
+    $server_db = defined('_INSTALL_SERVER_DB')
+        ? _INSTALL_SERVER_DB
+        : _request('server_db');
 
-	$name_db = defined('_INSTALL_NAME_DB')
-		? _INSTALL_NAME_DB
-		: '';
+    $name_db = defined('_INSTALL_NAME_DB')
+        ? _INSTALL_NAME_DB
+        : '';
 
-	$chmod = _request('chmod');
+    $chmod = _request('chmod');
 
-	$link = spip_connect_db($adresse_db, $port, $login_db, $pass_db, $name_db, $server_db);
-	$GLOBALS['connexions'][$server_db] = $link;
+    $link = spip_connect_db($adresse_db, $port, $login_db, $pass_db, $name_db, $server_db);
+    $GLOBALS['connexions'][$server_db] = $link;
 
-	$GLOBALS['connexions'][$server_db][$GLOBALS['spip_sql_version']]
-		= $GLOBALS['spip_' . $server_db . '_functions_' . $GLOBALS['spip_sql_version']];
+    $GLOBALS['connexions'][$server_db][$GLOBALS['spip_sql_version']]
+        = $GLOBALS['spip_' . $server_db . '_functions_' . $GLOBALS['spip_sql_version']];
 
-	$minipage = new Installation();
-	echo $minipage->installDebutPage();
+    $minipage = new Installation();
+    echo $minipage->installDebutPage();
 
 
 // prenons toutes les dispositions possibles pour que rien ne s'affiche !
 
-	/*
+    /*
 	 * /!\ sqlite3/PDO : erreur sur join(', ', $link)
 	 * L'objet PDO ne peut pas etre transformee en chaine
 	 * Un echo $link ne fonctionne pas non plus
 	 * Il faut utiliser par exemple print_r($link)
 	 */
-	//echo "\n<!--\n", join(', ', $link), " $login_db ";
-	$db_connect = 0; // revoirfunction_exists($ferrno) ? $ferrno() : 0;
-	//echo join(', ', $GLOBALS['connexions'][$server_db]);
-	//echo "\n-->\n";
+    //echo "\n<!--\n", join(', ', $link), " $login_db ";
+    $db_connect = 0; // revoirfunction_exists($ferrno) ? $ferrno() : 0;
+    //echo join(', ', $GLOBALS['connexions'][$server_db]);
+    //echo "\n-->\n";
 
-	if (($db_connect == '0') && $link) {
-		echo "<div class='success'><b>" . _T('info_connexion_ok') . '</b></div>';
-		echo info_progression_etape(2, 'etape_', 'install/');
+    if (($db_connect == '0') && $link) {
+        echo "<div class='success'><b>" . _T('info_connexion_ok') . '</b></div>';
+        echo info_progression_etape(2, 'etape_', 'install/');
 
-		echo info_etape(_T('menu_aide_installation_choix_base') . aider('install2', true));
+        echo info_etape(_T('menu_aide_installation_choix_base') . aider('install2', true));
 
-		echo "\n", '<!-- ', sql_version($server_db), ' -->';
-		[$checked, $res] = install_etape_2_bases($login_db, $server_db);
+        echo "\n", '<!-- ', sql_version($server_db), ' -->';
+        [$checked, $res] = install_etape_2_bases($login_db, $server_db);
 
-		$hidden = (defined('_SPIP_CHMOD')
-				? ''
-				: ("\n<input type='hidden' name='chmod' value='" . spip_htmlspecialchars($chmod) . "' />"))
-			. predef_ou_cache($adresse_db . ($port ? ':' . $port : ''), $login_db, $pass_db, $server_db);
+        $hidden = (defined('_SPIP_CHMOD')
+                ? ''
+                : ("\n<input type='hidden' name='chmod' value='" . spip_htmlspecialchars($chmod) . "' />"))
+            . predef_ou_cache($adresse_db . ($port ? ':' . $port : ''), $login_db, $pass_db, $server_db);
 
-		echo install_etape_2_form($hidden, $checked, $res, 3);
-	} else {
-		echo info_progression_etape(1, 'etape_', 'install/', true);
+        echo install_etape_2_form($hidden, $checked, $res, 3);
+    } else {
+        echo info_progression_etape(1, 'etape_', 'install/', true);
 
-		echo "<div class='error'>";
-		echo info_etape(_T('info_connexion_base'));
-		echo '<h3>' . _T('avis_connexion_echec_1') . '</h3>';
-		echo '<p>' . _T('avis_connexion_echec_2') . '</p>';
+        echo "<div class='error'>";
+        echo info_etape(_T('info_connexion_base'));
+        echo '<h3>' . _T('avis_connexion_echec_1') . '</h3>';
+        echo '<p>' . _T('avis_connexion_echec_2') . '</p>';
 
-		echo "<p style='font-size: small;'>",
-		_T('avis_connexion_echec_3'),
-		'</p></div>';
-	}
+        echo "<p style='font-size: small;'>",
+        _T('avis_connexion_echec_3'),
+        '</p></div>';
+    }
 
-	echo $minipage->installFinPage();
+    echo $minipage->installFinPage();
 }
 
 // Liste les bases accessibles,
 // avec une heuristique pour preselectionner la plus probable
 
 function install_etape_2_bases($login_db, $server_db) {
-	$res = install_etape_liste_bases($server_db, $login_db);
-	if ($res) {
-		[$checked, $bases] = $res;
-
-		return [
-			$checked,
-			"<label for='choix_db'><b>"
-			. _T('texte_choix_base_2')
-			. '</b><br />'
-			. _T('texte_choix_base_3')
-			. '</label>'
-			. "<ul>\n<li>"
-			. implode("</li>\n<li>", $bases)
-			. "</li>\n</ul><p>"
-			. _T('info_ou')
-			. ' '
-		];
-	}
-	$res = '<b>' . _T('avis_lecture_noms_bases_1') . '</b>
+    $res = install_etape_liste_bases($server_db, $login_db);
+    if ($res) {
+        [$checked, $bases] = $res;
+
+        return [
+            $checked,
+            "<label for='choix_db'><b>"
+            . _T('texte_choix_base_2')
+            . '</b><br />'
+            . _T('texte_choix_base_3')
+            . '</label>'
+            . "<ul>\n<li>"
+            . implode("</li>\n<li>", $bases)
+            . "</li>\n</ul><p>"
+            . _T('info_ou')
+            . ' '
+        ];
+    }
+    $res = '<b>' . _T('avis_lecture_noms_bases_1') . '</b>
 		' . _T('avis_lecture_noms_bases_2') . '<p>';
 
-	$checked = false;
-	if ($login_db) {
-		// Si un login comporte un point, le nom de la base est plus
-		// probablement le login sans le point -- testons pour savoir
-		$test_base = $login_db;
-		$ok = sql_selectdb($test_base, $server_db);
-		$test_base2 = str_replace('.', '_', (string) $test_base);
-		if (sql_selectdb($test_base2, $server_db)) {
-			$test_base = $test_base2;
-			$ok = true;
-		}
-
-		if ($ok) {
-			$res .= _T('avis_lecture_noms_bases_3')
-				. '<ul>'
-				. '<li><input name="choix_db" value="' . $test_base . "\" type='radio' id='stand' checked='checked' />"
-				. "<label for='stand'>" . $test_base . "</label></li>\n"
-				. '</ul>'
-				. '<p>' . _T('info_ou') . ' ';
-			$checked = true;
-		}
-	}
-
-	return [$checked, $res];
+    $checked = false;
+    if ($login_db) {
+        // Si un login comporte un point, le nom de la base est plus
+        // probablement le login sans le point -- testons pour savoir
+        $test_base = $login_db;
+        $ok = sql_selectdb($test_base, $server_db);
+        $test_base2 = str_replace('.', '_', (string) $test_base);
+        if (sql_selectdb($test_base2, $server_db)) {
+            $test_base = $test_base2;
+            $ok = true;
+        }
+
+        if ($ok) {
+            $res .= _T('avis_lecture_noms_bases_3')
+                . '<ul>'
+                . '<li><input name="choix_db" value="' . $test_base . "\" type='radio' id='stand' checked='checked' />"
+                . "<label for='stand'>" . $test_base . "</label></li>\n"
+                . '</ul>'
+                . '<p>' . _T('info_ou') . ' ';
+            $checked = true;
+        }
+    }
+
+    return [$checked, $res];
 }
 
 function install_etape_2_form($hidden, $checked, $res, $etape) {
-	return generer_form_ecrire('install', (
-		"\n<input type='hidden' name='etape' value='$etape' />"
-		. $hidden
-		. (defined('_INSTALL_NAME_DB')
-			? '<h3>' . _T('install_nom_base_hebergeur') . ' <tt>' . _INSTALL_NAME_DB . '</tt>' . '</h3>'
-			: "\n<fieldset><legend>" . _T('texte_choix_base_1') . "</legend>\n"
-			. $res
-			. "\n<input name=\"choix_db\" value=\"new_spip\" type='radio' id='nou'"
-			. ($checked ? '' : " checked='checked'")
-			. " />\n<label for='nou'>" . _T('info_creer_base') . "</label></p>\n<p>"
-			. "\n<input type='text' name='table_new' class='text' value=\"spip\" size='20' /></p></fieldset>\n"
-		)
-
-		. ((defined('_INSTALL_TABLE_PREFIX') || $GLOBALS['table_prefix'] != 'spip')
-			? '<h3>' . _T('install_table_prefix_hebergeur') . '  <tt>' . $GLOBALS['table_prefix'] . '</tt>' . '</h3>'
-			: '<fieldset><legend>' . _T('texte_choix_table_prefix') . "</legend>\n"
-			. "<p><label for='table_prefix'>" . _T('info_table_prefix') . '</label></p><p>'
-			. "\n<input type='text' id='tprefix' name='tprefix' class='text' value='"
-			. 'spip' # valeur par defaut
-			. "' size='20' /></p></fieldset>"
-		)
-
-		. bouton_suivant()));
+    return generer_form_ecrire('install', (
+        "\n<input type='hidden' name='etape' value='$etape' />"
+        . $hidden
+        . (defined('_INSTALL_NAME_DB')
+            ? '<h3>' . _T('install_nom_base_hebergeur') . ' <tt>' . _INSTALL_NAME_DB . '</tt>' . '</h3>'
+            : "\n<fieldset><legend>" . _T('texte_choix_base_1') . "</legend>\n"
+            . $res
+            . "\n<input name=\"choix_db\" value=\"new_spip\" type='radio' id='nou'"
+            . ($checked ? '' : " checked='checked'")
+            . " />\n<label for='nou'>" . _T('info_creer_base') . "</label></p>\n<p>"
+            . "\n<input type='text' name='table_new' class='text' value=\"spip\" size='20' /></p></fieldset>\n"
+        )
+
+        . ((defined('_INSTALL_TABLE_PREFIX') || $GLOBALS['table_prefix'] != 'spip')
+            ? '<h3>' . _T('install_table_prefix_hebergeur') . '  <tt>' . $GLOBALS['table_prefix'] . '</tt>' . '</h3>'
+            : '<fieldset><legend>' . _T('texte_choix_table_prefix') . "</legend>\n"
+            . "<p><label for='table_prefix'>" . _T('info_table_prefix') . '</label></p><p>'
+            . "\n<input type='text' id='tprefix' name='tprefix' class='text' value='"
+            . 'spip' # valeur par defaut
+            . "' size='20' /></p></fieldset>"
+        )
+
+        . bouton_suivant()));
 }