Inspection of "Un petit fond crémeux sous le formulaire, et -> l'..." - spip/SPIP - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( c2b92a...d64163 )

by cam

created 2021-05-18 20:17 UTC

Status

Indentation +16 added lines, -16 removed lines patch added patch discarded remove patch

@@ -17,7 +17,7 @@  discard block
 block discarded – undo
  */
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 /**
@@ -25,25 +25,25 @@  discard block
 block discarded – undo
  */
 function exec_404_dist() {
 
-	$exec = _request('exec');
+    $exec = _request('exec');
 
-	$titre = "exec_$exec";
-	$navigation = '';
-	$extra = '';
+    $titre = "exec_$exec";
+    $navigation = '';
+    $extra = '';
 
-	include_spip('inc/presentation'); // alleger les inclusions avec un inc/presentation_mini
-	$commencer_page = charger_fonction('commencer_page', 'inc');
-	echo $commencer_page($titre);
+    include_spip('inc/presentation'); // alleger les inclusions avec un inc/presentation_mini
+    $commencer_page = charger_fonction('commencer_page', 'inc');
+    echo $commencer_page($titre);
 
-	echo debut_gauche("404_$exec", true);
-	echo pipeline('affiche_gauche', array('args' => array('exec' => '404', 'exec_erreur' => $exec), 'data' => ''));
+    echo debut_gauche("404_$exec", true);
+    echo pipeline('affiche_gauche', array('args' => array('exec' => '404', 'exec_erreur' => $exec), 'data' => ''));
 
-	echo creer_colonne_droite('404', true);
-	echo pipeline('affiche_droite', array('args' => array('exec' => '404', 'exec_erreur' => $exec), 'data' => ''));
+    echo creer_colonne_droite('404', true);
+    echo pipeline('affiche_droite', array('args' => array('exec' => '404', 'exec_erreur' => $exec), 'data' => ''));
 
-	echo debut_droite('404', true);
-	echo "<h1 class='grostitre'>" . _T('fichier_introuvable', array('fichier' => $exec)) . '</h1>';
-	echo pipeline('affiche_milieu', array('args' => array('exec' => '404', 'exec_erreur' => $exec), 'data' => ''));
+    echo debut_droite('404', true);
+    echo "<h1 class='grostitre'>" . _T('fichier_introuvable', array('fichier' => $exec)) . '</h1>';
+    echo pipeline('affiche_milieu', array('args' => array('exec' => '404', 'exec_erreur' => $exec), 'data' => ''));
 
-	echo fin_gauche(), fin_page();
+    echo fin_gauche(), fin_page();
 }

Please login to merge, or discard this patch.

ecrire/exec/plonger.php 1 patch

Indentation +17 added lines, -17 removed lines patch added patch discarded remove patch

@@ -17,7 +17,7 @@  discard block
 block discarded – undo
  */
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 /**
@@ -27,23 +27,23 @@  discard block
 block discarded – undo
  * @uses ajax_retour()
  **/
 function exec_plonger_dist() {
-	include_spip('inc/actions');
+    include_spip('inc/actions');
 
-	$rac = preg_replace(',[^\w\,/#&;-]+,', ' ', _request('rac'));
-	$id = intval(_request('id'));
-	$exclus = intval(_request('exclus'));
-	$col = intval(_request('col'));
-	$do = _request('do');
-	if (preg_match('/^\w*$/', $do)) {
-		if (!$do) {
-			$do = 'aff';
-		}
+    $rac = preg_replace(',[^\w\,/#&;-]+,', ' ', _request('rac'));
+    $id = intval(_request('id'));
+    $exclus = intval(_request('exclus'));
+    $col = intval(_request('col'));
+    $do = _request('do');
+    if (preg_match('/^\w*$/', $do)) {
+        if (!$do) {
+            $do = 'aff';
+        }
 
-		$plonger = charger_fonction('plonger', 'inc');
-		$r = $plonger($id, spip_htmlentities($rac), array(), $col, $exclus, $do);
-	} else {
-		$r = '';
-	}
+        $plonger = charger_fonction('plonger', 'inc');
+        $r = $plonger($id, spip_htmlentities($rac), array(), $col, $exclus, $do);
+    } else {
+        $r = '';
+    }
 
-	ajax_retour($r);
+    ajax_retour($r);
 }

Please login to merge, or discard this patch.

ecrire/exec/info_plugin.php 1 patch

Indentation +20 added lines, -20 removed lines patch added patch discarded remove patch

@@ -7,7 +7,7 @@  discard block
 block discarded – undo
  */
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 include_spip('inc/actions');
@@ -21,23 +21,23 @@  discard block
 block discarded – undo
  * @uses ajax_retour()
  */
 function exec_info_plugin_dist() {
-	if (!autoriser('configurer', '_plugins')) {
-		include_spip('inc/minipres');
-		echo minipres();
-	} else {
-		$plug = _DIR_RACINE . htmlspecialchars(_request('plugin'));
-		$get_infos = charger_fonction('get_infos', 'plugins');
-		$dir = "";
-		if (strncmp($plug, _DIR_PLUGINS, strlen(_DIR_PLUGINS)) == 0) {
-			$dir = _DIR_PLUGINS;
-		} elseif (strncmp($plug, _DIR_PLUGINS_DIST, strlen(_DIR_PLUGINS_DIST)) == 0) {
-			$dir = _DIR_PLUGINS_DIST;
-		}
-		if ($dir) {
-			$plug = substr($plug, strlen($dir));
-		}
-		$info = $get_infos($plug, false, $dir);
-		$afficher_plugin = charger_fonction("afficher_plugin", "plugins");
-		ajax_retour(affiche_bloc_plugin($plug, $info, $dir));
-	}
+    if (!autoriser('configurer', '_plugins')) {
+        include_spip('inc/minipres');
+        echo minipres();
+    } else {
+        $plug = _DIR_RACINE . htmlspecialchars(_request('plugin'));
+        $get_infos = charger_fonction('get_infos', 'plugins');
+        $dir = "";
+        if (strncmp($plug, _DIR_PLUGINS, strlen(_DIR_PLUGINS)) == 0) {
+            $dir = _DIR_PLUGINS;
+        } elseif (strncmp($plug, _DIR_PLUGINS_DIST, strlen(_DIR_PLUGINS_DIST)) == 0) {
+            $dir = _DIR_PLUGINS_DIST;
+        }
+        if ($dir) {
+            $plug = substr($plug, strlen($dir));
+        }
+        $info = $get_infos($plug, false, $dir);
+        $afficher_plugin = charger_fonction("afficher_plugin", "plugins");
+        ajax_retour(affiche_bloc_plugin($plug, $info, $dir));
+    }
 }

