Inspection of "docs(changelog): pour #5708" - spip/SPIP - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 32470c...ffbbca )

by cam

created 2023-12-22 10:02 UTC

Status

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

@@ -16,7 +16,7 @@  discard block
 block discarded – undo
  **/
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 include_spip('inc/presentation');
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
  * @uses exec_puce_statut_args()
  **/
 function exec_puce_statut_dist(): void {
-	exec_puce_statut_args(_request('id'), _request('type'));
+    exec_puce_statut_args(_request('id'), _request('type'));
 }
 
 /**
@@ -49,22 +49,22 @@  discard block
 block discarded – undo
  *     Type d'objet
  **/
 function exec_puce_statut_args($id, $type): void {
-	$id = (int) $id;
-	if (
-		($table_objet_sql = table_objet_sql($type))
-		&& ($d = lister_tables_objets_sql($table_objet_sql))
-		&& isset($d['statut_textes_instituer'])
-		&& $d['statut_textes_instituer']
-	) {
-		$prim = id_table_objet($type);
-		$select = isset($d['field']['id_rubrique']) ? 'id_rubrique,statut' : '0 as id_rubrique,statut';
-		$r = sql_fetsel($select, $table_objet_sql, "$prim=$id");
-		$statut = $r['statut'];
-		$id_rubrique = $r['id_rubrique'];
-	} else {
-		$id_rubrique = $id;
-		$statut = 'prop'; // arbitraire
-	}
-	$puce_statut = charger_fonction('puce_statut', 'inc');
-	ajax_retour($puce_statut($id, $statut, $id_rubrique, $type, true));
+    $id = (int) $id;
+    if (
+        ($table_objet_sql = table_objet_sql($type))
+        && ($d = lister_tables_objets_sql($table_objet_sql))
+        && isset($d['statut_textes_instituer'])
+        && $d['statut_textes_instituer']
+    ) {
+        $prim = id_table_objet($type);
+        $select = isset($d['field']['id_rubrique']) ? 'id_rubrique,statut' : '0 as id_rubrique,statut';
+        $r = sql_fetsel($select, $table_objet_sql, "$prim=$id");
+        $statut = $r['statut'];
+        $id_rubrique = $r['id_rubrique'];
+    } else {
+        $id_rubrique = $id;
+        $statut = 'prop'; // arbitraire
+    }
+    $puce_statut = charger_fonction('puce_statut', 'inc');
+    ajax_retour($puce_statut($id, $statut, $id_rubrique, $type, true));
 }

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

