Inspection of "[Salvatore] [source:ecrire/lang/ ecrire] Export de..." - spip/SPIP - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( c76770...babdec )

by cam

created 2023-02-28 00:27 UTC

Status

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

@@ -17,7 +17,7 @@  discard block
 block discarded – undo
  **/
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 /**
@@ -34,33 +34,33 @@  discard block
 block discarded – undo
  *     Contenu HTML, avec boutons d'administrations et sa CSS
  **/
 function affiche_boutons_admin($contenu) {
-	include_spip('inc/filtres');
+    include_spip('inc/filtres');
 
-	// Inserer le css d'admin
-	$css = "<link rel='stylesheet' href='" . url_absolue(direction_css(find_in_path('spip_admin.css')))
-		. "' type='text/css' />\n";
-	if ($f = find_in_path('spip_admin_perso.css')) {
-		$css .= "<link rel='stylesheet' href='"
-			. url_absolue(direction_css($f)) . "' type='text/css' />\n";
-	}
+    // Inserer le css d'admin
+    $css = "<link rel='stylesheet' href='" . url_absolue(direction_css(find_in_path('spip_admin.css')))
+        . "' type='text/css' />\n";
+    if ($f = find_in_path('spip_admin_perso.css')) {
+        $css .= "<link rel='stylesheet' href='"
+            . url_absolue(direction_css($f)) . "' type='text/css' />\n";
+    }
 
-	($pos = stripos($contenu, '</head>'))
-	|| ($pos = stripos($contenu, '<body>'))
-	|| ($pos = 0);
-	$contenu = substr_replace($contenu, $css, $pos, 0);
+    ($pos = stripos($contenu, '</head>'))
+    || ($pos = stripos($contenu, '<body>'))
+    || ($pos = 0);
+    $contenu = substr_replace($contenu, $css, $pos, 0);
 
 
-	// Inserer la balise #FORMULAIRE_ADMIN, en float
-	$boutons_admin = inclure_balise_dynamique(
-		balise_FORMULAIRE_ADMIN_dyn('spip-admin-float'),
-		false
-	);
+    // Inserer la balise #FORMULAIRE_ADMIN, en float
+    $boutons_admin = inclure_balise_dynamique(
+        balise_FORMULAIRE_ADMIN_dyn('spip-admin-float'),
+        false
+    );
 
-	($pos = strripos($contenu, '</body>'))
-	|| ($pos = strripos($contenu, '</html>'))
-	|| ($pos = strlen($contenu));
-	$contenu = substr_replace($contenu, $boutons_admin, $pos, 0);
+    ($pos = strripos($contenu, '</body>'))
+    || ($pos = strripos($contenu, '</html>'))
+    || ($pos = strlen($contenu));
+    $contenu = substr_replace($contenu, $boutons_admin, $pos, 0);
 
 
-	return $contenu;
+    return $contenu;
 }

Please login to merge, or discard this patch.

ecrire/public/boucles.php 1 patch

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

@@ -17,7 +17,7 @@  discard block
 block discarded – undo
  **/
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
  *     Code PHP compilé de la boucle
  **/
 function boucle_DEFAUT_dist($id_boucle, &$boucles) {
-	return calculer_boucle($id_boucle, $boucles);
+    return calculer_boucle($id_boucle, $boucles);
 }
 
 
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
  *     Code PHP compilé de la boucle
  **/
 function boucle_BOUCLE_dist($id_boucle, &$boucles) {
-	return calculer_boucle($id_boucle, $boucles);
+    return calculer_boucle($id_boucle, $boucles);
 }
 
 
@@ -81,30 +81,30 @@  discard block
 block discarded – undo
  *     Code PHP compilé de la boucle
  **/
 function boucle_HIERARCHIE_dist($id_boucle, &$boucles) {
-	$boucle = &$boucles[$id_boucle];
-	$id_table = $boucle->id_table . '.id_rubrique';
+    $boucle = &$boucles[$id_boucle];
+    $id_table = $boucle->id_table . '.id_rubrique';
 
-	// Si la boucle mere est une boucle RUBRIQUES il faut ignorer la feuille
-	// sauf en presence du critere {tout} (vu par phraser_html)
-	// ou {id_article} qui positionne aussi le {tout}
+    // Si la boucle mere est une boucle RUBRIQUES il faut ignorer la feuille
+    // sauf en presence du critere {tout} (vu par phraser_html)
+    // ou {id_article} qui positionne aussi le {tout}
 
-	$boucle->hierarchie = 'if (!($id_rubrique = intval('
-		. calculer_argument_precedent($boucle->id_boucle, 'id_rubrique', $boucles)
-		. ")))\n\t\treturn '';\n\t"
-		. "include_spip('inc/rubriques');\n\t"
-		. '$hierarchie = calcul_hierarchie_in($id_rubrique,'
-		. (isset($boucle->modificateur['tout']) ? 'true' : 'false')
-		. ");\n\t"
-		. 'if (!$hierarchie) return "";' . "\n\t";
+    $boucle->hierarchie = 'if (!($id_rubrique = intval('
+        . calculer_argument_precedent($boucle->id_boucle, 'id_rubrique', $boucles)
+        . ")))\n\t\treturn '';\n\t"
+        . "include_spip('inc/rubriques');\n\t"
+        . '$hierarchie = calcul_hierarchie_in($id_rubrique,'
+        . (isset($boucle->modificateur['tout']) ? 'true' : 'false')
+        . ");\n\t"
+        . 'if (!$hierarchie) return "";' . "\n\t";
 
-	$boucle->where[] = ["'IN'", "'$id_table'", '"($hierarchie)"'];
+    $boucle->where[] = ["'IN'", "'$id_table'", '"($hierarchie)"'];
 
-	$order = "FIELD($id_table, \$hierarchie)";
-	if (!isset($boucle->default_order[0]) or $boucle->default_order[0] != ' DESC') {
-		$boucle->default_order[] = "\"$order\"";
-	} else {
-		$boucle->default_order[0] = "\"$order DESC\"";
-	}
+    $order = "FIELD($id_table, \$hierarchie)";
+    if (!isset($boucle->default_order[0]) or $boucle->default_order[0] != ' DESC') {
+        $boucle->default_order[] = "\"$order\"";
+    } else {
+        $boucle->default_order[0] = "\"$order DESC\"";
+    }
 
-	return calculer_boucle($id_boucle, $boucles);
+    return calculer_boucle($id_boucle, $boucles);
 }