Please login to merge, or discard this patch.

ecrire/exec/base_delete_all.php 1 patch

Indentation +28 added lines, -28 removed lines patch added patch discarded remove patch

@@ -17,38 +17,38 @@
 block discarded – undo
  */
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 /**
  * Exec de la page de destruction des tables de SPIP
  **/
 function exec_base_delete_all_dist() {
-	include_spip('inc/autoriser');
-	if (!autoriser('detruire')) {
-		include_spip('inc/minipres');
-		echo minipres();
-	} else {
-		include_spip('base/dump');
-		$res = base_lister_toutes_tables('', array(), array(), true);
-		if (!$res) {
-			include_spip('inc/minipres');
-			spip_log("Erreur base de donnees");
-			echo minipres(_T('info_travaux_titre'),
-				_T('titre_probleme_technique') . "<p><tt>" . sql_errno() . " " . sql_error() . "</tt></p>");
-		} else {
-			$res = base_saisie_tables('delete', $res);
-			include_spip('inc/headers');
-			$res = "\n<ol style='text-align:left'><li>\n" .
-				join("</li>\n<li>", $res) .
-				'</li></ol>';
-			$admin = charger_fonction('admin', 'inc');
-			$res = $admin('delete_all', _T('titre_page_delete_all'), $res);
-			if (!$res) {
-				redirige_url_ecrire('install', '');
-			} else {
-				echo $res;
-			}
-		}
-	}
+    include_spip('inc/autoriser');
+    if (!autoriser('detruire')) {
+        include_spip('inc/minipres');
+        echo minipres();
+    } else {
+        include_spip('base/dump');
+        $res = base_lister_toutes_tables('', array(), array(), true);
+        if (!$res) {
+            include_spip('inc/minipres');
+            spip_log("Erreur base de donnees");
+            echo minipres(_T('info_travaux_titre'),
+                _T('titre_probleme_technique') . "<p><tt>" . sql_errno() . " " . sql_error() . "</tt></p>");
+        } else {
+            $res = base_saisie_tables('delete', $res);
+            include_spip('inc/headers');
+            $res = "\n<ol style='text-align:left'><li>\n" .
+                join("</li>\n<li>", $res) .
+                '</li></ol>';
+            $admin = charger_fonction('admin', 'inc');
+            $res = $admin('delete_all', _T('titre_page_delete_all'), $res);
+            if (!$res) {
+                redirige_url_ecrire('install', '');
+            } else {
+                echo $res;
+            }
+        }
+    }
 }

Please login to merge, or discard this patch.

ecrire/exec/selectionner.php 1 patch

Indentation +16 added lines, -16 removed lines patch added patch discarded remove patch

@@ -16,7 +16,7 @@  discard block
 block discarded – undo
  * @package SPIP\Core\Rubriques
  **/
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 include_spip('inc/actions');
@@ -28,21 +28,21 @@  discard block
 block discarded – undo
  * @uses ajax_retour()
  **/
 function exec_selectionner_dist() {
-	$id = intval(_request('id'));
-	$exclus = intval(_request('exclus'));
-	$type = _request('type');
-	$rac = _request('racine');
-	$do = _request('do');
-	if (preg_match('/^\w*$/', $do)) {
-		if (!$do) {
-			$do = 'aff';
-		}
+    $id = intval(_request('id'));
+    $exclus = intval(_request('exclus'));
+    $type = _request('type');
+    $rac = _request('racine');
+    $do = _request('do');
+    if (preg_match('/^\w*$/', $do)) {
+        if (!$do) {
+            $do = 'aff';
+        }
 
-		$selectionner = charger_fonction('selectionner', 'inc');
+        $selectionner = charger_fonction('selectionner', 'inc');
 
-		$r = $selectionner($id, "choix_parent", $exclus, $rac, $type != 'breve', $do);
-	} else {
-		$r = '';
-	}
-	ajax_retour($r);
+        $r = $selectionner($id, "choix_parent", $exclus, $rac, $type != 'breve', $do);
+    } else {
+        $r = '';
+    }
+    ajax_retour($r);
 }

Please login to merge, or discard this patch.

ecrire/exec/informer.php 1 patch

Indentation +15 added lines, -15 removed lines patch added patch discarded remove patch

@@ -17,7 +17,7 @@  discard block
 block discarded – undo
  */
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 include_spip('inc/actions');
@@ -29,20 +29,20 @@  discard block
 block discarded – undo
  * @uses ajax_retour()
  **/
 function exec_informer_dist() {
-	$id = intval(_request('id'));
-	$col = intval(_request('col'));
-	$exclus = intval(_request('exclus'));
-	$do = _request('do');
+    $id = intval(_request('id'));
+    $col = intval(_request('col'));
+    $exclus = intval(_request('exclus'));
+    $do = _request('do');
 
-	if (preg_match('/^\w*$/', $do)) {
-		if (!$do) {
-			$do = 'aff';
-		}
+    if (preg_match('/^\w*$/', $do)) {
+        if (!$do) {
+            $do = 'aff';
+        }
 
-		$informer = charger_fonction('informer', 'inc');
-		$res = $informer($id, $col, $exclus, _request('rac'), _request('type'), $do);
-	} else {
-		$res = '';
-	}
-	ajax_retour($res);
+        $informer = charger_fonction('informer', 'inc');
+        $res = $informer($id, $col, $exclus, _request('rac'), _request('type'), $do);
+    } else {
+        $res = '';
+    }
+    ajax_retour($res);
 }

Please login to merge, or discard this patch.

ecrire/exec/upgrade.php 1 patch

Indentation +55 added lines, -55 removed lines patch added patch discarded remove patch

