spip / SPIP

ecrire/req/mysql.php

Spacing +77 added lines, -77 removed lines

@@ -58,12 +58,12 @@ 
 			$link = @mysqli_connect($host, $login, $pass);
 		}
 	} catch (\mysqli_sql_exception $e) {
-		spip_log('mysqli_sql_exception: ' . $e->getMessage(), 'mysql.' . _LOG_DEBUG);
+		spip_log('mysqli_sql_exception: '.$e->getMessage(), 'mysql.'._LOG_DEBUG);
 		$link = false;
 	}
 
 	if (!$link) {
-		spip_log('Echec mysqli_connect. Erreur : ' . mysqli_connect_error(), 'mysql.' . _LOG_HS);
+		spip_log('Echec mysqli_connect. Erreur : '.mysqli_connect_error(), 'mysql.'._LOG_HS);
 
 		return false;
 	}
@@ -82,7 +82,7 @@ 
 	}
 
 	spip_log(
-		"Connexion MySQLi vers $host, base $db, prefixe $prefixe " . ($ok ? 'operationnelle' : 'impossible'),
+		"Connexion MySQLi vers $host, base $db, prefixe $prefixe ".($ok ? 'operationnelle' : 'impossible'),
 		_LOG_DEBUG
 	);
 
@@ -173,9 +173,9 @@ 
  */
 function spip_mysql_set_charset($charset, $serveur = '', $requeter = true) {
 	$connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0];
-	spip_log('changement de charset sql : ' . 'SET NAMES ' . _q($charset), _LOG_DEBUG);
+	spip_log('changement de charset sql : '.'SET NAMES '._q($charset), _LOG_DEBUG);
 
-	return mysqli_query($connexion['link'], $connexion['last'] = 'SET NAMES ' . _q($charset));
+	return mysqli_query($connexion['link'], $connexion['last'] = 'SET NAMES '._q($charset));
 }
 
 
@@ -190,7 +190,7 @@ 
 function spip_mysql_get_charset($charset = [], $serveur = '', $requeter = true) {
 	$connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0];
 	$connexion['last'] = $c = 'SHOW CHARACTER SET'
-		. (!$charset ? '' : (' LIKE ' . _q($charset['charset'])));
+		. (!$charset ? '' : (' LIKE '._q($charset['charset'])));
 
 	return spip_mysql_fetch(mysqli_query($connexion['link'], $c), null, $serveur);
 }
@@ -234,21 +234,21 @@ 
 	$debug = '';
 	if (defined('_DEBUG_SLOW_QUERIES') and _DEBUG_SLOW_QUERIES) {
 		if (isset($GLOBALS['debug']['aucasou'])) {
-			[, $id, , $infos] = $GLOBALS['debug']['aucasou'];
-			$debug .= "BOUCLE$id @ " . ($infos[0] ?? '') . ' | ';
+			[, $id,, $infos] = $GLOBALS['debug']['aucasou'];
+			$debug .= "BOUCLE$id @ ".($infos[0] ?? '').' | ';
 		}
 		if (isset($_SERVER['REQUEST_URI'])) {
 			$debug .= $_SERVER['REQUEST_URI'];
 		}
 		if (!empty($GLOBALS['ip'])) {
-			$debug .= ' + ' . $GLOBALS['ip'];
+			$debug .= ' + '.$GLOBALS['ip'];
 		}
-		$debug = ' /* ' . mysqli_real_escape_string($link, str_replace('*/', '@/', $debug)) . ' */';
+		$debug = ' /* '.mysqli_real_escape_string($link, str_replace('*/', '@/', $debug)).' */';
 	}
 	try {
-		$r = mysqli_query($link, $query . $debug);
+		$r = mysqli_query($link, $query.$debug);
 	} catch (\mysqli_sql_exception $e) {
-		spip_log('mysqli_sql_exception: ' . $e->getMessage(), 'mysql.' . _LOG_DEBUG);
+		spip_log('mysqli_sql_exception: '.$e->getMessage(), 'mysql.'._LOG_DEBUG);
 		$r = false;
 		// Todo: utiliser l’exception ensuite plutôt que les appels à spip_mysql_errno()
 		// mais il faut pour php < 8.1 forcer les exeptions via mysqli_report().
@@ -265,7 +265,7 @@ 
 			$connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0];
 			$link = $connexion['link'];
 			//On retente au cas où
