spip / SPIP

ecrire/balise/logo_.php

Indentation +115 added lines, -115 removed lines

@@ -17,7 +17,7 @@ 
  **/
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 
@@ -54,84 +54,84 @@ 
  */
 function balise_LOGO__dist($p) {
 
-	preg_match(',^LOGO_([A-Z_]+?)(|_NORMAL|_SURVOL|_RUBRIQUE)$,i', $p->nom_champ, $regs);
-	$type = strtolower($regs[1]);
-	$suite_logo = $regs[2];
-
-	// cas de #LOGO_SITE_SPIP
-	if ($type == 'site_spip') {
-		$type = 'site';
-		$_id_objet = "\"'0'\"";
-	}
-
-	$id_objet = id_table_objet($type);
-	if (!isset($_id_objet)) {
-		$_id_objet = champ_sql($id_objet, $p);
-	}
-
-	$fichier = ($p->etoile === '**') ? -1 : 0;
-	$coord = array();
-	$align = $lien = '';
-	$mode_logo = '';
-
-	if ($p->param and !$p->param[0][0]) {
-		$params = $p->param[0];
-		array_shift($params);
-		foreach ($params as $a) {
-			if ($a[0]->type === 'texte') {
-				$n = $a[0]->texte;
-				if (is_numeric($n)) {
-					$coord[] = $n;
-				} elseif (in_array($n, array('top', 'left', 'right', 'center', 'bottom'))) {
-					$align = $n;
-				} elseif (in_array($n, array('auto', 'icone', 'apercu', 'vignette'))) {
-					$mode_logo = $n;
-				}
-			} else {
-				$lien = calculer_liste($a, $p->descr, $p->boucles, $p->id_boucle);
-			}
-		}
-	}
-
-	$coord_x = !$coord ? 0 : intval(array_shift($coord));
-	$coord_y = !$coord ? 0 : intval(array_shift($coord));
-
-	if ($p->etoile === '*') {
-		include_spip('balise/url_');
-		$lien = generer_generer_url_arg($type, $p, $_id_objet);
-	}
-
-	$connect = $p->id_boucle ? $p->boucles[$p->id_boucle]->sql_serveur : '';
-	if ($type == 'document') {
-		$qconnect = _q($connect);
-		$doc = "quete_document($_id_objet, $qconnect)";
-		if ($fichier) {
-			$code = "quete_logo_file($doc, $qconnect)";
-		} else {
-			$code = "quete_logo_document($doc, " . ($lien ? $lien : "''") . ", '$align', '$mode_logo', $coord_x, $coord_y, $qconnect)";
-		}
-		// (x=non-faux ? y : '') pour affecter x en retournant y
-		if ($p->descr['documents']) {
-			$code = '(($doublons["documents"] .= ",". '
-				. $_id_objet
-				. ") ? $code : '')";
-		}
-	} elseif ($connect) {
-		$code = "''";
-		spip_log('Les logos distants ne sont pas prevus');
-	} else {
-		$code = logo_survol($id_objet, $_id_objet, $type, $align, $fichier, $lien, $p, $suite_logo);
-	}
-
-	// demande de reduction sur logo avec ecriture spip 2.1 : #LOGO_xxx{200, 0}
-	if ($coord_x or $coord_y) {
-		$code = "filtrer('image_graver',filtrer('image_reduire'," . $code . ", '$coord_x', '$coord_y'))";
-	}
-
-	$p->code = $code;
-	$p->interdire_scripts = false;
-
-	return $p;
+    preg_match(',^LOGO_([A-Z_]+?)(|_NORMAL|_SURVOL|_RUBRIQUE)$,i', $p->nom_champ, $regs);
+    $type = strtolower($regs[1]);
+    $suite_logo = $regs[2];
+
+    // cas de #LOGO_SITE_SPIP
+    if ($type == 'site_spip') {
+        $type = 'site';
+        $_id_objet = "\"'0'\"";
+    }
+
+    $id_objet = id_table_objet($type);
+    if (!isset($_id_objet)) {
+        $_id_objet = champ_sql($id_objet, $p);
+    }
+
+    $fichier = ($p->etoile === '**') ? -1 : 0;
+    $coord = array();
+    $align = $lien = '';
+    $mode_logo = '';
+
+    if ($p->param and !$p->param[0][0]) {
+        $params = $p->param[0];
+        array_shift($params);
+        foreach ($params as $a) {
+            if ($a[0]->type === 'texte') {
+                $n = $a[0]->texte;
+                if (is_numeric($n)) {
+                    $coord[] = $n;
+                } elseif (in_array($n, array('top', 'left', 'right', 'center', 'bottom'))) {
+                    $align = $n;
+                } elseif (in_array($n, array('auto', 'icone', 'apercu', 'vignette'))) {
+                    $mode_logo = $n;
+                }
+            } else {
+                $lien = calculer_liste($a, $p->descr, $p->boucles, $p->id_boucle);
+            }
+        }
+    }
+
+    $coord_x = !$coord ? 0 : intval(array_shift($coord));
+    $coord_y = !$coord ? 0 : intval(array_shift($coord));
+
+    if ($p->etoile === '*') {
+        include_spip('balise/url_');
+        $lien = generer_generer_url_arg($type, $p, $_id_objet);
+    }
+
+    $connect = $p->id_boucle ? $p->boucles[$p->id_boucle]->sql_serveur : '';
+    if ($type == 'document') {
+        $qconnect = _q($connect);
+        $doc = "quete_document($_id_objet, $qconnect)";
+        if ($fichier) {
+            $code = "quete_logo_file($doc, $qconnect)";
+        } else {
+            $code = "quete_logo_document($doc, " . ($lien ? $lien : "''") . ", '$align', '$mode_logo', $coord_x, $coord_y, $qconnect)";
+        }
+        // (x=non-faux ? y : '') pour affecter x en retournant y
+        if ($p->descr['documents']) {
+            $code = '(($doublons["documents"] .= ",". '
+                . $_id_objet
+                . ") ? $code : '')";
+        }
+    } elseif ($connect) {
+        $code = "''";
+        spip_log('Les logos distants ne sont pas prevus');
+    } else {
+        $code = logo_survol($id_objet, $_id_objet, $type, $align, $fichier, $lien, $p, $suite_logo);
+    }
+
+    // demande de reduction sur logo avec ecriture spip 2.1 : #LOGO_xxx{200, 0}
+    if ($coord_x or $coord_y) {
+        $code = "filtrer('image_graver',filtrer('image_reduire'," . $code . ", '$coord_x', '$coord_y'))";
+    }
+
+    $p->code = $code;
+    $p->interdire_scripts = false;
+
+    return $p;
 }
 
 /**
@@ -158,41 +158,41 @@ 
  *     Code compilé retournant le chemin du logo ou le code HTML du logo.
  **/
 function logo_survol($id_objet, $_id_objet, $type, $align, $fichier, $lien, $p, $suite) {
-	$code = "quete_logo('$id_objet', '" .
-		(($suite == '_SURVOL') ? 'off' :
-			(($suite == '_NORMAL') ? 'on' : 'ON')) .
-		"', $_id_objet," .
-		(($suite == '_RUBRIQUE') ?
-			champ_sql('id_rubrique', $p) :
-			(($type == 'rubrique') ? "quete_parent($_id_objet)" : "''")) .
-		', ' . intval($fichier) . ')';
-
-	if ($fichier) {
-		return $code;
-	}
-
-	// class spip_logos a supprimer ulterieurement (transition douce vers spip_logo)
-	// cf http://core.spip.net/issues/2483
-	$class = 'spip_logo ';
-	if ($align) {
-		$class .= "spip_logo_$align ";
-	}
-	$class .= 'spip_logos';
-	$style = '';
-	if (in_array($align, array('left', 'right'))) {
-		$style = "float:$align";
-		$align = '';
-	}
-	$code = "\n((!is_array(\$l = $code)) ? '':\n (" .
-		'"<img class=\"' . $class . '\" alt=\"\"' .
-		($style ? " style=\\\"$style\\\"" : '') .
-		($align ? " align=\\\"$align\\\"" : '') .
-		' src=\"$l[0]\"" . $l[2] .  ($l[1] ? " onmouseover=\"this.src=\'$l[1]\'\" onmouseout=\"this.src=\'$l[0]\'\"" : "") . \' />\'))';
-
-	if (!$lien) {
-		return $code;
-	}
-
-	return ('(strlen($logo=' . $code . ')?\'<a href="\' .' . $lien . ' . \'">\' . $logo . \'</a>\':\'\')');
+    $code = "quete_logo('$id_objet', '" .
+        (($suite == '_SURVOL') ? 'off' :
+            (($suite == '_NORMAL') ? 'on' : 'ON')) .
+        "', $_id_objet," .
+        (($suite == '_RUBRIQUE') ?
+            champ_sql('id_rubrique', $p) :
+            (($type == 'rubrique') ? "quete_parent($_id_objet)" : "''")) .
+        ', ' . intval($fichier) . ')';
+
+    if ($fichier) {
+        return $code;
+    }
+
+    // class spip_logos a supprimer ulterieurement (transition douce vers spip_logo)
+    // cf http://core.spip.net/issues/2483
+    $class = 'spip_logo ';
+    if ($align) {
+        $class .= "spip_logo_$align ";
+    }
+    $class .= 'spip_logos';
+    $style = '';
+    if (in_array($align, array('left', 'right'))) {
+        $style = "float:$align";
+        $align = '';
+    }
+    $code = "\n((!is_array(\$l = $code)) ? '':\n (" .
+        '"<img class=\"' . $class . '\" alt=\"\"' .
+        ($style ? " style=\\\"$style\\\"" : '') .
+        ($align ? " align=\\\"$align\\\"" : '') .
+        ' src=\"$l[0]\"" . $l[2] .  ($l[1] ? " onmouseover=\"this.src=\'$l[1]\'\" onmouseout=\"this.src=\'$l[0]\'\"" : "") . \' />\'))';
+
+    if (!$lien) {
+        return $code;
+    }
+
+    return ('(strlen($logo=' . $code . ')?\'<a href="\' .' . $lien . ' . \'">\' . $logo . \'</a>\':\'\')');
 
 }

ecrire/balise/url_.php

Indentation +155 added lines, -155 removed lines

@@ -19,7 +19,7 @@ 
  **/
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 /**
@@ -37,14 +37,14 @@ 
  *     Code compilé
  **/
 function generer_generer_url($type, $p) {
-	$_id = interprete_argument_balise(1, $p);
+    $_id = interprete_argument_balise(1, $p);
 
-	if (!$_id) {
-		$primary = id_table_objet($type);
-		$_id = champ_sql($primary, $p);
-	}
+    if (!$_id) {
+        $primary = id_table_objet($type);
+        $_id = champ_sql($primary, $p);
+    }
 
-	return generer_generer_url_arg($type, $p, $_id);
+    return generer_generer_url_arg($type, $p, $_id);
 }
 
 /**
@@ -73,29 +73,29 @@ 
  *     Code compilé
  **/
 function generer_generer_url_arg($type, $p, $_id) {
-	if ($s = trouver_nom_serveur_distant($p)) {
-
-		// si une fonction de generation des url a ete definie pour ce connect l'utiliser
-		if (function_exists($f = 'generer_generer_url_' . $s)) {
-			return $f($type, $_id, $s);
-		}
-		if (!$GLOBALS['connexions'][strtolower($s)]['spip_connect_version']) {
-			return null;
-		}
-		$s = _q($s);
-		# exception des urls de documents sur un serveur distant...
-		if ($type == 'document') {
-			return
-				"quete_meta('adresse_site', $s) . '/' .\n\t" .
-				"quete_meta('dir_img', $s) . \n\t" .
-				"quete_fichier($_id,$s)";
-		}
-		$s = ", '', '', $s, quete_meta('type_urls', $s)";
-	} else {
-		$s = ", '', '', true";
-	}
-
-	return "urlencode_1738(generer_url_entite($_id, '$type'$s))";
+    if ($s = trouver_nom_serveur_distant($p)) {
+
+        // si une fonction de generation des url a ete definie pour ce connect l'utiliser
+        if (function_exists($f = 'generer_generer_url_' . $s)) {
+            return $f($type, $_id, $s);
+        }
+        if (!$GLOBALS['connexions'][strtolower($s)]['spip_connect_version']) {
+            return null;
+        }
+        $s = _q($s);
+        # exception des urls de documents sur un serveur distant...
+        if ($type == 'document') {
+            return
+                "quete_meta('adresse_site', $s) . '/' .\n\t" .
+                "quete_meta('dir_img', $s) . \n\t" .
+                "quete_fichier($_id,$s)";
+        }
+        $s = ", '', '', $s, quete_meta('type_urls', $s)";
+    } else {
+        $s = ", '', '', true";
+    }
+
+    return "urlencode_1738(generer_url_entite($_id, '$type'$s))";
 }
 
 