@@ -16,7 +16,7 @@  discard block
 block discarded – undo
  */
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 include_spip('inc/actions');
@@ -28,20 +28,20 @@  discard block
 block discarded – undo
  * @uses ajax_retour()
  **/
 function exec_informer_dist() {
-	$id = (int) _request('id');
-	$col = (int) _request('col');
-	$exclus = (int) _request('exclus');
-	$do = _request('do');
+    $id = (int) _request('id');
+    $col = (int) _request('col');
+    $exclus = (int) _request('exclus');
+    $do = _request('do');
 
-	if (preg_match('/^\w*$/', (string) $do)) {
-		if (!$do) {
-			$do = 'aff';
-		}
+    if (preg_match('/^\w*$/', (string) $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/install.php 1 patch

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

@@ -16,7 +16,7 @@  discard block
 block discarded – undo
  */
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 include_spip('inc/minipres');
@@ -41,27 +41,27 @@  discard block
 block discarded – undo
  *
  **/
 function exec_install_dist() {
-	$etape = _request('etape');
-	$deja = (_FILE_CONNECT && analyse_fichier_connection(_FILE_CONNECT));
+    $etape = _request('etape');
+    $deja = (_FILE_CONNECT && analyse_fichier_connection(_FILE_CONNECT));
 
-	// Si deja installe, on n'a plus le droit qu'a l'etape chmod
-	// pour chgt post-install ou aux etapes supplementaires
-	// de declaration de base externes.
-	// Mais alors il faut authentifier car ecrire/index.php l'a omis
+    // Si deja installe, on n'a plus le droit qu'a l'etape chmod
+    // pour chgt post-install ou aux etapes supplementaires
+    // de declaration de base externes.
+    // Mais alors il faut authentifier car ecrire/index.php l'a omis
 
-	if ($deja && in_array($etape, ['chmod', 'sup1', 'sup2'])) {
-		$auth = charger_fonction('auth', 'inc');
-		if (!$auth()) {
-			verifier_visiteur();
-			$deja = (!autoriser('configurer'));
-		}
-	}
-	if ($deja) {
-		// Rien a faire ici
-		echo minipres();
-	} else {
-		include_spip('base/create');
-		$fonc = charger_fonction("etape_$etape", 'install');
-		$fonc();
-	}
+    if ($deja && in_array($etape, ['chmod', 'sup1', 'sup2'])) {
+        $auth = charger_fonction('auth', 'inc');
+        if (!$auth()) {
+            verifier_visiteur();
+            $deja = (!autoriser('configurer'));
+        }
+    }
+    if ($deja) {
+        // Rien a faire ici
+        echo minipres();
+    } else {
+        include_spip('base/create');
+        $fonc = charger_fonction("etape_$etape", 'install');
+        $fonc();
+    }
 }

Please login to merge, or discard this patch.

ecrire/exec/upgrade.php 2 patches

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

@@ -16,7 +16,7 @@  discard block
 block discarded – undo
  */
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 include_spip('inc/actions');
@@ -29,70 +29,70 @@  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',
-				['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(',', '.', (string) $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'
+    // 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',
+                ['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(',', '.', (string) $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.

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -43,7 +43,7 @@  discard block
 block discarded – undo
 			. '</b><p> '
 			. _T(
 				'texte_nouvelle_version_spip_2',
-				['connect' => '<tt>' . _FILE_CONNECT . '</tt>']
+				['connect' => '<tt>'._FILE_CONNECT.'</tt>']
 			)
 			. generer_form_ecrire(
 				'upgrade',
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
 			$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');

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

@@ -16,7 +16,7 @@  discard block
 block discarded – undo
  */
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 /**
@@ -26,23 +26,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\,/#&;-]+,', ' ', (string) _request('rac'));
-	$id = (int) _request('id');
-	$exclus = (int) _request('exclus');
-	$col = (int) _request('col');
-	$do = _request('do');
-	if (preg_match('/^\w*$/', (string) $do)) {
-		if (!$do) {
-			$do = 'aff';
-		}
+    $rac = preg_replace(',[^\w\,/#&;-]+,', ' ', (string) _request('rac'));
+    $id = (int) _request('id');
+    $exclus = (int) _request('exclus');
+    $col = (int) _request('col');
+    $do = _request('do');
+    if (preg_match('/^\w*$/', (string) $do)) {
+        if (!$do) {
+            $do = 'aff';
+        }
 
-		$plonger = charger_fonction('plonger', 'inc');
-		$r = $plonger($id, spip_htmlentities($rac), [], $col, $exclus, $do);
-	} else {
-		$r = '';
-	}
+        $plonger = charger_fonction('plonger', 'inc');
+        $r = $plonger($id, spip_htmlentities($rac), [], $col, $exclus, $do);
+    } else {
+        $r = '';
+    }
 
-	ajax_retour($r);
+    ajax_retour($r);
 }

Please login to merge, or discard this patch.

ecrire/exec/fond.php 2 patches

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

@@ -20,7 +20,7 @@  discard block
 block discarded – undo
  */
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 
@@ -28,16 +28,16 @@  discard block
 block discarded – undo
 $GLOBALS['delais'] = 0;// pas de cache !
 // Securite
 if (strstr((string) $fond, '/')) {
-	if (
-		!include_spip('inc/autoriser')
-		|| !autoriser('webmestre')
-	) {
-		include_spip('inc/minipres');
-		echo minipres();
-		exit;
-	}
+    if (
+        !include_spip('inc/autoriser')
+        || !autoriser('webmestre')
+    ) {
+        include_spip('inc/minipres');
+        echo minipres();
+        exit;
+    }
 } else {
-	$fond = "prive/squelettes/$fond";
+    $fond = "prive/squelettes/$fond";
 }
 
 // quelques inclusions et ini prealables
@@ -49,8 +49,8 @@  discard block
 block discarded – undo
  * @todo supprimer cette fonction vide ?
  **/
 function shutdown_error() {
-	// si on arrive ici avec un tampon non ferme : erreur fatale
-	/*	if (ob_get_level()){
+    // si on arrive ici avec un tampon non ferme : erreur fatale
+    /*	if (ob_get_level()){
 			// envoyer tous les tampons
 			while (ob_get_level())
 				ob_end_flush();

Please login to merge, or discard this patch.

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -25,7 +25,7 @@
 block discarded – undo
 
 
 $fond = _request('exec');
-$GLOBALS['delais'] = 0;// pas de cache !
+$GLOBALS['delais'] = 0; // pas de cache !
 // Securite
 if (strstr((string) $fond, '/')) {
 	if (

Please login to merge, or discard this patch.

ecrire/exec/info_plugin.php 2 patches

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((string) _request('plugin'));
-		$get_infos = charger_fonction('get_infos', 'plugins');
-		$dir = '';
-		if (str_starts_with($plug, (string) _DIR_PLUGINS)) {
-			$dir = _DIR_PLUGINS;
-		} elseif (str_starts_with($plug, (string) _DIR_PLUGINS_DIST)) {
-			$dir = _DIR_PLUGINS_DIST;
-		}
-		if ($dir) {
-			$plug = substr($plug, strlen((string) $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((string) _request('plugin'));
+        $get_infos = charger_fonction('get_infos', 'plugins');
+        $dir = '';
+        if (str_starts_with($plug, (string) _DIR_PLUGINS)) {
+            $dir = _DIR_PLUGINS;
+        } elseif (str_starts_with($plug, (string) _DIR_PLUGINS_DIST)) {
+            $dir = _DIR_PLUGINS_DIST;
+        }
+        if ($dir) {
+            $plug = substr($plug, strlen((string) $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.

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -25,7 +25,7 @@
 block discarded – undo
 		include_spip('inc/minipres');
 		echo minipres();
 	} else {
-		$plug = _DIR_RACINE . htmlspecialchars((string) _request('plugin'));
+		$plug = _DIR_RACINE.htmlspecialchars((string) _request('plugin'));
 		$get_infos = charger_fonction('get_infos', 'plugins');
 		$dir = '';
 		if (str_starts_with($plug, (string) _DIR_PLUGINS)) {

Please login to merge, or discard this patch.

ecrire/exec/rechercher.php 2 patches

Indentation +96 added lines, -96 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,13 +31,13 @@  discard block
 block discarded – undo
  * @uses ajax_retour()
  **/
 function exec_rechercher_dist() {
-	$id = (int) _request('id');
-	$exclus = (int) _request('exclus');
-	$rac = spip_htmlentities(_request('rac'));
-	$type = _request('type');
-	$do = _request('do');
-	$r = preg_match('/^\w*$/', (string) $do) ? exec_rechercher_args($id, $type, $exclus, $rac, $do) : '';
-	ajax_retour($r);
+    $id = (int) _request('id');
+    $exclus = (int) _request('exclus');
+    $rac = spip_htmlentities(_request('rac'));
+    $type = _request('type');
+    $do = _request('do');
+    $r = preg_match('/^\w*$/', (string) $do) ? exec_rechercher_args($id, $type, $exclus, $rac, $do) : '';
+    ajax_retour($r);
 }
 
 /**
@@ -54,61 +54,61 @@  discard block
 block discarded – undo
  * @return string
  **/
 function exec_rechercher_args($id, $type, $exclus, $rac, $do) {
-	if (!$do) {
-		$do = 'aff';
-	}
-
-	$points = $rub = [];
-
-	$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 ' . implode(' AND titre LIKE ', $where) . ')');
-		$where_desc = ('(descriptif LIKE ' . implode(' AND descriptif LIKE ', $where) . ')');
-		$where_id = ('(id_rubrique = ' . (int) $type . ')');
-
-		if ($exclus) {
-			include_spip('inc/rubriques');
-			$where_exclus = ' AND ' . sql_in('id_rubrique', calcul_branche_in($exclus), 'NOT');
-		} else {
-			$where_exclus = '';
-		}
-
-		foreach (
-			[
-				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] = [];
-				}
-				$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] += $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 = [];
+
+    $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 ' . implode(' AND titre LIKE ', $where) . ')');
+        $where_desc = ('(descriptif LIKE ' . implode(' AND descriptif LIKE ', $where) . ')');
+        $where_id = ('(id_rubrique = ' . (int) $type . ')');
+
+        if ($exclus) {
+            include_spip('inc/rubriques');
+            $where_exclus = ' AND ' . sql_in('id_rubrique', calcul_branche_in($exclus), 'NOT');
+        } else {
+            $where_exclus = '';
+        }
+
+        foreach (
+            [
+                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] = [];
+                }
+                $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] += $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));
 }
 
 
@@ -131,37 +131,37 @@  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>';
-	}
-
-	$ret = '';
-	$info = generer_url_ecrire('informer', "type=rubrique&rac=$rac&id=");
-
-	$onClick = "aff_selection(this.firstChild.title,'$rac" . "_selection','$info', event)";
-
-	$ondbClick = "$do(this.firstChild.firstChild.nodeValue,this.firstChild.title,'selection_rubrique', 'id_parent');";
-
-	foreach (array_keys($ids) as $id) {
-		$titre = strtr(
-			str_replace("'", '&#8217;', str_replace('"', '&#34;', (string) 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>';
-	}
-
-	return $ret;
+    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=");
+
+    $onClick = "aff_selection(this.firstChild.title,'$rac" . "_selection','$info', event)";
+
+    $ondbClick = "$do(this.firstChild.firstChild.nodeValue,this.firstChild.title,'selection_rubrique', 'id_parent');";
+
+    foreach (array_keys($ids) as $id) {
+        $titre = strtr(
+            str_replace("'", '&#8217;', str_replace('"', '&#34;', (string) 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>';
+    }
+
+    return $ret;
 }

Please login to merge, or discard this patch.

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -63,15 +63,15 @@  discard block
 block discarded – undo
 	$where = preg_split(',\s+,', $type);
 	if ($where) {
 		foreach ($where as $k => $v) {
-			$where[$k] = "'%" . substr(str_replace('%', '\%', sql_quote($v, '', 'string')), 1, -1) . "%'";
+			$where[$k] = "'%".substr(str_replace('%', '\%', sql_quote($v, '', 'string')), 1, -1)."%'";
 		}
-		$where_titre = ('(titre LIKE ' . implode(' AND titre LIKE ', $where) . ')');
-		$where_desc = ('(descriptif LIKE ' . implode(' AND descriptif LIKE ', $where) . ')');
-		$where_id = ('(id_rubrique = ' . (int) $type . ')');
+		$where_titre = ('(titre LIKE '.implode(' AND titre LIKE ', $where).')');
+		$where_desc = ('(descriptif LIKE '.implode(' AND descriptif LIKE ', $where).')');
+		$where_id = ('(id_rubrique = '.(int) $type.')');
 
 		if ($exclus) {
 			include_spip('inc/rubriques');
-			$where_exclus = ' AND ' . sql_in('id_rubrique', calcul_branche_in($exclus), 'NOT');
+			$where_exclus = ' AND '.sql_in('id_rubrique', calcul_branche_in($exclus), 'NOT');
 		} else {
 			$where_exclus = '';
 		}
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
 
 	if ($points) {
 		arsort($points);
-		$style = " style='background-image: url(" . chemin_image('secteur-12.png') . ")'";
+		$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'";
@@ -134,13 +134,13 @@  discard block
 block discarded – undo
 	if (!$ids) {
 		return "<br /><br /><div style='padding: 5px; color: red;'><b>"
 		. spip_htmlentities($type)
-		. '</b> :  ' . _T('avis_aucun_resultat') . '</div>';
+		. '</b> :  '._T('avis_aucun_resultat').'</div>';
 	}
 
 	$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');";
 

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

@@ -15,7 +15,7 @@  discard block
 block discarded – undo
  * @package SPIP\Core\Rubriques
  **/
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 include_spip('inc/actions');
@@ -27,21 +27,21 @@  discard block
 block discarded – undo
  * @uses ajax_retour()
  **/
 function exec_selectionner_dist() {
-	$id = (int) _request('id');
-	$exclus = (int) _request('exclus');
-	$type = _request('type');
-	$rac = _request('racine');
-	$do = _request('do');
-	if (preg_match('/^\w*$/', (string) $do)) {
-		if (!$do) {
-			$do = 'aff';
-		}
+    $id = (int) _request('id');
+    $exclus = (int) _request('exclus');
+    $type = _request('type');
+    $rac = _request('racine');
+    $do = _request('do');
+    if (preg_match('/^\w*$/', (string) $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.

		@@ -63,15 +63,15 @@ discard block
		block discarded – undo
63	63	$where = preg_split(',\s+,', $type);
64	64	if ($where) {
65	65	foreach ($where as $k => $v) {
66		- $where[$k] = "'%" . substr(str_replace('%', '\%', sql_quote($v, '', 'string')), 1, -1) . "%'";
	66	+ $where[$k] = "'%".substr(str_replace('%', '\%', sql_quote($v, '', 'string')), 1, -1)."%'";
67	67	}
68		- $where_titre = ('(titre LIKE ' . implode(' AND titre LIKE ', $where) . ')');
69		- $where_desc = ('(descriptif LIKE ' . implode(' AND descriptif LIKE ', $where) . ')');
70		- $where_id = ('(id_rubrique = ' . (int) $type . ')');
	68	+ $where_titre = ('(titre LIKE '.implode(' AND titre LIKE ', $where).')');
	69	+ $where_desc = ('(descriptif LIKE '.implode(' AND descriptif LIKE ', $where).')');
	70	+ $where_id = ('(id_rubrique = '.(int) $type.')');
71	71
72	72	if ($exclus) {
73	73	include_spip('inc/rubriques');
74		- $where_exclus = ' AND ' . sql_in('id_rubrique', calcul_branche_in($exclus), 'NOT');
	74	+ $where_exclus = ' AND '.sql_in('id_rubrique', calcul_branche_in($exclus), 'NOT');
75	75	} else {
76	76	$where_exclus = '';
77	77	}
		@@ -101,7 +101,7 @@ discard block
		block discarded – undo
101	101
102	102	if ($points) {
103	103	arsort($points);
104		- $style = " style='background-image: url(" . chemin_image('secteur-12.png') . ")'";
	104	+ $style = " style='background-image: url(".chemin_image('secteur-12.png').")'";
105	105	foreach ($rub as $k => $v) {
106	106	$rub[$k]['atts'] = ($v['id_parent'] ? $style : '')
107	107	. " class='petite-rubrique'";
		@@ -134,13 +134,13 @@ discard block
		block discarded – undo
134	134	if (!$ids) {
135	135	return "<br /><br /><div style='padding: 5px; color: red;'><b>"
136	136	. spip_htmlentities($type)
137		- . '</b> : ' . _T('avis_aucun_resultat') . '</div>';
	137	+ . '</b> : '._T('avis_aucun_resultat').'</div>';
138	138	}
139	139
140	140	$ret = '';
141	141	$info = generer_url_ecrire('informer', "type=rubrique&rac=$rac&id=");
142	142
143		- $onClick = "aff_selection(this.firstChild.title,'$rac" . "_selection','$info', event)";
	143	+ $onClick = "aff_selection(this.firstChild.title,'$rac"."_selection','$info', event)";
144	144
145	145	$ondbClick = "$do(this.firstChild.firstChild.nodeValue,this.firstChild.title,'selection_rubrique', 'id_parent');";
146	146

		@@ -16,7 +16,7 @@ discard block
		block discarded – undo
16	16	**/
17	17
18	18	if (!defined('_ECRIRE_INC_VERSION')) {
19		- return;
	19	+ return;
20	20	}
21	21
22	22	include_spip('inc/presentation');
		@@ -30,7 +30,7 @@ discard block
		block discarded – undo
30	30	* @uses exec_puce_statut_args()
31	31	**/
32	32	function exec_puce_statut_dist(): void {
33		- exec_puce_statut_args(_request('id'), _request('type'));
	33	+ exec_puce_statut_args(_request('id'), _request('type'));
34	34	}
35	35
36	36	/**
		@@ -49,22 +49,22 @@ discard block
		block discarded – undo
49	49	* Type d'objet
50	50	**/
51	51	function exec_puce_statut_args($id, $type): void {
52		- $id = (int) $id;
53		- if (
54		- ($table_objet_sql = table_objet_sql($type))
55		- && ($d = lister_tables_objets_sql($table_objet_sql))
56		- && isset($d['statut_textes_instituer'])
57		- && $d['statut_textes_instituer']
58		- ) {
59		- $prim = id_table_objet($type);
60		- $select = isset($d['field']['id_rubrique']) ? 'id_rubrique,statut' : '0 as id_rubrique,statut';
61		- $r = sql_fetsel($select, $table_objet_sql, "$prim=$id");
62		- $statut = $r['statut'];
63		- $id_rubrique = $r['id_rubrique'];
64		- } else {
65		- $id_rubrique = $id;
66		- $statut = 'prop'; // arbitraire
67		- }
68		- $puce_statut = charger_fonction('puce_statut', 'inc');
69		- ajax_retour($puce_statut($id, $statut, $id_rubrique, $type, true));
	52	+ $id = (int) $id;
	53	+ if (
	54	+ ($table_objet_sql = table_objet_sql($type))
	55	+ && ($d = lister_tables_objets_sql($table_objet_sql))
	56	+ && isset($d['statut_textes_instituer'])
	57	+ && $d['statut_textes_instituer']
	58	+ ) {
	59	+ $prim = id_table_objet($type);
	60	+ $select = isset($d['field']['id_rubrique']) ? 'id_rubrique,statut' : '0 as id_rubrique,statut';
	61	+ $r = sql_fetsel($select, $table_objet_sql, "$prim=$id");
	62	+ $statut = $r['statut'];
	63	+ $id_rubrique = $r['id_rubrique'];
	64	+ } else {
	65	+ $id_rubrique = $id;
	66	+ $statut = 'prop'; // arbitraire
	67	+ }
	68	+ $puce_statut = charger_fonction('puce_statut', 'inc');
	69	+ ajax_retour($puce_statut($id, $statut, $id_rubrique, $type, true));
70	70	}

		@@ -43,7 +43,7 @@ discard block
		block discarded – undo
43	43	. '</b><p> '
44	44	. _T(
45	45	'texte_nouvelle_version_spip_2',
46		- ['connect' => '<tt>' . _FILE_CONNECT . '</tt>']
	46	+ ['connect' => '<tt>'._FILE_CONNECT.'</tt>']
47	47	)
48	48	. generer_form_ecrire(
49	49	'upgrade',
		@@ -78,7 +78,7 @@ discard block
		block discarded – undo
78	78	$commentaire = _T('texte_mise_a_niveau_base_1');
79	79	}
80	80
81		- $commentaire .= '<br />[' . $GLOBALS['meta']['version_installee'] . '/' . $GLOBALS['spip_version_base'] . ']';
	81	+ $commentaire .= '<br />['.$GLOBALS['meta']['version_installee'].'/'.$GLOBALS['spip_version_base'].']';
82	82
83	83	$_POST['reinstall'] = 'non'; // pour copy_request dans admin
84	84	include_spip('inc/headers');

		@@ -20,7 +20,7 @@ discard block
		block discarded – undo
20	20	*/
21	21
22	22	if (!defined('_ECRIRE_INC_VERSION')) {
23		- return;
	23	+ return;
24	24	}
25	25
26	26
		@@ -28,16 +28,16 @@ discard block
		block discarded – undo
28	28	$GLOBALS['delais'] = 0;// pas de cache !
29	29	// Securite
30	30	if (strstr((string) $fond, '/')) {
31		- if (
32		- !include_spip('inc/autoriser')
33		- \|\| !autoriser('webmestre')
34		- ) {
35		- include_spip('inc/minipres');
36		- echo minipres();
37		- exit;
38		- }
	31	+ if (
	32	+ !include_spip('inc/autoriser')
	33	+ \|\| !autoriser('webmestre')
	34	+ ) {
	35	+ include_spip('inc/minipres');
	36	+ echo minipres();
	37	+ exit;
	38	+ }
39	39	} else {
40		- $fond = "prive/squelettes/$fond";
	40	+ $fond = "prive/squelettes/$fond";
41	41	}
42	42
43	43	// quelques inclusions et ini prealables
		@@ -49,8 +49,8 @@ discard block
		block discarded – undo
49	49	* @todo supprimer cette fonction vide ?
50	50	**/
51	51	function shutdown_error() {
52		- // si on arrive ici avec un tampon non ferme : erreur fatale
53		- /* if (ob_get_level()){
	52	+ // si on arrive ici avec un tampon non ferme : erreur fatale
	53	+ /* if (ob_get_level()){
54	54	// envoyer tous les tampons
55	55	while (ob_get_level())
56	56	ob_end_flush();

		@@ -25,7 +25,7 @@
		block discarded – undo
25	25
26	26
27	27	$fond = _request('exec');
28		-$GLOBALS['delais'] = 0;// pas de cache !
	28	+$GLOBALS['delais'] = 0; // pas de cache !
29	29	// Securite
30	30	if (strstr((string) $fond, '/')) {
31	31	if (

		@@ -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((string) _request('plugin'));
29		- $get_infos = charger_fonction('get_infos', 'plugins');
30		- $dir = '';
31		- if (str_starts_with($plug, (string) _DIR_PLUGINS)) {
32		- $dir = _DIR_PLUGINS;
33		- } elseif (str_starts_with($plug, (string) _DIR_PLUGINS_DIST)) {
34		- $dir = _DIR_PLUGINS_DIST;
35		- }
36		- if ($dir) {
37		- $plug = substr($plug, strlen((string) $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((string) _request('plugin'));
	29	+ $get_infos = charger_fonction('get_infos', 'plugins');
	30	+ $dir = '';
	31	+ if (str_starts_with($plug, (string) _DIR_PLUGINS)) {
	32	+ $dir = _DIR_PLUGINS;
	33	+ } elseif (str_starts_with($plug, (string) _DIR_PLUGINS_DIST)) {
	34	+ $dir = _DIR_PLUGINS_DIST;
	35	+ }
	36	+ if ($dir) {
	37	+ $plug = substr($plug, strlen((string) $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	}

		@@ -25,7 +25,7 @@
		block discarded – undo
25	25	include_spip('inc/minipres');
26	26	echo minipres();
27	27	} else {
28		- $plug = _DIR_RACINE . htmlspecialchars((string) _request('plugin'));
	28	+ $plug = _DIR_RACINE.htmlspecialchars((string) _request('plugin'));
29	29	$get_infos = charger_fonction('get_infos', 'plugins');
30	30	$dir = '';
31	31	if (str_starts_with($plug, (string) _DIR_PLUGINS)) {

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

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

spip / SPIP

Push — master ( 32470c...ffbbca )

Status

Category

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

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

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

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

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

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

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

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

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

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

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

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

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