-			$r = mysqli_query($link, $query . $debug);
+			$r = mysqli_query($link, $query.$debug);
 		}
 	}
 
@@ -294,7 +294,7 @@ 
 	// d'utiliser ceux-ci, copie-colle de phpmyadmin
 	$query = preg_replace(',^TABLE\s*`([^`]*)`,i', "TABLE \\1", $query);
 
-	return spip_mysql_query('ALTER ' . $query, $serveur, $requeter); # i.e. que PG se debrouille
+	return spip_mysql_query('ALTER '.$query, $serveur, $requeter); # i.e. que PG se debrouille
 }
 
 
@@ -307,7 +307,7 @@ 
  * @return bool            Toujours true
  */
 function spip_mysql_optimize($table, $serveur = '', $requeter = true) {
-	spip_mysql_query('OPTIMIZE TABLE ' . $table);
+	spip_mysql_query('OPTIMIZE TABLE '.$table);
 
 	return true;
 }
@@ -330,7 +330,7 @@ 
 	$link = $connexion['link'];
 	$db = $connexion['db'];
 
-	$query = 'EXPLAIN ' . _mysql_traite_query($query, $db, $prefixe);
+	$query = 'EXPLAIN '._mysql_traite_query($query, $db, $prefixe);
 	$r = mysqli_query($link, $query);
 
 	return spip_mysql_fetch($r, null, $serveur);
@@ -381,7 +381,7 @@ 
 		. calculer_mysql_expression('WHERE', $where)
 		. calculer_mysql_expression('GROUP BY', $groupby, ',')
 		. calculer_mysql_expression('HAVING', $having)
-		. ($orderby ? ("\nORDER BY " . spip_mysql_order($orderby)) : '')
+		. ($orderby ? ("\nORDER BY ".spip_mysql_order($orderby)) : '')
 		. ($limit ? "\nLIMIT $limit" : '');
 
 	// renvoyer la requete inerte si demandee
@@ -471,12 +471,12 @@ 
 	$exp = "\n$expression ";
 
 	if (!is_array($v)) {
-		return $exp . $v;
+		return $exp.$v;
 	} else {
 		if (strtoupper($join) === 'AND') {
-			return $exp . join("\n\t$join ", array_map('calculer_mysql_where', $v));
+			return $exp.join("\n\t$join ", array_map('calculer_mysql_where', $v));
 		} else {
-			return $exp . join($join, $v);
+			return $exp.join($join, $v);
 		}
 	}
 }
@@ -494,17 +494,17 @@ 
 		if (substr($k, -1) == '@') {
 			// c'est une jointure qui se refere au from precedent
 			// pas de virgule
-			$res .= '  ' . $v;
+			$res .= '  '.$v;
 		} else {
 			if (!is_numeric($k)) {
 				$p = strpos($v, ' ');
 				if ($p) {
-					$v = substr($v, 0, $p) . " AS `$k`" . substr($v, $p);
+					$v = substr($v, 0, $p)." AS `$k`".substr($v, $p);
 				} else {
 					$v .= " AS `$k`";
 				}
 			}
-			$res .= ', ' . $v;
+			$res .= ', '.$v;
 		}
 	}
 