Please login to merge, or discard this patch.

ecrire/maj/legacy/v31.php 1 patch

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

@@ -18,12 +18,12 @@  discard block
 block discarded – undo
  * @package SPIP\Core\SQL\Upgrade
  **/
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 
 $GLOBALS['maj'][21676] = [
-	['ranger_cache_gd2'],
+    ['ranger_cache_gd2'],
 ];
 
 /**
@@ -32,30 +32,30 @@  discard block
 block discarded – undo
  * https://core.spip.net/issues/3277
  */
 function ranger_cache_gd2() {
-	spip_log('ranger_cache_gd2');
-	$base = _DIR_VAR . 'cache-gd2/';
-	if (is_dir($base) and is_readable($base)) {
-		if ($dir = opendir($base)) {
-			while (($f = readdir($dir)) !== false) {
-				if (
-					!is_dir($base . $f) and strncmp($f, '.', 1) !== 0
-					and preg_match(',[0-9a-f]{32}\.\w+,', $f)
-				) {
-					$sub = substr($f, 0, 2);
-					$sub = sous_repertoire($base, $sub);
-					@rename($base . $f, $sub . substr($f, 2));
-					@unlink($base . $f); // au cas ou le rename a foire (collision)
-				}
-				if (time() >= _TIME_OUT) {
-					return;
-				}
-			}
-		}
-	}
+    spip_log('ranger_cache_gd2');
+    $base = _DIR_VAR . 'cache-gd2/';
+    if (is_dir($base) and is_readable($base)) {
+        if ($dir = opendir($base)) {
+            while (($f = readdir($dir)) !== false) {
+                if (
+                    !is_dir($base . $f) and strncmp($f, '.', 1) !== 0
+                    and preg_match(',[0-9a-f]{32}\.\w+,', $f)
+                ) {
+                    $sub = substr($f, 0, 2);
+                    $sub = sous_repertoire($base, $sub);
+                    @rename($base . $f, $sub . substr($f, 2));
+                    @unlink($base . $f); // au cas ou le rename a foire (collision)
+                }
+                if (time() >= _TIME_OUT) {
+                    return;
+                }
+            }
+        }
+    }
 }
 
 
 $GLOBALS['maj'][21742] = [
-	['sql_alter', "TABLE spip_articles CHANGE url_site url_site text DEFAULT '' NOT NULL"],
-	['sql_alter', "TABLE spip_articles CHANGE virtuel virtuel text DEFAULT '' NOT NULL"],
+    ['sql_alter', "TABLE spip_articles CHANGE url_site url_site text DEFAULT '' NOT NULL"],
+    ['sql_alter', "TABLE spip_articles CHANGE virtuel virtuel text DEFAULT '' NOT NULL"],
 ];

Please login to merge, or discard this patch.

ecrire/maj/legacy/v21.php 1 patch

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

