spip / SPIP

ecrire/charsets/iso-8859-15.php

Spacing +8 added lines, -8 removed lines

@@ -17,14 +17,14 @@
 load_charset('iso-8859-1');
 
 $trans = $GLOBALS['CHARSET']['iso-8859-1'];
-$trans[164]=8364;
-$trans[166]=352;
-$trans[168]=353;
-$trans[180]=381;
-$trans[184]=382;
-$trans[188]=338;
-$trans[189]=339;
-$trans[190]=376;
+$trans[164] = 8364;
+$trans[166] = 352;
+$trans[168] = 353;
+$trans[180] = 381;
+$trans[184] = 382;
+$trans[188] = 338;
+$trans[189] = 339;
+$trans[190] = 376;
 
 $GLOBALS['CHARSET']['iso-8859-15'] = $trans;
 

Braces +3 added lines, -1 removed lines

@@ -10,7 +10,9 @@
  *  Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne.   *
 \***************************************************************************/
 
-if (!defined('_ECRIRE_INC_VERSION')) return;
+if (!defined('_ECRIRE_INC_VERSION')) {
+    return;
+}
 
 // iso latin 15 - Gaetan Ryckeboer <gryckeboer@virtual-net.fr>
 

ecrire/req/sqlite3.php

Indentation +7 added lines, -7 removed lines

@@ -21,22 +21,22 @@
 
 // http://doc.spip.org/@req_sqlite3_dist
 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);
 }
 
 
 // http://doc.spip.org/@spip_sqlite3_constantes
 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;
 }
 
 ?>

Spacing +5 added lines, -5 removed lines

@@ -20,17 +20,17 @@
 
 
 // http://doc.spip.org/@req_sqlite3_dist
-function req_sqlite3_dist($addr, $port, $login, $pass, $db='', $prefixe='') {
-	return req_sqlite_dist($addr, $port, $login, $pass, $db, $prefixe, $sqlite_version=3);
+function req_sqlite3_dist($addr, $port, $login, $pass, $db = '', $prefixe = '') {
+	return req_sqlite_dist($addr, $port, $login, $pass, $db, $prefixe, $sqlite_version = 3);
 }
 
 
 // http://doc.spip.org/@spip_sqlite3_constantes
-function spip_sqlite3_constantes(){
+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);
+		define('SPIP_SQLITE3_NUM', PDO::FETCH_NUM);
+		define('SPIP_SQLITE3_BOTH', PDO::FETCH_BOTH);
 	}
 }
 

Braces +3 added lines, -1 removed lines

@@ -10,7 +10,9 @@
  *  Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne.   *
 \***************************************************************************/
 
-if (!defined('_ECRIRE_INC_VERSION')) return;
+if (!defined('_ECRIRE_INC_VERSION')) {
+    return;
+}
 
 
 

ecrire/req/sqlite2.php

Indentation +7 added lines, -7 removed lines

@@ -19,20 +19,20 @@
 
 // http://doc.spip.org/@req_sqlite2_dist
 function req_sqlite2_dist($addr, $port, $login, $pass, $db='', $prefixe='') {	
-	return req_sqlite_dist($addr, $port, $login, $pass, $db, $prefixe, $sqlite_version=2);
+    return req_sqlite_dist($addr, $port, $login, $pass, $db, $prefixe, $sqlite_version=2);
 }
 
 // http://doc.spip.org/@spip_sqlite2_constantes
 function spip_sqlite2_constantes(){
-	if (!defined('SPIP_SQLITE2_ASSOC')) {
-		define('SPIP_SQLITE2_ASSOC', SQLITE_ASSOC);
-		define('SPIP_SQLITE2_NUM',   SQLITE_NUM);
-		define('SPIP_SQLITE2_BOTH',  SQLITE_BOTH);
-	}
+    if (!defined('SPIP_SQLITE2_ASSOC')) {
+        define('SPIP_SQLITE2_ASSOC', SQLITE_ASSOC);
+        define('SPIP_SQLITE2_NUM',   SQLITE_NUM);
+        define('SPIP_SQLITE2_BOTH',  SQLITE_BOTH);
+    }
 }
 
 function spip_versions_sqlite2()
 {
-	return _sqlite_charger_version(2) ? 2 : false;
+    return _sqlite_charger_version(2) ? 2 : false;
 }
 ?>

Spacing +5 added lines, -5 removed lines

@@ -18,16 +18,16 @@
 
 
 // http://doc.spip.org/@req_sqlite2_dist