@@ -17,7 +17,7 @@  discard block
 block discarded – undo
  */
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 include_spip('inc/actions');
@@ -30,63 +30,63 @@  discard block
 block discarded – undo
  **/
 function exec_upgrade_dist() {
 
-	if (!_FILE_CONNECT) {
-		redirige_url_ecrire("install");
-	}
+    if (!_FILE_CONNECT) {
+        redirige_url_ecrire("install");
+    }
 
-	// Si reinstallation necessaire, message ad hoc
-	if (_request('reinstall') == 'oui') {
-		include_spip('inc/minipres');
-		$r = minipres(_T('titre_page_upgrade'),
-			"<p><b>"
-			. _T('texte_nouvelle_version_spip_1')
-			. "</b><p> "
-			. _T('texte_nouvelle_version_spip_2',
-				array('connect' => '<tt>' . _FILE_CONNECT . '</tt>'))
-			. generer_form_ecrire('upgrade', "<input type='hidden' name='reinstall' value='non' />", '',
-				_T('bouton_relancer_installation')));
-		echo $r;
-	} elseif (_request('fin')) {
-		include_spip('inc/plugin');
-		actualise_plugins_actifs();
-		include_spip('inc/headers');
-		$res = generer_url_ecrire('admin_plugin', 'var_mode=recalcul');
-		echo redirige_formulaire($res);
-	} else {
+    // Si reinstallation necessaire, message ad hoc
+    if (_request('reinstall') == 'oui') {
+        include_spip('inc/minipres');
+        $r = minipres(_T('titre_page_upgrade'),
+            "<p><b>"
+            . _T('texte_nouvelle_version_spip_1')
+            . "</b><p> "
+            . _T('texte_nouvelle_version_spip_2',
+                array('connect' => '<tt>' . _FILE_CONNECT . '</tt>'))
+            . generer_form_ecrire('upgrade', "<input type='hidden' name='reinstall' value='non' />", '',
+                _T('bouton_relancer_installation')));
+        echo $r;
+    } elseif (_request('fin')) {
+        include_spip('inc/plugin');
+        actualise_plugins_actifs();
+        include_spip('inc/headers');
+        $res = generer_url_ecrire('admin_plugin', 'var_mode=recalcul');
+        echo redirige_formulaire($res);
+    } else {
 
-		if (!isset($GLOBALS['meta']['version_installee'])) {
-			$GLOBALS['meta']['version_installee'] = 0.0;
-		} else {
-			$GLOBALS['meta']['version_installee'] =
-				(double)str_replace(',', '.', $GLOBALS['meta']['version_installee']);
-		}
-		# NB: str_replace car, sur club-internet, il semble que version_installe soit
-		# enregistree au format '1,812' et non '1.812'
+        if (!isset($GLOBALS['meta']['version_installee'])) {
+            $GLOBALS['meta']['version_installee'] = 0.0;
+        } else {
+            $GLOBALS['meta']['version_installee'] =
+                (double)str_replace(',', '.', $GLOBALS['meta']['version_installee']);
+        }
+        # NB: str_replace car, sur club-internet, il semble que version_installe soit
+        # enregistree au format '1,812' et non '1.812'
 
-		// Erreur downgrade
-		// (cas de double installation de fichiers SPIP sur une meme base)
-		if ($GLOBALS['spip_version_base'] < $GLOBALS['meta']['version_installee']) {
-			$commentaire = _T('info_mise_a_niveau_base_2');
-		} // Commentaire standard upgrade
-		else {
-			$commentaire = _T('texte_mise_a_niveau_base_1');
-		}
+        // Erreur downgrade
+        // (cas de double installation de fichiers SPIP sur une meme base)
+        if ($GLOBALS['spip_version_base'] < $GLOBALS['meta']['version_installee']) {
+            $commentaire = _T('info_mise_a_niveau_base_2');
+        } // Commentaire standard upgrade
+        else {
+            $commentaire = _T('texte_mise_a_niveau_base_1');
+        }
 
-		$commentaire .= "<br />[" . $GLOBALS['meta']['version_installee'] . "/" . $GLOBALS['spip_version_base'] . "]";
+        $commentaire .= "<br />[" . $GLOBALS['meta']['version_installee'] . "/" . $GLOBALS['spip_version_base'] . "]";
 
-		$_POST['reinstall'] = 'non'; // pour copy_request dans admin
-		include_spip('inc/headers');
-		$admin = charger_fonction('admin', 'inc');
-		$res = $admin('upgrade', _T('info_mise_a_niveau_base'), $commentaire);
-		if ($res) {
-			echo $res;
-		} else {
-			// effacer les alea pour forcer leur relecture
-			// si jamais ils ont change pendant l'upgrade
-			unset($GLOBALS['meta']['alea_ephemere']);
-			unset($GLOBALS['meta']['alea_ephemere_ancien']);
-			$res = redirige_action_auteur('purger', 'cache', 'upgrade', 'fin=oui', true);
-			echo redirige_formulaire($res);
-		}
-	}
+        $_POST['reinstall'] = 'non'; // pour copy_request dans admin
+        include_spip('inc/headers');
+        $admin = charger_fonction('admin', 'inc');
+        $res = $admin('upgrade', _T('info_mise_a_niveau_base'), $commentaire);
+        if ($res) {
+            echo $res;
+        } else {
+            // effacer les alea pour forcer leur relecture
+            // si jamais ils ont change pendant l'upgrade
+            unset($GLOBALS['meta']['alea_ephemere']);
+            unset($GLOBALS['meta']['alea_ephemere_ancien']);
+            $res = redirige_action_auteur('purger', 'cache', 'upgrade', 'fin=oui', true);
+            echo redirige_formulaire($res);
+        }
+    }
 }

Please login to merge, or discard this patch.

ecrire/exec/demande_mise_a_jour.php 1 patch

Indentation +26 added lines, -26 removed lines patch added patch discarded remove patch

@@ -21,7 +21,7 @@  discard block
 block discarded – undo
  */
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 
@@ -29,29 +29,29 @@  discard block
 block discarded – undo
  * Demander à mettre à jour la base de données
  */
 function exec_demande_mise_a_jour_dist() {
-	// on fait la verif du path avant tout,
-	// et l'installation des qu'on est dans la colonne principale
-	// si jamais la liste des plugins actifs change, il faut faire un refresh du hit
-	// pour etre sur que les bons fichiers seront charges lors de l'install
-	include_spip('inc/plugin');
-	if (actualise_plugins_actifs()) {
-		include_spip('inc/headers');
-		redirige_par_entete(self());
-	}
-
-	include_spip('inc/presentation');
-	include_spip('inc/filtres_boites');
-	$commencer_page = charger_fonction('commencer_page', 'inc');
-	echo $commencer_page('', '', '', '', true, false, false);
-
-	echo debut_grand_cadre(true);
-	echo boite_ouvrir(_T('info_message_technique'), 'notice');
-	echo "<p>" . _T('info_procedure_maj_version') . "</p>",
-		"<p>" . _T('info_administrateur_site_01') . "</p>";
-	echo bouton_action(_T('bouton_mettre_a_jour_base'), generer_url_ecrire("upgrade", "reinstall=non"));
-	echo boite_fermer();
-	// masquer les erreurs sql sur cette page car proviennent de la base pas a jour !
-	echo '<style type="text/css">#debug-nav {display: none;}</style>';
-	echo fin_grand_cadre(true);
-	echo fin_page();
+    // on fait la verif du path avant tout,
+    // et l'installation des qu'on est dans la colonne principale
+    // si jamais la liste des plugins actifs change, il faut faire un refresh du hit
+    // pour etre sur que les bons fichiers seront charges lors de l'install
+    include_spip('inc/plugin');
+    if (actualise_plugins_actifs()) {
+        include_spip('inc/headers');
+        redirige_par_entete(self());
+    }
+
+    include_spip('inc/presentation');
+    include_spip('inc/filtres_boites');
+    $commencer_page = charger_fonction('commencer_page', 'inc');
+    echo $commencer_page('', '', '', '', true, false, false);
+
+    echo debut_grand_cadre(true);
+    echo boite_ouvrir(_T('info_message_technique'), 'notice');
+    echo "<p>" . _T('info_procedure_maj_version') . "</p>",
+        "<p>" . _T('info_administrateur_site_01') . "</p>";
+    echo bouton_action(_T('bouton_mettre_a_jour_base'), generer_url_ecrire("upgrade", "reinstall=non"));
+    echo boite_fermer();
+    // masquer les erreurs sql sur cette page car proviennent de la base pas a jour !
+    echo '<style type="text/css">#debug-nav {display: none;}</style>';
+    echo fin_grand_cadre(true);
+    echo fin_page();
 }