@@ -120,27 +120,27 @@ 
  */
 function balise_URL__dist($p) {
 
-	$nom = $p->nom_champ;
-	if ($nom === 'URL_') {
-		$msg = array('zbug_balise_sans_argument', array('balise' => ' URL_'));
-		erreur_squelette($msg, $p);
-		$p->interdire_scripts = false;
-
-		return $p;
-	} elseif ($f = charger_fonction($nom, 'balise', true)) {
-		return $f($p);
-	} else {
-		$nom = strtolower($nom);
-		$code = generer_generer_url(substr($nom, 4), $p);
-		$code = champ_sql($nom, $p, $code);
-		$p->code = $code;
-		if (!$p->etoile) {
-			$p->code = "vider_url($code)";
-		}
-		$p->interdire_scripts = false;
-
-		return $p;
-	}
+    $nom = $p->nom_champ;
+    if ($nom === 'URL_') {
+        $msg = array('zbug_balise_sans_argument', array('balise' => ' URL_'));
+        erreur_squelette($msg, $p);
+        $p->interdire_scripts = false;
+
+        return $p;
+    } elseif ($f = charger_fonction($nom, 'balise', true)) {
+        return $f($p);
+    } else {
+        $nom = strtolower($nom);
+        $code = generer_generer_url(substr($nom, 4), $p);
+        $code = champ_sql($nom, $p, $code);
+        $p->code = $code;
+        if (!$p->etoile) {
+            $p->code = "vider_url($code)";
+        }
+        $p->interdire_scripts = false;
+
+        return $p;
+    }
 }
 
 /**
@@ -164,20 +164,20 @@ 
  */
 function balise_URL_ARTICLE_dist($p) {
 
-	// Cas particulier des boucles (SYNDIC_ARTICLES)
-	if ($p->type_requete == 'syndic_articles') {
-		$code = champ_sql('url', $p);
-	} else {
-		$code = generer_generer_url('article', $p);
-	}
+    // Cas particulier des boucles (SYNDIC_ARTICLES)
+    if ($p->type_requete == 'syndic_articles') {
+        $code = champ_sql('url', $p);
+    } else {
+        $code = generer_generer_url('article', $p);
+    }
 
-	$p->code = $code;
-	if (!$p->etoile) {
-		$p->code = "vider_url($code)";
-	}
-	$p->interdire_scripts = false;
+    $p->code = $code;
+    if (!$p->etoile) {
+        $p->code = "vider_url($code)";
+    }
+    $p->interdire_scripts = false;
 
-	return $p;
+    return $p;
 }
 
 /**
@@ -197,21 +197,21 @@ 
  *     Pile complétée par le code à générer
  */
 function balise_URL_SITE_dist($p) {
-	$code = champ_sql('url_site', $p);
-	if (strpos($code, '@$Pile[0]') !== false) {
-		$code = generer_generer_url('site', $p);
-		if ($code === null) {
-			return null;
-		}
-	} else {
-		if (!$p->etoile) {
-			$code = "calculer_url($code,'','url', \$connect)";
-		}
-	}
-	$p->code = $code;
-	$p->interdire_scripts = false;
-
-	return $p;
+    $code = champ_sql('url_site', $p);
+    if (strpos($code, '@$Pile[0]') !== false) {
+        $code = generer_generer_url('site', $p);
+        if ($code === null) {
+            return null;
+        }
+    } else {
+        if (!$p->etoile) {
+            $code = "calculer_url($code,'','url', \$connect)";
+        }
+    }
+    $p->code = $code;
+    $p->interdire_scripts = false;
+
+    return $p;
 }
 
 // Autres balises URL_*, qui ne concernent pas une table
@@ -230,11 +230,11 @@ 
  *     Pile complétée par le code à générer
  */
 function balise_URL_SITE_SPIP_dist($p) {
-	$p->code = "sinon(\$GLOBALS['meta']['adresse_site'],'.')";
-	$p->code = "spip_htmlspecialchars(" . $p->code . ")";
-	$p->interdire_scripts = false;
+    $p->code = "sinon(\$GLOBALS['meta']['adresse_site'],'.')";
+    $p->code = "spip_htmlspecialchars(" . $p->code . ")";
+    $p->interdire_scripts = false;
 
-	return $p;
+    return $p;
 }
 
 
@@ -263,42 +263,42 @@ 
  */
 function balise_URL_PAGE_dist($p) {
 
-	$code = interprete_argument_balise(1, $p);
-	$args = interprete_argument_balise(2, $p);
-	if ($args == null) {
-		$args = "''";
-	}
-
-	if ($s = trouver_nom_serveur_distant($p)) {
-		// si une fonction de generation des url a ete definie pour ce connect l'utiliser
-		// elle devra aussi traiter le cas derogatoire type=page
-		if (function_exists($f = 'generer_generer_url_' . $s)) {
-			if ($args and $args !== "''") {
-				$code .= ", $args";
-			}
-			$code = $f('page', $code, $s);
-
-			return $p;
-		}
-		$s = 'connect=' . addslashes($s);
-		$args = (($args and $args !== "''") ? "$args . '&$s'" : "'$s'");
-	}
-
-	if (!$code) {
-		$noentities = $p->etoile ? "'&'" : '';
-		$code = "url_de_base() . preg_replace(',^./,', '', self($noentities))";
-	} else {
-		if (!$args) {
-			$args = "''";
-		}
-		$noentities = $p->etoile ? ", true" : '';
-		$code = "generer_url_public($code, $args$noentities)";
-	}
-	$p->code = $code;
-	spip_log("Calcul url page : connect vaut $s ca donne :" . $p->code . " args $args", _LOG_INFO);
-
-	#$p->interdire_scripts = true;
-	return $p;
+    $code = interprete_argument_balise(1, $p);
+    $args = interprete_argument_balise(2, $p);
+    if ($args == null) {
+        $args = "''";
+    }
+
+    if ($s = trouver_nom_serveur_distant($p)) {
+        // si une fonction de generation des url a ete definie pour ce connect l'utiliser
+        // elle devra aussi traiter le cas derogatoire type=page
+        if (function_exists($f = 'generer_generer_url_' . $s)) {
+            if ($args and $args !== "''") {
+                $code .= ", $args";
+            }
+            $code = $f('page', $code, $s);
+
+            return $p;
+        }
+        $s = 'connect=' . addslashes($s);
+        $args = (($args and $args !== "''") ? "$args . '&$s'" : "'$s'");
+    }
+
+    if (!$code) {
+        $noentities = $p->etoile ? "'&'" : '';
+        $code = "url_de_base() . preg_replace(',^./,', '', self($noentities))";
+    } else {
+        if (!$args) {
+            $args = "''";
+        }
+        $noentities = $p->etoile ? ", true" : '';
+        $code = "generer_url_public($code, $args$noentities)";
+    }
+    $p->code = $code;
+    spip_log("Calcul url page : connect vaut $s ca donne :" . $p->code . " args $args", _LOG_INFO);
+
+    #$p->interdire_scripts = true;
+    return $p;
 }
 
 
@@ -325,24 +325,24 @@ 
  */
 function balise_URL_ECRIRE_dist($p) {
 
-	$code = interprete_argument_balise(1, $p);
-	if (!$code) {
-		$fonc = "''";
-	} else {
-		$fonc = $code;
-		$args = interprete_argument_balise(2, $p);
-		if ($args === null) {
-			$args = "''";
-		}
-		$noentities = $p->etoile ? ", true" : '';
-		if (($args != "''") or $noentities) {
-			$fonc .= ",$args$noentities";
-		}
-	}
-	$p->code = 'generer_url_ecrire(' . $fonc . ')';
-	$p->interdire_scripts = false;
-
-	return $p;
+    $code = interprete_argument_balise(1, $p);
+    if (!$code) {
+        $fonc = "''";
+    } else {
+        $fonc = $code;
+        $args = interprete_argument_balise(2, $p);
+        if ($args === null) {
+            $args = "''";
+        }
+        $noentities = $p->etoile ? ", true" : '';
+        if (($args != "''") or $noentities) {
+            $fonc .= ",$args$noentities";
+        }
+    }
+    $p->code = 'generer_url_ecrire(' . $fonc . ')';
+    $p->interdire_scripts = false;
+
+    return $p;
 }
 
 
@@ -368,23 +368,23 @@ 
  *     Pile complétée par le code à générer
  */
 function balise_URL_ACTION_AUTEUR_dist($p) {
-	$p->descr['session'] = true;
-
-	$p->code = interprete_argument_balise(1, $p);
-	$args = interprete_argument_balise(2, $p);
-	if ($args != "''" && $args !== null) {
-		$p->code .= "," . $args;
-	}
-	$redirect = interprete_argument_balise(3, $p);
-	if ($redirect != "''" && $redirect !== null) {
-		if ($args == "''" || $args === null) {
-			$p->code .= ",''";
-		}
-		$p->code .= "," . $redirect;
-	}
-
-	$p->code = "generer_action_auteur(" . $p->code . ")";
-	$p->interdire_scripts = false;
-
-	return $p;
+    $p->descr['session'] = true;
+
+    $p->code = interprete_argument_balise(1, $p);
+    $args = interprete_argument_balise(2, $p);
+    if ($args != "''" && $args !== null) {
+        $p->code .= "," . $args;
+    }
+    $redirect = interprete_argument_balise(3, $p);
+    if ($redirect != "''" && $redirect !== null) {
+        if ($args == "''" || $args === null) {
+            $p->code .= ",''";
+        }
+        $p->code .= "," . $redirect;
+    }
+
+    $p->code = "generer_action_auteur(" . $p->code . ")";
+    $p->interdire_scripts = false;
+
+    return $p;
 }

ecrire/balise/menu_lang.php

Indentation +8 added lines, -8 removed lines