@@ -18,7 +18,7 @@  discard block
 block discarded – undo
  * @package SPIP\Core\SQL\Upgrade
  **/
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 include_spip('base/medias');
@@ -27,27 +27,27 @@  discard block
 block discarded – undo
 
 // http://archives.rezo.net/archives/spip-zone.mbox/C6RZKNBUNJYN42IOEOC4QKVCA233AMLI/
 $GLOBALS['maj'][13833] = [
-	['sql_alter', 'TABLE spip_documents_liens ADD INDEX objet(id_objet,objet)']
+    ['sql_alter', 'TABLE spip_documents_liens ADD INDEX objet(id_objet,objet)']
 ];
 
 // 2.1
 
 $GLOBALS['maj'][13904] = [
-	['sql_alter', "TABLE spip_auteurs ADD webmestre varchar(3)  DEFAULT 'non' NOT NULL"],
-	[
-		'sql_update',
-		'spip_auteurs',
-		['webmestre' => "'oui'"],
-		sql_in('id_auteur', defined('_ID_WEBMESTRES') ? explode(
-			':',
-			_ID_WEBMESTRES
-		) : (autoriser('configurer') ? [$GLOBALS['visiteur_session']['id_auteur']] : [0]))
-	] // le webmestre est celui qui fait l'upgrade si rien de defini
+    ['sql_alter', "TABLE spip_auteurs ADD webmestre varchar(3)  DEFAULT 'non' NOT NULL"],
+    [
+        'sql_update',
+        'spip_auteurs',
+        ['webmestre' => "'oui'"],
+        sql_in('id_auteur', defined('_ID_WEBMESTRES') ? explode(
+            ':',
+            _ID_WEBMESTRES
+        ) : (autoriser('configurer') ? [$GLOBALS['visiteur_session']['id_auteur']] : [0]))
+    ] // le webmestre est celui qui fait l'upgrade si rien de defini
 ];
 
 // sites plantes en mode "'su" au lieu de "sus"
 $GLOBALS['maj'][13929] = [
-	['sql_update', 'spip_syndic', ['syndication' => "'sus'"], "syndication LIKE '\\'%'"]
+    ['sql_update', 'spip_syndic', ['syndication' => "'sus'"], "syndication LIKE '\\'%'"]
 ];
 
 // Types de fichiers m4a/m4b/m4p/m4u/m4v/dv
@@ -61,24 +61,24 @@  discard block
 block discarded – undo
 // La version 14588 etait une mauvaise piste:
 // Retour en arriere pour ceux qui l'ont subi, ne rien faire sinon
 if (@$GLOBALS['meta']['version_installee'] >= 14588) {
-	// "mode" est un mot-cle d'Oracle
-	$GLOBALS['maj'][14588] = [
-		['sql_alter', 'TABLE spip_documents  DROP INDEX mode'],
-		[
-			'sql_alter',
-			"TABLE spip_documents  CHANGE mode genre ENUM('vignette', 'image', 'document') DEFAULT 'document' NOT NULL"
-		],
-		['sql_alter', 'TABLE spip_documents  ADD INDEX genre(genre)']
-	];
-	// solution moins intrusive au pb de mot-cle d'Oracle, retour avant 14588
-	$GLOBALS['maj'][14598] = [
-		['sql_alter', 'TABLE spip_documents  DROP INDEX genre'],
-		[
-			'sql_alter',
-			"TABLE spip_documents  CHANGE genre mode ENUM('vignette', 'image', 'document') DEFAULT 'document' NOT NULL"
-		],
-		['sql_alter', 'TABLE spip_documents  ADD INDEX mode(mode)']
-	];
+    // "mode" est un mot-cle d'Oracle
+    $GLOBALS['maj'][14588] = [
+        ['sql_alter', 'TABLE spip_documents  DROP INDEX mode'],
+        [
+            'sql_alter',
+            "TABLE spip_documents  CHANGE mode genre ENUM('vignette', 'image', 'document') DEFAULT 'document' NOT NULL"
+        ],
+        ['sql_alter', 'TABLE spip_documents  ADD INDEX genre(genre)']
+    ];
+    // solution moins intrusive au pb de mot-cle d'Oracle, retour avant 14588
+    $GLOBALS['maj'][14598] = [
+        ['sql_alter', 'TABLE spip_documents  DROP INDEX genre'],
+        [
+            'sql_alter',
+            "TABLE spip_documents  CHANGE genre mode ENUM('vignette', 'image', 'document') DEFAULT 'document' NOT NULL"
+        ],
+        ['sql_alter', 'TABLE spip_documents  ADD INDEX mode(mode)']
+    ];
 }
 
 // Restauration correcte des types mime des fichiers Ogg

Please login to merge, or discard this patch.

ecrire/maj/legacy/v32.php 1 patch

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

@@ -18,10 +18,10 @@
 block discarded – undo
  * @package SPIP\Core\SQL\Upgrade
  **/
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 
 $GLOBALS['maj'][23375] = [
-	['sql_alter', 'TABLE spip_auteurs CHANGE prefs prefs text'],
+    ['sql_alter', 'TABLE spip_auteurs CHANGE prefs prefs text'],
 ];

Please login to merge, or discard this patch.

ecrire/maj/legacy/v40.php 1 patch

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