-function req_sqlite2_dist($addr, $port, $login, $pass, $db='', $prefixe='') {	
-	return req_sqlite_dist($addr, $port, $login, $pass, $db, $prefixe, $sqlite_version=2);
+function req_sqlite2_dist($addr, $port, $login, $pass, $db = '', $prefixe = '') {	
+	return req_sqlite_dist($addr, $port, $login, $pass, $db, $prefixe, $sqlite_version = 2);
 }
 
 // http://doc.spip.org/@spip_sqlite2_constantes
-function spip_sqlite2_constantes(){
+function spip_sqlite2_constantes() {
 	if (!defined('SPIP_SQLITE2_ASSOC')) {
 		define('SPIP_SQLITE2_ASSOC', SQLITE_ASSOC);
-		define('SPIP_SQLITE2_NUM',   SQLITE_NUM);
-		define('SPIP_SQLITE2_BOTH',  SQLITE_BOTH);
+		define('SPIP_SQLITE2_NUM', SQLITE_NUM);
+		define('SPIP_SQLITE2_BOTH', SQLITE_BOTH);
 	}
 }
 

Braces +3 added lines, -1 removed lines

@@ -10,7 +10,9 @@
  *  Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne.   *
 \***************************************************************************/
 
-if (!defined('_ECRIRE_INC_VERSION')) return;
+if (!defined('_ECRIRE_INC_VERSION')) {
+    return;
+}
 
 include_spip('req/sqlite_generique');
 

ecrire/install/etape_ldap5.php

Indentation +51 added lines, -51 removed lines

@@ -17,69 +17,69 @@
 // http://doc.spip.org/@install_etape_ldap5_dist
 function install_etape_ldap5_dist()
 {
-	etape_ldap5_save();
-	etape_ldap5_suite();
+    etape_ldap5_save();
+    etape_ldap5_suite();
 }
 
 function etape_ldap5_save()
 {
-	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($conn, "'');")) {
-			ecrire_fichier(_FILE_CONNECT_TMP, 
-				       substr($conn, 0, $p+1) 
-				       . _FILE_LDAP
-				       . substr($conn, $p+1));
-	}
-
-	$adresse_ldap = addcslashes(_request('adresse_ldap'),"'\\");
-	$login_ldap = addcslashes(_request('login_ldap'),"'\\");
-	$pass_ldap = addcslashes(_request('pass_ldap'),"'\\");
-	$port_ldap = addcslashes(_request('port_ldap'),"'\\");
-	$tls_ldap = addcslashes(_request('tls_ldap'),"'\\");
-	$protocole_ldap = addcslashes(_request('protocole_ldap'),"'\\");
-	$base_ldap = addcslashes(_request('base_ldap'),"'\\");
-	$base_ldap_text = addcslashes(_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'] : array();
-	$res = '';
-	foreach ($champs as $champ => $v ) {
-		$nom = 'ldap_' . $champ;
-		$val = trim(_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";
+    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($conn, "'');")) {
+            ecrire_fichier(_FILE_CONNECT_TMP, 
+                        substr($conn, 0, $p+1) 
+                        . _FILE_LDAP
+                        . substr($conn, $p+1));
+    }
+
+    $adresse_ldap = addcslashes(_request('adresse_ldap'),"'\\");
+    $login_ldap = addcslashes(_request('login_ldap'),"'\\");
+    $pass_ldap = addcslashes(_request('pass_ldap'),"'\\");
+    $port_ldap = addcslashes(_request('port_ldap'),"'\\");
+    $tls_ldap = addcslashes(_request('tls_ldap'),"'\\");
+    $protocole_ldap = addcslashes(_request('protocole_ldap'),"'\\");
+    $base_ldap = addcslashes(_request('base_ldap'),"'\\");
+    $base_ldap_text = addcslashes(_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'] : array();
+    $res = '';
+    foreach ($champs as $champ => $v ) {
+        $nom = 'ldap_' . $champ;
+        $val = trim(_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);
+    install_fichier_connexion(_DIR_CONNECT . _FILE_LDAP, $conn);
 }
 
 function etape_ldap5_suite()
 {
-	echo install_debut_html('AUTO', ' onload="document.getElementById(\'suivant\').focus();return false;"');
+    echo install_debut_html('AUTO', ' onload="document.getElementById(\'suivant\').focus();return false;"');
 
-	echo info_etape(_T('info_ldap_ok'), info_progression_etape(5,'etape_ldap','install/'), _T('info_terminer_installation'));
+    echo info_etape(_T('info_ldap_ok'), info_progression_etape(5,'etape_ldap','install/'), _T('info_terminer_installation'));
 
-	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 install_fin_html();
+    echo install_fin_html();
 }
 
 

Spacing +18 added lines, -19 removed lines

@@ -32,50 +32,49 @@
 
 	if ($p = strpos($conn, "'');")) {
 			ecrire_fichier(_FILE_CONNECT_TMP, 
-				       substr($conn, 0, $p+1) 
+				       substr($conn, 0, $p + 1) 
 				       . _FILE_LDAP
-				       . substr($conn, $p+1));
+				       . substr($conn, $p + 1));
 	}
 
-	$adresse_ldap = addcslashes(_request('adresse_ldap'),"'\\");
-	$login_ldap = addcslashes(_request('login_ldap'),"'\\");
-	$pass_ldap = addcslashes(_request('pass_ldap'),"'\\");
-	$port_ldap = addcslashes(_request('port_ldap'),"'\\");
-	$tls_ldap = addcslashes(_request('tls_ldap'),"'\\");
-	$protocole_ldap = addcslashes(_request('protocole_ldap'),"'\\");
-	$base_ldap = addcslashes(_request('base_ldap'),"'\\");
-	$base_ldap_text = addcslashes(_request('base_ldap_text'),"'\\");
+	$adresse_ldap = addcslashes(_request('adresse_ldap'), "'\\");
+	$login_ldap = addcslashes(_request('login_ldap'), "'\\");
+	$pass_ldap = addcslashes(_request('pass_ldap'), "'\\");
+	$port_ldap = addcslashes(_request('port_ldap'), "'\\");
+	$tls_ldap = addcslashes(_request('tls_ldap'), "'\\");
+	$protocole_ldap = addcslashes(_request('protocole_ldap'), "'\\");
+	$base_ldap = addcslashes(_request('base_ldap'), "'\\");
+	$base_ldap_text = addcslashes(_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")
+		. (($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'] : array();
 	$res = '';
-	foreach ($champs as $champ => $v ) {
-		$nom = 'ldap_' . $champ;
+	foreach ($champs as $champ => $v) {
+		$nom = 'ldap_'.$champ;
 		$val = trim(_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 . ",";
+		} 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);
+	install_fichier_connexion(_DIR_CONNECT._FILE_LDAP, $conn);
 }
 
 function etape_ldap5_suite()
 {
 	echo install_debut_html('AUTO', ' onload="document.getElementById(\'suivant\').focus();return false;"');
 
-	echo info_etape(_T('info_ldap_ok'), info_progression_etape(5,'etape_ldap','install/'), _T('info_terminer_installation'));
+	echo info_etape(_T('info_ldap_ok'), info_progression_etape(5, 'etape_ldap', 'install/'), _T('info_terminer_installation'));
 
 	echo generer_form_ecrire('install', (
-		"<input type='hidden' name='etape' value='3' />" .
+		"<input type='hidden' name='etape' value='3' />".
 		"<input type='hidden' name='ldap_present' value='true' />" 
 		. bouton_suivant()));
 

Braces +16 added lines, -6 removed lines

@@ -10,7 +10,9 @@ 
  *  Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne.   *
 \***************************************************************************/
 
-if (!defined('_ECRIRE_INC_VERSION')) return;
+if (!defined('_ECRIRE_INC_VERSION')) {
+    return;
+}
 include_spip('inc/headers');
 include_spip('auth/ldap');
 
@@ -23,8 +25,9 @@ 
 
 function etape_ldap5_save()
 {
-	if (!@file_exists(_FILE_CONNECT_TMP))
-		redirige_url_ecrire('install');
+	if (!@file_exists(_FILE_CONNECT_TMP)) {
+			redirige_url_ecrire('install');
+	}
 
 	ecrire_meta('ldap_statut_import', _request('statut_ldap'));
 
@@ -59,9 +62,16 @@ 
 		$nom = 'ldap_' . $champ;
 		$val = trim(_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 . ",";
+			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";
 	  

ecrire/install/etape_chmod.php

Braces +33 added lines, -18 removed lines

@@ -10,9 +10,13 @@ 
  *  Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne.   *
 \***************************************************************************/
 
-if (!defined('_ECRIRE_INC_VERSION')) return;
+if (!defined('_ECRIRE_INC_VERSION')) {
+    return;
+}
 
-if (defined('_TEST_DIRS')) return;
+if (defined('_TEST_DIRS')) {
+    return;
+}
 define('_TEST_DIRS', "1");
 
 include_spip('inc/minipres');
@@ -40,12 +44,13 @@ 
 		@rmdir('test');
 		spip_unlink('test'); // effacer au cas ou
 		@touch('test');
-		if ($uid > 0 && $uid == $uid2 && @fileowner('test') == $uid)
-			$chmod = 0700;
-		else if ($gid > 0 && $gid == $gid2 && @filegroup('test') == $gid)
-			$chmod = 0770;
-		else
-			$chmod = 0777;
+		if ($uid > 0 && $uid == $uid2 && @fileowner('test') == $uid) {
+					$chmod = 0700;
+		} else if ($gid > 0 && $gid == $gid2 && @filegroup('test') == $gid) {
+					$chmod = 0770;
+		} else {
+					$chmod = 0777;
+		}
 		// Appliquer de plus les droits d'acces du script
 		if ($perms > 0) {
 			$perms = ($perms & 0777) | (($perms & 0444) >> 2);
@@ -71,8 +76,12 @@ 
 	$chmod = 0;
 
 	if ($test_dir) {
-		if (substr($test_dir,-1)!=='/') $test_dir .= '/';
-		if (!in_array($test_dir, $test_dirs)) $test_dirs[] = _DIR_RACINE  . $test_dir;
+		if (substr($test_dir,-1)!=='/') {
+		    $test_dir .= '/';
+		}
+		if (!in_array($test_dir, $test_dirs)) {
+		    $test_dirs[] = _DIR_RACINE  . $test_dir;
+		}
 	} else {
 		if (!_FILE_CONNECT) {
 			$test_dirs[] = _DIR_CONNECT;
@@ -89,9 +98,12 @@ 
 			$m = preg_replace(',^' . _DIR_RACINE . ',', '',$my_dir);
 			if (@file_exists($my_dir)) {
 				$bad_dirs["<li>".$m."</li>"] = 1;
-			} else
-				$absent_dirs["<li>".$m."</li>"] = 1;
-		} else $chmod = max($chmod, $test);
+			} else {
+							$absent_dirs["<li>".$m."</li>"] = 1;
+			}
+		} else {
+		    $chmod = max($chmod, $test);
+		}
 	}
 
 	if ($bad_dirs OR $absent_dirs) {
@@ -99,8 +111,9 @@ 
 	if (!_FILE_CONNECT) {
 		$titre = _T('dirs_preliminaire');
 		$continuer = ' '._T('dirs_commencer') . '.';
-	} else
-		$titre = _T('dirs_probleme_droits');
+	} else {
+			$titre = _T('dirs_probleme_droits');
+	}
 
 
 	$res = "<div align='right'>". menu_langues('var_lang_ecrire')."</div>\n";
@@ -130,9 +143,11 @@ 
 
 	} else {
 		$deja = (_FILE_CONNECT AND analyse_fichier_connection(_FILE_CONNECT));
-		if (!$deja)
-			redirige_url_ecrire("install", "etape=1&chmod=".$chmod);
-		else	redirige_url_ecrire();
+		if (!$deja) {
+					redirige_url_ecrire("install", "etape=1&chmod=".$chmod);
+		} else {
+		    redirige_url_ecrire();
+		}
 	}
 }
 ?>

Indentation +100 added lines, -100 removed lines

@@ -23,39 +23,39 @@ 
 //
 // http://doc.spip.org/@test_ecrire
 function test_ecrire($my_dir) {
-	static $chmod = 0;
+    static $chmod = 0;
 	
-	$ok = false;
-	$script = @file_exists('spip_loader.php') ? 'spip_loader.php' : $_SERVER['PHP_SELF'];
-	$self = basename($script);
-	$uid = @fileowner('.');
-	$uid2 = @fileowner($self);
-	$gid = @filegroup('.');
-	$gid2 = @filegroup($self);
-	$perms = @fileperms($self);
-
-	// Comparer l'appartenance d'un fichier cree par PHP
-	// avec celle du script et du repertoire courant
-	if(!$chmod) {
-		@rmdir('test');
-		spip_unlink('test'); // effacer au cas ou
-		@touch('test');
-		if ($uid > 0 && $uid == $uid2 && @fileowner('test') == $uid)
-			$chmod = 0700;
-		else if ($gid > 0 && $gid == $gid2 && @filegroup('test') == $gid)
-			$chmod = 0770;
-		else
-			$chmod = 0777;
-		// Appliquer de plus les droits d'acces du script
-		if ($perms > 0) {
-			$perms = ($perms & 0777) | (($perms & 0444) >> 2);
-			$chmod |= $perms;
-		}
-		spip_unlink('test');
-	}
-	$ok = is_dir($my_dir) && is_writable($my_dir);
-
-	return $ok ? $chmod : false;
+    $ok = false;
+    $script = @file_exists('spip_loader.php') ? 'spip_loader.php' : $_SERVER['PHP_SELF'];
+    $self = basename($script);
+    $uid = @fileowner('.');
+    $uid2 = @fileowner($self);
+    $gid = @filegroup('.');
+    $gid2 = @filegroup($self);
+    $perms = @fileperms($self);
+
+    // Comparer l'appartenance d'un fichier cree par PHP
+    // avec celle du script et du repertoire courant
+    if(!$chmod) {
+        @rmdir('test');
+        spip_unlink('test'); // effacer au cas ou
+        @touch('test');
+        if ($uid > 0 && $uid == $uid2 && @fileowner('test') == $uid)
+            $chmod = 0700;
+        else if ($gid > 0 && $gid == $gid2 && @filegroup('test') == $gid)
+            $chmod = 0770;
+        else
+            $chmod = 0777;
+        // Appliquer de plus les droits d'acces du script
+        if ($perms > 0) {
+            $perms = ($perms & 0777) | (($perms & 0444) >> 2);
+            $chmod |= $perms;
+        }
+        spip_unlink('test');
+    }
+    $ok = is_dir($my_dir) && is_writable($my_dir);
+
+    return $ok ? $chmod : false;
 }
 
 //
@@ -66,73 +66,73 @@ 
 // http://doc.spip.org/@install_etape_chmod_dist
 function install_etape_chmod_dist()
 {
-	global $test_dirs;
-	$test_dir =  _request('test_dir');
-	$chmod = 0;
-
-	if ($test_dir) {
-		if (substr($test_dir,-1)!=='/') $test_dir .= '/';
-		if (!in_array($test_dir, $test_dirs)) $test_dirs[] = _DIR_RACINE  . $test_dir;
-	} else {
-		if (!_FILE_CONNECT) {
-			$test_dirs[] = _DIR_CONNECT;
-			$test_dirs[] = _DIR_CHMOD;
-		}
-	}
-
-	$bad_dirs = array();
-	$absent_dirs  = array();;
-
-	while (list(, $my_dir) = each($test_dirs)) {
-		$test = test_ecrire($my_dir);
-		if (!$test) {
-			$m = preg_replace(',^' . _DIR_RACINE . ',', '',$my_dir);
-			if (@file_exists($my_dir)) {
-				$bad_dirs["<li>".$m."</li>"] = 1;
-			} else
-				$absent_dirs["<li>".$m."</li>"] = 1;
-		} else $chmod = max($chmod, $test);
-	}
-
-	if ($bad_dirs OR $absent_dirs) {
-
-	if (!_FILE_CONNECT) {
-		$titre = _T('dirs_preliminaire');
-		$continuer = ' '._T('dirs_commencer') . '.';
-	} else
-		$titre = _T('dirs_probleme_droits');
-
-
-	$res = "<div align='right'>". menu_langues('var_lang_ecrire')."</div>\n";
-
-	if ($bad_dirs) {
-		$res .=
-		  _T('dirs_repertoires_suivants',
-		     array('bad_dirs' => join("\n", array_keys($bad_dirs)))) .
-		  	"<b>". _T('login_recharger')."</b>.";
-	}
-
-	if ($absent_dirs) {
-	  	$res .=
-			_T('dirs_repertoires_absents',
-			   array('bad_dirs' => join("\n", array_keys($absent_dirs)))) .
-			"<b>". _T('login_recharger')."</b>.";
-	}
-	$res = "<p>" . $continuer  . $res . aide ("install0", true) . "</p>";
-
-	$t = _T('login_recharger');
-	$t = (!$test_dir ? '' :
-		"<input type='hidden' name='test_dir' value='" . spip_htmlspecialchars($test_dir, ENT_QUOTES) . "' />")
-	. "<input type='hidden' name='etape' value='chmod' />"
-	. "<div style='text-align: right'><input type='submit' value='" . attribut_html($t) . "' /></div>";
-
-	echo minipres($titre, $res . generer_form_ecrire('install',  $t));
-
-	} else {
-		$deja = (_FILE_CONNECT AND analyse_fichier_connection(_FILE_CONNECT));
-		if (!$deja)
-			redirige_url_ecrire("install", "etape=1&chmod=".$chmod);
-		else	redirige_url_ecrire();
-	}
+    global $test_dirs;
+    $test_dir =  _request('test_dir');
+    $chmod = 0;
+
+    if ($test_dir) {
+        if (substr($test_dir,-1)!=='/') $test_dir .= '/';
+        if (!in_array($test_dir, $test_dirs)) $test_dirs[] = _DIR_RACINE  . $test_dir;
+    } else {
+        if (!_FILE_CONNECT) {
+            $test_dirs[] = _DIR_CONNECT;
+            $test_dirs[] = _DIR_CHMOD;
+        }
+    }
+
+    $bad_dirs = array();
+    $absent_dirs  = array();;
+
+    while (list(, $my_dir) = each($test_dirs)) {
+        $test = test_ecrire($my_dir);
+        if (!$test) {
+            $m = preg_replace(',^' . _DIR_RACINE . ',', '',$my_dir);
+            if (@file_exists($my_dir)) {
+                $bad_dirs["<li>".$m."</li>"] = 1;
+            } else
+                $absent_dirs["<li>".$m."</li>"] = 1;
+        } else $chmod = max($chmod, $test);
+    }
+
+    if ($bad_dirs OR $absent_dirs) {
+
+    if (!_FILE_CONNECT) {
+        $titre = _T('dirs_preliminaire');
+        $continuer = ' '._T('dirs_commencer') . '.';
+    } else
+        $titre = _T('dirs_probleme_droits');
+
+
+    $res = "<div align='right'>". menu_langues('var_lang_ecrire')."</div>\n";
+
+    if ($bad_dirs) {
+        $res .=
+            _T('dirs_repertoires_suivants',
+                array('bad_dirs' => join("\n", array_keys($bad_dirs)))) .
+                "<b>". _T('login_recharger')."</b>.";
+    }
+
+    if ($absent_dirs) {
+            $res .=
+            _T('dirs_repertoires_absents',
+                array('bad_dirs' => join("\n", array_keys($absent_dirs)))) .
+            "<b>". _T('login_recharger')."</b>.";
+    }
+    $res = "<p>" . $continuer  . $res . aide ("install0", true) . "</p>";
+
+    $t = _T('login_recharger');
+    $t = (!$test_dir ? '' :
+        "<input type='hidden' name='test_dir' value='" . spip_htmlspecialchars($test_dir, ENT_QUOTES) . "' />")
+    . "<input type='hidden' name='etape' value='chmod' />"
+    . "<div style='text-align: right'><input type='submit' value='" . attribut_html($t) . "' /></div>";
+
+    echo minipres($titre, $res . generer_form_ecrire('install',  $t));
+
+    } else {
+        $deja = (_FILE_CONNECT AND analyse_fichier_connection(_FILE_CONNECT));
+        if (!$deja)
+            redirige_url_ecrire("install", "etape=1&chmod=".$chmod);
+        else	redirige_url_ecrire();
+    }
 }
 ?>

Spacing +16 added lines, -17 removed lines

@@ -36,7 +36,7 @@ 
 
 	// Comparer l'appartenance d'un fichier cree par PHP
 	// avec celle du script et du repertoire courant
-	if(!$chmod) {
+	if (!$chmod) {
 		@rmdir('test');
 		spip_unlink('test'); // effacer au cas ou
 		@touch('test');
@@ -67,12 +67,12 @@ 
 function install_etape_chmod_dist()
 {
 	global $test_dirs;
-	$test_dir =  _request('test_dir');
+	$test_dir = _request('test_dir');
 	$chmod = 0;
 
 	if ($test_dir) {
-		if (substr($test_dir,-1)!=='/') $test_dir .= '/';
-		if (!in_array($test_dir, $test_dirs)) $test_dirs[] = _DIR_RACINE  . $test_dir;
+		if (substr($test_dir, -1) !== '/') $test_dir .= '/';
+		if (!in_array($test_dir, $test_dirs)) $test_dirs[] = _DIR_RACINE.$test_dir;
 	} else {
 		if (!_FILE_CONNECT) {
 			$test_dirs[] = _DIR_CONNECT;
@@ -81,12 +81,12 @@ 
 	}
 
 	$bad_dirs = array();
-	$absent_dirs  = array();;
+	$absent_dirs = array(); ;
 
 	while (list(, $my_dir) = each($test_dirs)) {
 		$test = test_ecrire($my_dir);
 		if (!$test) {
-			$m = preg_replace(',^' . _DIR_RACINE . ',', '',$my_dir);
+			$m = preg_replace(',^'._DIR_RACINE.',', '', $my_dir);
 			if (@file_exists($my_dir)) {
 				$bad_dirs["<li>".$m."</li>"] = 1;
 			} else
@@ -98,35 +98,34 @@ 
 
 	if (!_FILE_CONNECT) {
 		$titre = _T('dirs_preliminaire');
-		$continuer = ' '._T('dirs_commencer') . '.';
+		$continuer = ' '._T('dirs_commencer').'.';
 	} else
 		$titre = _T('dirs_probleme_droits');
 
 
-	$res = "<div align='right'>". menu_langues('var_lang_ecrire')."</div>\n";
+	$res = "<div align='right'>".menu_langues('var_lang_ecrire')."</div>\n";
 
 	if ($bad_dirs) {
 		$res .=
 		  _T('dirs_repertoires_suivants',
-		     array('bad_dirs' => join("\n", array_keys($bad_dirs)))) .
-		  	"<b>". _T('login_recharger')."</b>.";
+		     array('bad_dirs' => join("\n", array_keys($bad_dirs)))).
+		  	"<b>"._T('login_recharger')."</b>.";
 	}
 
 	if ($absent_dirs) {
 	  	$res .=
 			_T('dirs_repertoires_absents',
-			   array('bad_dirs' => join("\n", array_keys($absent_dirs)))) .
-			"<b>". _T('login_recharger')."</b>.";
+			   array('bad_dirs' => join("\n", array_keys($absent_dirs)))).
+			"<b>"._T('login_recharger')."</b>.";
 	}
-	$res = "<p>" . $continuer  . $res . aide ("install0", true) . "</p>";
+	$res = "<p>".$continuer.$res.aide("install0", true)."</p>";
 
 	$t = _T('login_recharger');
-	$t = (!$test_dir ? '' :
-		"<input type='hidden' name='test_dir' value='" . spip_htmlspecialchars($test_dir, ENT_QUOTES) . "' />")
+	$t = (!$test_dir ? '' : "<input type='hidden' name='test_dir' value='".spip_htmlspecialchars($test_dir, ENT_QUOTES)."' />")
 	. "<input type='hidden' name='etape' value='chmod' />"
-	. "<div style='text-align: right'><input type='submit' value='" . attribut_html($t) . "' /></div>";
+	. "<div style='text-align: right'><input type='submit' value='".attribut_html($t)."' /></div>";
 
-	echo minipres($titre, $res . generer_form_ecrire('install',  $t));
+	echo minipres($titre, $res.generer_form_ecrire('install', $t));
 
 	} else {
 		$deja = (_FILE_CONNECT AND analyse_fichier_connection(_FILE_CONNECT));

ecrire/install/etape_4.php

Indentation +28 added lines, -28 removed lines

@@ -18,44 +18,44 @@
 function install_etape_4_dist()
 {
 
-	// creer le repertoire cache, qui sert partout !
-	if(!@file_exists(_DIR_CACHE)) {
-		$rep = preg_replace(','._DIR_TMP.',', '', _DIR_CACHE);
-		$rep = sous_repertoire(_DIR_TMP, $rep, true,true);
-	}
+    // creer le repertoire cache, qui sert partout !
+    if(!@file_exists(_DIR_CACHE)) {
+        $rep = preg_replace(','._DIR_TMP.',', '', _DIR_CACHE);
+        $rep = sous_repertoire(_DIR_TMP, $rep, true,true);
+    }
 
 
-	echo install_debut_html('AUTO', ' onload="document.getElementById(\'suivant\').focus();return false;"');
-	echo info_progression_etape(4,'etape_','install/');
+    echo install_debut_html('AUTO', ' 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 "<div class='success'><b>"
+        . _T('info_derniere_etape')
+        . "</b><p>"
+        . _T('info_utilisation_spip')
+        . "</p></div>";
 
 
-	echo "<p>"
-			._T('plugin_info_plugins_dist_1', array('plugins_dist' => "<tt>".joli_repertoire(_DIR_PLUGINS_DIST)."</tt>"))
-			."</p>";
+    echo "<p>"
+            ._T('plugin_info_plugins_dist_1', array('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),array(), array(), _DIR_PLUGINS_DIST,'afficher_nom_plugin');
+    // installer les extensions
+    include_spip('inc/plugin');
+    $afficher = charger_fonction("afficher_liste",'plugins');
+    echo $afficher(self(), liste_plugin_files(_DIR_PLUGINS_DIST),array(), array(), _DIR_PLUGINS_DIST,'afficher_nom_plugin');
 
-	plugin_installes_meta();
+    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('');
+    // 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'));
+    // 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 install_fin_html();
+    echo generer_form_ecrire('install', $suite);	echo install_fin_html();
 }
 
 ?>

Spacing +7 added lines, -7 removed lines

@@ -19,14 +19,14 @@ 
 {
 
 	// creer le repertoire cache, qui sert partout !
-	if(!@file_exists(_DIR_CACHE)) {
+	if (!@file_exists(_DIR_CACHE)) {
 		$rep = preg_replace(','._DIR_TMP.',', '', _DIR_CACHE);
-		$rep = sous_repertoire(_DIR_TMP, $rep, true,true);
+		$rep = sous_repertoire(_DIR_TMP, $rep, true, true);
 	}
 
 
 	echo install_debut_html('AUTO', ' onload="document.getElementById(\'suivant\').focus();return false;"');
-	echo info_progression_etape(4,'etape_','install/');
+	echo info_progression_etape(4, 'etape_', 'install/');
 
 	echo "<div class='success'><b>"
 		. _T('info_derniere_etape')
@@ -41,8 +41,8 @@ 
 
 	// installer les extensions
 	include_spip('inc/plugin');
-	$afficher = charger_fonction("afficher_liste",'plugins');
-	echo $afficher(self(), liste_plugin_files(_DIR_PLUGINS_DIST),array(), array(), _DIR_PLUGINS_DIST,'afficher_nom_plugin');
+	$afficher = charger_fonction("afficher_liste", 'plugins');
+	echo $afficher(self(), liste_plugin_files(_DIR_PLUGINS_DIST), array(), array(), _DIR_PLUGINS_DIST, 'afficher_nom_plugin');
 
 	plugin_installes_meta();
 
@@ -52,10 +52,10 @@ 
 	appliquer_adresse_site('');
 
 	// aller a la derniere etape qui clos l'install et redirige
-	$suite =  "\n<input type='hidden' name='etape' value='fin' />"
+	$suite = "\n<input type='hidden' name='etape' value='fin' />"
 	  . bouton_suivant(_T('login_espace_prive'));
 
-	echo generer_form_ecrire('install', $suite);	echo install_fin_html();
+	echo generer_form_ecrire('install', $suite); echo install_fin_html();
 }
 
 ?>

Braces +3 added lines, -1 removed lines

@@ -10,7 +10,9 @@
  *  Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne.   *
 \***************************************************************************/
 
-if (!defined('_ECRIRE_INC_VERSION')) return;
+if (!defined('_ECRIRE_INC_VERSION')) {
+    return;
+}
 
 include_spip('inc/headers');
 

ecrire/install/etape_ldap1.php

Indentation +77 added lines, -77 removed lines

@@ -15,83 +15,83 @@
 // http://doc.spip.org/@install_etape_ldap1_dist
 function install_etape_ldap1_dist()
 {
-	$adresse_ldap = defined('_INSTALL_HOST_LDAP')
-		? _INSTALL_HOST_LDAP
-	  : 'localhost';
-
-	$port_ldap = defined('_INSTALL_PORT_LDAP')
-		? _INSTALL_PORT_LDAP
-		: 389;
-
-	$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
-
-	$login_ldap = defined('_INSTALL_USER_LDAP')
-		? _INSTALL_USER_LDAP
-		: '';
-
-	$pass_ldap = defined('_INSTALL_PASS_LDAP')
-		? _INSTALL_PASS_LDAP
-		: '';
-
-	echo install_debut_html('AUTO', ' onload="document.getElementById(\'suivant\').focus();return false;"');
-
-	echo info_etape(_T('titre_connexion_ldap'),info_progression_etape(1,'etape_ldap','install/'), _T('entree_informations_connexion_ldap'));
-
-	echo generer_form_ecrire('install', (
-	 "\n<input type='hidden' name='etape' value='ldap2' />"
-
-	. fieldset(_T('entree_adresse_annuaire'),
-		array(
-			'adresse_ldap' => array(
-				'label' => _T('texte_adresse_annuaire_1'),
-				'valeur' => $adresse_ldap
-			),
-			'port_ldap' => array(
-				'label' => _T('entree_port_annuaire').'<br />'._T('texte_port_annuaire'),
-				'valeur' => $port_ldap
-			),
-			'tls_ldap' => array(
-				'label' => '<b>'._T('tls_ldap').'</b>',
-				'valeur' => $tls_ldap,
-				'alternatives' => array(
-					'non' => _T('item_non'),
-					'oui' => _T('item_oui')
-				)
-			),
-			'protocole_ldap' => array(
-				'label' => _T('protocole_ldap'),
-				'valeur' => $protocole_ldap,
-				'alternatives' => array(
-					'3' => '3',
-					'2' => '2'
-				)
-			)
-		)
-	)
-
-	. "\n<p>"._T('texte_acces_ldap_anonyme_1').'</p>'
-	. fieldset(_T('connexion_ldap'),
-		array(
-			'login_ldap' => array(
-				'label' => _T('texte_login_ldap_1'),
-				'valeur' => $login_ldap
-			),
-			'pass_ldap' => array(
-				'label' => _T('entree_passe_ldap'),
-				'valeur' => $pass_ldap
-			)
-		)
-	)
-
-	. bouton_suivant()));
-
-	echo install_fin_html();
+    $adresse_ldap = defined('_INSTALL_HOST_LDAP')
+        ? _INSTALL_HOST_LDAP
+      : 'localhost';
+
+    $port_ldap = defined('_INSTALL_PORT_LDAP')
+        ? _INSTALL_PORT_LDAP
+        : 389;
+
+    $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
+
+    $login_ldap = defined('_INSTALL_USER_LDAP')
+        ? _INSTALL_USER_LDAP
+        : '';
+
+    $pass_ldap = defined('_INSTALL_PASS_LDAP')
+        ? _INSTALL_PASS_LDAP
+        : '';
+
+    echo install_debut_html('AUTO', ' onload="document.getElementById(\'suivant\').focus();return false;"');
+
+    echo info_etape(_T('titre_connexion_ldap'),info_progression_etape(1,'etape_ldap','install/'), _T('entree_informations_connexion_ldap'));
+
+    echo generer_form_ecrire('install', (
+        "\n<input type='hidden' name='etape' value='ldap2' />"
+
+    . fieldset(_T('entree_adresse_annuaire'),
+        array(
+            'adresse_ldap' => array(
+                'label' => _T('texte_adresse_annuaire_1'),
+                'valeur' => $adresse_ldap
+            ),
+            'port_ldap' => array(
+                'label' => _T('entree_port_annuaire').'<br />'._T('texte_port_annuaire'),
+                'valeur' => $port_ldap
+            ),
+            'tls_ldap' => array(
+                'label' => '<b>'._T('tls_ldap').'</b>',
+                'valeur' => $tls_ldap,
+                'alternatives' => array(
+                    'non' => _T('item_non'),
+                    'oui' => _T('item_oui')
+                )
+            ),
+            'protocole_ldap' => array(
+                'label' => _T('protocole_ldap'),
+                'valeur' => $protocole_ldap,
+                'alternatives' => array(
+                    '3' => '3',
+                    '2' => '2'
+                )
+            )
+        )
+    )
+
+    . "\n<p>"._T('texte_acces_ldap_anonyme_1').'</p>'
+    . fieldset(_T('connexion_ldap'),
+        array(
+            'login_ldap' => array(
+                'label' => _T('texte_login_ldap_1'),
+                'valeur' => $login_ldap
+            ),
+            'pass_ldap' => array(
+                'label' => _T('entree_passe_ldap'),
+                'valeur' => $pass_ldap
+            )
+        )
+    )
+
+    . bouton_suivant()));
+
+    echo install_fin_html();
 }
 
 ?>

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
 
 	$protocole_ldap = defined('_INSTALL_PROTOCOLE_LDAP')
 		? _INSTALL_PROTOCOLE_LDAP
-		: 3 ; // on essaie 2 en cas d'echec
+		: 3; // on essaie 2 en cas d'echec
 
 	$login_ldap = defined('_INSTALL_USER_LDAP')
 		? _INSTALL_USER_LDAP
@@ -41,7 +41,7 @@ 
 
 	echo install_debut_html('AUTO', ' onload="document.getElementById(\'suivant\').focus();return false;"');
 
-	echo info_etape(_T('titre_connexion_ldap'),info_progression_etape(1,'etape_ldap','install/'), _T('entree_informations_connexion_ldap'));
+	echo info_etape(_T('titre_connexion_ldap'), info_progression_etape(1, 'etape_ldap', 'install/'), _T('entree_informations_connexion_ldap'));
 
 	echo generer_form_ecrire('install', (
 	 "\n<input type='hidden' name='etape' value='ldap2' />"

Braces +3 added lines, -1 removed lines

@@ -10,7 +10,9 @@
  *  Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne.   *
 \***************************************************************************/
 
-if (!defined('_ECRIRE_INC_VERSION')) return;
+if (!defined('_ECRIRE_INC_VERSION')) {
+    return;
+}
 
 // http://doc.spip.org/@install_etape_ldap1_dist
 function install_etape_ldap1_dist()

ecrire/install/etape_ldap4.php

Indentation +71 added lines, -71 removed lines

@@ -17,85 +17,85 @@
 // http://doc.spip.org/@install_etape_ldap4_dist
 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;
-
-	echo install_debut_html('AUTO', ' 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(array('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'),
-			array(
-				'statut_ldap' => array(
-					'label' => _T('info_statut_utilisateurs_2').'<br />',
-					'valeur' => $statut_ldap,
-					'alternatives' => $statuts
-					)
-				)
-			   )
-		. install_ldap_correspondances()
-		. bouton_suivant();
-
-		echo generer_form_ecrire('install', $res); 
-	}
-
-	echo install_fin_html();
+    $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;
+
+    echo install_debut_html('AUTO', ' 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(array('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'),
+            array(
+                'statut_ldap' => array(
+                    'label' => _T('info_statut_utilisateurs_2').'<br />',
+                    'valeur' => $statut_ldap,
+                    'alternatives' => $statuts
+                    )
+                )
+                )
+        . install_ldap_correspondances()
+        . bouton_suivant();
+
+        echo generer_form_ecrire('install', $res); 
+    }
+
+    echo install_fin_html();
 }
 
 // http://doc.spip.org/@liste_statuts_ldap
 function liste_statuts_ldap() {
-	$recom = array("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 />"));
+    $recom = array("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 = array();
-	foreach($GLOBALS['liste_des_statuts'] as $k => $v) {
-		if (isset($recom[$k])) $res[$v] = $recom[$k];
-	}
-	return $res;
+    $res = array();
+    foreach($GLOBALS['liste_des_statuts'] as $k => $v) {
+        if (isset($recom[$k])) $res[$v] = $recom[$k];
+    }
+    return $res;
 }
 
 function install_ldap_correspondances()
 {
-	$champs = array();
-	foreach (is_array($GLOBALS['ldap_attributes']) ? $GLOBALS['ldap_attributes'] : array() as $champ => $v ) {
-			$nom = 'ldap_' . $champ;
-			$val = is_array($v) ? join(',', $v) : strval($v);
-			$champs[$nom]= array(
-				'label' => _T('ldap_correspondance', array('champ' => "<tt>$champ</tt>")).'<br />',
-				'valeur' => $val
-						  );
-	}
-
-	return !$champs ? '' : fieldset(_T('ldap_correspondance_1'), $champs, '', _T('ldap_correspondance_2') . '<br /><br />');
+    $champs = array();
+    foreach (is_array($GLOBALS['ldap_attributes']) ? $GLOBALS['ldap_attributes'] : array() as $champ => $v ) {
+            $nom = 'ldap_' . $champ;
+            $val = is_array($v) ? join(',', $v) : strval($v);
+            $champs[$nom]= array(
+                'label' => _T('ldap_correspondance', array('champ' => "<tt>$champ</tt>")).'<br />',
+                'valeur' => $val
+                            );
+    }
+
+    return !$champs ? '' : fieldset(_T('ldap_correspondance_1'), $champs, '', _T('ldap_correspondance_2') . '<br /><br />');
 }
 ?>

Spacing +10 added lines, -10 removed lines

@@ -36,13 +36,13 @@ 
 
 	if ($fail) {
 		echo info_etape(_T('info_chemin_acces_annuaire')),
-			info_progression_etape(3,'etape_ldap','install/', true),
+			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/');
+		echo info_progression_etape(4, 'etape_ldap', 'install/');
 
 		$statuts = liste_statuts_ldap();
 		$statut_ldap = defined('_INSTALL_STATUT_LDAP')
@@ -50,9 +50,9 @@ 
 		  : $GLOBALS['liste_des_statuts']['info_redacteurs'];
 
 
-		$res = install_propager(array('adresse_ldap','port_ldap','login_ldap','pass_ldap','protocole_ldap','tls_ldap'))
+		$res = install_propager(array('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) . "' />"
+		. "<input type='hidden' name='base_ldap' value='".spip_htmlentities($base_ldap)."' />"
 		. fieldset(_T('info_statut_utilisateurs_1'),
 			array(
 				'statut_ldap' => array(
@@ -73,12 +73,12 @@ 
 
 // http://doc.spip.org/@liste_statuts_ldap
 function liste_statuts_ldap() {
-	$recom = array("info_administrateurs" => ("<b>" ._T('info_administrateur_1')."</b> "._T('info_administrateur_2')."<br />"),
+	$recom = array("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 = array();
-	foreach($GLOBALS['liste_des_statuts'] as $k => $v) {
+	foreach ($GLOBALS['liste_des_statuts'] as $k => $v) {
 		if (isset($recom[$k])) $res[$v] = $recom[$k];
 	}
 	return $res;
@@ -87,15 +87,15 @@ 
 function install_ldap_correspondances()
 {
 	$champs = array();
-	foreach (is_array($GLOBALS['ldap_attributes']) ? $GLOBALS['ldap_attributes'] : array() as $champ => $v ) {
-			$nom = 'ldap_' . $champ;
+	foreach (is_array($GLOBALS['ldap_attributes']) ? $GLOBALS['ldap_attributes'] : array() as $champ => $v) {
+			$nom = 'ldap_'.$champ;
 			$val = is_array($v) ? join(',', $v) : strval($v);
-			$champs[$nom]= array(
+			$champs[$nom] = array(
 				'label' => _T('ldap_correspondance', array('champ' => "<tt>$champ</tt>")).'<br />',
 				'valeur' => $val
 						  );
 	}
 
-	return !$champs ? '' : fieldset(_T('ldap_correspondance_1'), $champs, '', _T('ldap_correspondance_2') . '<br /><br />');
+	return !$champs ? '' : fieldset(_T('ldap_correspondance_1'), $champs, '', _T('ldap_correspondance_2').'<br /><br />');
 }
 ?>

Braces +10 added lines, -5 removed lines

@@ -10,7 +10,9 @@ 
  *  Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne.   *
 \***************************************************************************/
 
-if (!defined('_ECRIRE_INC_VERSION')) return;
+if (!defined('_ECRIRE_INC_VERSION')) {
+    return;
+}
 
 include_spip('auth/ldap');
 
@@ -23,7 +25,9 @@ 
 	$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;
+	if (!$base_ldap) {
+	    $base_ldap = $base_ldap_text;
+	}
 
 	echo install_debut_html('AUTO', ' onload="document.getElementById(\'suivant\').focus();return false;"');
 
@@ -39,8 +43,7 @@ 
 			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 {
+	} else {
 		info_etape(_T('info_reglage_ldap'));
 		echo info_progression_etape(4,'etape_ldap','install/');
 
@@ -79,7 +82,9 @@ 
 	
 	$res = array();
 	foreach($GLOBALS['liste_des_statuts'] as $k => $v) {
-		if (isset($recom[$k])) $res[$v] = $recom[$k];
+		if (isset($recom[$k])) {
+		    $res[$v] = $recom[$k];
+		}
 	}
 	return $res;
 }

ecrire/install/etape_ldap3.php

Indentation +55 added lines, -55 removed lines

@@ -16,69 +16,69 @@
 // http://doc.spip.org/@install_etape_ldap3_dist
 function install_etape_ldap3_dist()
 {
-	$adresse_ldap = _request('adresse_ldap');
-	$login_ldap = _request('login_ldap');
-	$pass_ldap = _request('pass_ldap');
-	$port_ldap = _request('port_ldap');
+    $adresse_ldap = _request('adresse_ldap');
+    $login_ldap = _request('login_ldap');
+    $pass_ldap = _request('pass_ldap');
+    $port_ldap = _request('port_ldap');
 
-	$base_ldap_text = defined('_INSTALL_BASE_LDAP')
-		? _INSTALL_BASE_LDAP
-		: "ou=users, dc=mon-domaine, dc=com";
+    $base_ldap_text = defined('_INSTALL_BASE_LDAP')
+        ? _INSTALL_BASE_LDAP
+        : "ou=users, dc=mon-domaine, dc=com";
 
-	echo install_debut_html('AUTO', ' onload="document.getElementById(\'suivant\').focus();return false;"');
+    echo install_debut_html('AUTO', ' onload="document.getElementById(\'suivant\').focus();return false;"');
 
-	echo info_etape(_T('info_chemin_acces_1'),info_progression_etape(3,'etape_ldap','install/')),_T('info_chemin_acces_2');
+    echo info_etape(_T('info_chemin_acces_1'),info_progression_etape(3,'etape_ldap','install/')),_T('info_chemin_acces_2');
 
-	$ldap_link = @ldap_connect("$adresse_ldap", "$port_ldap");
-	if ($ldap_link) {
-		@ldap_bind($ldap_link, "$login_ldap", "$pass_ldap");
-		$result = @ldap_read($ldap_link, "", "objectclass=*", array("namingContexts"));
-		$info = @ldap_get_entries($ldap_link, $result);
-		@ldap_close($ldap_link);
-	}
+    $ldap_link = @ldap_connect("$adresse_ldap", "$port_ldap");
+    if ($ldap_link) {
+        @ldap_bind($ldap_link, "$login_ldap", "$pass_ldap");
+        $result = @ldap_read($ldap_link, "", "objectclass=*", array("namingContexts"));
+        $info = @ldap_get_entries($ldap_link, $result);
+        @ldap_close($ldap_link);
+    }
 	
-	$checked = false;
-	$res = '';
-	if (is_array($info) AND $info["count"] > 0) {
-		$res .= "<p>"._T('info_selection_chemin_acces')."</p>";
-		$res .= "<ul>";
-		$n = 0;
-		for ($i = 0; $i < $info["count"]; $i++) {
-			$names = $info[$i]["namingcontexts"];
-			if (is_array($names)) {
-				for ($j = 0; $j < $names["count"]; $j++) {
-					$n++;
-					$res .= "<li><input name=\"base_ldap\" value=\"".spip_htmlspecialchars($names[$j])."\" type='radio' id='tab$n'";
-					if (!$checked) {
-						$res .= " checked=\"checked\"";
-						$checked = true;
-					}
-					$res .= " />";
-					$res .= "<label for='tab$n'>".spip_htmlspecialchars($names[$j])."</label></li>\n";
-				}
-			}
-		}
-		$res .= "</ul>";
-		$res .= _T('info_ou')." ";
-	}
-	$res .= "<br />\n<input name=\"base_ldap\" value=\"\" type='radio' id='manuel'";
-	if (!$checked) {
-		$res .= " checked=\"checked\"";
-		$checked = true;
-	}
+    $checked = false;
+    $res = '';
+    if (is_array($info) AND $info["count"] > 0) {
+        $res .= "<p>"._T('info_selection_chemin_acces')."</p>";
+        $res .= "<ul>";
+        $n = 0;
+        for ($i = 0; $i < $info["count"]; $i++) {
+            $names = $info[$i]["namingcontexts"];
+            if (is_array($names)) {
+                for ($j = 0; $j < $names["count"]; $j++) {
+                    $n++;
+                    $res .= "<li><input name=\"base_ldap\" value=\"".spip_htmlspecialchars($names[$j])."\" type='radio' id='tab$n'";
+                    if (!$checked) {
+                        $res .= " checked=\"checked\"";
+                        $checked = true;
+                    }
+                    $res .= " />";
+                    $res .= "<label for='tab$n'>".spip_htmlspecialchars($names[$j])."</label></li>\n";
+                }
+            }
+        }
+        $res .= "</ul>";
+        $res .= _T('info_ou')." ";
+    }
+    $res .= "<br />\n<input name=\"base_ldap\" value=\"\" type='radio' id='manuel'";
+    if (!$checked) {
+        $res .= " checked=\"checked\"";
+        $checked = true;
+    }
 
-	$res .= " />"
-	. "\n<label for='manuel'>"._T('entree_chemin_acces')."</label> "
-	. "\n<fieldset>"
-	. "<input type='text' name='base_ldap_text' class='text' value=\"$base_ldap_text\" size='40' />"
-	. "\n</fieldset>"
-	. "\n<input type='hidden' name='etape' value='ldap4' />"
-	. install_propager(array('adresse_ldap','port_ldap','login_ldap','pass_ldap','protocole_ldap','tls_ldap'))
-	. bouton_suivant();
+    $res .= " />"
+    . "\n<label for='manuel'>"._T('entree_chemin_acces')."</label> "
+    . "\n<fieldset>"
+    . "<input type='text' name='base_ldap_text' class='text' value=\"$base_ldap_text\" size='40' />"
+    . "\n</fieldset>"
+    . "\n<input type='hidden' name='etape' value='ldap4' />"
+    . install_propager(array('adresse_ldap','port_ldap','login_ldap','pass_ldap','protocole_ldap','tls_ldap'))
+    . bouton_suivant();
 
-	echo generer_form_ecrire('install', $res);
+    echo generer_form_ecrire('install', $res);
 
-	echo install_fin_html();
+    echo install_fin_html();
 }
 
 

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
 
 	echo install_debut_html('AUTO', ' onload="document.getElementById(\'suivant\').focus();return false;"');
 
-	echo info_etape(_T('info_chemin_acces_1'),info_progression_etape(3,'etape_ldap','install/')),_T('info_chemin_acces_2');
+	echo info_etape(_T('info_chemin_acces_1'), info_progression_etape(3, 'etape_ldap', 'install/')), _T('info_chemin_acces_2');
 
 	$ldap_link = @ldap_connect("$adresse_ldap", "$port_ldap");
 	if ($ldap_link) {
@@ -73,7 +73,7 @@ 
 	. "<input type='text' name='base_ldap_text' class='text' value=\"$base_ldap_text\" size='40' />"
 	. "\n</fieldset>"
 	. "\n<input type='hidden' name='etape' value='ldap4' />"
-	. install_propager(array('adresse_ldap','port_ldap','login_ldap','pass_ldap','protocole_ldap','tls_ldap'))
+	. install_propager(array('adresse_ldap', 'port_ldap', 'login_ldap', 'pass_ldap', 'protocole_ldap', 'tls_ldap'))
 	. bouton_suivant();
 
 	echo generer_form_ecrire('install', $res);

Braces +3 added lines, -1 removed lines

@@ -11,7 +11,9 @@
 \***************************************************************************/
 
 
-if (!defined('_ECRIRE_INC_VERSION')) return;
+if (!defined('_ECRIRE_INC_VERSION')) {
+    return;
+}
 
 // http://doc.spip.org/@install_etape_ldap3_dist
 function install_etape_ldap3_dist()