Please login to merge, or discard this patch.

ecrire/exec/rechercher.php 1 patch

Indentation +89 added lines, -89 removed lines patch added patch discarded remove patch

@@ -18,7 +18,7 @@  discard block
 block discarded – undo
  **/
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 include_spip('inc/actions');
@@ -31,17 +31,17 @@  discard block
 block discarded – undo
  * @uses ajax_retour()
  **/
 function exec_rechercher_dist() {
-	$id = intval(_request('id'));
-	$exclus = intval(_request('exclus'));
-	$rac = spip_htmlentities(_request('rac'));
-	$type = _request('type');
-	$do = _request('do');
-	if (preg_match('/^\w*$/', $do)) {
-		$r = exec_rechercher_args($id, $type, $exclus, $rac, $do);
-	} else {
-		$r = '';
-	}
-	ajax_retour($r);
+    $id = intval(_request('id'));
+    $exclus = intval(_request('exclus'));
+    $rac = spip_htmlentities(_request('rac'));
+    $type = _request('type');
+    $do = _request('do');
+    if (preg_match('/^\w*$/', $do)) {
+        $r = exec_rechercher_args($id, $type, $exclus, $rac, $do);
+    } else {
+        $r = '';
+    }
+    ajax_retour($r);
 }
 
 /**
@@ -58,59 +58,59 @@  discard block
 block discarded – undo
  * @return string
  **/
 function exec_rechercher_args($id, $type, $exclus, $rac, $do) {
-	if (!$do) {
-		$do = 'aff';
-	}
-
-	$points = $rub = array();
-
-	$where = preg_split(",\s+,", $type);
-	if ($where) {
-		foreach ($where as $k => $v) {
-			$where[$k] = "'%" . substr(str_replace("%", "\%", sql_quote($v, '', 'string')), 1, -1) . "%'";
-		}
-		$where_titre = ("(titre LIKE " . join(" AND titre LIKE ", $where) . ")");
-		$where_desc = ("(descriptif LIKE " . join(" AND descriptif LIKE ", $where) . ")");
-		$where_id = ("(id_rubrique = " . intval($type) . ")");
-
-		if ($exclus) {
-			include_spip('inc/rubriques');
-			$where_exclus = " AND " . sql_in('id_rubrique', calcul_branche_in($exclus), 'NOT');
-		} else {
-			$where_exclus = '';
-		}
-
-		foreach (array(
-			3 => $where_titre,
-			2 => $where_desc,
-			1 => $where_id,
-		) as $point => $recherche) {
-			$res = sql_select("id_rubrique, id_parent, titre", "spip_rubriques", "$recherche$where_exclus");
-			while ($row = sql_fetch($res)) {
-				$id_rubrique = $row["id_rubrique"];
-				if (!isset($rub[$id_rubrique])) {
-					$rub[$id_rubrique] = array();
-				}
-				$rub[$id_rubrique]["titre"] = typo($row["titre"]);
-				$rub[$id_rubrique]["id_parent"] = $row["id_parent"];
-				if (!isset($points[$id_rubrique])) {
-					$points[$id_rubrique] = 0;
-				}
-				$points[$id_rubrique] = $points[$id_rubrique] + $point;
-			}
-		}
-	}
-
-	if ($points) {
-		arsort($points);
-		$style = " style='background-image: url(" . chemin_image('secteur-12.png') . ")'";
-		foreach ($rub as $k => $v) {
-			$rub[$k]['atts'] = ($v["id_parent"] ? $style : '')
-				. " class='petite-rubrique'";
-		}
-	}
-
-	return (proposer_item($points, $rub, $rac, $type, $do));
+    if (!$do) {
+        $do = 'aff';
+    }
+
+    $points = $rub = array();
+
+    $where = preg_split(",\s+,", $type);
+    if ($where) {
+        foreach ($where as $k => $v) {
+            $where[$k] = "'%" . substr(str_replace("%", "\%", sql_quote($v, '', 'string')), 1, -1) . "%'";
+        }
+        $where_titre = ("(titre LIKE " . join(" AND titre LIKE ", $where) . ")");
+        $where_desc = ("(descriptif LIKE " . join(" AND descriptif LIKE ", $where) . ")");
+        $where_id = ("(id_rubrique = " . intval($type) . ")");
+
+        if ($exclus) {
+            include_spip('inc/rubriques');
+            $where_exclus = " AND " . sql_in('id_rubrique', calcul_branche_in($exclus), 'NOT');
+        } else {
+            $where_exclus = '';
+        }
+
+        foreach (array(
+            3 => $where_titre,
+            2 => $where_desc,
+            1 => $where_id,
+        ) as $point => $recherche) {
+            $res = sql_select("id_rubrique, id_parent, titre", "spip_rubriques", "$recherche$where_exclus");
+            while ($row = sql_fetch($res)) {
+                $id_rubrique = $row["id_rubrique"];
+                if (!isset($rub[$id_rubrique])) {
+                    $rub[$id_rubrique] = array();
+                }
+                $rub[$id_rubrique]["titre"] = typo($row["titre"]);
+                $rub[$id_rubrique]["id_parent"] = $row["id_parent"];
+                if (!isset($points[$id_rubrique])) {
+                    $points[$id_rubrique] = 0;
+                }
+                $points[$id_rubrique] = $points[$id_rubrique] + $point;
+            }
+        }
+    }
+
+    if ($points) {
+        arsort($points);
+        $style = " style='background-image: url(" . chemin_image('secteur-12.png') . ")'";
+        foreach ($rub as $k => $v) {
+            $rub[$k]['atts'] = ($v["id_parent"] ? $style : '')
+                . " class='petite-rubrique'";
+        }
+    }
+
+    return (proposer_item($points, $rub, $rac, $type, $do));
 }
 
 