@@ -20,7 +20,7 @@  discard block
 block discarded – undo
  * @package SPIP\Core\SQL\Upgrade
  **/
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 
@@ -35,49 +35,49 @@  discard block
 block discarded – undo
  **/
 function maj_timestamp_mysql($tables = null) {
 
-	include_spip('base/dump');
-	if (is_null($tables)) {
-		$tables = base_lister_toutes_tables();
-	} elseif (is_string($tables)) {
-		$tables = [$tables];
-	} elseif (!is_array($tables)) {
-		return;
-	}
+    include_spip('base/dump');
+    if (is_null($tables)) {
+        $tables = base_lister_toutes_tables();
+    } elseif (is_string($tables)) {
+        $tables = [$tables];
+    } elseif (!is_array($tables)) {
+        return;
+    }
 
-	// rien a faire si base non mysql
-	if (strncmp($GLOBALS['connexions'][0]['type'], 'mysql', 5) !== 0) {
-		return;
-	}
+    // rien a faire si base non mysql
+    if (strncmp($GLOBALS['connexions'][0]['type'], 'mysql', 5) !== 0) {
+        return;
+    }
 
-	$trouver_table = charger_fonction('trouver_table', 'base');
-	// forcer le vidage de cache
-	$trouver_table('');
+    $trouver_table = charger_fonction('trouver_table', 'base');
+    // forcer le vidage de cache
+    $trouver_table('');
 
-	foreach ($tables as $table) {
-		if (time() >= _TIME_OUT) {
-			return;
-		}
-		if ($desc = $trouver_table($table)) {
-			$fields_corrected = _mysql_remplacements_definitions_table($desc['field']);
-			$d = array_diff($desc['field'], $fields_corrected);
-			if ($d) {
-				spip_log("Table $table TIMESTAMP incorrect", 'maj');
-				foreach ($desc['field'] as $field => $type) {
-					if ($desc['field'][$field] !== $fields_corrected[$field]) {
-						spip_log("Adaptation TIMESTAMP table $table", 'maj.' . _LOG_INFO_IMPORTANTE);
-						sql_alter("table $table change $field $field " . $fields_corrected[$field]);
-						$trouver_table('');
-						$new_desc = $trouver_table($table);
-						spip_log(
-							"Apres conversion $table : " . var_export($new_desc['field'], true),
-							'maj.' . _LOG_INFO_IMPORTANTE
-						);
-					}
-				}
-			}
-		}
-	}
+    foreach ($tables as $table) {
+        if (time() >= _TIME_OUT) {
+            return;
+        }
+        if ($desc = $trouver_table($table)) {
+            $fields_corrected = _mysql_remplacements_definitions_table($desc['field']);
+            $d = array_diff($desc['field'], $fields_corrected);
+            if ($d) {
+                spip_log("Table $table TIMESTAMP incorrect", 'maj');
+                foreach ($desc['field'] as $field => $type) {
+                    if ($desc['field'][$field] !== $fields_corrected[$field]) {
+                        spip_log("Adaptation TIMESTAMP table $table", 'maj.' . _LOG_INFO_IMPORTANTE);
+                        sql_alter("table $table change $field $field " . $fields_corrected[$field]);
+                        $trouver_table('');
+                        $new_desc = $trouver_table($table);
+                        spip_log(
+                            "Apres conversion $table : " . var_export($new_desc['field'], true),
+                            'maj.' . _LOG_INFO_IMPORTANTE
+                        );
+                    }
+                }
+            }
+        }
+    }
 
-	// forcer le vidage de cache
-	$trouver_table('');
+    // forcer le vidage de cache
+    $trouver_table('');
 }

Please login to merge, or discard this patch.

ecrire/maj/legacy/svn10000.php 1 patch

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

@@ -18,7 +18,7 @@
 block discarded – undo
  */
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 include_spip('maj/legacy/v30');

Please login to merge, or discard this patch.

ecrire/xml/interfaces.php 1 patch

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

		@@ -11,12 +11,12 @@ discard block
		block discarded – undo
11	11	\***************************************************************************/
12	12
13	13	if (!defined('_ECRIRE_INC_VERSION')) {
14		- return;
	14	+ return;
15	15	}
16	16
17	17	define(
18		- '_REGEXP_DOCTYPE',
19		- '/^((?:<\001?[?][^>]>\s)(?:<!--.?-->\s))<!DOCTYPE\s+(\w+)\s+(\w+)\s([^>])>\s/s'
	18	+ '_REGEXP_DOCTYPE',
	19	+ '/^((?:<\001?[?][^>]>\s)(?:<!--.?-->\s))<!DOCTYPE\s+(\w+)\s+(\w+)\s([^>])>\s/s'
20	20	);
21	21
22	22	define('_REGEXP_XML', '/^(\s(?:<[?][^x>][^>]>\s)?(?:<[?]xml[^>]>)?\s(?:<!--.?-->\s))<(\w+)/s');
		@@ -35,14 +35,14 @@ discard block
		block discarded – undo