@@ -534,13 +534,13 @@ 
 function _mysql_traite_query($query, $db = '', $prefixe = '', $echappe_textes = true) {
 
 	if ($GLOBALS['mysql_rappel_nom_base'] and $db) {
-		$pref = '`' . $db . '`.';
+		$pref = '`'.$db.'`.';
 	} else {
 		$pref = '';
 	}
 
 	if ($prefixe) {
-		$pref .= $prefixe . '_';
+		$pref .= $prefixe.'_';
 	}
 
 	if (!preg_match('/\s(SET|VALUES|WHERE|DATABASE)\s/i', $query, $regs)) {
@@ -559,7 +559,7 @@ 
 				$suite_echap = $suite;
 			}
 			if (preg_match('/^(.*?)([(]\s*SELECT\b.*)$/si', $suite_echap, $r)) {
-				$suite_echap = $r[1] . _mysql_traite_query($r[2], $db, $prefixe, false);
+				$suite_echap = $r[1]._mysql_traite_query($r[2], $db, $prefixe, false);
 				if ($echappe_textes) {
 					$suite = query_reinjecte_textes($suite_echap, $textes);
 				}
@@ -569,7 +569,7 @@ 
 			}
 		}
 	}
-	$r = preg_replace(_SQL_PREFIXE_TABLE_MYSQL, '\1' . $pref, $query) . $suite;
+	$r = preg_replace(_SQL_PREFIXE_TABLE_MYSQL, '\1'.$pref, $query).$suite;
 
 	// en option, remplacer les emoji (que mysql ne sait pas gérer) en &#128169;
 	// remplacer les emoji (que mysql ne sait pas gérer) en &#128169;
@@ -605,7 +605,7 @@ 
 	$link = _mysql_link($serveur);
 	$ok = mysqli_select_db($link, $db);
 	if (!$ok) {
-		spip_log('Echec mysqli_selectdb. Erreur : ' . mysqli_error($link), 'mysql.' . _LOG_CRITIQUE);
+		spip_log('Echec mysqli_selectdb. Erreur : '.mysqli_error($link), 'mysql.'._LOG_CRITIQUE);
 	}
 
 	return $ok;
@@ -695,10 +695,10 @@ 
 
 	$character_set = '';
 	if (@$GLOBALS['meta']['charset_sql_base']) {
-		$character_set .= ' CHARACTER SET ' . $GLOBALS['meta']['charset_sql_base'];
+		$character_set .= ' CHARACTER SET '.$GLOBALS['meta']['charset_sql_base'];
 	}
 	if (@$GLOBALS['meta']['charset_collation_sql_base']) {
-		$character_set .= ' COLLATE ' . $GLOBALS['meta']['charset_collation_sql_base'];
+		$character_set .= ' COLLATE '.$GLOBALS['meta']['charset_collation_sql_base'];
 	}
 
 	foreach ($champs as $k => $v) {
@@ -708,7 +708,7 @@ 
 				preg_match(',(char|text),i', $defs[1])
 				and !preg_match(',(binary|CHARACTER|COLLATE),i', $v)
 			) {
-				$v = $defs[1] . $character_set . ' ' . substr($v, strlen($defs[1]));
+				$v = $defs[1].$character_set.' '.substr($v, strlen($defs[1]));
 			}
 		}
 
@@ -720,7 +720,7 @@ 
 		$s = ',';
 	}
 	$temporary = $temporary ? 'TEMPORARY' : '';
-	$q = "CREATE $temporary TABLE IF NOT EXISTS $nom ($query" . ($keys ? ",$keys" : '') . ')'
+	$q = "CREATE $temporary TABLE IF NOT EXISTS $nom ($query".($keys ? ",$keys" : '').')'
 		. ' ENGINE=MyISAM'
 		. ($character_set ? " DEFAULT $character_set" : '')
 		. "\n";
@@ -800,7 +800,7 @@ 
 		return false;
 	}
 
-	$query = "CREATE VIEW $nom AS " . $query_select;
+	$query = "CREATE VIEW $nom AS ".$query_select;
 
 	return spip_mysql_query($query, $serveur, $requeter);
 }