@@ -17,7 +17,7 @@ 
  **/
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 /**
@@ -37,7 +37,7 @@ 
  *     Pile complétée du code compilé
  **/
 function balise_MENU_LANG($p) {
-	return calculer_balise_dynamique($p, 'MENU_LANG', array('lang'));
+    return calculer_balise_dynamique($p, 'MENU_LANG', array('lang'));
 }
 
 /**
@@ -55,11 +55,11 @@ 
  *   Liste (lang) des arguments collectés et fournis.
  */
 function balise_MENU_LANG_stat($args, $context_compil) {
-	if (strpos($GLOBALS['meta']['langues_multilingue'], ',') === false) {
-		return '';
-	}
+    if (strpos($GLOBALS['meta']['langues_multilingue'], ',') === false) {
+        return '';
+    }
 
-	return $args;
+    return $args;
 }
 
 /**
@@ -75,7 +75,7 @@ 
  *     Liste : Chemin du squelette, durée du cache, contexte
  **/
 function balise_MENU_LANG_dyn($opt) {
-	include_spip('balise/menu_lang_ecrire');
+    include_spip('balise/menu_lang_ecrire');
 
-	return menu_lang_pour_tous('var_lang', $opt);
+    return menu_lang_pour_tous('var_lang', $opt);
 }

ecrire/balise/formulaire_admin.php

Indentation +140 added lines, -140 removed lines

@@ -17,7 +17,7 @@ 
  **/
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 /**
@@ -42,7 +42,7 @@ 
  *     Pile complétée du code compilé
  **/
 function balise_FORMULAIRE_ADMIN($p) {
-	return calculer_balise_dynamique($p, 'FORMULAIRE_ADMIN', array());
+    return calculer_balise_dynamique($p, 'FORMULAIRE_ADMIN', array());
 }
 
 /**
@@ -59,7 +59,7 @@ 
  *   - chaîne vide sinon.
  */
 function balise_FORMULAIRE_ADMIN_stat($args, $context_compil) {
-	return $args;
+    return $args;
 }
 
 
@@ -84,66 +84,66 @@ 
  **/
 function balise_FORMULAIRE_ADMIN_dyn($float = '', $debug = '') {
 
-	static $dejafait = false;
+    static $dejafait = false;
 
-	if (!@$_COOKIE['spip_admin']) {
-		return '';
-	}
+    if (!@$_COOKIE['spip_admin']) {
+        return '';
+    }
 
-	if (!is_array($debug)) {
-		if ($dejafait) {
-			return '';
-		}
-	} else {
-		if ($dejafait) {
-			if (empty($debug['sourcefile'])) {
-				return '';
-			}
-			foreach ($debug['sourcefile'] as $k => $v) {
-				if (strpos($v, 'administration.') !== false) {
-					if (isset($debug['resultat'][$k . 'tout'])) {
-						return $debug['resultat'][$k . 'tout'];
-					}
-				}
-			}
+    if (!is_array($debug)) {
+        if ($dejafait) {
+            return '';
+        }
+    } else {
+        if ($dejafait) {
+            if (empty($debug['sourcefile'])) {
+                return '';
+            }
+            foreach ($debug['sourcefile'] as $k => $v) {
+                if (strpos($v, 'administration.') !== false) {
+                    if (isset($debug['resultat'][$k . 'tout'])) {
+                        return $debug['resultat'][$k . 'tout'];
+                    }
+                }
+            }
 
-			return '';
-		}
-	}
+            return '';
+        }
+    }
 
-	include_spip('inc/autoriser');
-	include_spip('base/abstract_sql');
+    include_spip('inc/autoriser');
+    include_spip('base/abstract_sql');
 
 
-	$dejafait = true;
+    $dejafait = true;
 
-	// Preparer le #ENV des boutons
+    // Preparer le #ENV des boutons
 
-	$env = admin_objet();
+    $env = admin_objet();
 
-	// Pas de "modifier ce..." ? -> donner "acces a l'espace prive"
-	if (!$env) {
-		$env['ecrire'] = _DIR_RESTREINT_ABS;
-	}
+    // Pas de "modifier ce..." ? -> donner "acces a l'espace prive"
+    if (!$env) {
+        $env['ecrire'] = _DIR_RESTREINT_ABS;
+    }
 
-	$env['divclass'] = $float;
-	$env['lang'] = admin_lang();
-	$env['calcul'] = (_request('var_mode') ? 'recalcul' : 'calcul');
-	$env['debug'] = ((defined('_VAR_PREVIEW') and _VAR_PREVIEW) ? "" : admin_debug());
-	$env['analyser'] = (!$env['debug'] and !$GLOBALS['xhtml']) ? '' : admin_valider();
-	$env['inclure'] = ((defined('_VAR_INCLURE') and _VAR_INCLURE) ? 'inclure' : '');
+    $env['divclass'] = $float;
+    $env['lang'] = admin_lang();
+    $env['calcul'] = (_request('var_mode') ? 'recalcul' : 'calcul');
+    $env['debug'] = ((defined('_VAR_PREVIEW') and _VAR_PREVIEW) ? "" : admin_debug());
+    $env['analyser'] = (!$env['debug'] and !$GLOBALS['xhtml']) ? '' : admin_valider();
+    $env['inclure'] = ((defined('_VAR_INCLURE') and _VAR_INCLURE) ? 'inclure' : '');
 
-	if (!$GLOBALS['use_cache']) {
-		$env['use_cache'] = ' *';
-	}
+    if (!$GLOBALS['use_cache']) {
+        $env['use_cache'] = ' *';
+    }
 
-	if (isset($debug['validation'])) {
-		$env['xhtml_error'] = $debug['validation'];
-	}
+    if (isset($debug['validation'])) {
+        $env['xhtml_error'] = $debug['validation'];
+    }
 
-	$env['_pipelines']['formulaire_admin'] = array();
+    $env['_pipelines']['formulaire_admin'] = array();
 
-	return array('formulaires/administration', 0, $env);
+    return array('formulaires/administration', 0, $env);
 }
 
 
@@ -161,45 +161,45 @@ 
  *     Tableau de l'environnement calculé
  **/
 function admin_objet() {
-	include_spip('inc/urls');
-	$env = array();
-
-	$trouver_table = charger_fonction('trouver_table', 'base');
-	$objets = urls_liste_objets(false);
-	$objets = array_diff($objets, array('rubrique'));
-	$objets = array_reverse($objets);
-	array_unshift($objets, 'rubrique');
-	foreach ($objets as $obj) {
-		$type = $obj;
-		if ($type == objet_type($type, false)
-			and $_id_type = id_table_objet($type)
-			and isset($GLOBALS['contexte'][$_id_type])
-			and $id = $GLOBALS['contexte'][$_id_type]
-			and !is_array($id)
-			and $id = intval($id)
-		) {
-			$id = sql_getfetsel($_id_type, table_objet_sql($type), "$_id_type=" . intval($id));
-			if ($id) {
-				$env[$_id_type] = $id;
-				$env['objet'] = $type;
-				$env['id_objet'] = $id;
-				$env['voir_' . $obj] =
-					str_replace('&', '&', generer_url_entite($id, $obj, '', '', false));
-				if ($desc = $trouver_table(table_objet_sql($type))
-					and isset($desc['field']['id_rubrique'])
-					and $type != 'rubrique'
-				) {
-					unset($env['id_rubrique']);
-					unset($env['voir_rubrique']);
-					if (admin_preview($type, $id, $desc)) {
-						$env['preview'] = parametre_url(self(), 'var_mode', 'preview', '&');
-					}
-				}
-			}
-		}
-	}
-
-	return $env;
+    include_spip('inc/urls');
+    $env = array();
+
+    $trouver_table = charger_fonction('trouver_table', 'base');
+    $objets = urls_liste_objets(false);
+    $objets = array_diff($objets, array('rubrique'));
+    $objets = array_reverse($objets);
+    array_unshift($objets, 'rubrique');
+    foreach ($objets as $obj) {
+        $type = $obj;
+        if ($type == objet_type($type, false)
+            and $_id_type = id_table_objet($type)
+            and isset($GLOBALS['contexte'][$_id_type])
+            and $id = $GLOBALS['contexte'][$_id_type]
+            and !is_array($id)
+            and $id = intval($id)
+        ) {
+            $id = sql_getfetsel($_id_type, table_objet_sql($type), "$_id_type=" . intval($id));
+            if ($id) {
+                $env[$_id_type] = $id;
+                $env['objet'] = $type;
+                $env['id_objet'] = $id;
+                $env['voir_' . $obj] =
+                    str_replace('&', '&', generer_url_entite($id, $obj, '', '', false));
+                if ($desc = $trouver_table(table_objet_sql($type))
+                    and isset($desc['field']['id_rubrique'])
+                    and $type != 'rubrique'
+                ) {
+                    unset($env['id_rubrique']);
+                    unset($env['voir_rubrique']);
+                    if (admin_preview($type, $id, $desc)) {
+                        $env['preview'] = parametre_url(self(), 'var_mode', 'preview', '&');
+                    }
+                }
+            }
+        }
+    }
+
+    return $env;
 }
 
 
@@ -217,30 +217,30 @@ 
  *     - Tableau d'un élément sinon.
  **/
 function admin_preview($type, $id, $desc = null) {
-	if (defined('_VAR_PREVIEW') and _VAR_PREVIEW) {
-		return '';
-	}
-
-	if (!$desc) {
-		$trouver_table = charger_fonction('trouver_table', 'base');
-		$desc = $trouver_table(table_objet_sql($type));
-	}
-	if (!$desc or !isset($desc['field']['statut'])) {
-		return '';
-	}
-
-	include_spip('inc/autoriser');
-	if (!autoriser('previsualiser')) {
-		return '';
-	}
-
-	$notpub = sql_in("statut", array('prop', 'prive'));
-
-	if ($type == 'article' and $GLOBALS['meta']['post_dates'] != 'oui') {
-		$notpub .= " OR (statut='publie' AND date>" . sql_quote(date('Y-m-d H:i:s')) . ")";
-	}
-
-	return sql_fetsel('1', table_objet_sql($type), id_table_objet($type) . "=" . $id . " AND ($notpub)");
+    if (defined('_VAR_PREVIEW') and _VAR_PREVIEW) {
+        return '';
+    }
+
+    if (!$desc) {
+        $trouver_table = charger_fonction('trouver_table', 'base');
+        $desc = $trouver_table(table_objet_sql($type));
+    }
+    if (!$desc or !isset($desc['field']['statut'])) {
+        return '';
+    }
+
+    include_spip('inc/autoriser');
+    if (!autoriser('previsualiser')) {
+        return '';
+    }
+
+    $notpub = sql_in("statut", array('prop', 'prive'));
+
+    if ($type == 'article' and $GLOBALS['meta']['post_dates'] != 'oui') {
+        $notpub .= " OR (statut='publie' AND date>" . sql_quote(date('Y-m-d H:i:s')) . ")";
+    }
+
+    return sql_fetsel('1', table_objet_sql($type), id_table_objet($type) . "=" . $id . " AND ($notpub)");
 }
 
 