35	35	define('_REGEXP_ENTITY_DEF', '/^%(' . _SUB_REGEXP_SYMBOL . '+);/');
36	36	define('_REGEXP_TYPE_XML', 'PUBLIC\|SYSTEM\|INCLUDE\|IGNORE\|CDATA');
37	37	define('_REGEXP_ENTITY_DECL', '/^<!ENTITY\s+(%?)\s*(' .
38		- _SUB_REGEXP_SYMBOL .
39		- '+;?)\s+(' .
40		- _REGEXP_TYPE_XML .
41		- ')?\s*(' .
42		- "('([^']*)')" .
43		- '\|("([^"]*)")' .
44		- '\|\s(%' . _SUB_REGEXP_SYMBOL . '+;)\s' .
45		- ')\s(--.?--)?("([^"])")?\s>\s(.)$/s');
	38	+ _SUB_REGEXP_SYMBOL .
	39	+ '+;?)\s+(' .
	40	+ _REGEXP_TYPE_XML .
	41	+ ')?\s*(' .
	42	+ "('([^']*)')" .
	43	+ '\|("([^"]*)")' .
	44	+ '\|\s(%' . _SUB_REGEXP_SYMBOL . '+;)\s' .
	45	+ ')\s(--.?--)?("([^"])")?\s>\s(.)$/s');
46	46
47	47	define('_REGEXP_INCLUDE_USE', '/^<!\[\s%\s([^;]);\s\[\s(.)$/s');
48	48
		@@ -52,11 +52,11 @@ discard block
		block discarded – undo
52	52	* Document Type Compilation
53	53	**/
54	54	class DTC {
55		- public $macros = [];
56		- public $elements = [];
57		- public $peres = [];
58		- public $attributs = [];
59		- public $entites = [];
60		- public $regles = [];
61		- public $pcdata = [];
	55	+ public $macros = [];
	56	+ public $elements = [];
	57	+ public $peres = [];
	58	+ public $attributs = [];
	59	+ public $entites = [];
	60	+ public $regles = [];
	61	+ public $pcdata = [];
62	62	}

Please login to merge, or discard this patch.

ecrire/inc/definir_menus_favoris.php 1 patch

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

@@ -20,21 +20,21 @@
 block discarded – undo
  * Retourne la liste des menus favoris par défaut ainsi que leur rang
  */
 function inc_definir_menus_favoris_dist() {
-	$liste = [
+    $liste = [
 
-		// Menu Édition,
-		'auteurs' => 1,
-		'rubriques' => 2,
-		'articles' => 3,
+        // Menu Édition,
+        'auteurs' => 1,
+        'rubriques' => 2,
+        'articles' => 3,
 
-		// Menu Maintenance
-		'admin_vider' => 1,
+        // Menu Maintenance
+        'admin_vider' => 1,
 
-		// Menu Configurations
-		'configurer_identite' => 1,
-		'admin_plugin' => 2,
+        // Menu Configurations
+        'configurer_identite' => 1,
+        'admin_plugin' => 2,
 
-	];
+    ];
 
-	return $liste;
+    return $liste;
 }

Please login to merge, or discard this patch.

		@@ -17,7 +17,7 @@ discard block
		block discarded – undo
17	17	**/
18	18
19	19	if (!defined('_ECRIRE_INC_VERSION')) {
20		- return;
	20	+ return;
21	21	}
22	22
23	23	/**
		@@ -34,33 +34,33 @@ discard block
		block discarded – undo
34	34	* Contenu HTML, avec boutons d'administrations et sa CSS
35	35	**/
36	36	function affiche_boutons_admin($contenu) {
37		- include_spip('inc/filtres');
	37	+ include_spip('inc/filtres');
38	38
39		- // Inserer le css d'admin
40		- $css = "<link rel='stylesheet' href='" . url_absolue(direction_css(find_in_path('spip_admin.css')))
41		- . "' type='text/css' />\n";
42		- if ($f = find_in_path('spip_admin_perso.css')) {
43		- $css .= "<link rel='stylesheet' href='"
44		- . url_absolue(direction_css($f)) . "' type='text/css' />\n";
45		- }
	39	+ // Inserer le css d'admin
	40	+ $css = "<link rel='stylesheet' href='" . url_absolue(direction_css(find_in_path('spip_admin.css')))
	41	+ . "' type='text/css' />\n";
	42	+ if ($f = find_in_path('spip_admin_perso.css')) {
	43	+ $css .= "<link rel='stylesheet' href='"
	44	+ . url_absolue(direction_css($f)) . "' type='text/css' />\n";
	45	+ }
46	46
47		- ($pos = stripos($contenu, '</head>'))
48		- \|\| ($pos = stripos($contenu, '<body>'))
49		- \|\| ($pos = 0);
50		- $contenu = substr_replace($contenu, $css, $pos, 0);
	47	+ ($pos = stripos($contenu, '</head>'))
	48	+ \|\| ($pos = stripos($contenu, '<body>'))
	49	+ \|\| ($pos = 0);
	50	+ $contenu = substr_replace($contenu, $css, $pos, 0);
51	51
52	52
53		- // Inserer la balise #FORMULAIRE_ADMIN, en float
54		- $boutons_admin = inclure_balise_dynamique(
55		- balise_FORMULAIRE_ADMIN_dyn('spip-admin-float'),
56		- false
57		- );
	53	+ // Inserer la balise #FORMULAIRE_ADMIN, en float
	54	+ $boutons_admin = inclure_balise_dynamique(
	55	+ balise_FORMULAIRE_ADMIN_dyn('spip-admin-float'),
	56	+ false
	57	+ );
58	58
59		- ($pos = strripos($contenu, '</body>'))
60		- \|\| ($pos = strripos($contenu, '</html>'))
61		- \|\| ($pos = strlen($contenu));
62		- $contenu = substr_replace($contenu, $boutons_admin, $pos, 0);
	59	+ ($pos = strripos($contenu, '</body>'))
	60	+ \|\| ($pos = strripos($contenu, '</html>'))
	61	+ \|\| ($pos = strlen($contenu));
	62	+ $contenu = substr_replace($contenu, $boutons_admin, $pos, 0);
63	63
64	64
65		- return $contenu;
	65	+ return $contenu;
66	66	}

		@@ -18,12 +18,12 @@ discard block
		block discarded – undo