@@ -858,7 +858,7 @@ 
  *     Ressource à utiliser avec sql_fetch()
  **/
 function spip_mysql_showbase($match, $serveur = '', $requeter = true) {
-	return spip_mysql_query('SHOW TABLES LIKE ' . _q($match), $serveur, $requeter);
+	return spip_mysql_query('SHOW TABLES LIKE '._q($match), $serveur, $requeter);
 }
 
 /**
@@ -891,7 +891,7 @@ 
  *     Ressource à utiliser avec sql_fetch()
  **/
 function spip_mysql_table_exists(string $table, $serveur = '', $requeter = true) {
-	$r = spip_mysql_query('SHOW TABLES LIKE ' . _q($table), $serveur, $requeter);
+	$r = spip_mysql_query('SHOW TABLES LIKE '._q($table), $serveur, $requeter);
 	if (!$requeter) {
 		return $r;
 	}
@@ -973,22 +973,22 @@ 
 			}
 			if ($val['Default'] === '0' || $val['Default']) {
 				if (preg_match('/[A-Z_]/', $val['Default'])) {
-					$nfields[$val['Field']] .= ' DEFAULT ' . $val['Default'];
+					$nfields[$val['Field']] .= ' DEFAULT '.$val['Default'];
 				} else {
-					$nfields[$val['Field']] .= " DEFAULT '" . $val['Default'] . "'";
+					$nfields[$val['Field']] .= " DEFAULT '".$val['Default']."'";
 				}
 			}
 			if ($val['Extra']) {
-				$nfields[$val['Field']] .= ' ' . $val['Extra'];
+				$nfields[$val['Field']] .= ' '.$val['Extra'];
 			}
 			if ($val['Key'] == 'PRI') {
 				$nkeys['PRIMARY KEY'] = $val['Field'];
 			} else {
 				if ($val['Key'] == 'MUL') {
-					$nkeys['KEY ' . $val['Field']] = $val['Field'];
+					$nkeys['KEY '.$val['Field']] = $val['Field'];
 				} else {
 					if ($val['Key'] == 'UNI') {
-						$nkeys['UNIQUE KEY ' . $val['Field']] = $val['Field'];
+						$nkeys['UNIQUE KEY '.$val['Field']] = $val['Field'];
 					}
 				}
 			}