@@ -133,35 +133,35 @@  discard block
 block discarded – undo
  **/
 function proposer_item($ids, $titles, $rac, $type, $do) {
 
-	if (!$ids) {
-		return "<br /><br /><div style='padding: 5px; color: red;'><b>"
-		. spip_htmlentities($type)
-		. "</b> :  " . _T('avis_aucun_resultat') . "</div>";
-	}
+    if (!$ids) {
+        return "<br /><br /><div style='padding: 5px; color: red;'><b>"
+        . spip_htmlentities($type)
+        . "</b> :  " . _T('avis_aucun_resultat') . "</div>";
+    }
 
-	$ret = '';
-	$info = generer_url_ecrire('informer', "type=rubrique&rac=$rac&id=");
+    $ret = '';
+    $info = generer_url_ecrire('informer', "type=rubrique&rac=$rac&id=");
 
-	$onClick = "aff_selection(this.firstChild.title,'$rac" . "_selection','$info', event)";
+    $onClick = "aff_selection(this.firstChild.title,'$rac" . "_selection','$info', event)";
 
-	$ondbClick = "$do(this.firstChild.firstChild.nodeValue,this.firstChild.title,'selection_rubrique', 'id_parent');";
+    $ondbClick = "$do(this.firstChild.firstChild.nodeValue,this.firstChild.title,'selection_rubrique', 'id_parent');";
 
-	foreach ($ids as $id => $bof) {
+    foreach ($ids as $id => $bof) {
 
-		$titre = strtr(str_replace("'", "&#8217;", str_replace('"', "&#34;", textebrut($titles[$id]["titre"]))), "\n\r",
-			"  ");
+        $titre = strtr(str_replace("'", "&#8217;", str_replace('"', "&#34;", textebrut($titles[$id]["titre"]))), "\n\r",
+            "  ");
 
-		$ret .= "<div class='highlight off'\nonclick=\"changerhighlight(this); "
-			. $onClick
-			. "\"\nondblclick=\""
-			. $ondbClick
-			. $onClick
-			. " \"><div"
-			. $titles[$id]["atts"]
-			. " title='$id'>&nbsp; "
-			. $titre
-			. "</div></div>";
-	}
+        $ret .= "<div class='highlight off'\nonclick=\"changerhighlight(this); "
+            . $onClick
+            . "\"\nondblclick=\""
+            . $ondbClick
+            . $onClick
+            . " \"><div"
+            . $titles[$id]["atts"]
+            . " title='$id'>&nbsp; "
+            . $titre
+            . "</div></div>";
+    }
 
-	return $ret;
+    return $ret;
 }

Please login to merge, or discard this patch.

		@@ -17,7 +17,7 @@ discard block
		block discarded – undo
17	17	*/
18	18
19	19	if (!defined('_ECRIRE_INC_VERSION')) {
20		- return;
	20	+ return;
21	21	}
22	22
23	23	/**
		@@ -25,25 +25,25 @@ discard block
		block discarded – undo
25	25	*/
26	26	function exec_404_dist() {
27	27
28		- $exec = _request('exec');
	28	+ $exec = _request('exec');
29	29
30		- $titre = "exec_$exec";
31		- $navigation = '';
32		- $extra = '';
	30	+ $titre = "exec_$exec";
	31	+ $navigation = '';
	32	+ $extra = '';
33	33
34		- include_spip('inc/presentation'); // alleger les inclusions avec un inc/presentation_mini
35		- $commencer_page = charger_fonction('commencer_page', 'inc');
36		- echo $commencer_page($titre);
	34	+ include_spip('inc/presentation'); // alleger les inclusions avec un inc/presentation_mini
	35	+ $commencer_page = charger_fonction('commencer_page', 'inc');
	36	+ echo $commencer_page($titre);
37	37
38		- echo debut_gauche("404_$exec", true);
39		- echo pipeline('affiche_gauche', array('args' => array('exec' => '404', 'exec_erreur' => $exec), 'data' => ''));
	38	+ echo debut_gauche("404_$exec", true);
	39	+ echo pipeline('affiche_gauche', array('args' => array('exec' => '404', 'exec_erreur' => $exec), 'data' => ''));
40	40
41		- echo creer_colonne_droite('404', true);
42		- echo pipeline('affiche_droite', array('args' => array('exec' => '404', 'exec_erreur' => $exec), 'data' => ''));
	41	+ echo creer_colonne_droite('404', true);
	42	+ echo pipeline('affiche_droite', array('args' => array('exec' => '404', 'exec_erreur' => $exec), 'data' => ''));
43	43
44		- echo debut_droite('404', true);
45		- echo "<h1 class='grostitre'>" . _T('fichier_introuvable', array('fichier' => $exec)) . '</h1>';
46		- echo pipeline('affiche_milieu', array('args' => array('exec' => '404', 'exec_erreur' => $exec), 'data' => ''));
	44	+ echo debut_droite('404', true);
	45	+ echo "<h1 class='grostitre'>" . _T('fichier_introuvable', array('fichier' => $exec)) . '</h1>';
	46	+ echo pipeline('affiche_milieu', array('args' => array('exec' => '404', 'exec_erreur' => $exec), 'data' => ''));
47	47
48		- echo fin_gauche(), fin_page();
	48	+ echo fin_gauche(), fin_page();
49	49	}

		@@ -7,7 +7,7 @@ discard block
		block discarded – undo
7	7	*/
8	8
9	9	if (!defined('_ECRIRE_INC_VERSION')) {
10		- return;
	10	+ return;
11	11	}
12	12
13	13	include_spip('inc/actions');
		@@ -21,23 +21,23 @@ discard block
		block discarded – undo