18	18	* @package SPIP\Core\SQL\Upgrade
19	19	**/
20	20	if (!defined('_ECRIRE_INC_VERSION')) {
21		- return;
	21	+ return;
22	22	}
23	23
24	24
25	25	$GLOBALS['maj'][21676] = [
26		- ['ranger_cache_gd2'],
	26	+ ['ranger_cache_gd2'],
27	27	];
28	28
29	29	/**
		@@ -32,30 +32,30 @@ discard block
		block discarded – undo
32	32	* https://core.spip.net/issues/3277
33	33	*/
34	34	function ranger_cache_gd2() {
35		- spip_log('ranger_cache_gd2');
36		- $base = _DIR_VAR . 'cache-gd2/';
37		- if (is_dir($base) and is_readable($base)) {
38		- if ($dir = opendir($base)) {
39		- while (($f = readdir($dir)) !== false) {
40		- if (
41		- !is_dir($base . $f) and strncmp($f, '.', 1) !== 0
42		- and preg_match(',[0-9a-f]{32}\.\w+,', $f)
43		- ) {
44		- $sub = substr($f, 0, 2);
45		- $sub = sous_repertoire($base, $sub);
46		- @rename($base . $f, $sub . substr($f, 2));
47		- @unlink($base . $f); // au cas ou le rename a foire (collision)
48		- }
49		- if (time() >= _TIME_OUT) {
50		- return;
51		- }
52		- }
53		- }
54		- }
	35	+ spip_log('ranger_cache_gd2');
	36	+ $base = _DIR_VAR . 'cache-gd2/';
	37	+ if (is_dir($base) and is_readable($base)) {
	38	+ if ($dir = opendir($base)) {
	39	+ while (($f = readdir($dir)) !== false) {
	40	+ if (
	41	+ !is_dir($base . $f) and strncmp($f, '.', 1) !== 0
	42	+ and preg_match(',[0-9a-f]{32}\.\w+,', $f)
	43	+ ) {
	44	+ $sub = substr($f, 0, 2);
	45	+ $sub = sous_repertoire($base, $sub);
	46	+ @rename($base . $f, $sub . substr($f, 2));
	47	+ @unlink($base . $f); // au cas ou le rename a foire (collision)
	48	+ }
	49	+ if (time() >= _TIME_OUT) {
	50	+ return;
	51	+ }
	52	+ }
	53	+ }
	54	+ }
55	55	}
56	56
57	57
58	58	$GLOBALS['maj'][21742] = [
59		- ['sql_alter', "TABLE spip_articles CHANGE url_site url_site text DEFAULT '' NOT NULL"],
60		- ['sql_alter', "TABLE spip_articles CHANGE virtuel virtuel text DEFAULT '' NOT NULL"],
	59	+ ['sql_alter', "TABLE spip_articles CHANGE url_site url_site text DEFAULT '' NOT NULL"],
	60	+ ['sql_alter', "TABLE spip_articles CHANGE virtuel virtuel text DEFAULT '' NOT NULL"],
61	61	];

		@@ -18,7 +18,7 @@ discard block
		block discarded – undo
18	18	* @package SPIP\Core\SQL\Upgrade
19	19	**/
20	20	if (!defined('_ECRIRE_INC_VERSION')) {
21		- return;
	21	+ return;
22	22	}
23	23
24	24	include_spip('base/medias');
		@@ -27,27 +27,27 @@ discard block
		block discarded – undo