@@ -1059,7 +1059,7 @@ 
 	$serveur = '',
 	$requeter = true
 ) {
-	$c = !$groupby ? '*' : ('DISTINCT ' . (is_string($groupby) ? $groupby : join(',', $groupby)));
+	$c = !$groupby ? '*' : ('DISTINCT '.(is_string($groupby) ? $groupby : join(',', $groupby)));
 
 	$r = spip_mysql_select("COUNT($c)", $from, $where, '', '', '', $having, $serveur, $requeter);
 	if (!$requeter) {
@@ -1099,7 +1099,7 @@ 
 	if ($s) {
 		$trace = debug_backtrace();
 		if ($trace[0]['function'] != 'spip_mysql_error') {
-			spip_log("$s - $query - " . sql_error_backtrace(), 'mysql.' . _LOG_ERREUR);
+			spip_log("$s - $query - ".sql_error_backtrace(), 'mysql.'._LOG_ERREUR);
 		}
 	}
 
@@ -1225,7 +1225,7 @@ 
 	try {
 		$insert = mysqli_query($link, $query);
 	} catch (\mysqli_sql_exception $e) {
-		spip_log('mysqli_sql_exception: ' . $e->getMessage(), 'mysql.' . _LOG_DEBUG);
+		spip_log('mysqli_sql_exception: '.$e->getMessage(), 'mysql.'._LOG_DEBUG);
 		// Todo: utiliser l’exception ensuite plutôt que les appels à spip_mysql_errno()
 		// mais il faut pour php < 8.1 forcer les exeptions via mysqli_report().
 	}
@@ -1280,8 +1280,8 @@ 
 
 	return spip_mysql_insert(
 		$table,
-		'(' . join(',', array_keys($couples)) . ')',
-		'(' . join(',', $couples) . ')',
+		'('.join(',', array_keys($couples)).')',
+		'('.join(',', $couples).')',
 		$desc,
 		$serveur,
 		$requeter
@@ -1318,7 +1318,7 @@ 
 	}
 	$fields = $desc['field'] ?? [];
 
-	$cles = '(' . join(',', array_keys(reset($tab_couples))) . ')';
+	$cles = '('.join(',', array_keys(reset($tab_couples))).')';
 	$valeurs = [];
 	$r = false;
 
@@ -1327,7 +1327,7 @@ 
 		foreach ($couples as $champ => $val) {
 			$couples[$champ] = spip_mysql_cite($val, $fields[$champ]);
 		}
-		$valeurs[] = '(' . join(',', $couples) . ')';
+		$valeurs[] = '('.join(',', $couples).')';
 		if (count($valeurs) >= 100) {
 			$r = spip_mysql_insert($table, $cles, join(', ', $valeurs), $desc, $serveur, $requeter);
 			$valeurs = [];
@@ -1364,7 +1364,7 @@ 
 function spip_mysql_update($table, $champs, $where = '', $desc = [], $serveur = '', $requeter = true) {
 	$set = [];
 	foreach ($champs as $champ => $val) {
-		$set[] = $champ . "=$val";
+		$set[] = $champ."=$val";
 	}
 	if (!empty($set)) {
 		return spip_mysql_query(
@@ -1420,7 +1420,7 @@ 
 	}
 	$set = [];
 	foreach ($champs as $champ => $val) {
-		$set[] = $champ . '=' . spip_mysql_cite($val, @$fields[$champ]);
+		$set[] = $champ.'='.spip_mysql_cite($val, @$fields[$champ]);
 	}
 
 	return spip_mysql_query(
@@ -1489,10 +1489,10 @@ 
  *     - False en cas d'erreur.
  **/
 function spip_mysql_replace($table, $couples, $desc = [], $serveur = '', $requeter = true) {
-	return spip_mysql_query("REPLACE $table (" . join(',', array_keys($couples)) . ') VALUES (' . join(
+	return spip_mysql_query("REPLACE $table (".join(',', array_keys($couples)).') VALUES ('.join(
 		',',
 		array_map('_q', $couples)
-	) . ')', $serveur, $requeter);
+	).')', $serveur, $requeter);
 }
 
 
@@ -1521,10 +1521,10 @@ 
  *     - False en cas d'erreur.
  **/
 function spip_mysql_replace_multi($table, $tab_couples, $desc = [], $serveur = '', $requeter = true) {
-	$cles = '(' . join(',', array_keys($tab_couples[0])) . ')';
+	$cles = '('.join(',', array_keys($tab_couples[0])).')';
 	$valeurs = [];
 	foreach ($tab_couples as $couples) {
-		$valeurs[] = '(' . join(',', array_map('_q', $couples)) . ')';
+		$valeurs[] = '('.join(',', array_map('_q', $couples)).')';
 	}
 	$valeurs = implode(', ', $valeurs);
 
@@ -1544,28 +1544,28 @@ 
  */
 function spip_mysql_multi($objet, $lang) {
 	$lengthlang = strlen("[$lang]");
-	$posmulti = 'INSTR(' . $objet . ", '<multi>')";
-	$posfinmulti = 'INSTR(' . $objet . ", '</multi>')";
-	$debutchaine = 'LEFT(' . $objet . ", $posmulti-1)";
-	$finchaine = 'RIGHT(' . $objet . ', CHAR_LENGTH(' . $objet . ") -(7+$posfinmulti))";
-	$chainemulti = 'TRIM(SUBSTRING(' . $objet . ", $posmulti+7, $posfinmulti -(7+$posmulti)))";
-	$poslang = "INSTR($chainemulti,'[" . $lang . "]')";
+	$posmulti = 'INSTR('.$objet.", '<multi>')";
+	$posfinmulti = 'INSTR('.$objet.", '</multi>')";
+	$debutchaine = 'LEFT('.$objet.", $posmulti-1)";
+	$finchaine = 'RIGHT('.$objet.', CHAR_LENGTH('.$objet.") -(7+$posfinmulti))";
+	$chainemulti = 'TRIM(SUBSTRING('.$objet.", $posmulti+7, $posfinmulti -(7+$posmulti)))";
+	$poslang = "INSTR($chainemulti,'[".$lang."]')";
 	$poslang = "IF($poslang=0,INSTR($chainemulti,']')+1,$poslang+$lengthlang)";
-	$chainelang = 'TRIM(SUBSTRING(' . $objet . ", $posmulti+7+$poslang-1,$posfinmulti -($posmulti+7+$poslang-1) ))";
-	$posfinlang = 'INSTR(' . $chainelang . ", '[')";
+	$chainelang = 'TRIM(SUBSTRING('.$objet.", $posmulti+7+$poslang-1,$posfinmulti -($posmulti+7+$poslang-1) ))";
+	$posfinlang = 'INSTR('.$chainelang.", '[')";
 	$chainelang = "IF($posfinlang>0,LEFT($chainelang,$posfinlang-1),$chainelang)";
 	//$chainelang = "LEFT($chainelang,$posfinlang-1)";
-	$retour = "(TRIM(IF($posmulti = 0 , " .
-		'     TRIM(' . $objet . '), ' .
-		'     CONCAT( ' .
-		"          $debutchaine, " .
-		'          IF( ' .
-		"               $poslang = 0, " .
-		"                     $chainemulti, " .
-		"               $chainelang" .
-		'          ), ' .
-		"          $finchaine" .
-		'     ) ' .
+	$retour = "(TRIM(IF($posmulti = 0 , ".
+		'     TRIM('.$objet.'), '.
+		'     CONCAT( '.
+		"          $debutchaine, ".
+		'          IF( '.
+		"               $poslang = 0, ".
+		"                     $chainemulti, ".
+		"               $chainelang".
+		'          ), '.
+		"          $finchaine".
+		'     ) '.
 		'))) AS multi';
 
 	return $retour;
@@ -1582,7 +1582,7 @@ 
  *     Valeur hexadécimale pour MySQL
  **/
 function spip_mysql_hex($v) {
-	return '0x' . $v;
+	return '0x'.$v;
 }
 
 /**
@@ -1622,7 +1622,7 @@ 
  *     Expression SQL
  **/
 function spip_mysql_date_proche($champ, $interval, $unite) {
-	$use_now = ( ($champ === 'maj' or strpos($champ, '.maj')) ? true : false );
+	$use_now = (($champ === 'maj' or strpos($champ, '.maj')) ? true : false);
 	return '('
 	. $champ
 	. (($interval <= 0) ? '>' : '<')
@@ -1677,7 +1677,7 @@ 
 		} elseif ($v === null) {
 			return "''";
 		}
-		return "'" . addslashes($v) . "'";
+		return "'".addslashes($v)."'";
 	}
 
 	if ($v === null) {
@@ -1701,7 +1701,7 @@ 
 		}
 	}
 
-	return ("'" . addslashes($v) . "'");
+	return ("'".addslashes($v)."'");
 }
 
 /**
@@ -1735,7 +1735,7 @@ 
 	} else {
 		$GLOBALS['mysql_rappel_nom_base'] = false;
 
-		return "\$GLOBALS['mysql_rappel_nom_base'] = false; " .
+		return "\$GLOBALS['mysql_rappel_nom_base'] = false; ".
 		"/* echec de test_rappel_nom_base_mysql a l'installation. */\n";
 	}
 }