@@ -251,19 +251,19 @@ 
  *     Code de langue
  **/
 function admin_lang() {
-	$alang = sql_getfetsel('lang', 'spip_auteurs',
-		"login=" . sql_quote(preg_replace(',^@,', '', @$_COOKIE['spip_admin'])));
-	if (!$alang) {
-		return '';
-	}
-
-	$l = lang_select($alang);
-	$alang = $GLOBALS['spip_lang'];
-	if ($l) {
-		lang_select();
-	}
-
-	return $alang;
+    $alang = sql_getfetsel('lang', 'spip_auteurs',
+        "login=" . sql_quote(preg_replace(',^@,', '', @$_COOKIE['spip_admin'])));
+    if (!$alang) {
+        return '';
+    }
+
+    $l = lang_select($alang);
+    $alang = $GLOBALS['spip_lang'];
+    if ($l) {
+        lang_select();
+    }
+
+    return $alang;
 }
 
 /**
@@ -273,11 +273,11 @@ 
  **/
 function admin_valider() {
 
-	return ((!isset($GLOBALS['xhtml']) or $GLOBALS['xhtml'] !== 'true') ?
-		(parametre_url(self(), 'var_mode', 'debug', '&')
-			. '&var_mode_affiche=validation') :
-		('http://validator.w3.org/check?uri='
-			. rawurlencode("http://" . $_SERVER['HTTP_HOST'] . nettoyer_uri())));
+    return ((!isset($GLOBALS['xhtml']) or $GLOBALS['xhtml'] !== 'true') ?
+        (parametre_url(self(), 'var_mode', 'debug', '&')
+            . '&var_mode_affiche=validation') :
+        ('http://validator.w3.org/check?uri='
+            . rawurlencode("http://" . $_SERVER['HTTP_HOST'] . nettoyer_uri())));
 }
 
 /**
@@ -286,14 +286,14 @@ 
  * @return string
  **/
 function admin_debug() {
-	return ((
-			(isset($GLOBALS['forcer_debug']) and $GLOBALS['forcer_debug'])
-			or (isset($GLOBALS['bouton_admin_debug']) and $GLOBALS['bouton_admin_debug'])
-			or (
-				defined('_VAR_MODE') and _VAR_MODE == 'debug'
-				and isset($_COOKIE['spip_debug']) and $_COOKIE['spip_debug']
-			)
-		) and autoriser('debug')
-	)
-		? parametre_url(self(), 'var_mode', 'debug', '&') : '';
+    return ((
+            (isset($GLOBALS['forcer_debug']) and $GLOBALS['forcer_debug'])
+            or (isset($GLOBALS['bouton_admin_debug']) and $GLOBALS['bouton_admin_debug'])
+            or (
+                defined('_VAR_MODE') and _VAR_MODE == 'debug'
+                and isset($_COOKIE['spip_debug']) and $_COOKIE['spip_debug']
+            )
+        ) and autoriser('debug')
+    )
+        ? parametre_url(self(), 'var_mode', 'debug', '&') : '';
 }

ecrire/notifications/instituerarticle.php

Indentation +43 added lines, -43 removed lines

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

ecrire/auth/ldap.php

Indentation +175 added lines, -175 removed lines

@@ -17,7 +17,7 @@ 
  **/
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 // Authentifie via LDAP et retourne la ligne SQL decrivant l'utilisateur si ok
@@ -25,12 +25,12 @@ 
 // Attributs LDAP correspondants a ceux de SPIP, notamment pour le login
 // ne pas ecraser une definition perso dans mes_options
 if (!isset($GLOBALS['ldap_attributes']) or !is_array($GLOBALS['ldap_attributes'])) {
-	$GLOBALS['ldap_attributes'] = array(
-		'login' => array('sAMAccountName', 'uid', 'login', 'userid', 'cn', 'sn'),
-		'nom' => "cn",
-		'email' => "mail",
-		'bio' => "description"
-	);
+    $GLOBALS['ldap_attributes'] = array(
+        'login' => array('sAMAccountName', 'uid', 'login', 'userid', 'cn', 'sn'),
+        'nom' => "cn",
+        'email' => "mail",
+        'bio' => "description"
+    );
 }
 
 /**
@@ -56,49 +56,49 @@ 
  */
 function auth_ldap_dist($login, $pass, $serveur = '', $phpauth = false) {
 
-	#spip_log("ldap $login " . ($pass ? "mdp fourni" : "mdp absent"));
-
-	// Utilisateur connu ?
-	// si http auth, inutile de reauthentifier: cela
-	// ne marchera pas avec auth http autre que basic.
-	$checkpass = isset($_SERVER["REMOTE_USER"]) ? false : true;
-	if (!($dn = auth_ldap_search($login, $pass, $checkpass, $serveur))) {
-		return array();
-	}
-	$credentials_ldap = array('ldap_dn' => $dn, 'ldap_password' => $pass);
-
-	// Si l'utilisateur figure deja dans la base, y recuperer les infos
-	$r = sql_fetsel("*", "spip_auteurs", "login=" . sql_quote($login) . " AND source='ldap'", '', '', '', '', $serveur);
-
-	if ($r) {
-		return array_merge($r, $credentials_ldap);
-	}
-
-	// sinon importer les infos depuis LDAP, 
-
-	if ($GLOBALS['meta']["ldap_statut_import"]
-		and $desc = auth_ldap_retrouver($dn, array(), $serveur)
-	) {
-		// rajouter le statut indique  a l'install
-		$desc['statut'] = $GLOBALS['meta']["ldap_statut_import"];
-		$desc['login'] = $login;
-		$desc['source'] = 'ldap';
-		$desc['pass'] = '';
-
-		$r = sql_insertq('spip_auteurs', $desc, '', $serveur);
-	}
-
-	if ($r) {
-		return array_merge(
-			$credentials_ldap,
-			sql_fetsel("*", "spip_auteurs", "id_auteur=" . intval($r), '', '', '', '', $serveur)
-		);
-	}
-
-	// sinon echec
-	spip_log("Creation de l'auteur '$login' impossible");
-
-	return array();
+    #spip_log("ldap $login " . ($pass ? "mdp fourni" : "mdp absent"));
+
+    // Utilisateur connu ?
+    // si http auth, inutile de reauthentifier: cela
+    // ne marchera pas avec auth http autre que basic.
+    $checkpass = isset($_SERVER["REMOTE_USER"]) ? false : true;
+    if (!($dn = auth_ldap_search($login, $pass, $checkpass, $serveur))) {
+        return array();
+    }
+    $credentials_ldap = array('ldap_dn' => $dn, 'ldap_password' => $pass);
+
+    // Si l'utilisateur figure deja dans la base, y recuperer les infos
+    $r = sql_fetsel("*", "spip_auteurs", "login=" . sql_quote($login) . " AND source='ldap'", '', '', '', '', $serveur);
+
+    if ($r) {
+        return array_merge($r, $credentials_ldap);
+    }
+
+    // sinon importer les infos depuis LDAP, 
+
+    if ($GLOBALS['meta']["ldap_statut_import"]
+        and $desc = auth_ldap_retrouver($dn, array(), $serveur)
+    ) {
+        // rajouter le statut indique  a l'install
+        $desc['statut'] = $GLOBALS['meta']["ldap_statut_import"];
+        $desc['login'] = $login;
+        $desc['source'] = 'ldap';
+        $desc['pass'] = '';
+
+        $r = sql_insertq('spip_auteurs', $desc, '', $serveur);
+    }
+
+    if ($r) {
+        return array_merge(
+            $credentials_ldap,
+            sql_fetsel("*", "spip_auteurs", "id_auteur=" . intval($r), '', '', '', '', $serveur)
+        );
+    }
+
+    // sinon echec
+    spip_log("Creation de l'auteur '$login' impossible");
+
+    return array();
 }
 
 /**
@@ -112,36 +112,36 @@ 
  * @return array
  */
 function auth_ldap_connect($serveur = '') {
-	include_spip('base/connect_sql');
-	static $connexions_ldap = array();
-	if (isset($connexions_ldap[$serveur])) {
-		return $connexions_ldap[$serveur];
-	}
-	$connexion = spip_connect($serveur);
-	if (!is_array($connexion['ldap'])) {
-		if ($connexion['authentification']['ldap']) {
-			$f = _DIR_CONNECT . $connexion['authentification']['ldap'];
-			unset($GLOBALS['ldap_link']);
-			if (is_readable($f)) {
-				include_once($f);
-			};
-			if (isset($GLOBALS['ldap_link'])) {
-				$connexion['ldap'] = array(
-					'link' => $GLOBALS['ldap_link'],
-					'base' => $GLOBALS['ldap_base']
-				);
-			} else {
-				spip_log("connection LDAP $serveur mal definie dans $f");
-			}
-			if (isset($GLOBALS['ldap_champs'])) {
-				$connexion['ldap']['attributes'] = $GLOBALS['ldap_champs'];
-			}
-		} else {
-			spip_log("connection LDAP $serveur inconnue");
-		}
-	}
-
-	return $connexions_ldap[$serveur] = $connexion['ldap'];
+    include_spip('base/connect_sql');
+    static $connexions_ldap = array();
+    if (isset($connexions_ldap[$serveur])) {
+        return $connexions_ldap[$serveur];
+    }
+    $connexion = spip_connect($serveur);
+    if (!is_array($connexion['ldap'])) {
+        if ($connexion['authentification']['ldap']) {
+            $f = _DIR_CONNECT . $connexion['authentification']['ldap'];
+            unset($GLOBALS['ldap_link']);
+            if (is_readable($f)) {
+                include_once($f);
+            };
+            if (isset($GLOBALS['ldap_link'])) {
+                $connexion['ldap'] = array(
+                    'link' => $GLOBALS['ldap_link'],
+                    'base' => $GLOBALS['ldap_base']
+                );
+            } else {
+                spip_log("connection LDAP $serveur mal definie dans $f");
+            }
+            if (isset($GLOBALS['ldap_champs'])) {
+                $connexion['ldap']['attributes'] = $GLOBALS['ldap_champs'];
+            }
+        } else {
+            spip_log("connection LDAP $serveur inconnue");
+        }
+    }
+
+    return $connexions_ldap[$serveur] = $connexion['ldap'];
 }
 
 /**
@@ -155,52 +155,52 @@ 
  *    Le login trouvé ou chaine vide si non trouvé
  */
 function auth_ldap_search($login, $pass, $checkpass = true, $serveur = '') {
-	// Securite anti-injection et contre un serveur LDAP laxiste
-	$login_search = preg_replace("/[^-@._\s\d\w]/", "", $login);
-	if (!strlen($login_search) or ($checkpass and !strlen($pass))) {
-		return '';
-	}
-
-	// verifier la connexion
-	if (!$ldap = auth_ldap_connect($serveur)) {
-		return '';
-	}
-
-	$ldap_link = isset($ldap['link']) ? $ldap['link'] : null;
-	$ldap_base = isset($ldap['base']) ? $ldap['base'] : null;
-	$desc = isset($ldap['attributes']) && $ldap['attributes'] ? $ldap['attributes'] : $GLOBALS['ldap_attributes'] ;
-
-	$logins = is_array($desc['login']) ? $desc['login'] : array($desc['login']);
-
-	// Tenter une recherche pour essayer de retrouver le DN
-	foreach ($logins as $att) {
-		$result = @ldap_search($ldap_link, $ldap_base, "$att=$login_search", array("dn"));
-		$info = @ldap_get_entries($ldap_link, $result);
-		// Ne pas accepter les resultats si plus d'une entree
-		// (on veut un attribut unique)
-
-		if (is_array($info) and $info['count'] == 1) {
-			$dn = $info[0]['dn'];
-			if (!$checkpass) {
-				return $dn;
-			}
-			if (@ldap_bind($ldap_link, $dn, $pass)) {
-				return $dn;
-			}
-		}
-	}
-
-	if ($checkpass and !isset($dn)) {
-		// Si echec, essayer de deviner le DN
-		foreach ($logins as $att) {
-			$dn = "$att=$login_search, $ldap_base";
-			if (@ldap_bind($ldap_link, $dn, $pass)) {
-				return "$att=$login_search, $ldap_base";
-			}
-		}
-	}
-
-	return '';
+    // Securite anti-injection et contre un serveur LDAP laxiste
+    $login_search = preg_replace("/[^-@._\s\d\w]/", "", $login);
+    if (!strlen($login_search) or ($checkpass and !strlen($pass))) {
+        return '';
+    }
+
+    // verifier la connexion
+    if (!$ldap = auth_ldap_connect($serveur)) {
+        return '';
+    }
+
+    $ldap_link = isset($ldap['link']) ? $ldap['link'] : null;
+    $ldap_base = isset($ldap['base']) ? $ldap['base'] : null;
+    $desc = isset($ldap['attributes']) && $ldap['attributes'] ? $ldap['attributes'] : $GLOBALS['ldap_attributes'] ;
+
+    $logins = is_array($desc['login']) ? $desc['login'] : array($desc['login']);
+
+    // Tenter une recherche pour essayer de retrouver le DN
+    foreach ($logins as $att) {
+        $result = @ldap_search($ldap_link, $ldap_base, "$att=$login_search", array("dn"));
+        $info = @ldap_get_entries($ldap_link, $result);
+        // Ne pas accepter les resultats si plus d'une entree
+        // (on veut un attribut unique)
+
+        if (is_array($info) and $info['count'] == 1) {
+            $dn = $info[0]['dn'];
+            if (!$checkpass) {
+                return $dn;
+            }
+            if (@ldap_bind($ldap_link, $dn, $pass)) {
+                return $dn;
+            }
+        }
+    }
+
+    if ($checkpass and !isset($dn)) {
+        // Si echec, essayer de deviner le DN
+        foreach ($logins as $att) {
+            $dn = "$att=$login_search, $ldap_base";
+            if (@ldap_bind($ldap_link, $dn, $pass)) {
+                return "$att=$login_search, $ldap_base";
+            }
+        }
+    }
+
+    return '';
 }
 
 /**
@@ -212,40 +212,40 @@ 
  * @return array
  */
 function auth_ldap_retrouver($dn, $desc = array(), $serveur = '') {
-	// Lire les infos sur l'utilisateur a partir de son DN depuis LDAP
+    // Lire les infos sur l'utilisateur a partir de son DN depuis LDAP
 
-	if (!$ldap = spip_connect_ldap($serveur)) {
-		spip_log("ldap $serveur injoignable");
+    if (!$ldap = spip_connect_ldap($serveur)) {
+        spip_log("ldap $serveur injoignable");
 
-		return array();
-	}
+        return array();
+    }
 
-	$ldap_link = $ldap['link'];
-	if (!$desc) {
-		$desc = $ldap['attributes'] ? $ldap['attributes'] : $GLOBALS['ldap_attributes'];
-		unset($desc['login']);
-	}
-	$result = @ldap_read($ldap_link, $dn, "objectClass=*", array_values($desc));
+    $ldap_link = $ldap['link'];
+    if (!$desc) {
+        $desc = $ldap['attributes'] ? $ldap['attributes'] : $GLOBALS['ldap_attributes'];
+        unset($desc['login']);
+    }
+    $result = @ldap_read($ldap_link, $dn, "objectClass=*", array_values($desc));
 
-	if (!$result) {
-		return array();
-	}
+    if (!$result) {
+        return array();
+    }
 
-	// Recuperer les donnees du premier (unique?) compte de l'auteur
-	$val = @ldap_get_entries($ldap_link, $result);
-	if (!is_array($val) or !is_array($val[0])) {
-		return array();
-	}
-	$val = $val[0];
+    // Recuperer les donnees du premier (unique?) compte de l'auteur
+    $val = @ldap_get_entries($ldap_link, $result);
+    if (!is_array($val) or !is_array($val[0])) {
+        return array();
+    }
+    $val = $val[0];
 
-	// Convertir depuis UTF-8 (jeu de caracteres par defaut)
-	include_spip('inc/charsets');
+    // Convertir depuis UTF-8 (jeu de caracteres par defaut)
+    include_spip('inc/charsets');
 
-	foreach ($desc as $k => $v) {
-		$desc[$k] = importer_charset($val[strtolower($v)][0], 'utf-8');
-	}
+    foreach ($desc as $k => $v) {
+        $desc[$k] = importer_charset($val[strtolower($v)][0], 'utf-8');
+    }
 
-	return $desc;
+    return $desc;
 }
 
 