27	27
28	28	// http://archives.rezo.net/archives/spip-zone.mbox/C6RZKNBUNJYN42IOEOC4QKVCA233AMLI/
29	29	$GLOBALS['maj'][13833] = [
30		- ['sql_alter', 'TABLE spip_documents_liens ADD INDEX objet(id_objet,objet)']
	30	+ ['sql_alter', 'TABLE spip_documents_liens ADD INDEX objet(id_objet,objet)']
31	31	];
32	32
33	33	// 2.1
34	34
35	35	$GLOBALS['maj'][13904] = [
36		- ['sql_alter', "TABLE spip_auteurs ADD webmestre varchar(3) DEFAULT 'non' NOT NULL"],
37		- [
38		- 'sql_update',
39		- 'spip_auteurs',
40		- ['webmestre' => "'oui'"],
41		- sql_in('id_auteur', defined('_ID_WEBMESTRES') ? explode(
42		- ':',
43		- _ID_WEBMESTRES
44		- ) : (autoriser('configurer') ? [$GLOBALS['visiteur_session']['id_auteur']] : [0]))
45		- ] // le webmestre est celui qui fait l'upgrade si rien de defini
	36	+ ['sql_alter', "TABLE spip_auteurs ADD webmestre varchar(3) DEFAULT 'non' NOT NULL"],
	37	+ [
	38	+ 'sql_update',
	39	+ 'spip_auteurs',
	40	+ ['webmestre' => "'oui'"],
	41	+ sql_in('id_auteur', defined('_ID_WEBMESTRES') ? explode(
	42	+ ':',
	43	+ _ID_WEBMESTRES
	44	+ ) : (autoriser('configurer') ? [$GLOBALS['visiteur_session']['id_auteur']] : [0]))
	45	+ ] // le webmestre est celui qui fait l'upgrade si rien de defini
46	46	];
47	47
48	48	// sites plantes en mode "'su" au lieu de "sus"
49	49	$GLOBALS['maj'][13929] = [
50		- ['sql_update', 'spip_syndic', ['syndication' => "'sus'"], "syndication LIKE '\\'%'"]
	50	+ ['sql_update', 'spip_syndic', ['syndication' => "'sus'"], "syndication LIKE '\\'%'"]
51	51	];
52	52
53	53	// Types de fichiers m4a/m4b/m4p/m4u/m4v/dv
		@@ -61,24 +61,24 @@ discard block
		block discarded – undo
61	61	// La version 14588 etait une mauvaise piste:
62	62	// Retour en arriere pour ceux qui l'ont subi, ne rien faire sinon
63	63	if (@$GLOBALS['meta']['version_installee'] >= 14588) {
64		- // "mode" est un mot-cle d'Oracle
65		- $GLOBALS['maj'][14588] = [
66		- ['sql_alter', 'TABLE spip_documents DROP INDEX mode'],
67		- [
68		- 'sql_alter',
69		- "TABLE spip_documents CHANGE mode genre ENUM('vignette', 'image', 'document') DEFAULT 'document' NOT NULL"
70		- ],
71		- ['sql_alter', 'TABLE spip_documents ADD INDEX genre(genre)']
72		- ];
73		- // solution moins intrusive au pb de mot-cle d'Oracle, retour avant 14588
74		- $GLOBALS['maj'][14598] = [
75		- ['sql_alter', 'TABLE spip_documents DROP INDEX genre'],
76		- [
77		- 'sql_alter',
78		- "TABLE spip_documents CHANGE genre mode ENUM('vignette', 'image', 'document') DEFAULT 'document' NOT NULL"
79		- ],
80		- ['sql_alter', 'TABLE spip_documents ADD INDEX mode(mode)']
81		- ];
	64	+ // "mode" est un mot-cle d'Oracle
	65	+ $GLOBALS['maj'][14588] = [
	66	+ ['sql_alter', 'TABLE spip_documents DROP INDEX mode'],
	67	+ [
	68	+ 'sql_alter',
	69	+ "TABLE spip_documents CHANGE mode genre ENUM('vignette', 'image', 'document') DEFAULT 'document' NOT NULL"
	70	+ ],
	71	+ ['sql_alter', 'TABLE spip_documents ADD INDEX genre(genre)']
	72	+ ];
	73	+ // solution moins intrusive au pb de mot-cle d'Oracle, retour avant 14588
	74	+ $GLOBALS['maj'][14598] = [
	75	+ ['sql_alter', 'TABLE spip_documents DROP INDEX genre'],
	76	+ [
	77	+ 'sql_alter',
	78	+ "TABLE spip_documents CHANGE genre mode ENUM('vignette', 'image', 'document') DEFAULT 'document' NOT NULL"
	79	+ ],
	80	+ ['sql_alter', 'TABLE spip_documents ADD INDEX mode(mode)']
	81	+ ];
82	82	}
83	83
84	84	// Restauration correcte des types mime des fichiers Ogg

		@@ -18,10 +18,10 @@
		block discarded – undo
18	18	* @package SPIP\Core\SQL\Upgrade
19	19	**/
20	20	if (!defined('_ECRIRE_INC_VERSION')) {
21		- return;
	21	+ return;
22	22	}
23	23
24	24
25	25	$GLOBALS['maj'][23375] = [
26		- ['sql_alter', 'TABLE spip_auteurs CHANGE prefs prefs text'],
	26	+ ['sql_alter', 'TABLE spip_auteurs CHANGE prefs prefs text'],
27	27	];

		@@ -20,7 +20,7 @@ discard block
		block discarded – undo
20	20	* @package SPIP\Core\SQL\Upgrade
21	21	**/
22	22	if (!defined('_ECRIRE_INC_VERSION')) {
23		- return;
	23	+ return;
24	24	}
25	25
26	26
		@@ -35,49 +35,49 @@ discard block
		block discarded – undo