21	21	* @uses ajax_retour()
22	22	*/
23	23	function exec_info_plugin_dist() {
24		- if (!autoriser('configurer', '_plugins')) {
25		- include_spip('inc/minipres');
26		- echo minipres();
27		- } else {
28		- $plug = _DIR_RACINE . htmlspecialchars(_request('plugin'));
29		- $get_infos = charger_fonction('get_infos', 'plugins');
30		- $dir = "";
31		- if (strncmp($plug, _DIR_PLUGINS, strlen(_DIR_PLUGINS)) == 0) {
32		- $dir = _DIR_PLUGINS;
33		- } elseif (strncmp($plug, _DIR_PLUGINS_DIST, strlen(_DIR_PLUGINS_DIST)) == 0) {
34		- $dir = _DIR_PLUGINS_DIST;
35		- }
36		- if ($dir) {
37		- $plug = substr($plug, strlen($dir));
38		- }
39		- $info = $get_infos($plug, false, $dir);
40		- $afficher_plugin = charger_fonction("afficher_plugin", "plugins");
41		- ajax_retour(affiche_bloc_plugin($plug, $info, $dir));
42		- }
	24	+ if (!autoriser('configurer', '_plugins')) {
	25	+ include_spip('inc/minipres');
	26	+ echo minipres();
	27	+ } else {
	28	+ $plug = _DIR_RACINE . htmlspecialchars(_request('plugin'));
	29	+ $get_infos = charger_fonction('get_infos', 'plugins');
	30	+ $dir = "";
	31	+ if (strncmp($plug, _DIR_PLUGINS, strlen(_DIR_PLUGINS)) == 0) {
	32	+ $dir = _DIR_PLUGINS;
	33	+ } elseif (strncmp($plug, _DIR_PLUGINS_DIST, strlen(_DIR_PLUGINS_DIST)) == 0) {
	34	+ $dir = _DIR_PLUGINS_DIST;
	35	+ }
	36	+ if ($dir) {
	37	+ $plug = substr($plug, strlen($dir));
	38	+ }
	39	+ $info = $get_infos($plug, false, $dir);
	40	+ $afficher_plugin = charger_fonction("afficher_plugin", "plugins");
	41	+ ajax_retour(affiche_bloc_plugin($plug, $info, $dir));
	42	+ }
43	43	}

		@@ -17,38 +17,38 @@
		block discarded – undo
17	17	*/
18	18
19	19	if (!defined('_ECRIRE_INC_VERSION')) {
20		- return;
	20	+ return;
21	21	}
22	22
23	23	/**
24	24	* Exec de la page de destruction des tables de SPIP
25	25	**/
26	26	function exec_base_delete_all_dist() {
27		- include_spip('inc/autoriser');
28		- if (!autoriser('detruire')) {
29		- include_spip('inc/minipres');
30		- echo minipres();
31		- } else {
32		- include_spip('base/dump');
33		- $res = base_lister_toutes_tables('', array(), array(), true);
34		- if (!$res) {
35		- include_spip('inc/minipres');
36		- spip_log("Erreur base de donnees");
37		- echo minipres(_T('info_travaux_titre'),
38		- _T('titre_probleme_technique') . "<p><tt>" . sql_errno() . " " . sql_error() . "</tt></p>");
39		- } else {
40		- $res = base_saisie_tables('delete', $res);
41		- include_spip('inc/headers');
42		- $res = "\n<ol style='text-align:left'><li>\n" .
43		- join("</li>\n<li>", $res) .
44		- '</li></ol>';
45		- $admin = charger_fonction('admin', 'inc');
46		- $res = $admin('delete_all', _T('titre_page_delete_all'), $res);
47		- if (!$res) {
48		- redirige_url_ecrire('install', '');
49		- } else {
50		- echo $res;
51		- }
52		- }
53		- }
	27	+ include_spip('inc/autoriser');
	28	+ if (!autoriser('detruire')) {
	29	+ include_spip('inc/minipres');
	30	+ echo minipres();
	31	+ } else {
	32	+ include_spip('base/dump');
	33	+ $res = base_lister_toutes_tables('', array(), array(), true);
	34	+ if (!$res) {
	35	+ include_spip('inc/minipres');
	36	+ spip_log("Erreur base de donnees");
	37	+ echo minipres(_T('info_travaux_titre'),
	38	+ _T('titre_probleme_technique') . "<p><tt>" . sql_errno() . " " . sql_error() . "</tt></p>");
	39	+ } else {
	40	+ $res = base_saisie_tables('delete', $res);
	41	+ include_spip('inc/headers');
	42	+ $res = "\n<ol style='text-align:left'><li>\n" .
	43	+ join("</li>\n<li>", $res) .
	44	+ '</li></ol>';
	45	+ $admin = charger_fonction('admin', 'inc');
	46	+ $res = $admin('delete_all', _T('titre_page_delete_all'), $res);
	47	+ if (!$res) {
	48	+ redirige_url_ecrire('install', '');
	49	+ } else {
	50	+ echo $res;
	51	+ }
	52	+ }
	53	+ }
54	54	}

		@@ -16,7 +16,7 @@ discard block
		block discarded – undo
16	16	* @package SPIP\Core\Rubriques
17	17	**/
18	18	if (!defined('_ECRIRE_INC_VERSION')) {
19		- return;
	19	+ return;
20	20	}
21	21
22	22	include_spip('inc/actions');
		@@ -28,21 +28,21 @@ discard block
		block discarded – undo
28	28	* @uses ajax_retour()
29	29	**/
30	30	function exec_selectionner_dist() {
31		- $id = intval(_request('id'));
32		- $exclus = intval(_request('exclus'));
33		- $type = _request('type');
34		- $rac = _request('racine');
35		- $do = _request('do');
36		- if (preg_match('/^\w*$/', $do)) {
37		- if (!$do) {
38		- $do = 'aff';
39		- }
	31	+ $id = intval(_request('id'));
	32	+ $exclus = intval(_request('exclus'));
	33	+ $type = _request('type');
	34	+ $rac = _request('racine');
	35	+ $do = _request('do');
	36	+ if (preg_match('/^\w*$/', $do)) {
	37	+ if (!$do) {
	38	+ $do = 'aff';
	39	+ }
40	40
41		- $selectionner = charger_fonction('selectionner', 'inc');
	41	+ $selectionner = charger_fonction('selectionner', 'inc');
42	42
43		- $r = $selectionner($id, "choix_parent", $exclus, $rac, $type != 'breve', $do);
44		- } else {
45		- $r = '';
46		- }
47		- ajax_retour($r);
	43	+ $r = $selectionner($id, "choix_parent", $exclus, $rac, $type != 'breve', $do);
	44	+ } else {
	45	+ $r = '';
	46	+ }
	47	+ ajax_retour($r);
48	48	}

		@@ -21,7 +21,7 @@ discard block
		block discarded – undo
21	21	*/
22	22
23	23	if (!defined('_ECRIRE_INC_VERSION')) {
24		- return;
	24	+ return;
25	25	}
26	26
27	27
		@@ -29,29 +29,29 @@ discard block
		block discarded – undo
