Inspection of "Quand aucun pattern n'est fournit dans preg_files(..." - spip/SPIP - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 4a1dc4...073957 )

by cam

created 2022-04-14 09:32 UTC

Status

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

@@ -10,127 +10,127 @@
 block discarded – undo
  **/
 
 $GLOBALS['CHARSET']['cp1250'] = [
-	0x80 => 0x20AC,
-	0x82 => 0x201A,
-	0x84 => 0x201E,
-	0x85 => 0x2026,
-	0x86 => 0x2020,
-	0x87 => 0x2021,
-	0x89 => 0x2030,
-	0x8A => 0x0160,
-	0x8B => 0x2039,
-	0x8C => 0x015A,
-	0x8D => 0x0164,
-	0x8E => 0x017D,
-	0x8F => 0x0179,
-	0x91 => 0x2018,
-	0x92 => 0x2019,
-	0x93 => 0x201C,
-	0x94 => 0x201D,
-	0x95 => 0x2022,
-	0x96 => 0x2013,
-	0x97 => 0x2014,
-	0x99 => 0x2122,
-	0x9A => 0x0161,
-	0x9B => 0x203A,
-	0x9C => 0x015B,
-	0x9D => 0x0165,
-	0x9E => 0x017E,
-	0x9F => 0x017A,
-	0xA0 => 0x00A0,
-	0xA1 => 0x02C7,
-	0xA2 => 0x02D8,
-	0xA3 => 0x0141,
-	0xA4 => 0x00A4,
-	0xA5 => 0x0104,
-	0xA6 => 0x00A6,
-	0xA7 => 0x00A7,
-	0xA8 => 0x00A8,
-	0xA9 => 0x00A9,
-	0xAA => 0x015E,
-	0xAB => 0x00AB,
-	0xAC => 0x00AC,
-	0xAD => 0x00AD,
-	0xAE => 0x00AE,
-	0xAF => 0x017B,
-	0xB0 => 0x00B0,
-	0xB1 => 0x00B1,
-	0xB2 => 0x02DB,
-	0xB3 => 0x0142,
-	0xB4 => 0x00B4,
-	0xB5 => 0x00B5,
-	0xB6 => 0x00B6,
-	0xB7 => 0x00B7,
-	0xB8 => 0x00B8,
-	0xB9 => 0x0105,
-	0xBA => 0x015F,
-	0xBB => 0x00BB,
-	0xBC => 0x013D,
-	0xBD => 0x02DD,
-	0xBE => 0x013E,
-	0xBF => 0x017C,
-	0xC0 => 0x0154,
-	0xC1 => 0x00C1,
-	0xC2 => 0x00C2,
-	0xC3 => 0x0102,
-	0xC4 => 0x00C4,
-	0xC5 => 0x0139,
-	0xC6 => 0x0106,
-	0xC7 => 0x00C7,
-	0xC8 => 0x010C,
-	0xC9 => 0x00C9,
-	0xCA => 0x0118,
-	0xCB => 0x00CB,
-	0xCC => 0x011A,
-	0xCD => 0x00CD,
-	0xCE => 0x00CE,
-	0xCF => 0x010E,
-	0xD0 => 0x0110,
-	0xD1 => 0x0143,
-	0xD2 => 0x0147,
-	0xD3 => 0x00D3,
-	0xD4 => 0x00D4,
-	0xD5 => 0x0150,
-	0xD6 => 0x00D6,
-	0xD7 => 0x00D7,
-	0xD8 => 0x0158,
-	0xD9 => 0x016E,
-	0xDA => 0x00DA,
-	0xDB => 0x0170,
-	0xDC => 0x00DC,
-	0xDD => 0x00DD,
-	0xDE => 0x0162,
-	0xDF => 0x00DF,
-	0xE0 => 0x0155,
-	0xE1 => 0x00E1,
-	0xE2 => 0x00E2,
-	0xE3 => 0x0103,
-	0xE4 => 0x00E4,
-	0xE5 => 0x013A,
-	0xE6 => 0x0107,
-	0xE7 => 0x00E7,
-	0xE8 => 0x010D,
-	0xE9 => 0x00E9,
-	0xEA => 0x0119,
-	0xEB => 0x00EB,
-	0xEC => 0x011B,
-	0xED => 0x00ED,
-	0xEE => 0x00EE,
-	0xEF => 0x010F,
-	0xF0 => 0x0111,
-	0xF1 => 0x0144,
-	0xF2 => 0x0148,
-	0xF3 => 0x00F3,
-	0xF4 => 0x00F4,
-	0xF5 => 0x0151,
-	0xF6 => 0x00F6,
-	0xF7 => 0x00F7,
-	0xF8 => 0x0159,
-	0xF9 => 0x016F,
-	0xFA => 0x00FA,
-	0xFB => 0x0171,
-	0xFC => 0x00FC,
-	0xFD => 0x00FD,
-	0xFE => 0x0163,
-	0xFF => 0x02D9
+    0x80 => 0x20AC,
+    0x82 => 0x201A,
+    0x84 => 0x201E,
+    0x85 => 0x2026,
+    0x86 => 0x2020,
+    0x87 => 0x2021,
+    0x89 => 0x2030,
+    0x8A => 0x0160,
+    0x8B => 0x2039,
+    0x8C => 0x015A,
+    0x8D => 0x0164,
+    0x8E => 0x017D,
+    0x8F => 0x0179,
+    0x91 => 0x2018,
+    0x92 => 0x2019,
+    0x93 => 0x201C,
+    0x94 => 0x201D,
+    0x95 => 0x2022,
+    0x96 => 0x2013,
+    0x97 => 0x2014,
+    0x99 => 0x2122,
+    0x9A => 0x0161,
+    0x9B => 0x203A,
+    0x9C => 0x015B,
+    0x9D => 0x0165,
+    0x9E => 0x017E,
+    0x9F => 0x017A,
+    0xA0 => 0x00A0,
+    0xA1 => 0x02C7,
+    0xA2 => 0x02D8,
+    0xA3 => 0x0141,
+    0xA4 => 0x00A4,
+    0xA5 => 0x0104,
+    0xA6 => 0x00A6,
+    0xA7 => 0x00A7,
+    0xA8 => 0x00A8,
+    0xA9 => 0x00A9,
+    0xAA => 0x015E,
+    0xAB => 0x00AB,
+    0xAC => 0x00AC,
+    0xAD => 0x00AD,
+    0xAE => 0x00AE,
+    0xAF => 0x017B,
+    0xB0 => 0x00B0,
+    0xB1 => 0x00B1,
+    0xB2 => 0x02DB,
+    0xB3 => 0x0142,
+    0xB4 => 0x00B4,
+    0xB5 => 0x00B5,
+    0xB6 => 0x00B6,
+    0xB7 => 0x00B7,
+    0xB8 => 0x00B8,
+    0xB9 => 0x0105,
+    0xBA => 0x015F,
+    0xBB => 0x00BB,
+    0xBC => 0x013D,
+    0xBD => 0x02DD,
+    0xBE => 0x013E,
+    0xBF => 0x017C,
+    0xC0 => 0x0154,
+    0xC1 => 0x00C1,
+    0xC2 => 0x00C2,
+    0xC3 => 0x0102,
+    0xC4 => 0x00C4,
+    0xC5 => 0x0139,
+    0xC6 => 0x0106,
+    0xC7 => 0x00C7,
+    0xC8 => 0x010C,
+    0xC9 => 0x00C9,
+    0xCA => 0x0118,
+    0xCB => 0x00CB,
+    0xCC => 0x011A,
+    0xCD => 0x00CD,
+    0xCE => 0x00CE,
+    0xCF => 0x010E,
+    0xD0 => 0x0110,
+    0xD1 => 0x0143,
+    0xD2 => 0x0147,
+    0xD3 => 0x00D3,
+    0xD4 => 0x00D4,
+    0xD5 => 0x0150,
+    0xD6 => 0x00D6,
+    0xD7 => 0x00D7,
+    0xD8 => 0x0158,
+    0xD9 => 0x016E,
+    0xDA => 0x00DA,
+    0xDB => 0x0170,
+    0xDC => 0x00DC,
+    0xDD => 0x00DD,
+    0xDE => 0x0162,
+    0xDF => 0x00DF,
+    0xE0 => 0x0155,
+    0xE1 => 0x00E1,
+    0xE2 => 0x00E2,
+    0xE3 => 0x0103,
+    0xE4 => 0x00E4,
+    0xE5 => 0x013A,
+    0xE6 => 0x0107,
+    0xE7 => 0x00E7,
+    0xE8 => 0x010D,
+    0xE9 => 0x00E9,
+    0xEA => 0x0119,
+    0xEB => 0x00EB,
+    0xEC => 0x011B,
+    0xED => 0x00ED,
+    0xEE => 0x00EE,
+    0xEF => 0x010F,
+    0xF0 => 0x0111,
+    0xF1 => 0x0144,
+    0xF2 => 0x0148,
+    0xF3 => 0x00F3,
+    0xF4 => 0x00F4,
+    0xF5 => 0x0151,
+    0xF6 => 0x00F6,
+    0xF7 => 0x00F7,
+    0xF8 => 0x0159,
+    0xF9 => 0x016F,
+    0xFA => 0x00FA,
+    0xFB => 0x0171,
+    0xFC => 0x00FC,
+    0xFD => 0x00FD,
+    0xFE => 0x0163,
+    0xFF => 0x02D9
 ];

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(_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.

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(_request('plugin'));
+		$plug = _DIR_RACINE.htmlspecialchars(_request('plugin'));
 		$get_infos = charger_fonction('get_infos', 'plugins');
 		$dir = '';
 		if (strncmp($plug, _DIR_PLUGINS, strlen(_DIR_PLUGINS)) == 0) {

Please login to merge, or discard this patch.

ecrire/exec/403.php 2 patches

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

@@ -37,7 +37,7 @@
 block discarded – undo
 		$message = _T('avis_acces_interdit_prive', ['exec' => _request('exec')]);
 	}
 
-	$contenu = "<h1 class='grostitre'>" . _T('info_acces_interdit') . '</h1>' . $message;
+	$contenu = "<h1 class='grostitre'>"._T('info_acces_interdit').'</h1>'.$message;
 
 	if (_request('var_zajax')) {
 		include_spip('inc/actions');

Please login to merge, or discard this patch.

Indentation +28 added lines, -28 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,40 +27,40 @@  discard block
 block discarded – undo
  */
 function exec_403_dist($message = '') {
 
-	$exec = _request('exec');
+    $exec = _request('exec');
 
-	$titre = "exec_$exec";
-	$navigation = '';
-	$extra = '';
+    $titre = "exec_$exec";
+    $navigation = '';
+    $extra = '';
 
-	if (!$message) {
-		$message = _T('avis_acces_interdit_prive', ['exec' => _request('exec')]);
-	}
+    if (!$message) {
+        $message = _T('avis_acces_interdit_prive', ['exec' => _request('exec')]);
+    }
 
-	$contenu = "<h1 class='grostitre'>" . _T('info_acces_interdit') . '</h1>' . $message;
+    $contenu = "<h1 class='grostitre'>" . _T('info_acces_interdit') . '</h1>' . $message;
 
-	if (_request('var_zajax')) {
-		include_spip('inc/actions');
-		ajax_retour($contenu);
-	} else {
-		include_spip('inc/presentation'); // alleger les inclusions avec un inc/presentation_mini
+    if (_request('var_zajax')) {
+        include_spip('inc/actions');
+        ajax_retour($contenu);
+    } else {
+        include_spip('inc/presentation'); // alleger les inclusions avec un inc/presentation_mini
 
-		$commencer_page = charger_fonction('commencer_page', 'inc');
-		echo $commencer_page($titre);
+        $commencer_page = charger_fonction('commencer_page', 'inc');
+        echo $commencer_page($titre);
 
-		echo debut_gauche();
-		echo recuperer_fond('prive/squelettes/navigation/dist', []);
-		echo pipeline('affiche_gauche', ['args' => ['exec' => '403', 'exec_erreur' => $exec], 'data' => '']);
+        echo debut_gauche();
+        echo recuperer_fond('prive/squelettes/navigation/dist', []);
+        echo pipeline('affiche_gauche', ['args' => ['exec' => '403', 'exec_erreur' => $exec], 'data' => '']);
 
-		echo creer_colonne_droite();
-		echo pipeline('affiche_droite', ['args' => ['exec' => '403', 'exec_erreur' => $exec], 'data' => '']);
+        echo creer_colonne_droite();
+        echo pipeline('affiche_droite', ['args' => ['exec' => '403', 'exec_erreur' => $exec], 'data' => '']);
 
-		echo debut_droite();
-		echo pipeline(
-			'affiche_milieu',
-			['args' => ['exec' => '403', 'exec_erreur' => $exec], 'data' => $contenu]
-		);
+        echo debut_droite();
+        echo pipeline(
+            'affiche_milieu',
+            ['args' => ['exec' => '403', 'exec_erreur' => $exec], 'data' => $contenu]
+        );
 
-		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), [], $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/install.php 1 patch

Indentation +22 added lines, -22 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/minipres');
@@ -42,27 +42,27 @@  discard block
 block discarded – undo
  *
  **/
 function exec_install_dist() {
-	$etape = _request('etape');
-	$deja = (_FILE_CONNECT and analyse_fichier_connection(_FILE_CONNECT));
+    $etape = _request('etape');
+    $deja = (_FILE_CONNECT and 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 and 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 and 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/rechercher.php 2 patches

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

@@ -68,15 +68,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 ' . join(' AND titre LIKE ', $where) . ')');
-		$where_desc = ('(descriptif LIKE ' . join(' AND descriptif LIKE ', $where) . ')');
-		$where_id = ('(id_rubrique = ' . intval($type) . ')');
+		$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');
+			$where_exclus = ' AND '.sql_in('id_rubrique', calcul_branche_in($exclus), 'NOT');
 		} else {
 			$where_exclus = '';
 		}
@@ -106,7 +106,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'";
@@ -139,13 +139,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.

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

@@ -19,7 +19,7 @@  discard block
 block discarded – undo
  **/
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 include_spip('inc/actions');
@@ -32,17 +32,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);
 }
 
 /**
@@ -59,61 +59,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 ' . 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 (
-			[
-				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] = $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 ' . 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 (
+            [
+                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] = $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));
 }
 
 
@@ -136,37 +136,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 ($ids as $id => $bof) {
-		$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>';
-	}
-
-	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 ($ids as $id => $bof) {
+        $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>';
+    }
+
+    return $ret;
 }

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

@@ -17,7 +17,7 @@  discard block
 block discarded – undo
  */
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 include_spip('inc/actions');
@@ -30,70 +30,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(',', '.', $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(',', '.', $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 +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -44,7 +44,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',
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
 			$GLOBALS['meta']['version_installee'] = 0.0;
 		} else {
 			$GLOBALS['meta']['version_installee'] =
-				(double)str_replace(',', '.', $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'
@@ -79,7 +79,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/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/base_delete_all.php 2 patches

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

@@ -17,40 +17,40 @@
 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('', [], [], 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('', [], [], 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.

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

@@ -36,13 +36,13 @@
 block discarded – undo
 			spip_log('Erreur base de donnees');
 			echo minipres(
 				_T('info_travaux_titre'),
-				_T('titre_probleme_technique') . '<p><tt>' . sql_errno() . ' ' . sql_error() . '</tt></p>'
+				_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) .
+			$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);

Please login to merge, or discard this patch.

		@@ -10,127 +10,127 @@
		block discarded – undo
10	10	**/
11	11
12	12	$GLOBALS['CHARSET']['cp1250'] = [
13		- 0x80 => 0x20AC,
14		- 0x82 => 0x201A,
15		- 0x84 => 0x201E,
16		- 0x85 => 0x2026,
17		- 0x86 => 0x2020,
18		- 0x87 => 0x2021,
19		- 0x89 => 0x2030,
20		- 0x8A => 0x0160,
21		- 0x8B => 0x2039,
22		- 0x8C => 0x015A,
23		- 0x8D => 0x0164,
24		- 0x8E => 0x017D,
25		- 0x8F => 0x0179,
26		- 0x91 => 0x2018,
27		- 0x92 => 0x2019,
28		- 0x93 => 0x201C,
29		- 0x94 => 0x201D,
30		- 0x95 => 0x2022,
31		- 0x96 => 0x2013,
32		- 0x97 => 0x2014,
33		- 0x99 => 0x2122,
34		- 0x9A => 0x0161,
35		- 0x9B => 0x203A,
36		- 0x9C => 0x015B,
37		- 0x9D => 0x0165,
38		- 0x9E => 0x017E,
39		- 0x9F => 0x017A,
40		- 0xA0 => 0x00A0,
41		- 0xA1 => 0x02C7,
42		- 0xA2 => 0x02D8,
43		- 0xA3 => 0x0141,
44		- 0xA4 => 0x00A4,
45		- 0xA5 => 0x0104,
46		- 0xA6 => 0x00A6,
47		- 0xA7 => 0x00A7,
48		- 0xA8 => 0x00A8,
49		- 0xA9 => 0x00A9,
50		- 0xAA => 0x015E,
51		- 0xAB => 0x00AB,
52		- 0xAC => 0x00AC,
53		- 0xAD => 0x00AD,
54		- 0xAE => 0x00AE,
55		- 0xAF => 0x017B,
56		- 0xB0 => 0x00B0,
57		- 0xB1 => 0x00B1,
58		- 0xB2 => 0x02DB,
59		- 0xB3 => 0x0142,
60		- 0xB4 => 0x00B4,
61		- 0xB5 => 0x00B5,
62		- 0xB6 => 0x00B6,
63		- 0xB7 => 0x00B7,
64		- 0xB8 => 0x00B8,
65		- 0xB9 => 0x0105,
66		- 0xBA => 0x015F,
67		- 0xBB => 0x00BB,
68		- 0xBC => 0x013D,
69		- 0xBD => 0x02DD,
70		- 0xBE => 0x013E,
71		- 0xBF => 0x017C,
72		- 0xC0 => 0x0154,
73		- 0xC1 => 0x00C1,
74		- 0xC2 => 0x00C2,
75		- 0xC3 => 0x0102,
76		- 0xC4 => 0x00C4,
77		- 0xC5 => 0x0139,
78		- 0xC6 => 0x0106,
79		- 0xC7 => 0x00C7,
80		- 0xC8 => 0x010C,
81		- 0xC9 => 0x00C9,
82		- 0xCA => 0x0118,
83		- 0xCB => 0x00CB,
84		- 0xCC => 0x011A,
85		- 0xCD => 0x00CD,
86		- 0xCE => 0x00CE,
87		- 0xCF => 0x010E,
88		- 0xD0 => 0x0110,
89		- 0xD1 => 0x0143,
90		- 0xD2 => 0x0147,
91		- 0xD3 => 0x00D3,
92		- 0xD4 => 0x00D4,
93		- 0xD5 => 0x0150,
94		- 0xD6 => 0x00D6,
95		- 0xD7 => 0x00D7,
96		- 0xD8 => 0x0158,
97		- 0xD9 => 0x016E,
98		- 0xDA => 0x00DA,
99		- 0xDB => 0x0170,
100		- 0xDC => 0x00DC,
101		- 0xDD => 0x00DD,
102		- 0xDE => 0x0162,
103		- 0xDF => 0x00DF,
104		- 0xE0 => 0x0155,
105		- 0xE1 => 0x00E1,
106		- 0xE2 => 0x00E2,
107		- 0xE3 => 0x0103,
108		- 0xE4 => 0x00E4,
109		- 0xE5 => 0x013A,
110		- 0xE6 => 0x0107,
111		- 0xE7 => 0x00E7,
112		- 0xE8 => 0x010D,
113		- 0xE9 => 0x00E9,
114		- 0xEA => 0x0119,
115		- 0xEB => 0x00EB,
116		- 0xEC => 0x011B,
117		- 0xED => 0x00ED,
118		- 0xEE => 0x00EE,
119		- 0xEF => 0x010F,
120		- 0xF0 => 0x0111,
121		- 0xF1 => 0x0144,
122		- 0xF2 => 0x0148,
123		- 0xF3 => 0x00F3,
124		- 0xF4 => 0x00F4,
125		- 0xF5 => 0x0151,
126		- 0xF6 => 0x00F6,
127		- 0xF7 => 0x00F7,
128		- 0xF8 => 0x0159,
129		- 0xF9 => 0x016F,
130		- 0xFA => 0x00FA,
131		- 0xFB => 0x0171,
132		- 0xFC => 0x00FC,
133		- 0xFD => 0x00FD,
134		- 0xFE => 0x0163,
135		- 0xFF => 0x02D9
	13	+ 0x80 => 0x20AC,
	14	+ 0x82 => 0x201A,
	15	+ 0x84 => 0x201E,
	16	+ 0x85 => 0x2026,
	17	+ 0x86 => 0x2020,
	18	+ 0x87 => 0x2021,
	19	+ 0x89 => 0x2030,
	20	+ 0x8A => 0x0160,
	21	+ 0x8B => 0x2039,
	22	+ 0x8C => 0x015A,
	23	+ 0x8D => 0x0164,
	24	+ 0x8E => 0x017D,
	25	+ 0x8F => 0x0179,
	26	+ 0x91 => 0x2018,
	27	+ 0x92 => 0x2019,
	28	+ 0x93 => 0x201C,
	29	+ 0x94 => 0x201D,
	30	+ 0x95 => 0x2022,
	31	+ 0x96 => 0x2013,
	32	+ 0x97 => 0x2014,
	33	+ 0x99 => 0x2122,
	34	+ 0x9A => 0x0161,
	35	+ 0x9B => 0x203A,
	36	+ 0x9C => 0x015B,
	37	+ 0x9D => 0x0165,
	38	+ 0x9E => 0x017E,
	39	+ 0x9F => 0x017A,
	40	+ 0xA0 => 0x00A0,
	41	+ 0xA1 => 0x02C7,
	42	+ 0xA2 => 0x02D8,
	43	+ 0xA3 => 0x0141,
	44	+ 0xA4 => 0x00A4,
	45	+ 0xA5 => 0x0104,
	46	+ 0xA6 => 0x00A6,
	47	+ 0xA7 => 0x00A7,
	48	+ 0xA8 => 0x00A8,
	49	+ 0xA9 => 0x00A9,
	50	+ 0xAA => 0x015E,
	51	+ 0xAB => 0x00AB,
	52	+ 0xAC => 0x00AC,
	53	+ 0xAD => 0x00AD,
	54	+ 0xAE => 0x00AE,
	55	+ 0xAF => 0x017B,
	56	+ 0xB0 => 0x00B0,
	57	+ 0xB1 => 0x00B1,
	58	+ 0xB2 => 0x02DB,
	59	+ 0xB3 => 0x0142,
	60	+ 0xB4 => 0x00B4,
	61	+ 0xB5 => 0x00B5,
	62	+ 0xB6 => 0x00B6,
	63	+ 0xB7 => 0x00B7,
	64	+ 0xB8 => 0x00B8,
	65	+ 0xB9 => 0x0105,
	66	+ 0xBA => 0x015F,
	67	+ 0xBB => 0x00BB,
	68	+ 0xBC => 0x013D,
	69	+ 0xBD => 0x02DD,
	70	+ 0xBE => 0x013E,
	71	+ 0xBF => 0x017C,
	72	+ 0xC0 => 0x0154,
	73	+ 0xC1 => 0x00C1,
	74	+ 0xC2 => 0x00C2,
	75	+ 0xC3 => 0x0102,
	76	+ 0xC4 => 0x00C4,
	77	+ 0xC5 => 0x0139,
	78	+ 0xC6 => 0x0106,
	79	+ 0xC7 => 0x00C7,
	80	+ 0xC8 => 0x010C,
	81	+ 0xC9 => 0x00C9,
	82	+ 0xCA => 0x0118,
	83	+ 0xCB => 0x00CB,
	84	+ 0xCC => 0x011A,
	85	+ 0xCD => 0x00CD,
	86	+ 0xCE => 0x00CE,
	87	+ 0xCF => 0x010E,
	88	+ 0xD0 => 0x0110,
	89	+ 0xD1 => 0x0143,
	90	+ 0xD2 => 0x0147,
	91	+ 0xD3 => 0x00D3,
	92	+ 0xD4 => 0x00D4,
	93	+ 0xD5 => 0x0150,
	94	+ 0xD6 => 0x00D6,
	95	+ 0xD7 => 0x00D7,
	96	+ 0xD8 => 0x0158,
	97	+ 0xD9 => 0x016E,
	98	+ 0xDA => 0x00DA,
	99	+ 0xDB => 0x0170,
	100	+ 0xDC => 0x00DC,
	101	+ 0xDD => 0x00DD,
	102	+ 0xDE => 0x0162,
	103	+ 0xDF => 0x00DF,
	104	+ 0xE0 => 0x0155,
	105	+ 0xE1 => 0x00E1,
	106	+ 0xE2 => 0x00E2,
	107	+ 0xE3 => 0x0103,
	108	+ 0xE4 => 0x00E4,
	109	+ 0xE5 => 0x013A,
	110	+ 0xE6 => 0x0107,
	111	+ 0xE7 => 0x00E7,
	112	+ 0xE8 => 0x010D,
	113	+ 0xE9 => 0x00E9,
	114	+ 0xEA => 0x0119,
	115	+ 0xEB => 0x00EB,
	116	+ 0xEC => 0x011B,
	117	+ 0xED => 0x00ED,
	118	+ 0xEE => 0x00EE,
	119	+ 0xEF => 0x010F,
	120	+ 0xF0 => 0x0111,
	121	+ 0xF1 => 0x0144,
	122	+ 0xF2 => 0x0148,
	123	+ 0xF3 => 0x00F3,
	124	+ 0xF4 => 0x00F4,
	125	+ 0xF5 => 0x0151,
	126	+ 0xF6 => 0x00F6,
	127	+ 0xF7 => 0x00F7,
	128	+ 0xF8 => 0x0159,
	129	+ 0xF9 => 0x016F,
	130	+ 0xFA => 0x00FA,
	131	+ 0xFB => 0x0171,
	132	+ 0xFC => 0x00FC,
	133	+ 0xFD => 0x00FD,
	134	+ 0xFE => 0x0163,
	135	+ 0xFF => 0x02D9
136	136	];

		@@ -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	}

		@@ -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(_request('plugin'));
	28	+ $plug = _DIR_RACINE.htmlspecialchars(_request('plugin'));
29	29	$get_infos = charger_fonction('get_infos', 'plugins');
30	30	$dir = '';
31	31	if (strncmp($plug, _DIR_PLUGINS, strlen(_DIR_PLUGINS)) == 0) {

		@@ -37,7 +37,7 @@
		block discarded – undo
37	37	$message = _T('avis_acces_interdit_prive', ['exec' => _request('exec')]);
38	38	}
39	39
40		- $contenu = "<h1 class='grostitre'>" . _T('info_acces_interdit') . '</h1>' . $message;
	40	+ $contenu = "<h1 class='grostitre'>"._T('info_acces_interdit').'</h1>'.$message;
41	41
42	42	if (_request('var_zajax')) {
43	43	include_spip('inc/actions');

		@@ -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	/**
		@@ -27,40 +27,40 @@ discard block
		block discarded – undo
27	27	*/
28	28	function exec_403_dist($message = '') {
29	29
30		- $exec = _request('exec');
	30	+ $exec = _request('exec');
31	31
32		- $titre = "exec_$exec";
33		- $navigation = '';
34		- $extra = '';
	32	+ $titre = "exec_$exec";
	33	+ $navigation = '';
	34	+ $extra = '';
35	35
36		- if (!$message) {
37		- $message = _T('avis_acces_interdit_prive', ['exec' => _request('exec')]);
38		- }
	36	+ if (!$message) {
	37	+ $message = _T('avis_acces_interdit_prive', ['exec' => _request('exec')]);
	38	+ }
39	39
40		- $contenu = "<h1 class='grostitre'>" . _T('info_acces_interdit') . '</h1>' . $message;
	40	+ $contenu = "<h1 class='grostitre'>" . _T('info_acces_interdit') . '</h1>' . $message;
41	41
42		- if (_request('var_zajax')) {
43		- include_spip('inc/actions');
44		- ajax_retour($contenu);
45		- } else {
46		- include_spip('inc/presentation'); // alleger les inclusions avec un inc/presentation_mini
	42	+ if (_request('var_zajax')) {
	43	+ include_spip('inc/actions');
	44	+ ajax_retour($contenu);
	45	+ } else {
	46	+ include_spip('inc/presentation'); // alleger les inclusions avec un inc/presentation_mini
47	47
48		- $commencer_page = charger_fonction('commencer_page', 'inc');
49		- echo $commencer_page($titre);
	48	+ $commencer_page = charger_fonction('commencer_page', 'inc');
	49	+ echo $commencer_page($titre);
50	50
51		- echo debut_gauche();
52		- echo recuperer_fond('prive/squelettes/navigation/dist', []);
53		- echo pipeline('affiche_gauche', ['args' => ['exec' => '403', 'exec_erreur' => $exec], 'data' => '']);
	51	+ echo debut_gauche();
	52	+ echo recuperer_fond('prive/squelettes/navigation/dist', []);
	53	+ echo pipeline('affiche_gauche', ['args' => ['exec' => '403', 'exec_erreur' => $exec], 'data' => '']);
54	54
55		- echo creer_colonne_droite();
56		- echo pipeline('affiche_droite', ['args' => ['exec' => '403', 'exec_erreur' => $exec], 'data' => '']);
	55	+ echo creer_colonne_droite();
	56	+ echo pipeline('affiche_droite', ['args' => ['exec' => '403', 'exec_erreur' => $exec], 'data' => '']);
57	57
58		- echo debut_droite();
59		- echo pipeline(
60		- 'affiche_milieu',
61		- ['args' => ['exec' => '403', 'exec_erreur' => $exec], 'data' => $contenu]
62		- );
	58	+ echo debut_droite();
	59	+ echo pipeline(
	60	+ 'affiche_milieu',
	61	+ ['args' => ['exec' => '403', 'exec_erreur' => $exec], 'data' => $contenu]
	62	+ );
63	63
64		- echo fin_gauche(), fin_page();
65		- }
	64	+ echo fin_gauche(), fin_page();
	65	+ }
66	66	}

		@@ -68,15 +68,15 @@ discard block
		block discarded – undo
68	68	$where = preg_split(',\s+,', $type);
69	69	if ($where) {
70	70	foreach ($where as $k => $v) {
71		- $where[$k] = "'%" . substr(str_replace('%', '\%', sql_quote($v, '', 'string')), 1, -1) . "%'";
	71	+ $where[$k] = "'%".substr(str_replace('%', '\%', sql_quote($v, '', 'string')), 1, -1)."%'";
72	72	}
73		- $where_titre = ('(titre LIKE ' . join(' AND titre LIKE ', $where) . ')');
74		- $where_desc = ('(descriptif LIKE ' . join(' AND descriptif LIKE ', $where) . ')');
75		- $where_id = ('(id_rubrique = ' . intval($type) . ')');
	73	+ $where_titre = ('(titre LIKE '.join(' AND titre LIKE ', $where).')');
	74	+ $where_desc = ('(descriptif LIKE '.join(' AND descriptif LIKE ', $where).')');
	75	+ $where_id = ('(id_rubrique = '.intval($type).')');
76	76
77	77	if ($exclus) {
78	78	include_spip('inc/rubriques');
79		- $where_exclus = ' AND ' . sql_in('id_rubrique', calcul_branche_in($exclus), 'NOT');
	79	+ $where_exclus = ' AND '.sql_in('id_rubrique', calcul_branche_in($exclus), 'NOT');
80	80	} else {
81	81	$where_exclus = '';
82	82	}
		@@ -106,7 +106,7 @@ discard block
		block discarded – undo
106	106
107	107	if ($points) {
108	108	arsort($points);
109		- $style = " style='background-image: url(" . chemin_image('secteur-12.png') . ")'";
	109	+ $style = " style='background-image: url(".chemin_image('secteur-12.png').")'";
110	110	foreach ($rub as $k => $v) {
111	111	$rub[$k]['atts'] = ($v['id_parent'] ? $style : '')
112	112	. " class='petite-rubrique'";
		@@ -139,13 +139,13 @@ discard block
		block discarded – undo
139	139	if (!$ids) {
140	140	return "<br /><br /><div style='padding: 5px; color: red;'><b>"
141	141	. spip_htmlentities($type)
142		- . '</b> : ' . _T('avis_aucun_resultat') . '</div>';
	142	+ . '</b> : '._T('avis_aucun_resultat').'</div>';
143	143	}
144	144
145	145	$ret = '';
146	146	$info = generer_url_ecrire('informer', "type=rubrique&rac=$rac&id=");
147	147
148		- $onClick = "aff_selection(this.firstChild.title,'$rac" . "_selection','$info', event)";
	148	+ $onClick = "aff_selection(this.firstChild.title,'$rac"."_selection','$info', event)";
149	149
150	150	$ondbClick = "$do(this.firstChild.firstChild.nodeValue,this.firstChild.title,'selection_rubrique', 'id_parent');";
151	151

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

		@@ -44,7 +44,7 @@ discard block
		block discarded – undo
44	44	. '</b><p> '
45	45	. _T(
46	46	'texte_nouvelle_version_spip_2',
47		- ['connect' => '<tt>' . _FILE_CONNECT . '</tt>']
	47	+ ['connect' => '<tt>'._FILE_CONNECT.'</tt>']
48	48	)
49	49	. generer_form_ecrire(
50	50	'upgrade',
		@@ -65,7 +65,7 @@ discard block
		block discarded – undo
65	65	$GLOBALS['meta']['version_installee'] = 0.0;
66	66	} else {
67	67	$GLOBALS['meta']['version_installee'] =
68		- (double)str_replace(',', '.', $GLOBALS['meta']['version_installee']);
	68	+ (double) str_replace(',', '.', $GLOBALS['meta']['version_installee']);
69	69	}
70	70	# NB: str_replace car, sur club-internet, il semble que version_installe soit
71	71	# enregistree au format '1,812' et non '1.812'
		@@ -79,7 +79,7 @@ discard block
		block discarded – undo
79	79	$commentaire = _T('texte_mise_a_niveau_base_1');
80	80	}
81	81
82		- $commentaire .= '<br />[' . $GLOBALS['meta']['version_installee'] . '/' . $GLOBALS['spip_version_base'] . ']';
	82	+ $commentaire .= '<br />['.$GLOBALS['meta']['version_installee'].'/'.$GLOBALS['spip_version_base'].']';
83	83
84	84	$_POST['reinstall'] = 'non'; // pour copy_request dans admin
85	85	include_spip('inc/headers');

		@@ -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	}

		@@ -17,40 +17,40 @@
		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('', [], [], true);
34		- if (!$res) {
35		- include_spip('inc/minipres');
36		- spip_log('Erreur base de donnees');
37		- echo minipres(
38		- _T('info_travaux_titre'),
39		- _T('titre_probleme_technique') . '<p><tt>' . sql_errno() . ' ' . sql_error() . '</tt></p>'
40		- );
41		- } else {
42		- $res = base_saisie_tables('delete', $res);
43		- include_spip('inc/headers');
44		- $res = "\n<ol style='text-align:left'><li>\n" .
45		- join("</li>\n<li>", $res) .
46		- '</li></ol>';
47		- $admin = charger_fonction('admin', 'inc');
48		- $res = $admin('delete_all', _T('titre_page_delete_all'), $res);
49		- if (!$res) {
50		- redirige_url_ecrire('install', '');
51		- } else {
52		- echo $res;
53		- }
54		- }
55		- }
	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('', [], [], true);
	34	+ if (!$res) {
	35	+ include_spip('inc/minipres');
	36	+ spip_log('Erreur base de donnees');
	37	+ echo minipres(
	38	+ _T('info_travaux_titre'),
	39	+ _T('titre_probleme_technique') . '<p><tt>' . sql_errno() . ' ' . sql_error() . '</tt></p>'
	40	+ );
	41	+ } else {
	42	+ $res = base_saisie_tables('delete', $res);
	43	+ include_spip('inc/headers');
	44	+ $res = "\n<ol style='text-align:left'><li>\n" .
	45	+ join("</li>\n<li>", $res) .
	46	+ '</li></ol>';
	47	+ $admin = charger_fonction('admin', 'inc');
	48	+ $res = $admin('delete_all', _T('titre_page_delete_all'), $res);
	49	+ if (!$res) {
	50	+ redirige_url_ecrire('install', '');
	51	+ } else {
	52	+ echo $res;
	53	+ }
	54	+ }
	55	+ }
56	56	}

		@@ -36,13 +36,13 @@
		block discarded – undo
36	36	spip_log('Erreur base de donnees');
37	37	echo minipres(
38	38	_T('info_travaux_titre'),
39		- _T('titre_probleme_technique') . '<p><tt>' . sql_errno() . ' ' . sql_error() . '</tt></p>'
	39	+ _T('titre_probleme_technique').'<p><tt>'.sql_errno().' '.sql_error().'</tt></p>'
40	40	);
41	41	} else {
42	42	$res = base_saisie_tables('delete', $res);
43	43	include_spip('inc/headers');
44		- $res = "\n<ol style='text-align:left'><li>\n" .
45		- join("</li>\n<li>", $res) .
	44	+ $res = "\n<ol style='text-align:left'><li>\n".
	45	+ join("</li>\n<li>", $res).
46	46	'</li></ol>';
47	47	$admin = charger_fonction('admin', 'inc');
48	48	$res = $admin('delete_all', _T('titre_page_delete_all'), $res);

spip / SPIP

Push — master ( 4a1dc4...073957 )

Status

Category

Indentation +123 added lines, -123 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

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

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

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

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

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

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

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

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

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

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

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