Inspection of "fix undefined index sur l'action réparation de la..." - spip/SPIP - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 30650c...2d0717 )

by cam

created 2020-10-25 18:45 UTC

Status

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

@@ -16,7 +16,7 @@  discard block
 block discarded – undo
  * @package SPIP\Core\Installation
  **/
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 include_spip('inc/acces');
@@ -33,18 +33,18 @@  discard block
 block discarded – undo
  * @return bool
  */
 function base_determine_autoinc($table, $desc = array()) {
-	if ($t = lister_tables_principales() and isset($t[$table])) {
-		$autoinc = true;
-	} elseif ($t = lister_tables_auxiliaires() and isset($t[$table])) {
-		$autoinc = false;
-	} else {
-		// essayer de faire au mieux !
-		$autoinc = (isset($desc['key']['PRIMARY KEY'])
-			and strpos($desc['key']['PRIMARY KEY'], ',') === false
-			and strpos($desc['field'][$desc['key']['PRIMARY KEY']], 'default') === false);
-	}
+    if ($t = lister_tables_principales() and isset($t[$table])) {
+        $autoinc = true;
+    } elseif ($t = lister_tables_auxiliaires() and isset($t[$table])) {
+        $autoinc = false;
+    } else {
+        // essayer de faire au mieux !
+        $autoinc = (isset($desc['key']['PRIMARY KEY'])
+            and strpos($desc['key']['PRIMARY KEY'], ',') === false
+            and strpos($desc['field'][$desc['key']['PRIMARY KEY']], 'default') === false);
+    }
 
-	return $autoinc;
+    return $autoinc;
 }
 
 /**
@@ -61,59 +61,59 @@  discard block
 block discarded – undo
  * @return void
  */
 function creer_ou_upgrader_table($table, $desc, $autoinc, $upgrade = false, $serveur = '') {
-	#spip_log("creer_ou_upgrader_table table=$table autoinc=$autoinc upgrade=$upgrade","dbinstall"._LOG_INFO_IMPORTANTE);
-	$sql_desc = $upgrade ? sql_showtable($table, true, $serveur) : false;
-	#if (!$sql_desc) $sql_desc = false;
-	#spip_log("table=$table sql_desc:$sql_desc","dbinstall"._LOG_INFO_IMPORTANTE);
-	if (!$sql_desc) {
-		if ($autoinc === 'auto') {
-			$autoinc = base_determine_autoinc($table, $desc);
-		}
-		#spip_log("sql_create $table autoinc=$autoinc","dbinstall"._LOG_INFO_IMPORTANTE);
-		if (isset($desc['field']) and isset($desc['key'])) {
-			sql_create($table, $desc['field'], $desc['key'], $autoinc, false, $serveur);
-		}
-		// verifier la bonne installation de la table (php-fpm es-tu la ?)
-		$sql_desc = sql_showtable($table, true, $serveur);
-		#if (!$sql_desc) $sql_desc = false;
-		#spip_log("Resultat table=$table sql_desc:$sql_desc","dbinstall"._LOG_INFO_IMPORTANTE);
-		if (!$sql_desc) {
-			// on retente avec un sleep ?
-			sleep(1);
-			sql_create($table, $desc['field'], $desc['key'], $autoinc, false, $serveur);
-			$sql_desc = sql_showtable($table, true, $serveur);
-			#if (!$sql_desc) $sql_desc = false;
-			#spip_log("Resultat table=$table sql_desc:$sql_desc","dbinstall"._LOG_INFO_IMPORTANTE);
-			if (!$sql_desc) {
-				spip_log("Echec creation table $table", "maj" . _LOG_CRITIQUE);
-			}
-		}
-	} else {
-		#spip_log("sql_alter $table ... (on s'en fiche)","dbinstall"._LOG_INFO_IMPORTANTE);
-		// ajouter les champs manquants
-		// on ne supprime jamais les champs, car c'est dangereux
-		// c'est toujours a faire manuellement
-		$last = '';
-		if (isset($desc['field'])) {
-			foreach ($desc['field'] as $field => $type) {
-				if (!isset($sql_desc['field'][$field])) {
-					sql_alter("TABLE $table ADD $field $type" . ($last ? " AFTER $last" : ""), $serveur);
-				}
-				$last = $field;
-			}
-		}
-		if (isset($desc['key'])) {
-			foreach ($desc['key'] as $key => $type) {
-				// Ne pas oublier les cas des cles non nommees dans la declaration et qui sont retournees
-				// par le showtable sous la forme d'un index de tableau "KEY $type" et non "KEY"
-				if (!isset($sql_desc['key'][$key]) and !isset($sql_desc['key']["$key $type"])) {
-					sql_alter("TABLE $table ADD $key ($type)", $serveur);
-				}
-				$last = $field;
-			}
-		}
+    #spip_log("creer_ou_upgrader_table table=$table autoinc=$autoinc upgrade=$upgrade","dbinstall"._LOG_INFO_IMPORTANTE);
+    $sql_desc = $upgrade ? sql_showtable($table, true, $serveur) : false;
+    #if (!$sql_desc) $sql_desc = false;
+    #spip_log("table=$table sql_desc:$sql_desc","dbinstall"._LOG_INFO_IMPORTANTE);
+    if (!$sql_desc) {
+        if ($autoinc === 'auto') {
+            $autoinc = base_determine_autoinc($table, $desc);
+        }
+        #spip_log("sql_create $table autoinc=$autoinc","dbinstall"._LOG_INFO_IMPORTANTE);
+        if (isset($desc['field']) and isset($desc['key'])) {
+            sql_create($table, $desc['field'], $desc['key'], $autoinc, false, $serveur);
+        }
+        // verifier la bonne installation de la table (php-fpm es-tu la ?)
+        $sql_desc = sql_showtable($table, true, $serveur);
+        #if (!$sql_desc) $sql_desc = false;
+        #spip_log("Resultat table=$table sql_desc:$sql_desc","dbinstall"._LOG_INFO_IMPORTANTE);
+        if (!$sql_desc) {
+            // on retente avec un sleep ?
+            sleep(1);
+            sql_create($table, $desc['field'], $desc['key'], $autoinc, false, $serveur);
+            $sql_desc = sql_showtable($table, true, $serveur);
+            #if (!$sql_desc) $sql_desc = false;
+            #spip_log("Resultat table=$table sql_desc:$sql_desc","dbinstall"._LOG_INFO_IMPORTANTE);
+            if (!$sql_desc) {
+                spip_log("Echec creation table $table", "maj" . _LOG_CRITIQUE);
+            }
+        }
+    } else {
+        #spip_log("sql_alter $table ... (on s'en fiche)","dbinstall"._LOG_INFO_IMPORTANTE);
+        // ajouter les champs manquants
+        // on ne supprime jamais les champs, car c'est dangereux
+        // c'est toujours a faire manuellement
+        $last = '';
+        if (isset($desc['field'])) {
+            foreach ($desc['field'] as $field => $type) {
+                if (!isset($sql_desc['field'][$field])) {
+                    sql_alter("TABLE $table ADD $field $type" . ($last ? " AFTER $last" : ""), $serveur);
+                }
+                $last = $field;
+            }
+        }
+        if (isset($desc['key'])) {
+            foreach ($desc['key'] as $key => $type) {
+                // Ne pas oublier les cas des cles non nommees dans la declaration et qui sont retournees
+                // par le showtable sous la forme d'un index de tableau "KEY $type" et non "KEY"
+                if (!isset($sql_desc['key'][$key]) and !isset($sql_desc['key']["$key $type"])) {
+                    sql_alter("TABLE $table ADD $key ($type)", $serveur);
+                }
+                $last = $field;
+            }
+        }
 
-	}
+    }
 }
 
 /**
@@ -135,26 +135,26 @@  discard block
 block discarded – undo
  * @return void
  */
 function alterer_base($tables_inc, $tables_noinc, $up = false, $serveur = '') {
-	if ($up === false) {
-		$old = false;
-		$up = array();
-	} else {
-		$old = true;
-		if (!is_array($up)) {
-			$up = array($up);
-		}
-	}
-	foreach ($tables_inc as $k => $v) {
-		if (!$old or in_array($k, $up)) {
-			creer_ou_upgrader_table($k, $v, true, $old, $serveur);
-		}
-	}
+    if ($up === false) {
+        $old = false;
+        $up = array();
+    } else {
+        $old = true;
+        if (!is_array($up)) {
+            $up = array($up);
+        }
+    }
+    foreach ($tables_inc as $k => $v) {
+        if (!$old or in_array($k, $up)) {
+            creer_ou_upgrader_table($k, $v, true, $old, $serveur);
+        }
+    }
 
-	foreach ($tables_noinc as $k => $v) {
-		if (!$old or in_array($k, $up)) {
-			creer_ou_upgrader_table($k, $v, false, $old, $serveur);
-		}
-	}
+    foreach ($tables_noinc as $k => $v) {
+        if (!$old or in_array($k, $up)) {
+            creer_ou_upgrader_table($k, $v, false, $old, $serveur);
+        }
+    }
 }
 
 /**
@@ -174,16 +174,16 @@  discard block
 block discarded – undo
  */
 function creer_base($serveur = '') {
 
-	// Note: les mises a jour reexecutent ce code pour s'assurer
-	// de la conformite de la base
-	// pas de panique sur  "already exists" et "duplicate entry" donc.
+    // Note: les mises a jour reexecutent ce code pour s'assurer
+    // de la conformite de la base
+    // pas de panique sur  "already exists" et "duplicate entry" donc.
 
-	alterer_base(
-		lister_tables_principales(),
-		lister_tables_auxiliaires(),
-		false,
-		$serveur
-	);
+    alterer_base(
+        lister_tables_principales(),
+        lister_tables_auxiliaires(),
+        false,
+        $serveur
+    );
 }
 
 /**
@@ -203,10 +203,10 @@  discard block
 block discarded – undo
  * @return void
  */
 function maj_tables($upgrade_tables = array(), $serveur = '') {
-	alterer_base(
-		lister_tables_principales(),
-		lister_tables_auxiliaires(),
-		$upgrade_tables,
-		$serveur
-	);
+    alterer_base(
+        lister_tables_principales(),
+        lister_tables_auxiliaires(),
+        $upgrade_tables,
+        $serveur
+    );
 }