29	29	* Demander à mettre à jour la base de données
30	30	*/
31	31	function exec_demande_mise_a_jour_dist() {
32		- // on fait la verif du path avant tout,
33		- // et l'installation des qu'on est dans la colonne principale
34		- // si jamais la liste des plugins actifs change, il faut faire un refresh du hit
35		- // pour etre sur que les bons fichiers seront charges lors de l'install
36		- include_spip('inc/plugin');
37		- if (actualise_plugins_actifs()) {
38		- include_spip('inc/headers');
39		- redirige_par_entete(self());
40		- }
41		-
42		- include_spip('inc/presentation');
43		- include_spip('inc/filtres_boites');
44		- $commencer_page = charger_fonction('commencer_page', 'inc');
45		- echo $commencer_page('', '', '', '', true, false, false);
46		-
47		- echo debut_grand_cadre(true);
48		- echo boite_ouvrir(_T('info_message_technique'), 'notice');
49		- echo "<p>" . _T('info_procedure_maj_version') . "</p>",
50		- "<p>" . _T('info_administrateur_site_01') . "</p>";
51		- echo bouton_action(_T('bouton_mettre_a_jour_base'), generer_url_ecrire("upgrade", "reinstall=non"));
52		- echo boite_fermer();
53		- // masquer les erreurs sql sur cette page car proviennent de la base pas a jour !
54		- echo '<style type="text/css">#debug-nav {display: none;}</style>';
55		- echo fin_grand_cadre(true);
56		- echo fin_page();
	32	+ // on fait la verif du path avant tout,
	33	+ // et l'installation des qu'on est dans la colonne principale
	34	+ // si jamais la liste des plugins actifs change, il faut faire un refresh du hit
	35	+ // pour etre sur que les bons fichiers seront charges lors de l'install
	36	+ include_spip('inc/plugin');
	37	+ if (actualise_plugins_actifs()) {
	38	+ include_spip('inc/headers');
	39	+ redirige_par_entete(self());
	40	+ }
	41	+
	42	+ include_spip('inc/presentation');
	43	+ include_spip('inc/filtres_boites');
	44	+ $commencer_page = charger_fonction('commencer_page', 'inc');
	45	+ echo $commencer_page('', '', '', '', true, false, false);
	46	+
	47	+ echo debut_grand_cadre(true);
	48	+ echo boite_ouvrir(_T('info_message_technique'), 'notice');
	49	+ echo "<p>" . _T('info_procedure_maj_version') . "</p>",
	50	+ "<p>" . _T('info_administrateur_site_01') . "</p>";
	51	+ echo bouton_action(_T('bouton_mettre_a_jour_base'), generer_url_ecrire("upgrade", "reinstall=non"));
	52	+ echo boite_fermer();
	53	+ // masquer les erreurs sql sur cette page car proviennent de la base pas a jour !
	54	+ echo '<style type="text/css">#debug-nav {display: none;}</style>';
	55	+ echo fin_grand_cadre(true);
	56	+ echo fin_page();
57	57	}

		@@ -18,7 +18,7 @@ discard block
		block discarded – undo
18	18	**/
19	19
20	20	if (!defined('_ECRIRE_INC_VERSION')) {
21		- return;
	21	+ return;
22	22	}
23	23
24	24	include_spip('inc/actions');
		@@ -31,17 +31,17 @@ discard block
		block discarded – undo
31	31	* @uses ajax_retour()
32	32	**/
33	33	function exec_rechercher_dist() {
34		- $id = intval(_request('id'));
35		- $exclus = intval(_request('exclus'));
36		- $rac = spip_htmlentities(_request('rac'));
37		- $type = _request('type');
38		- $do = _request('do');
39		- if (preg_match('/^\w*$/', $do)) {
40		- $r = exec_rechercher_args($id, $type, $exclus, $rac, $do);
41		- } else {
42		- $r = '';
43		- }
44		- ajax_retour($r);
	34	+ $id = intval(_request('id'));
	35	+ $exclus = intval(_request('exclus'));
	36	+ $rac = spip_htmlentities(_request('rac'));
	37	+ $type = _request('type');
	38	+ $do = _request('do');
	39	+ if (preg_match('/^\w*$/', $do)) {
	40	+ $r = exec_rechercher_args($id, $type, $exclus, $rac, $do);
	41	+ } else {
	42	+ $r = '';
	43	+ }
	44	+ ajax_retour($r);
45	45	}
46	46
47	47	/**
		@@ -58,59 +58,59 @@ discard block
		block discarded – undo
58	58	* @return string
59	59	**/
60	60	function exec_rechercher_args($id, $type, $exclus, $rac, $do) {
61		- if (!$do) {
62		- $do = 'aff';
63		- }
64		-
65		- $points = $rub = array();
66		-
67		- $where = preg_split(",\s+,", $type);
68		- if ($where) {
69		- foreach ($where as $k => $v) {
70		- $where[$k] = "'%" . substr(str_replace("%", "\%", sql_quote($v, '', 'string')), 1, -1) . "%'";
71		- }
72		- $where_titre = ("(titre LIKE " . join(" AND titre LIKE ", $where) . ")");
73		- $where_desc = ("(descriptif LIKE " . join(" AND descriptif LIKE ", $where) . ")");
74		- $where_id = ("(id_rubrique = " . intval($type) . ")");
75		-
76		- if ($exclus) {
77		- include_spip('inc/rubriques');
78		- $where_exclus = " AND " . sql_in('id_rubrique', calcul_branche_in($exclus), 'NOT');
79		- } else {
80		- $where_exclus = '';
81		- }
82		-
83		- foreach (array(
84		- 3 => $where_titre,
85		- 2 => $where_desc,
86		- 1 => $where_id,
87		- ) as $point => $recherche) {
88		- $res = sql_select("id_rubrique, id_parent, titre", "spip_rubriques", "$recherche$where_exclus");
89		- while ($row = sql_fetch($res)) {
90		- $id_rubrique = $row["id_rubrique"];
91		- if (!isset($rub[$id_rubrique])) {
92		- $rub[$id_rubrique] = array();
93		- }
94		- $rub[$id_rubrique]["titre"] = typo($row["titre"]);
95		- $rub[$id_rubrique]["id_parent"] = $row["id_parent"];
96		- if (!isset($points[$id_rubrique])) {
97		- $points[$id_rubrique] = 0;
98		- }
99		- $points[$id_rubrique] = $points[$id_rubrique] + $point;
100		- }
101		- }
102		- }
103		-
104		- if ($points) {
105		- arsort($points);
106		- $style = " style='background-image: url(" . chemin_image('secteur-12.png') . ")'";
107		- foreach ($rub as $k => $v) {
108		- $rub[$k]['atts'] = ($v["id_parent"] ? $style : '')
109		- . " class='petite-rubrique'";
110		- }
111		- }
112		-
113		- return (proposer_item($points, $rub, $rac, $type, $do));
	61	+ if (!$do) {
	62	+ $do = 'aff';
	63	+ }
	64	+
	65	+ $points = $rub = array();
	66	+
	67	+ $where = preg_split(",\s+,", $type);
	68	+ if ($where) {
	69	+ foreach ($where as $k => $v) {
	70	+ $where[$k] = "'%" . substr(str_replace("%", "\%", sql_quote($v, '', 'string')), 1, -1) . "%'";
	71	+ }
	72	+ $where_titre = ("(titre LIKE " . join(" AND titre LIKE ", $where) . ")");
	73	+ $where_desc = ("(descriptif LIKE " . join(" AND descriptif LIKE ", $where) . ")");
	74	+ $where_id = ("(id_rubrique = " . intval($type) . ")");
	75	+
	76	+ if ($exclus) {
	77	+ include_spip('inc/rubriques');
	78	+ $where_exclus = " AND " . sql_in('id_rubrique', calcul_branche_in($exclus), 'NOT');
	79	+ } else {
	80	+ $where_exclus = '';
	81	+ }
	82	+
	83	+ foreach (array(
	84	+ 3 => $where_titre,
	85	+ 2 => $where_desc,
	86	+ 1 => $where_id,
	87	+ ) as $point => $recherche) {
	88	+ $res = sql_select("id_rubrique, id_parent, titre", "spip_rubriques", "$recherche$where_exclus");
	89	+ while ($row = sql_fetch($res)) {
	90	+ $id_rubrique = $row["id_rubrique"];
	91	+ if (!isset($rub[$id_rubrique])) {
	92	+ $rub[$id_rubrique] = array();
	93	+ }
	94	+ $rub[$id_rubrique]["titre"] = typo($row["titre"]);
	95	+ $rub[$id_rubrique]["id_parent"] = $row["id_parent"];
	96	+ if (!isset($points[$id_rubrique])) {
	97	+ $points[$id_rubrique] = 0;
	98	+ }
	99	+ $points[$id_rubrique] = $points[$id_rubrique] + $point;
	100	+ }
	101	+ }
	102	+ }
	103	+
	104	+ if ($points) {
	105	+ arsort($points);
	106	+ $style = " style='background-image: url(" . chemin_image('secteur-12.png') . ")'";
	107	+ foreach ($rub as $k => $v) {
	108	+ $rub[$k]['atts'] = ($v["id_parent"] ? $style : '')
	109	+ . " class='petite-rubrique'";
	110	+ }
	111	+ }
	112	+
	113	+ return (proposer_item($points, $rub, $rac, $type, $do));
114	114	}
115	115
116	116
		@@ -133,35 +133,35 @@ discard block
		block discarded – undo
