X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=www%2Fecrire%2Finstall%2Fetape_ldap3.php;fp=www%2Fecrire%2Finstall%2Fetape_ldap3.php;h=e6623679432b952b0aeb57d4537393a68d47e251;hb=4f443dce95ff6f8221c189880a70c74ce1c1f238;hp=768f0076fc50cbcb58ac6951da102088f65e9dd2;hpb=4a628e9b277d3617535f99d663ca79fa2e891177;p=lhc%2Fweb%2Fwww.git

diff --git a/www/ecrire/install/etape_ldap3.php b/www/ecrire/install/etape_ldap3.php
index 768f0076..e6623679 100644
--- a/www/ecrire/install/etape_ldap3.php
+++ b/www/ecrire/install/etape_ldap3.php
@@ -3,7 +3,7 @@
 /***************************************************************************\
  *  SPIP, Systeme de publication pour l'internet                           *
  *                                                                         *
- *  Copyright (c) 2001-2016                                                *
+ *  Copyright (c) 2001-2017                                                *
  *  Arnaud Martin, Antoine Pitrou, Philippe Riviere, Emmanuel Saint-James  *
  *                                                                         *
  *  Ce programme est un logiciel libre distribue sous licence GNU/GPL.     *
@@ -11,11 +11,12 @@
 \***************************************************************************/
 
 
-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()
-{
+// http://code.spip.net/@install_etape_ldap3_dist
+function install_etape_ldap3_dist() {
 	$adresse_ldap = _request('adresse_ldap');
 	$login_ldap = _request('login_ldap');
 	$pass_ldap = _request('pass_ldap');
@@ -23,63 +24,64 @@ function install_etape_ldap3_dist()
 
 	$base_ldap_text = defined('_INSTALL_BASE_LDAP')
 		? _INSTALL_BASE_LDAP
-		: "ou=users, dc=mon-domaine, dc=com";
+		: 'ou=users, dc=mon-domaine, dc=com';
 
 	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"));
+		$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>";
+	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"];
+		for ($i = 0; $i < $info['count']; $i++) {
+			$names = $info[$i]['namingcontexts'];
 			if (is_array($names)) {
-				for ($j = 0; $j < $names["count"]; $j++) {
+				for ($j = 0; $j < $names['count']; $j++) {
 					$n++;
-					$res .= "<li><input name=\"base_ldap\" value=\"".spip_htmlspecialchars($names[$j])."\" type='radio' id='tab$n'";
+					$res .= '<li><input name="base_ldap" value="' . spip_htmlspecialchars($names[$j]) . "\" type='radio' id='tab$n'";
 					if (!$checked) {
-						$res .= " checked=\"checked\"";
+						$res .= ' checked="checked"';
 						$checked = true;
 					}
-					$res .= " />";
-					$res .= "<label for='tab$n'>".spip_htmlspecialchars($names[$j])."</label></li>\n";
+					$res .= ' />';
+					$res .= "<label for='tab$n'>" . spip_htmlspecialchars($names[$j]) . "</label></li>\n";
 				}
 			}
 		}
-		$res .= "</ul>";
-		$res .= _T('info_ou')." ";
+		$res .= '</ul>';
+		$res .= _T('info_ou') . ' ';
 	}
 	$res .= "<br />\n<input name=\"base_ldap\" value=\"\" type='radio' id='manuel'";
 	if (!$checked) {
-		$res .= " checked=\"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 install_fin_html();
 }
-
-
-?>