@@ -257,7 +257,7 @@ 
  * @return string
  */
 function auth_ldap_retrouver_login($login, $serveur = '') {
-	return auth_ldap_search($login, '', false, $serveur) ? $login : '';
+    return auth_ldap_search($login, '', false, $serveur) ? $login : '';
 }
 
 /**
@@ -277,9 +277,9 @@ 
  *   Message d'erreur si login non valide, chaîne vide sinon
  */
 function auth_ldap_verifier_pass($login, $new_pass, $id_auteur = 0, $serveur = '') {
-	include_spip('auth/spip');
+    include_spip('auth/spip');
 
-	return auth_spip_verifier_pass($login, $new_pass, $id_auteur, $serveur);
+    return auth_spip_verifier_pass($login, $new_pass, $id_auteur, $serveur);
 }
 
 /**
@@ -300,7 +300,7 @@ 
  *   ```
  */
 function auth_ldap_autoriser_modifier_pass($serveur = '') {
-	return true;
+    return true;
 }
 
 /**
@@ -318,23 +318,23 @@ 
  *    Informe du succès ou de l'echec du changement du mot de passe
  */
 function auth_ldap_modifier_pass($login, $new_pass, $id_auteur, $serveur = '') {
-	if (is_null($new_pass) or auth_ldap_verifier_pass($login, $new_pass, $id_auteur, $serveur) != '') {
-		return false;
-	}
-	if (!$ldap = auth_ldap_connect($serveur)) {
-		return '';
-	}
-	$link = $ldap['link'];
-	include_spip("inc/session");
-	$dn = session_get('ldap_dn');
-	if ('' == $dn) {
-		return false;
-	}
-	if (!ldap_bind($link, $dn, session_get('ldap_password'))) {
-		return false;
-	}
-	$encoded_pass = "{MD5}" . base64_encode(pack("H*", md5($new_pass)));
-	$success = ldap_mod_replace($link, $dn, array('userPassword' => $encoded_pass));
-
-	return $success;
+    if (is_null($new_pass) or auth_ldap_verifier_pass($login, $new_pass, $id_auteur, $serveur) != '') {
+        return false;
+    }
+    if (!$ldap = auth_ldap_connect($serveur)) {
+        return '';
+    }
+    $link = $ldap['link'];
+    include_spip("inc/session");
+    $dn = session_get('ldap_dn');
+    if ('' == $dn) {
+        return false;
+    }
+    if (!ldap_bind($link, $dn, session_get('ldap_password'))) {
+        return false;
+    }
+    $encoded_pass = "{MD5}" . base64_encode(pack("H*", md5($new_pass)));
+    $success = ldap_mod_replace($link, $dn, array('userPassword' => $encoded_pass));
+
+    return $success;
 }

ecrire/auth/sha256.inc.php

Indentation +500 added lines, -500 removed lines