133	133	**/
134	134	function proposer_item($ids, $titles, $rac, $type, $do) {
135	135
136		- if (!$ids) {
137		- return "<br /><br /><div style='padding: 5px; color: red;'><b>"
138		- . spip_htmlentities($type)
139		- . "</b> : " . _T('avis_aucun_resultat') . "</div>";
140		- }
	136	+ if (!$ids) {
	137	+ return "<br /><br /><div style='padding: 5px; color: red;'><b>"
	138	+ . spip_htmlentities($type)
	139	+ . "</b> : " . _T('avis_aucun_resultat') . "</div>";
	140	+ }
141	141
142		- $ret = '';
143		- $info = generer_url_ecrire('informer', "type=rubrique&rac=$rac&id=");
	142	+ $ret = '';
	143	+ $info = generer_url_ecrire('informer', "type=rubrique&rac=$rac&id=");
144	144
145		- $onClick = "aff_selection(this.firstChild.title,'$rac" . "_selection','$info', event)";
	145	+ $onClick = "aff_selection(this.firstChild.title,'$rac" . "_selection','$info', event)";
146	146
147		- $ondbClick = "$do(this.firstChild.firstChild.nodeValue,this.firstChild.title,'selection_rubrique', 'id_parent');";
	147	+ $ondbClick = "$do(this.firstChild.firstChild.nodeValue,this.firstChild.title,'selection_rubrique', 'id_parent');";
148	148
149		- foreach ($ids as $id => $bof) {
	149	+ foreach ($ids as $id => $bof) {
150	150
151		- $titre = strtr(str_replace("'", "’", str_replace('"', """, textebrut($titles[$id]["titre"]))), "\n\r",
152		- " ");
	151	+ $titre = strtr(str_replace("'", "’", str_replace('"', """, textebrut($titles[$id]["titre"]))), "\n\r",
	152	+ " ");
153	153
154		- $ret .= "<div class='highlight off'\nonclick=\"changerhighlight(this); "
155		- . $onClick
156		- . "\"\nondblclick=\""
157		- . $ondbClick
158		- . $onClick
159		- . " \"><div"
160		- . $titles[$id]["atts"]
161		- . " title='$id'>  "
162		- . $titre
163		- . "</div></div>";
164		- }
	154	+ $ret .= "<div class='highlight off'\nonclick=\"changerhighlight(this); "
	155	+ . $onClick
	156	+ . "\"\nondblclick=\""
	157	+ . $ondbClick
	158	+ . $onClick
	159	+ . " \"><div"
	160	+ . $titles[$id]["atts"]
	161	+ . " title='$id'>  "
	162	+ . $titre
	163	+ . "</div></div>";
	164	+ }
165	165
166		- return $ret;
	166	+ return $ret;
167	167	}

spip / SPIP

Push — master ( c2b92a...d64163 )

Status

Category

Indentation +16 added lines, -16 removed lines patch added patch discarded remove patch

Indentation +17 added lines, -17 removed lines patch added patch discarded remove patch

Indentation +20 added lines, -20 removed lines patch added patch discarded remove patch

Indentation +28 added lines, -28 removed lines patch added patch discarded remove patch

Indentation +16 added lines, -16 removed lines patch added patch discarded remove patch

Indentation +15 added lines, -15 removed lines patch added patch discarded remove patch

Indentation +55 added lines, -55 removed lines patch added patch discarded remove patch

Indentation +26 added lines, -26 removed lines patch added patch discarded remove patch

Indentation +89 added lines, -89 removed lines patch added patch discarded remove patch