Please login to merge, or discard this patch.

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

@@ -85,7 +85,7 @@  discard block
 block discarded – undo
 			#if (!$sql_desc) $sql_desc = false;
 			#spip_log("Resultat table=$table sql_desc:$sql_desc","dbinstall"._LOG_INFO_IMPORTANTE);
 			if (!$sql_desc) {
-				spip_log("Echec creation table $table", "maj" . _LOG_CRITIQUE);
+				spip_log("Echec creation table $table", "maj"._LOG_CRITIQUE);
 			}
 		}
 	} else {
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
 		if (isset($desc['field'])) {
 			foreach ($desc['field'] as $field => $type) {
 				if (!isset($sql_desc['field'][$field])) {
-					sql_alter("TABLE $table ADD $field $type" . ($last ? " AFTER $last" : ""), $serveur);
+					sql_alter("TABLE $table ADD $field $type".($last ? " AFTER $last" : ""), $serveur);
 				}
 				$last = $field;
 			}

Please login to merge, or discard this patch.

		@@ -16,7 +16,7 @@ discard block
		block discarded – undo
16	16	* @package SPIP\Core\Installation
17	17	**/
18	18	if (!defined('_ECRIRE_INC_VERSION')) {
19		- return;
	19	+ return;
20	20	}
21	21
22	22	include_spip('inc/acces');
		@@ -33,18 +33,18 @@ discard block
		block discarded – undo
33	33	* @return bool
34	34	*/
35	35	function base_determine_autoinc($table, $desc = array()) {
36		- if ($t = lister_tables_principales() and isset($t[$table])) {
37		- $autoinc = true;
38		- } elseif ($t = lister_tables_auxiliaires() and isset($t[$table])) {
39		- $autoinc = false;
40		- } else {
41		- // essayer de faire au mieux !
42		- $autoinc = (isset($desc['key']['PRIMARY KEY'])
43		- and strpos($desc['key']['PRIMARY KEY'], ',') === false
44		- and strpos($desc['field'][$desc['key']['PRIMARY KEY']], 'default') === false);
45		- }
	36	+ if ($t = lister_tables_principales() and isset($t[$table])) {
	37	+ $autoinc = true;
	38	+ } elseif ($t = lister_tables_auxiliaires() and isset($t[$table])) {
	39	+ $autoinc = false;
	40	+ } else {
	41	+ // essayer de faire au mieux !
	42	+ $autoinc = (isset($desc['key']['PRIMARY KEY'])
	43	+ and strpos($desc['key']['PRIMARY KEY'], ',') === false
	44	+ and strpos($desc['field'][$desc['key']['PRIMARY KEY']], 'default') === false);
	45	+ }
46	46
47		- return $autoinc;
	47	+ return $autoinc;
48	48	}
49	49
50	50	/**
		@@ -61,59 +61,59 @@ discard block
		block discarded – undo
61	61	* @return void
62	62	*/
63	63	function creer_ou_upgrader_table($table, $desc, $autoinc, $upgrade = false, $serveur = '') {
64		- #spip_log("creer_ou_upgrader_table table=$table autoinc=$autoinc upgrade=$upgrade","dbinstall"._LOG_INFO_IMPORTANTE);
65		- $sql_desc = $upgrade ? sql_showtable($table, true, $serveur) : false;
66		- #if (!$sql_desc) $sql_desc = false;
67		- #spip_log("table=$table sql_desc:$sql_desc","dbinstall"._LOG_INFO_IMPORTANTE);
68		- if (!$sql_desc) {
69		- if ($autoinc === 'auto') {
70		- $autoinc = base_determine_autoinc($table, $desc);
71		- }
72		- #spip_log("sql_create $table autoinc=$autoinc","dbinstall"._LOG_INFO_IMPORTANTE);
73		- if (isset($desc['field']) and isset($desc['key'])) {
74		- sql_create($table, $desc['field'], $desc['key'], $autoinc, false, $serveur);
75		- }
76		- // verifier la bonne installation de la table (php-fpm es-tu la ?)
77		- $sql_desc = sql_showtable($table, true, $serveur);
78		- #if (!$sql_desc) $sql_desc = false;
79		- #spip_log("Resultat table=$table sql_desc:$sql_desc","dbinstall"._LOG_INFO_IMPORTANTE);
80		- if (!$sql_desc) {
81		- // on retente avec un sleep ?
82		- sleep(1);
83		- sql_create($table, $desc['field'], $desc['key'], $autoinc, false, $serveur);
84		- $sql_desc = sql_showtable($table, true, $serveur);
85		- #if (!$sql_desc) $sql_desc = false;
86		- #spip_log("Resultat table=$table sql_desc:$sql_desc","dbinstall"._LOG_INFO_IMPORTANTE);
87		- if (!$sql_desc) {
88		- spip_log("Echec creation table $table", "maj" . _LOG_CRITIQUE);
89		- }
90		- }
91		- } else {
92		- #spip_log("sql_alter $table ... (on s'en fiche)","dbinstall"._LOG_INFO_IMPORTANTE);
93		- // ajouter les champs manquants
94		- // on ne supprime jamais les champs, car c'est dangereux
95		- // c'est toujours a faire manuellement
96		- $last = '';
97		- if (isset($desc['field'])) {
98		- foreach ($desc['field'] as $field => $type) {
99		- if (!isset($sql_desc['field'][$field])) {
100		- sql_alter("TABLE $table ADD $field $type" . ($last ? " AFTER $last" : ""), $serveur);
101		- }
102		- $last = $field;
103		- }
104		- }
105		- if (isset($desc['key'])) {
106		- foreach ($desc['key'] as $key => $type) {
107		- // Ne pas oublier les cas des cles non nommees dans la declaration et qui sont retournees
108		- // par le showtable sous la forme d'un index de tableau "KEY $type" et non "KEY"
109		- if (!isset($sql_desc['key'][$key]) and !isset($sql_desc['key']["$key $type"])) {
110		- sql_alter("TABLE $table ADD $key ($type)", $serveur);
111		- }
112		- $last = $field;
113		- }
114		- }
	64	+ #spip_log("creer_ou_upgrader_table table=$table autoinc=$autoinc upgrade=$upgrade","dbinstall"._LOG_INFO_IMPORTANTE);
	65	+ $sql_desc = $upgrade ? sql_showtable($table, true, $serveur) : false;
	66	+ #if (!$sql_desc) $sql_desc = false;
	67	+ #spip_log("table=$table sql_desc:$sql_desc","dbinstall"._LOG_INFO_IMPORTANTE);
	68	+ if (!$sql_desc) {
	69	+ if ($autoinc === 'auto') {
	70	+ $autoinc = base_determine_autoinc($table, $desc);
	71	+ }
	72	+ #spip_log("sql_create $table autoinc=$autoinc","dbinstall"._LOG_INFO_IMPORTANTE);
	73	+ if (isset($desc['field']) and isset($desc['key'])) {
	74	+ sql_create($table, $desc['field'], $desc['key'], $autoinc, false, $serveur);
	75	+ }
	76	+ // verifier la bonne installation de la table (php-fpm es-tu la ?)
	77	+ $sql_desc = sql_showtable($table, true, $serveur);
	78	+ #if (!$sql_desc) $sql_desc = false;
	79	+ #spip_log("Resultat table=$table sql_desc:$sql_desc","dbinstall"._LOG_INFO_IMPORTANTE);
	80	+ if (!$sql_desc) {
	81	+ // on retente avec un sleep ?
	82	+ sleep(1);
	83	+ sql_create($table, $desc['field'], $desc['key'], $autoinc, false, $serveur);
	84	+ $sql_desc = sql_showtable($table, true, $serveur);
	85	+ #if (!$sql_desc) $sql_desc = false;
	86	+ #spip_log("Resultat table=$table sql_desc:$sql_desc","dbinstall"._LOG_INFO_IMPORTANTE);
	87	+ if (!$sql_desc) {
	88	+ spip_log("Echec creation table $table", "maj" . _LOG_CRITIQUE);
	89	+ }
	90	+ }
	91	+ } else {
	92	+ #spip_log("sql_alter $table ... (on s'en fiche)","dbinstall"._LOG_INFO_IMPORTANTE);
	93	+ // ajouter les champs manquants
	94	+ // on ne supprime jamais les champs, car c'est dangereux
	95	+ // c'est toujours a faire manuellement
	96	+ $last = '';
	97	+ if (isset($desc['field'])) {
	98	+ foreach ($desc['field'] as $field => $type) {
	99	+ if (!isset($sql_desc['field'][$field])) {
	100	+ sql_alter("TABLE $table ADD $field $type" . ($last ? " AFTER $last" : ""), $serveur);
	101	+ }
	102	+ $last = $field;
	103	+ }
	104	+ }
	105	+ if (isset($desc['key'])) {
	106	+ foreach ($desc['key'] as $key => $type) {
	107	+ // Ne pas oublier les cas des cles non nommees dans la declaration et qui sont retournees
	108	+ // par le showtable sous la forme d'un index de tableau "KEY $type" et non "KEY"
	109	+ if (!isset($sql_desc['key'][$key]) and !isset($sql_desc['key']["$key $type"])) {
	110	+ sql_alter("TABLE $table ADD $key ($type)", $serveur);
	111	+ }
	112	+ $last = $field;
	113	+ }
	114	+ }
115	115
116		- }
	116	+ }
117	117	}
118	118
119	119	/**
		@@ -135,26 +135,26 @@ discard block
		block discarded – undo
135	135	* @return void
136	136	*/
137	137	function alterer_base($tables_inc, $tables_noinc, $up = false, $serveur = '') {
138		- if ($up === false) {
139		- $old = false;
140		- $up = array();
141		- } else {
142		- $old = true;
143		- if (!is_array($up)) {
144		- $up = array($up);
145		- }
146		- }
147		- foreach ($tables_inc as $k => $v) {
148		- if (!$old or in_array($k, $up)) {
149		- creer_ou_upgrader_table($k, $v, true, $old, $serveur);
150		- }
151		- }
	138	+ if ($up === false) {
	139	+ $old = false;
	140	+ $up = array();
	141	+ } else {
	142	+ $old = true;
	143	+ if (!is_array($up)) {
	144	+ $up = array($up);
	145	+ }
	146	+ }
	147	+ foreach ($tables_inc as $k => $v) {
	148	+ if (!$old or in_array($k, $up)) {
	149	+ creer_ou_upgrader_table($k, $v, true, $old, $serveur);
	150	+ }
	151	+ }
152	152
153		- foreach ($tables_noinc as $k => $v) {
154		- if (!$old or in_array($k, $up)) {
155		- creer_ou_upgrader_table($k, $v, false, $old, $serveur);
156		- }
157		- }
	153	+ foreach ($tables_noinc as $k => $v) {
	154	+ if (!$old or in_array($k, $up)) {
	155	+ creer_ou_upgrader_table($k, $v, false, $old, $serveur);
	156	+ }
	157	+ }
158	158	}
159	159
160	160	/**
		@@ -174,16 +174,16 @@ discard block
		block discarded – undo
174	174	*/
175	175	function creer_base($serveur = '') {
176	176
177		- // Note: les mises a jour reexecutent ce code pour s'assurer
178		- // de la conformite de la base
179		- // pas de panique sur "already exists" et "duplicate entry" donc.
	177	+ // Note: les mises a jour reexecutent ce code pour s'assurer
	178	+ // de la conformite de la base
	179	+ // pas de panique sur "already exists" et "duplicate entry" donc.
180	180
181		- alterer_base(
182		- lister_tables_principales(),
183		- lister_tables_auxiliaires(),
184		- false,
185		- $serveur
186		- );
	181	+ alterer_base(
	182	+ lister_tables_principales(),
	183	+ lister_tables_auxiliaires(),
	184	+ false,
	185	+ $serveur
	186	+ );
187	187	}
188	188
189	189	/**
		@@ -203,10 +203,10 @@ discard block
		block discarded – undo
203	203	* @return void
204	204	*/
205	205	function maj_tables($upgrade_tables = array(), $serveur = '') {
206		- alterer_base(
207		- lister_tables_principales(),
208		- lister_tables_auxiliaires(),
209		- $upgrade_tables,
210		- $serveur
211		- );
	206	+ alterer_base(
	207	+ lister_tables_principales(),
	208	+ lister_tables_auxiliaires(),
	209	+ $upgrade_tables,
	210	+ $serveur
	211	+ );
212	212	}

		@@ -85,7 +85,7 @@ discard block
		block discarded – undo
85	85	#if (!$sql_desc) $sql_desc = false;
86	86	#spip_log("Resultat table=$table sql_desc:$sql_desc","dbinstall"._LOG_INFO_IMPORTANTE);
87	87	if (!$sql_desc) {
88		- spip_log("Echec creation table $table", "maj" . _LOG_CRITIQUE);
	88	+ spip_log("Echec creation table $table", "maj"._LOG_CRITIQUE);
89	89	}
90	90	}
91	91	} else {
		@@ -97,7 +97,7 @@ discard block
		block discarded – undo
97	97	if (isset($desc['field'])) {
98	98	foreach ($desc['field'] as $field => $type) {
99	99	if (!isset($sql_desc['field'][$field])) {
100		- sql_alter("TABLE $table ADD $field $type" . ($last ? " AFTER $last" : ""), $serveur);
	100	+ sql_alter("TABLE $table ADD $field $type".($last ? " AFTER $last" : ""), $serveur);
101	101	}
102	102	$last = $field;
103	103	}

spip / SPIP

Push — master ( 30650c...2d0717 )

Status

Category

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

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