@@ -68,482 +68,482 @@ 
  * @package SPIP\Core\Authentification\Sha256
  */
 if (!class_exists('nanoSha2')) {
-	/**
-	 * Classe de calcul d'un SHA
-	 */
-	class nanoSha2 {
-		// php 4 - 5 compatable class properties
-		/** Le résultat doit être passé en majuscule ?
-		 *
-		 * @var bool
-		 */
-		var $toUpper;
-		/** 32 ou 64 bits ?
-		 *
-		 * @var int
-		 */
-		var $platform;
-		/** bytes par caractères */
-		var $bytesString = 16;
-
-		/**
-		 * Constructor
-		 *
-		 * @param bool $toUpper
-		 */
-		function __construct($toUpper = false) {
-			// Determine if the caller wants upper case or not.
-			$this->toUpper = is_bool($toUpper)
-				? $toUpper
-				: ((defined('_NANO_SHA2_UPPER')) ? true : false);
-
-			// Deteremine if the system is 32 or 64 bit.
-			$tmpInt = (int)4294967295;
-			$this->platform = ($tmpInt > 0) ? 64 : 32;
-		}
-
-		/**
-		 * Here are the bitwise and functions as defined in FIPS180-2 Standard
-		 *
-		 * @param int $x
-		 * @param int $y
-		 * @param int $n
-		 * @return int
-		 */
-		function addmod2n($x, $y, $n = 4294967296)      // Z = (X + Y) mod 2^32
-		{
-			$mask = 0x80000000;
-
-			if ($x < 0) {
-				$x &= 0x7FFFFFFF;
-				$x = (float)$x+$mask;
-			}
-
-			if ($y < 0) {
-				$y &= 0x7FFFFFFF;
-				$y = (float)$y+$mask;
-			}
-
-			$r = $x+$y;
-
-			if ($r >= $n) {
-				while ($r >= $n) {
-					$r -= $n;
-				}
-			}
-
-			return (int)$r;
-		}
-
-		/**
-		 * Logical bitwise right shift (PHP default is arithmetic shift)
-		 *
-		 * @param int $x
-		 * @param int $n
-		 * return int
-		 */
-		function SHR($x, $n)        // x >> n
-		{
-			if ($n >= 32) {      // impose some limits to keep it 32-bit
-				return (int)0;
-			}
-
-			if ($n <= 0) {
-				return (int)$x;
-			}
-
-			$mask = 0x40000000;
-
-			if ($x < 0) {
-				$x &= 0x7FFFFFFF;
-				$mask = $mask >> ($n-1);
-
-				return ($x >> $n) | $mask;
-			}
-
-			return (int)$x >> (int)$n;
-		}
-
-		/** ROTR
-		 *
-		 * @param int $x
-		 * @param int $n
-		 * @return int
-		 */
-		function ROTR($x, $n) { return (int)(($this->SHR($x, $n) | ($x << (32-$n)) & 0xFFFFFFFF)); }
-
-		/** Ch
-		 *
-		 * @param int $x
-		 * @param int $y
-		 * @param int $z
-		 * @return int
-		 */
-		function Ch($x, $y, $z) { return ($x & $y) ^ ((~$x) & $z); }
-
-		/** Maj
-		 *
-		 * @param int $x
-		 * @param int $y
-		 * @param int $z
-		 * @return int
-		 */
-		function Maj($x, $y, $z) { return ($x & $y) ^ ($x & $z) ^ ($y & $z); }
-
-		/** Sigma0
-		 *
-		 * @param int $x
-		 * @return int
-		 */
-		function Sigma0($x) { return (int)($this->ROTR($x, 2) ^ $this->ROTR($x, 13) ^ $this->ROTR($x, 22)); }
-
-		/** Sigma1
-		 *
-		 * @param int $x
-		 * @return int
-		 */
-		function Sigma1($x) { return (int)($this->ROTR($x, 6) ^ $this->ROTR($x, 11) ^ $this->ROTR($x, 25)); }
-
-		/** Sigma_0
-		 *
-		 * @param int $x
-		 * @return int
-		 */
-		function sigma_0($x) { return (int)($this->ROTR($x, 7) ^ $this->ROTR($x, 18) ^ $this->SHR($x, 3)); }
-
-		/** Sigma_1
-		 *
-		 * @param int $x
-		 * @return int
-		 */
-		function sigma_1($x) { return (int)($this->ROTR($x, 17) ^ $this->ROTR($x, 19) ^ $this->SHR($x, 10)); }
-
-		/** String 2 ord UTF8
-		 *
-		 * @param string $s
-		 * @param int $byteSize
-		 * @return array
-		 **/
-		function string2ordUTF8($s, &$byteSize) {
-			$chars = array();
-			// par defaut sur 8bits
-			$byteSize = 8;
-			$i = 0;
-			while ($i < strlen($s)) {
-				$chars[] = $this->ordUTF8($s, $i, $bytes);
-				$i += $bytes;
-				// mais si un char necessite 16bits, on passe tout sur 16
-				// sinon on ne concorde pas avec le lecture de la chaine en js
-				// et le sha256 js
-				if ($bytes > 1) {
-					$byteSize = 16;
-				}
-			}
-
-			return $chars;
-		}
-
-		/** Ord UTF8
-		 *
-		 * @param string $c
-		 * @param int $index
-		 * @param int $bytes
-		 * @return unknown
-		 **/
-		function ordUTF8($c, $index = 0, &$bytes) {
-			$len = strlen($c);
-			$bytes = 0;
-
-			if ($index >= $len) {
-				return false;
-			}
-
-			$h = ord($c{$index});
-
-			if ($h <= 0x7F) {
-				$bytes = 1;
-
-				return $h;
-			} else {
-				if ($h < 0xC2) {
-					// pas utf mais renvoyer quand meme ce qu'on a
-					$bytes = 1;
-
-					return $h;
-				} else {
-					if ($h <= 0xDF && $index < $len-1) {
-						$bytes = 2;
-
-						return ($h & 0x1F) << 6 | (ord($c{$index+1}) & 0x3F);
-					} else {
-						if ($h <= 0xEF && $index < $len-2) {
-							$bytes = 3;
-
-							return ($h & 0x0F) << 12 | (ord($c{$index+1}) & 0x3F) << 6
-							| (ord($c{$index+2}) & 0x3F);
-						} else {
-							if ($h <= 0xF4 && $index < $len-3) {
-								$bytes = 4;
-
-								return ($h & 0x0F) << 18 | (ord($c{$index+1}) & 0x3F) << 12
-								| (ord($c{$index+2}) & 0x3F) << 6
-								| (ord($c{$index+3}) & 0x3F);
-							} else {
-								// pas utf mais renvoyer quand meme ce qu'on a
-								$bytes = 1;
-
-								return $h;
-							}
-						}
-					}
-				}
-			}
-		}
-
-		/** String 2 bin int
-		 *
-		 * @param string $str
-		 * @param int $npad
-		 * @return int[]
-		 **/
-		function string2binint($str, $npad = 512) {
-			$bin = array();
-			$ords = $this->string2ordUTF8($str, $this->bytesString);
-			$npad = $npad/$this->bytesString;
-			$length = count($ords);
-			$ords[] = 0x80; // append the "1" bit followed by 7 0's
-			$pad = ceil(($length+1+32/$this->bytesString)/$npad)*$npad-32/$this->bytesString;
-			$ords = array_pad($ords, $pad, 0);
-			$mask = (1 << $this->bytesString)-1;
-			for ($i = 0; $i < count($ords)*$this->bytesString; $i += $this->bytesString) {
-				if (!isset($bin[$i >> 5])) {
-					$bin[$i >> 5] = 0;
-				} // pour eviter des notices.
-				$bin[$i >> 5] |= ($ords[$i/$this->bytesString] & $mask) << (24-$i%32);
-			}
-			$bin[] = $length*$this->bytesString;
-
-			return $bin;
-		}
-
-		/** Array split
-		 *
-		 * @param array $a
-		 * @param int $n
-		 * @return array
-		 **/
-		function array_split($a, $n) {
-			$split = array();
-			while (count($a) > $n) {
-				$s = array();
-				for ($i = 0; $i < $n; $i++) {
-					$s[] = array_shift($a);
-				}
-				$split[] = $s;
-			}
-			if (count($a)) {
-				$a = array_pad($a, $n, 0);
-				$split[] = $a;
-			}
-
-			return $split;
-		}
-
-		/**
-		 * Process and return the hash.
-		 *
-		 * @param $str Input string to hash
-		 * @param $ig_func Option param to ignore checking for php > 5.1.2
-		 * @return string Hexadecimal representation of the message digest
-		 */
-		function hash($str, $ig_func = true) {
-			unset($binStr);     // binary representation of input string
-			unset($hexStr);     // 256-bit message digest in readable hex format
-
-			// check for php's internal sha256 function, ignore if ig_func==true
-			if ($ig_func == false) {
-				if (version_compare(PHP_VERSION, '5.1.2', '>=') AND !defined('_NO_HASH_DEFINED')) {
-					return hash("sha256", $str, false);
-				} else {
-					if (function_exists('mhash') && defined('MHASH_SHA256')) {
-						return base64_encode(bin2hex(mhash(MHASH_SHA256, $str)));
-					}
-				}
-			}
-
-			/*
+    /**
+     * Classe de calcul d'un SHA
+     */
+    class nanoSha2 {
+        // php 4 - 5 compatable class properties
+        /** Le résultat doit être passé en majuscule ?
+         *
+         * @var bool
+         */
+        var $toUpper;
+        /** 32 ou 64 bits ?
+         *
+         * @var int
+         */
+        var $platform;
+        /** bytes par caractères */
+        var $bytesString = 16;
+
+        /**
+         * Constructor
+         *
+         * @param bool $toUpper
+         */
+        function __construct($toUpper = false) {
+            // Determine if the caller wants upper case or not.
+            $this->toUpper = is_bool($toUpper)
+                ? $toUpper
+                : ((defined('_NANO_SHA2_UPPER')) ? true : false);
+
+            // Deteremine if the system is 32 or 64 bit.
+            $tmpInt = (int)4294967295;
+            $this->platform = ($tmpInt > 0) ? 64 : 32;
+        }
+
+        /**
+         * Here are the bitwise and functions as defined in FIPS180-2 Standard
+         *
+         * @param int $x
+         * @param int $y
+         * @param int $n
+         * @return int
+         */
+        function addmod2n($x, $y, $n = 4294967296)      // Z = (X + Y) mod 2^32
+        {
+            $mask = 0x80000000;
+
+            if ($x < 0) {
+                $x &= 0x7FFFFFFF;
+                $x = (float)$x+$mask;
+            }
+
+            if ($y < 0) {
+                $y &= 0x7FFFFFFF;
+                $y = (float)$y+$mask;
+            }
+
+            $r = $x+$y;
+
+            if ($r >= $n) {
+                while ($r >= $n) {
+                    $r -= $n;
+                }
+            }
+
+            return (int)$r;
+        }
+
+        /**
+         * Logical bitwise right shift (PHP default is arithmetic shift)
+         *
+         * @param int $x
+         * @param int $n
+         * return int
+         */
+        function SHR($x, $n)        // x >> n
+        {
+            if ($n >= 32) {      // impose some limits to keep it 32-bit
+                return (int)0;
+            }
+
+            if ($n <= 0) {
+                return (int)$x;
+            }
+
+            $mask = 0x40000000;
+
+            if ($x < 0) {
+                $x &= 0x7FFFFFFF;
+                $mask = $mask >> ($n-1);
+
+                return ($x >> $n) | $mask;
+            }
+
+            return (int)$x >> (int)$n;
+        }
+
+        /** ROTR
+         *
+         * @param int $x
+         * @param int $n
+         * @return int
+         */
+        function ROTR($x, $n) { return (int)(($this->SHR($x, $n) | ($x << (32-$n)) & 0xFFFFFFFF)); }
+
+        /** Ch
+         *
+         * @param int $x
+         * @param int $y
+         * @param int $z
+         * @return int
+         */
+        function Ch($x, $y, $z) { return ($x & $y) ^ ((~$x) & $z); }
+
+        /** Maj
+         *
+         * @param int $x
+         * @param int $y
+         * @param int $z
+         * @return int
+         */
+        function Maj($x, $y, $z) { return ($x & $y) ^ ($x & $z) ^ ($y & $z); }
+
+        /** Sigma0
+         *
+         * @param int $x
+         * @return int
+         */
+        function Sigma0($x) { return (int)($this->ROTR($x, 2) ^ $this->ROTR($x, 13) ^ $this->ROTR($x, 22)); }
+
+        /** Sigma1
+         *
+         * @param int $x
+         * @return int
+         */
+        function Sigma1($x) { return (int)($this->ROTR($x, 6) ^ $this->ROTR($x, 11) ^ $this->ROTR($x, 25)); }
+
+        /** Sigma_0
+         *
+         * @param int $x
+         * @return int
+         */
+        function sigma_0($x) { return (int)($this->ROTR($x, 7) ^ $this->ROTR($x, 18) ^ $this->SHR($x, 3)); }
+
+        /** Sigma_1
+         *
+         * @param int $x
+         * @return int
+         */
+        function sigma_1($x) { return (int)($this->ROTR($x, 17) ^ $this->ROTR($x, 19) ^ $this->SHR($x, 10)); }
+
+        /** String 2 ord UTF8
+         *
+         * @param string $s
+         * @param int $byteSize
+         * @return array
+         **/
+        function string2ordUTF8($s, &$byteSize) {
+            $chars = array();
+            // par defaut sur 8bits
+            $byteSize = 8;
+            $i = 0;
+            while ($i < strlen($s)) {
+                $chars[] = $this->ordUTF8($s, $i, $bytes);
+                $i += $bytes;
+                // mais si un char necessite 16bits, on passe tout sur 16
+                // sinon on ne concorde pas avec le lecture de la chaine en js
+                // et le sha256 js
+                if ($bytes > 1) {
+                    $byteSize = 16;
+                }
+            }
+
+            return $chars;
+        }
+
+        /** Ord UTF8
+         *
+         * @param string $c
+         * @param int $index
+         * @param int $bytes
+         * @return unknown
+         **/
+        function ordUTF8($c, $index = 0, &$bytes) {
+            $len = strlen($c);
+            $bytes = 0;
+
+            if ($index >= $len) {
+                return false;
+            }
+
+            $h = ord($c{$index});
+
+            if ($h <= 0x7F) {
+                $bytes = 1;
+
+                return $h;
+            } else {
+                if ($h < 0xC2) {
+                    // pas utf mais renvoyer quand meme ce qu'on a
+                    $bytes = 1;
+
+                    return $h;
+                } else {
+                    if ($h <= 0xDF && $index < $len-1) {
+                        $bytes = 2;
+
+                        return ($h & 0x1F) << 6 | (ord($c{$index+1}) & 0x3F);
+                    } else {
+                        if ($h <= 0xEF && $index < $len-2) {
+                            $bytes = 3;
+
+                            return ($h & 0x0F) << 12 | (ord($c{$index+1}) & 0x3F) << 6
+                            | (ord($c{$index+2}) & 0x3F);
+                        } else {
+                            if ($h <= 0xF4 && $index < $len-3) {
+                                $bytes = 4;
+
+                                return ($h & 0x0F) << 18 | (ord($c{$index+1}) & 0x3F) << 12
+                                | (ord($c{$index+2}) & 0x3F) << 6
+                                | (ord($c{$index+3}) & 0x3F);
+                            } else {
+                                // pas utf mais renvoyer quand meme ce qu'on a
+                                $bytes = 1;
+
+                                return $h;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        /** String 2 bin int
+         *
+         * @param string $str
+         * @param int $npad
+         * @return int[]
+         **/
+        function string2binint($str, $npad = 512) {
+            $bin = array();
+            $ords = $this->string2ordUTF8($str, $this->bytesString);
+            $npad = $npad/$this->bytesString;
+            $length = count($ords);
+            $ords[] = 0x80; // append the "1" bit followed by 7 0's
+            $pad = ceil(($length+1+32/$this->bytesString)/$npad)*$npad-32/$this->bytesString;
+            $ords = array_pad($ords, $pad, 0);
+            $mask = (1 << $this->bytesString)-1;
+            for ($i = 0; $i < count($ords)*$this->bytesString; $i += $this->bytesString) {
+                if (!isset($bin[$i >> 5])) {
+                    $bin[$i >> 5] = 0;
+                } // pour eviter des notices.
+                $bin[$i >> 5] |= ($ords[$i/$this->bytesString] & $mask) << (24-$i%32);
+            }
+            $bin[] = $length*$this->bytesString;
+
+            return $bin;
+        }
+
+        /** Array split
+         *
+         * @param array $a
+         * @param int $n
+         * @return array
+         **/
+        function array_split($a, $n) {
+            $split = array();
+            while (count($a) > $n) {
+                $s = array();
+                for ($i = 0; $i < $n; $i++) {
+                    $s[] = array_shift($a);
+                }
+                $split[] = $s;
+            }
+            if (count($a)) {
+                $a = array_pad($a, $n, 0);
+                $split[] = $a;
+            }
+
+            return $split;
+        }
+
+        /**
+         * Process and return the hash.
+         *
+         * @param $str Input string to hash
+         * @param $ig_func Option param to ignore checking for php > 5.1.2
+         * @return string Hexadecimal representation of the message digest
+         */
+        function hash($str, $ig_func = true) {
+            unset($binStr);     // binary representation of input string
+            unset($hexStr);     // 256-bit message digest in readable hex format
+
+            // check for php's internal sha256 function, ignore if ig_func==true
+            if ($ig_func == false) {
+                if (version_compare(PHP_VERSION, '5.1.2', '>=') AND !defined('_NO_HASH_DEFINED')) {
+                    return hash("sha256", $str, false);
+                } else {
+                    if (function_exists('mhash') && defined('MHASH_SHA256')) {
+                        return base64_encode(bin2hex(mhash(MHASH_SHA256, $str)));
+                    }
+                }
+            }
+
+            /*
 			 * SHA-256 Constants
 			 *  Sequence of sixty-four constant 32-bit words representing the
 			 *  first thirty-two bits of the fractional parts of the cube roots
 			 *  of the first sixtyfour prime numbers.
 			 */
-			$K = array(
-				(int)0x428a2f98,
-				(int)0x71374491,
-				(int)0xb5c0fbcf,
-				(int)0xe9b5dba5,
-				(int)0x3956c25b,
-				(int)0x59f111f1,
-				(int)0x923f82a4,
-				(int)0xab1c5ed5,
-				(int)0xd807aa98,
-				(int)0x12835b01,
-				(int)0x243185be,
-				(int)0x550c7dc3,
-				(int)0x72be5d74,
-				(int)0x80deb1fe,
-				(int)0x9bdc06a7,
-				(int)0xc19bf174,
-				(int)0xe49b69c1,
-				(int)0xefbe4786,
-				(int)0x0fc19dc6,
-				(int)0x240ca1cc,
-				(int)0x2de92c6f,
-				(int)0x4a7484aa,
-				(int)0x5cb0a9dc,
-				(int)0x76f988da,
-				(int)0x983e5152,
-				(int)0xa831c66d,
-				(int)0xb00327c8,
-				(int)0xbf597fc7,
-				(int)0xc6e00bf3,
-				(int)0xd5a79147,
-				(int)0x06ca6351,
-				(int)0x14292967,
-				(int)0x27b70a85,
-				(int)0x2e1b2138,
-				(int)0x4d2c6dfc,
-				(int)0x53380d13,
-				(int)0x650a7354,
-				(int)0x766a0abb,
-				(int)0x81c2c92e,
-				(int)0x92722c85,
-				(int)0xa2bfe8a1,
-				(int)0xa81a664b,
-				(int)0xc24b8b70,
-				(int)0xc76c51a3,
-				(int)0xd192e819,
-				(int)0xd6990624,
-				(int)0xf40e3585,
-				(int)0x106aa070,
-				(int)0x19a4c116,
-				(int)0x1e376c08,
-				(int)0x2748774c,
-				(int)0x34b0bcb5,
-				(int)0x391c0cb3,
-				(int)0x4ed8aa4a,
-				(int)0x5b9cca4f,
-				(int)0x682e6ff3,
-				(int)0x748f82ee,
-				(int)0x78a5636f,
-				(int)0x84c87814,
-				(int)0x8cc70208,
-				(int)0x90befffa,
-				(int)0xa4506ceb,
-				(int)0xbef9a3f7,
-				(int)0xc67178f2
-			);
-
-			// Pre-processing: Padding the string
-			$binStr = $this->string2binint($str, 512);
-
-			// Parsing the Padded Message (Break into N 512-bit blocks)
-			$M = $this->array_split($binStr, 16);
-
-			// Set the initial hash values
-			$h[0] = (int)0x6a09e667;
-			$h[1] = (int)0xbb67ae85;
-			$h[2] = (int)0x3c6ef372;
-			$h[3] = (int)0xa54ff53a;
-			$h[4] = (int)0x510e527f;
-			$h[5] = (int)0x9b05688c;
-			$h[6] = (int)0x1f83d9ab;
-			$h[7] = (int)0x5be0cd19;
-
-			// loop through message blocks and compute hash. ( For i=1 to N : )
-			$N = count($M);
-			for ($i = 0; $i < $N; $i++) {
-				// Break input block into 16 32bit words (message schedule prep)
-				$MI = $M[$i];
-
-				// Initialize working variables
-				$_a = (int)$h[0];
-				$_b = (int)$h[1];
-				$_c = (int)$h[2];
-				$_d = (int)$h[3];
-				$_e = (int)$h[4];
-				$_f = (int)$h[5];
-				$_g = (int)$h[6];
-				$_h = (int)$h[7];
-				unset($_s0);
-				unset($_s1);
-				unset($_T1);
-				unset($_T2);
-				$W = array();
-
-				// Compute the hash and update
-				for ($t = 0; $t < 16; $t++) {
-					// Prepare the first 16 message schedule values as we loop
-					$W[$t] = $MI[$t];
-
-					// Compute hash
-					$_T1 = $this->addmod2n($this->addmod2n($this->addmod2n($this->addmod2n($_h, $this->Sigma1($_e)),
-						$this->Ch($_e, $_f, $_g)), $K[$t]), $W[$t]);
-					$_T2 = $this->addmod2n($this->Sigma0($_a), $this->Maj($_a, $_b, $_c));
-
-					// Update working variables
-					$_h = $_g;
-					$_g = $_f;
-					$_f = $_e;
-					$_e = $this->addmod2n($_d, $_T1);
-					$_d = $_c;
-					$_c = $_b;
-					$_b = $_a;
-					$_a = $this->addmod2n($_T1, $_T2);
-				}
-
-				for (; $t < 64; $t++) {
-					// Continue building the message schedule as we loop
-					$_s0 = $W[($t+1) & 0x0F];
-					$_s0 = $this->sigma_0($_s0);
-					$_s1 = $W[($t+14) & 0x0F];
-					$_s1 = $this->sigma_1($_s1);
-
-					$W[$t & 0xF] = $this->addmod2n($this->addmod2n($this->addmod2n($W[$t & 0xF], $_s0), $_s1), $W[($t+9) & 0x0F]);
-
-					// Compute hash
-					$_T1 = $this->addmod2n($this->addmod2n($this->addmod2n($this->addmod2n($_h, $this->Sigma1($_e)),
-						$this->Ch($_e, $_f, $_g)), $K[$t]), $W[$t & 0xF]);
-					$_T2 = $this->addmod2n($this->Sigma0($_a), $this->Maj($_a, $_b, $_c));
-
-					// Update working variables
-					$_h = $_g;
-					$_g = $_f;
-					$_f = $_e;
-					$_e = $this->addmod2n($_d, $_T1);
-					$_d = $_c;
-					$_c = $_b;
-					$_b = $_a;
-					$_a = $this->addmod2n($_T1, $_T2);
-				}
-
-				$h[0] = $this->addmod2n($h[0], $_a);
-				$h[1] = $this->addmod2n($h[1], $_b);
-				$h[2] = $this->addmod2n($h[2], $_c);
-				$h[3] = $this->addmod2n($h[3], $_d);
-				$h[4] = $this->addmod2n($h[4], $_e);
-				$h[5] = $this->addmod2n($h[5], $_f);
-				$h[6] = $this->addmod2n($h[6], $_g);
-				$h[7] = $this->addmod2n($h[7], $_h);
-			}
-
-			// Convert the 32-bit words into human readable hexadecimal format.
-			$hexStr = sprintf("%08x%08x%08x%08x%08x%08x%08x%08x", $h[0], $h[1], $h[2], $h[3], $h[4], $h[5], $h[6], $h[7]);
-
-			return ($this->toUpper) ? strtoupper($hexStr) : $hexStr;
-		}
-
-	}
+            $K = array(
+                (int)0x428a2f98,
+                (int)0x71374491,
+                (int)0xb5c0fbcf,
+                (int)0xe9b5dba5,
+                (int)0x3956c25b,
+                (int)0x59f111f1,
+                (int)0x923f82a4,
+                (int)0xab1c5ed5,
+                (int)0xd807aa98,
+                (int)0x12835b01,
+                (int)0x243185be,
+                (int)0x550c7dc3,
+                (int)0x72be5d74,
+                (int)0x80deb1fe,
+                (int)0x9bdc06a7,
+                (int)0xc19bf174,
+                (int)0xe49b69c1,
+                (int)0xefbe4786,
+                (int)0x0fc19dc6,
+                (int)0x240ca1cc,
+                (int)0x2de92c6f,
+                (int)0x4a7484aa,
+                (int)0x5cb0a9dc,
+                (int)0x76f988da,
+                (int)0x983e5152,
+                (int)0xa831c66d,
+                (int)0xb00327c8,
+                (int)0xbf597fc7,
+                (int)0xc6e00bf3,
+                (int)0xd5a79147,
+                (int)0x06ca6351,
+                (int)0x14292967,
+                (int)0x27b70a85,
+                (int)0x2e1b2138,
+                (int)0x4d2c6dfc,
+                (int)0x53380d13,
+                (int)0x650a7354,
+                (int)0x766a0abb,
+                (int)0x81c2c92e,
+                (int)0x92722c85,
+                (int)0xa2bfe8a1,
+                (int)0xa81a664b,
+                (int)0xc24b8b70,
+                (int)0xc76c51a3,
+                (int)0xd192e819,
+                (int)0xd6990624,
+                (int)0xf40e3585,
+                (int)0x106aa070,
+                (int)0x19a4c116,
+                (int)0x1e376c08,
+                (int)0x2748774c,
+                (int)0x34b0bcb5,
+                (int)0x391c0cb3,
+                (int)0x4ed8aa4a,
+                (int)0x5b9cca4f,
+                (int)0x682e6ff3,
+                (int)0x748f82ee,
+                (int)0x78a5636f,
+                (int)0x84c87814,
+                (int)0x8cc70208,
+                (int)0x90befffa,
+                (int)0xa4506ceb,
+                (int)0xbef9a3f7,
+                (int)0xc67178f2
+            );
+
+            // Pre-processing: Padding the string
+            $binStr = $this->string2binint($str, 512);
+
+            // Parsing the Padded Message (Break into N 512-bit blocks)
+            $M = $this->array_split($binStr, 16);
+
+            // Set the initial hash values
+            $h[0] = (int)0x6a09e667;
+            $h[1] = (int)0xbb67ae85;
+            $h[2] = (int)0x3c6ef372;
+            $h[3] = (int)0xa54ff53a;
+            $h[4] = (int)0x510e527f;
+            $h[5] = (int)0x9b05688c;
+            $h[6] = (int)0x1f83d9ab;
+            $h[7] = (int)0x5be0cd19;
+
+            // loop through message blocks and compute hash. ( For i=1 to N : )
+            $N = count($M);
+            for ($i = 0; $i < $N; $i++) {
+                // Break input block into 16 32bit words (message schedule prep)
+                $MI = $M[$i];
+
+                // Initialize working variables
+                $_a = (int)$h[0];
+                $_b = (int)$h[1];
+                $_c = (int)$h[2];
+                $_d = (int)$h[3];
+                $_e = (int)$h[4];
+                $_f = (int)$h[5];
+                $_g = (int)$h[6];
+                $_h = (int)$h[7];
+                unset($_s0);
+                unset($_s1);
+                unset($_T1);
+                unset($_T2);
+                $W = array();
+
+                // Compute the hash and update
+                for ($t = 0; $t < 16; $t++) {
+                    // Prepare the first 16 message schedule values as we loop
+                    $W[$t] = $MI[$t];
+
+                    // Compute hash
+                    $_T1 = $this->addmod2n($this->addmod2n($this->addmod2n($this->addmod2n($_h, $this->Sigma1($_e)),
+                        $this->Ch($_e, $_f, $_g)), $K[$t]), $W[$t]);
+                    $_T2 = $this->addmod2n($this->Sigma0($_a), $this->Maj($_a, $_b, $_c));
+
+                    // Update working variables
+                    $_h = $_g;
+                    $_g = $_f;
+                    $_f = $_e;
+                    $_e = $this->addmod2n($_d, $_T1);
+                    $_d = $_c;
+                    $_c = $_b;
+                    $_b = $_a;
+                    $_a = $this->addmod2n($_T1, $_T2);
+                }
+
+                for (; $t < 64; $t++) {
+                    // Continue building the message schedule as we loop
+                    $_s0 = $W[($t+1) & 0x0F];
+                    $_s0 = $this->sigma_0($_s0);
+                    $_s1 = $W[($t+14) & 0x0F];
+                    $_s1 = $this->sigma_1($_s1);
+
+                    $W[$t & 0xF] = $this->addmod2n($this->addmod2n($this->addmod2n($W[$t & 0xF], $_s0), $_s1), $W[($t+9) & 0x0F]);
+
+                    // Compute hash
+                    $_T1 = $this->addmod2n($this->addmod2n($this->addmod2n($this->addmod2n($_h, $this->Sigma1($_e)),
+                        $this->Ch($_e, $_f, $_g)), $K[$t]), $W[$t & 0xF]);
+                    $_T2 = $this->addmod2n($this->Sigma0($_a), $this->Maj($_a, $_b, $_c));
+
+                    // Update working variables
+                    $_h = $_g;
+                    $_g = $_f;
+                    $_f = $_e;
+                    $_e = $this->addmod2n($_d, $_T1);
+                    $_d = $_c;
+                    $_c = $_b;
+                    $_b = $_a;
+                    $_a = $this->addmod2n($_T1, $_T2);
+                }
+
+                $h[0] = $this->addmod2n($h[0], $_a);
+                $h[1] = $this->addmod2n($h[1], $_b);
+                $h[2] = $this->addmod2n($h[2], $_c);
+                $h[3] = $this->addmod2n($h[3], $_d);
+                $h[4] = $this->addmod2n($h[4], $_e);
+                $h[5] = $this->addmod2n($h[5], $_f);
+                $h[6] = $this->addmod2n($h[6], $_g);
+                $h[7] = $this->addmod2n($h[7], $_h);
+            }
+
+            // Convert the 32-bit words into human readable hexadecimal format.
+            $hexStr = sprintf("%08x%08x%08x%08x%08x%08x%08x%08x", $h[0], $h[1], $h[2], $h[3], $h[4], $h[5], $h[6], $h[7]);
+
+            return ($this->toUpper) ? strtoupper($hexStr) : $hexStr;
+        }
+
+    }
 }
 
 /**
@@ -562,42 +562,42 @@ 
  * @return string Le SHA de la chaîne
  */
 function _nano_sha256($str, $ig_func = true) {
-	$obj = new nanoSha2((defined('_NANO_SHA2_UPPER')) ? true : false);
+    $obj = new nanoSha2((defined('_NANO_SHA2_UPPER')) ? true : false);
 
-	return $obj->hash($str, $ig_func);
+    return $obj->hash($str, $ig_func);
 }
 
 // 2009-07-23: Added check for function as the Suhosin plugin adds this routine.
 if (!function_exists('sha256')) {
-	/**
-	 * Calcul du SHA256
-	 *
-	 * @param string $str Chaîne dont on veut calculer le SHA
-	 * @param bool $ig_func
-	 * @return string Le SHA de la chaîne
-	 */
-	function sha256($str, $ig_func = true) { return _nano_sha256($str, $ig_func); }
+    /**
+     * Calcul du SHA256
+     *
+     * @param string $str Chaîne dont on veut calculer le SHA
+     * @param bool $ig_func
+     * @return string Le SHA de la chaîne
+     */
+    function sha256($str, $ig_func = true) { return _nano_sha256($str, $ig_func); }
 }
 
 // support to give php4 the hash() routine which abstracts this code.
 if (!function_exists('hash')) {
-	define('_NO_HASH_DEFINED', true);
-	/**
-	 * Retourne le calcul d'un hachage d'une chaîne (pour PHP4)
-	 *
-	 * @param string $algo Nom de l'algorythme de hachage
-	 * @param string $data Chaîne à hacher
-	 * @return string|bool
-	 *     Hash de la chaîne
-	 *     False si pas d'algo trouvé
-	 */
-	function hash($algo, $data) {
-		if (empty($algo) || !is_string($algo) || !is_string($data)) {
-			return false;
-		}
-
-		if (function_exists($algo)) {
-			return $algo($data);
-		}
-	}
+    define('_NO_HASH_DEFINED', true);
+    /**
+     * Retourne le calcul d'un hachage d'une chaîne (pour PHP4)
+     *
+     * @param string $algo Nom de l'algorythme de hachage
+     * @param string $data Chaîne à hacher
+     * @return string|bool
+     *     Hash de la chaîne
+     *     False si pas d'algo trouvé
+     */
+    function hash($algo, $data) {
+        if (empty($algo) || !is_string($algo) || !is_string($data)) {
+            return false;
+        }
+
+        if (function_exists($algo)) {
+            return $algo($data);
+        }
+    }
 }
\ No newline at end of file

ecrire/prive.php

Indentation +12 added lines, -12 removed lines

@@ -20,18 +20,18 @@
 $var_auth = $auth();
 
 if ($var_auth !== '') {
-	if (!is_int($var_auth)) {
-		// si l'authentifie' n'a pas acces a l'espace de redac
-		// c'est qu'on voulait forcer sa reconnaissance en tant que visiteur.
-		// On reexecute pour deboucher sur le include public.
-		// autrement on insiste
-		if (is_array($var_auth)) {
-			$var_auth = '../?' . $_SERVER['QUERY_STRING'];
-			spip_setcookie('spip_session', $_COOKIE['spip_session'], time() + 3600 * 24 * 14);
-		}
-		include_spip('inc/headers');
-		redirige_formulaire($var_auth);
-	}
+    if (!is_int($var_auth)) {
+        // si l'authentifie' n'a pas acces a l'espace de redac
+        // c'est qu'on voulait forcer sa reconnaissance en tant que visiteur.
+        // On reexecute pour deboucher sur le include public.
+        // autrement on insiste
+        if (is_array($var_auth)) {
+            $var_auth = '../?' . $_SERVER['QUERY_STRING'];
+            spip_setcookie('spip_session', $_COOKIE['spip_session'], time() + 3600 * 24 * 14);
+        }
+        include_spip('inc/headers');
+        redirige_formulaire($var_auth);
+    }
 }
 
 // En somme, est prive' ce qui est publiquement nomme'...

ecrire/plugins/afficher_nom_plugin.php

Indentation +40 added lines, -40 removed lines

@@ -11,7 +11,7 @@ 
 \***************************************************************************/
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 include_spip('inc/charsets');
 include_spip('inc/texte');
@@ -19,54 +19,54 @@ 
 
 // http://code.spip.net/@ligne_plug
 function plugins_afficher_nom_plugin_dist(
-	$url_page,
-	$plug_file,
-	$checked,
-	$actif,
-	$expose = false,
-	$class_li = "item",
-	$dir_plugins = _DIR_PLUGINS
+    $url_page,
+    $plug_file,
+    $checked,
+    $actif,
+    $expose = false,
+    $class_li = "item",
+    $dir_plugins = _DIR_PLUGINS
 ) {
-	static $id_input = 0;
-	static $versions = array();
+    static $id_input = 0;
+    static $versions = array();
 
-	$erreur = false;
-	$s = "";
+    $erreur = false;
+    $s = "";
 
-	$get_infos = charger_fonction('get_infos', 'plugins');
-	$info = $get_infos($plug_file, false, $dir_plugins);
+    $get_infos = charger_fonction('get_infos', 'plugins');
+    $info = $get_infos($plug_file, false, $dir_plugins);
 
-	// numerotons les occurences d'un meme prefix
-	$versions[$info['prefix']] = isset($versions[$info['prefix']]) ? $versions[$info['prefix']] + 1 : '';
-	$id = $info['prefix'] . $versions[$info['prefix']];
+    // numerotons les occurences d'un meme prefix
+    $versions[$info['prefix']] = isset($versions[$info['prefix']]) ? $versions[$info['prefix']] + 1 : '';
+    $id = $info['prefix'] . $versions[$info['prefix']];
 
-	$class = $class_li;
-	$class .= $actif ? " actif" : "";
-	$class .= $expose ? " on" : "";
-	$erreur = isset($info['erreur']);
-	if ($erreur) {
-		$class .= " error";
-	}
-	$s .= "<li id='$id' class='$class'>";
+    $class = $class_li;
+    $class .= $actif ? " actif" : "";
+    $class .= $expose ? " on" : "";
+    $erreur = isset($info['erreur']);
+    if ($erreur) {
+        $class .= " error";
+    }
+    $s .= "<li id='$id' class='$class'>";
 
-	// Cartouche Resume
-	$s .= "<div class='resume'>";
+    // Cartouche Resume
+    $s .= "<div class='resume'>";
 
-	$prefix = $info['prefix'];
-	$dir = "$dir_plugins$plug_file/lang/$prefix";
-	$desc = plugin_propre($info['description'], $dir);
-	$url_stat = parametre_url($url_page, "plugin", $dir_plugins . $plug_file);
+    $prefix = $info['prefix'];
+    $dir = "$dir_plugins$plug_file/lang/$prefix";
+    $desc = plugin_propre($info['description'], $dir);
+    $url_stat = parametre_url($url_page, "plugin", $dir_plugins . $plug_file);
 
-	$s .= "<strong class='nom'>" . typo($info['nom']) . "</strong>";
-	$s .= " <span class='version'>" . $info['version'] . "</span>";
-	$s .= " <span class='etat'> - " . plugin_etat_en_clair($info['etat']) . "</span>";
-	$s .= "</div>";
+    $s .= "<strong class='nom'>" . typo($info['nom']) . "</strong>";
+    $s .= " <span class='version'>" . $info['version'] . "</span>";
+    $s .= " <span class='etat'> - " . plugin_etat_en_clair($info['etat']) . "</span>";
+    $s .= "</div>";
 
-	if ($erreur) {
-		$s .= "<div class='erreur'>" . join('<br >', $info['erreur']) . "</div>";
-	}
+    if ($erreur) {
+        $s .= "<div class='erreur'>" . join('<br >', $info['erreur']) . "</div>";
+    }
 
-	$s .= "</li>";
+    $s .= "</li>";
 
-	return $s;
+    return $s;
 }