35	35	**/
36	36	function maj_timestamp_mysql($tables = null) {
37	37
38		- include_spip('base/dump');
39		- if (is_null($tables)) {
40		- $tables = base_lister_toutes_tables();
41		- } elseif (is_string($tables)) {
42		- $tables = [$tables];
43		- } elseif (!is_array($tables)) {
44		- return;
45		- }
	38	+ include_spip('base/dump');
	39	+ if (is_null($tables)) {
	40	+ $tables = base_lister_toutes_tables();
	41	+ } elseif (is_string($tables)) {
	42	+ $tables = [$tables];
	43	+ } elseif (!is_array($tables)) {
	44	+ return;
	45	+ }
46	46
47		- // rien a faire si base non mysql
48		- if (strncmp($GLOBALS['connexions'][0]['type'], 'mysql', 5) !== 0) {
49		- return;
50		- }
	47	+ // rien a faire si base non mysql
	48	+ if (strncmp($GLOBALS['connexions'][0]['type'], 'mysql', 5) !== 0) {
	49	+ return;
	50	+ }
51	51
52		- $trouver_table = charger_fonction('trouver_table', 'base');
53		- // forcer le vidage de cache
54		- $trouver_table('');
	52	+ $trouver_table = charger_fonction('trouver_table', 'base');
	53	+ // forcer le vidage de cache
	54	+ $trouver_table('');
55	55
56		- foreach ($tables as $table) {
57		- if (time() >= _TIME_OUT) {
58		- return;
59		- }
60		- if ($desc = $trouver_table($table)) {
61		- $fields_corrected = _mysql_remplacements_definitions_table($desc['field']);
62		- $d = array_diff($desc['field'], $fields_corrected);
63		- if ($d) {
64		- spip_log("Table $table TIMESTAMP incorrect", 'maj');
65		- foreach ($desc['field'] as $field => $type) {
66		- if ($desc['field'][$field] !== $fields_corrected[$field]) {
67		- spip_log("Adaptation TIMESTAMP table $table", 'maj.' . _LOG_INFO_IMPORTANTE);
68		- sql_alter("table $table change $field $field " . $fields_corrected[$field]);
69		- $trouver_table('');
70		- $new_desc = $trouver_table($table);
71		- spip_log(
72		- "Apres conversion $table : " . var_export($new_desc['field'], true),
73		- 'maj.' . _LOG_INFO_IMPORTANTE
74		- );
75		- }
76		- }
77		- }
78		- }
79		- }
	56	+ foreach ($tables as $table) {
	57	+ if (time() >= _TIME_OUT) {
	58	+ return;
	59	+ }
	60	+ if ($desc = $trouver_table($table)) {
	61	+ $fields_corrected = _mysql_remplacements_definitions_table($desc['field']);
	62	+ $d = array_diff($desc['field'], $fields_corrected);
	63	+ if ($d) {
	64	+ spip_log("Table $table TIMESTAMP incorrect", 'maj');
	65	+ foreach ($desc['field'] as $field => $type) {
	66	+ if ($desc['field'][$field] !== $fields_corrected[$field]) {
	67	+ spip_log("Adaptation TIMESTAMP table $table", 'maj.' . _LOG_INFO_IMPORTANTE);
	68	+ sql_alter("table $table change $field $field " . $fields_corrected[$field]);
	69	+ $trouver_table('');
	70	+ $new_desc = $trouver_table($table);
	71	+ spip_log(
	72	+ "Apres conversion $table : " . var_export($new_desc['field'], true),
	73	+ 'maj.' . _LOG_INFO_IMPORTANTE
	74	+ );
	75	+ }
	76	+ }
	77	+ }
	78	+ }
	79	+ }
80	80
81		- // forcer le vidage de cache
82		- $trouver_table('');
	81	+ // forcer le vidage de cache
	82	+ $trouver_table('');
83	83	}

		@@ -18,7 +18,7 @@
		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('maj/legacy/v30');

		@@ -20,21 +20,21 @@
		block discarded – undo
20	20	* Retourne la liste des menus favoris par défaut ainsi que leur rang
21	21	*/
22	22	function inc_definir_menus_favoris_dist() {
23		- $liste = [
	23	+ $liste = [
24	24
25		- // Menu Édition,
26		- 'auteurs' => 1,
27		- 'rubriques' => 2,
28		- 'articles' => 3,
	25	+ // Menu Édition,
	26	+ 'auteurs' => 1,
	27	+ 'rubriques' => 2,
	28	+ 'articles' => 3,
29	29
30		- // Menu Maintenance
31		- 'admin_vider' => 1,
	30	+ // Menu Maintenance
	31	+ 'admin_vider' => 1,
32	32
33		- // Menu Configurations
34		- 'configurer_identite' => 1,
35		- 'admin_plugin' => 2,
	33	+ // Menu Configurations
	34	+ 'configurer_identite' => 1,
	35	+ 'admin_plugin' => 2,
36	36
37		- ];
	37	+ ];
38	38
39		- return $liste;
	39	+ return $liste;
40	40	}

spip / SPIP

Push — master ( c76770...babdec )

Status

Category

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

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

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

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

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

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

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

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

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