spip /
SPIP
@@ -20,11 +20,11 @@ discard block |
||
| 20 | 20 | */ |
| 21 | 21 | |
| 22 | 22 | if (!defined('_ECRIRE_INC_VERSION')) { |
| 23 | - return; |
|
| 23 | + return; |
|
| 24 | 24 | } |
| 25 | 25 | |
| 26 | 26 | if (!defined('_MYSQL_NOPLANES')) { |
| 27 | - define('_MYSQL_NOPLANES', true); |
|
| 27 | + define('_MYSQL_NOPLANES', true); |
|
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | /** |
@@ -41,112 +41,112 @@ discard block |
||
| 41 | 41 | * - tableau décrivant la connexion sinon |
| 42 | 42 | */ |
| 43 | 43 | function req_mysql_dist($host, $port, $login, $pass, $db = '', $prefixe = '') { |
| 44 | - if (!extension_loaded(\mysqli::class)) { |
|
| 45 | - return false; |
|
| 46 | - } |
|
| 47 | - |
|
| 48 | - // si port est fourni mais pas host, c'est un socket -> compat avec vieille syntaxe de mysql_connect() et anciens fichiers connect.php |
|
| 49 | - try { |
|
| 50 | - if ( |
|
| 51 | - $port and !is_numeric($socket = $port) |
|
| 52 | - and (!$host or $host === 'localhost') |
|
| 53 | - ) { |
|
| 54 | - $link = @mysqli_connect($host, $login, $pass, '', null, $socket); |
|
| 55 | - } elseif ($port) { |
|
| 56 | - $link = @mysqli_connect($host, $login, $pass, '', $port); |
|
| 57 | - } else { |
|
| 58 | - $link = @mysqli_connect($host, $login, $pass); |
|
| 59 | - } |
|
| 60 | - } catch (\mysqli_sql_exception $e) { |
|
| 61 | - spip_log('mysqli_sql_exception: ' . $e->getMessage(), 'mysql.' . _LOG_DEBUG); |
|
| 62 | - $link = false; |
|
| 63 | - } |
|
| 64 | - |
|
| 65 | - if (!$link) { |
|
| 66 | - spip_log('Echec mysqli_connect. Erreur : ' . mysqli_connect_error(), 'mysql.' . _LOG_HS); |
|
| 67 | - |
|
| 68 | - return false; |
|
| 69 | - } |
|
| 70 | - $last = ''; |
|
| 71 | - if (!$db) { |
|
| 72 | - $ok = $link; |
|
| 73 | - $db = 'spip'; |
|
| 74 | - } else { |
|
| 75 | - $ok = mysqli_select_db($link, $db); |
|
| 76 | - if ( |
|
| 77 | - defined('_MYSQL_SET_SQL_MODE') |
|
| 78 | - or defined('_MYSQL_SQL_MODE_TEXT_NOT_NULL') // compatibilite |
|
| 79 | - ) { |
|
| 80 | - mysqli_query($link, $last = "set sql_mode=''"); |
|
| 81 | - } |
|
| 82 | - } |
|
| 83 | - |
|
| 84 | - spip_log( |
|
| 85 | - "Connexion MySQLi vers $host, base $db, prefixe $prefixe " . ($ok ? 'operationnelle' : 'impossible'), |
|
| 86 | - _LOG_DEBUG |
|
| 87 | - ); |
|
| 88 | - |
|
| 89 | - return !$ok ? false : [ |
|
| 90 | - 'db' => $db, |
|
| 91 | - 'last' => $last, |
|
| 92 | - 'prefixe' => $prefixe ?: $db, |
|
| 93 | - 'link' => $link, |
|
| 94 | - 'total_requetes' => 0, |
|
| 95 | - ]; |
|
| 44 | + if (!extension_loaded(\mysqli::class)) { |
|
| 45 | + return false; |
|
| 46 | + } |
|
| 47 | + |
|
| 48 | + // si port est fourni mais pas host, c'est un socket -> compat avec vieille syntaxe de mysql_connect() et anciens fichiers connect.php |
|
| 49 | + try { |
|
| 50 | + if ( |
|
| 51 | + $port and !is_numeric($socket = $port) |
|
| 52 | + and (!$host or $host === 'localhost') |
|
| 53 | + ) { |
|
| 54 | + $link = @mysqli_connect($host, $login, $pass, '', null, $socket); |
|
| 55 | + } elseif ($port) { |
|
| 56 | + $link = @mysqli_connect($host, $login, $pass, '', $port); |
|
| 57 | + } else { |
|
| 58 | + $link = @mysqli_connect($host, $login, $pass); |
|
| 59 | + } |
|
| 60 | + } catch (\mysqli_sql_exception $e) { |
|
| 61 | + spip_log('mysqli_sql_exception: ' . $e->getMessage(), 'mysql.' . _LOG_DEBUG); |
|
| 62 | + $link = false; |
|
| 63 | + } |
|
| 64 | + |
|
| 65 | + if (!$link) { |
|
| 66 | + spip_log('Echec mysqli_connect. Erreur : ' . mysqli_connect_error(), 'mysql.' . _LOG_HS); |
|
| 67 | + |
|
| 68 | + return false; |
|
| 69 | + } |
|
| 70 | + $last = ''; |
|
| 71 | + if (!$db) { |
|
| 72 | + $ok = $link; |
|
| 73 | + $db = 'spip'; |
|
| 74 | + } else { |
|
| 75 | + $ok = mysqli_select_db($link, $db); |
|
| 76 | + if ( |
|
| 77 | + defined('_MYSQL_SET_SQL_MODE') |
|
| 78 | + or defined('_MYSQL_SQL_MODE_TEXT_NOT_NULL') // compatibilite |
|
| 79 | + ) { |
|
| 80 | + mysqli_query($link, $last = "set sql_mode=''"); |
|
| 81 | + } |
|
| 82 | + } |
|
| 83 | + |
|
| 84 | + spip_log( |
|
| 85 | + "Connexion MySQLi vers $host, base $db, prefixe $prefixe " . ($ok ? 'operationnelle' : 'impossible'), |
|
| 86 | + _LOG_DEBUG |
|
| 87 | + ); |
|
| 88 | + |
|
| 89 | + return !$ok ? false : [ |
|
| 90 | + 'db' => $db, |
|
| 91 | + 'last' => $last, |
|
| 92 | + 'prefixe' => $prefixe ?: $db, |
|
| 93 | + 'link' => $link, |
|
| 94 | + 'total_requetes' => 0, |
|
| 95 | + ]; |
|
| 96 | 96 | } |
| 97 | 97 | |
| 98 | 98 | |
| 99 | 99 | $GLOBALS['spip_mysql_functions_1'] = [ |
| 100 | - 'alter' => 'spip_mysql_alter', |
|
| 101 | - 'count' => 'spip_mysql_count', |
|
| 102 | - 'countsel' => 'spip_mysql_countsel', |
|
| 103 | - 'create' => 'spip_mysql_create', |
|
| 104 | - 'create_base' => 'spip_mysql_create_base', |
|
| 105 | - 'create_view' => 'spip_mysql_create_view', |
|
| 106 | - 'date_proche' => 'spip_mysql_date_proche', |
|
| 107 | - 'delete' => 'spip_mysql_delete', |
|
| 108 | - 'drop_table' => 'spip_mysql_drop_table', |
|
| 109 | - 'drop_view' => 'spip_mysql_drop_view', |
|
| 110 | - 'errno' => 'spip_mysql_errno', |
|
| 111 | - 'error' => 'spip_mysql_error', |
|
| 112 | - 'explain' => 'spip_mysql_explain', |
|
| 113 | - 'fetch' => 'spip_mysql_fetch', |
|
| 114 | - 'seek' => 'spip_mysql_seek', |
|
| 115 | - 'free' => 'spip_mysql_free', |
|
| 116 | - 'hex' => 'spip_mysql_hex', |
|
| 117 | - 'in' => 'spip_mysql_in', |
|
| 118 | - 'insert' => 'spip_mysql_insert', |
|
| 119 | - 'insertq' => 'spip_mysql_insertq', |
|
| 120 | - 'insertq_multi' => 'spip_mysql_insertq_multi', |
|
| 121 | - 'listdbs' => 'spip_mysql_listdbs', |
|
| 122 | - 'multi' => 'spip_mysql_multi', |
|
| 123 | - 'optimize' => 'spip_mysql_optimize', |
|
| 124 | - 'query' => 'spip_mysql_query', |
|
| 125 | - 'quote' => 'spip_mysql_quote', |
|
| 126 | - 'replace' => 'spip_mysql_replace', |
|
| 127 | - 'replace_multi' => 'spip_mysql_replace_multi', |
|
| 128 | - 'repair' => 'spip_mysql_repair', |
|
| 129 | - 'select' => 'spip_mysql_select', |
|
| 130 | - 'selectdb' => 'spip_mysql_selectdb', |
|
| 131 | - 'set_charset' => 'spip_mysql_set_charset', |
|
| 132 | - 'get_charset' => 'spip_mysql_get_charset', |
|
| 133 | - 'showbase' => 'spip_mysql_showbase', |
|
| 134 | - 'showtable' => 'spip_mysql_showtable', |
|
| 135 | - 'table_exists' => 'spip_mysql_table_exists', |
|
| 136 | - 'update' => 'spip_mysql_update', |
|
| 137 | - 'updateq' => 'spip_mysql_updateq', |
|
| 138 | - |
|
| 139 | - // association de chaque nom http d'un charset aux couples MySQL |
|
| 140 | - 'charsets' => [ |
|
| 141 | - 'cp1250' => ['charset' => 'cp1250', 'collation' => 'cp1250_general_ci'], |
|
| 142 | - 'cp1251' => ['charset' => 'cp1251', 'collation' => 'cp1251_general_ci'], |
|
| 143 | - 'cp1256' => ['charset' => 'cp1256', 'collation' => 'cp1256_general_ci'], |
|
| 144 | - 'iso-8859-1' => ['charset' => 'latin1', 'collation' => 'latin1_swedish_ci'], |
|
| 100 | + 'alter' => 'spip_mysql_alter', |
|
| 101 | + 'count' => 'spip_mysql_count', |
|
| 102 | + 'countsel' => 'spip_mysql_countsel', |
|
| 103 | + 'create' => 'spip_mysql_create', |
|
| 104 | + 'create_base' => 'spip_mysql_create_base', |
|
| 105 | + 'create_view' => 'spip_mysql_create_view', |
|
| 106 | + 'date_proche' => 'spip_mysql_date_proche', |
|
| 107 | + 'delete' => 'spip_mysql_delete', |
|
| 108 | + 'drop_table' => 'spip_mysql_drop_table', |
|
| 109 | + 'drop_view' => 'spip_mysql_drop_view', |
|
| 110 | + 'errno' => 'spip_mysql_errno', |
|
| 111 | + 'error' => 'spip_mysql_error', |
|
| 112 | + 'explain' => 'spip_mysql_explain', |
|
| 113 | + 'fetch' => 'spip_mysql_fetch', |
|
| 114 | + 'seek' => 'spip_mysql_seek', |
|
| 115 | + 'free' => 'spip_mysql_free', |
|
| 116 | + 'hex' => 'spip_mysql_hex', |
|
| 117 | + 'in' => 'spip_mysql_in', |
|
| 118 | + 'insert' => 'spip_mysql_insert', |
|
| 119 | + 'insertq' => 'spip_mysql_insertq', |
|
| 120 | + 'insertq_multi' => 'spip_mysql_insertq_multi', |
|
| 121 | + 'listdbs' => 'spip_mysql_listdbs', |
|
| 122 | + 'multi' => 'spip_mysql_multi', |
|
| 123 | + 'optimize' => 'spip_mysql_optimize', |
|
| 124 | + 'query' => 'spip_mysql_query', |
|
| 125 | + 'quote' => 'spip_mysql_quote', |
|
| 126 | + 'replace' => 'spip_mysql_replace', |
|
| 127 | + 'replace_multi' => 'spip_mysql_replace_multi', |
|
| 128 | + 'repair' => 'spip_mysql_repair', |
|
| 129 | + 'select' => 'spip_mysql_select', |
|
| 130 | + 'selectdb' => 'spip_mysql_selectdb', |
|
| 131 | + 'set_charset' => 'spip_mysql_set_charset', |
|
| 132 | + 'get_charset' => 'spip_mysql_get_charset', |
|
| 133 | + 'showbase' => 'spip_mysql_showbase', |
|
| 134 | + 'showtable' => 'spip_mysql_showtable', |
|
| 135 | + 'table_exists' => 'spip_mysql_table_exists', |
|
| 136 | + 'update' => 'spip_mysql_update', |
|
| 137 | + 'updateq' => 'spip_mysql_updateq', |
|
| 138 | + |
|
| 139 | + // association de chaque nom http d'un charset aux couples MySQL |
|
| 140 | + 'charsets' => [ |
|
| 141 | + 'cp1250' => ['charset' => 'cp1250', 'collation' => 'cp1250_general_ci'], |
|
| 142 | + 'cp1251' => ['charset' => 'cp1251', 'collation' => 'cp1251_general_ci'], |
|
| 143 | + 'cp1256' => ['charset' => 'cp1256', 'collation' => 'cp1256_general_ci'], |
|
| 144 | + 'iso-8859-1' => ['charset' => 'latin1', 'collation' => 'latin1_swedish_ci'], |
|
| 145 | 145 | //'iso-8859-6'=>array('charset'=>'latin1','collation'=>'latin1_swedish_ci'), |
| 146 | - 'iso-8859-9' => ['charset' => 'latin5', 'collation' => 'latin5_turkish_ci'], |
|
| 146 | + 'iso-8859-9' => ['charset' => 'latin5', 'collation' => 'latin5_turkish_ci'], |
|
| 147 | 147 | //'iso-8859-15'=>array('charset'=>'latin1','collation'=>'latin1_swedish_ci'), |
| 148 | - 'utf-8' => ['charset' => 'utf8', 'collation' => 'utf8_general_ci'] |
|
| 149 | - ] |
|
| 148 | + 'utf-8' => ['charset' => 'utf8', 'collation' => 'utf8_general_ci'] |
|
| 149 | + ] |
|
| 150 | 150 | ]; |
| 151 | 151 | |
| 152 | 152 | |
@@ -157,9 +157,9 @@ discard block |
||
| 157 | 157 | * @return Object Information de connexion pour mysqli |
| 158 | 158 | */ |
| 159 | 159 | function _mysql_link($serveur = '') { |
| 160 | - $link = &$GLOBALS['connexions'][$serveur ?: 0]['link']; |
|
| 160 | + $link = &$GLOBALS['connexions'][$serveur ?: 0]['link']; |
|
| 161 | 161 | |
| 162 | - return $link; |
|
| 162 | + return $link; |
|
| 163 | 163 | } |
| 164 | 164 | |
| 165 | 165 | |
@@ -172,10 +172,10 @@ discard block |
||
| 172 | 172 | * @return resource Ressource de résultats pour fetch() |
| 173 | 173 | */ |
| 174 | 174 | function spip_mysql_set_charset($charset, $serveur = '', $requeter = true) { |
| 175 | - $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 176 | - spip_log('changement de charset sql : ' . 'SET NAMES ' . _q($charset), _LOG_DEBUG); |
|
| 175 | + $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 176 | + spip_log('changement de charset sql : ' . 'SET NAMES ' . _q($charset), _LOG_DEBUG); |
|
| 177 | 177 | |
| 178 | - return mysqli_query($connexion['link'], $connexion['last'] = 'SET NAMES ' . _q($charset)); |
|
| 178 | + return mysqli_query($connexion['link'], $connexion['last'] = 'SET NAMES ' . _q($charset)); |
|
| 179 | 179 | } |
| 180 | 180 | |
| 181 | 181 | |
@@ -188,11 +188,11 @@ discard block |
||
| 188 | 188 | * @return array Description du charset (son nom est dans 'charset') |
| 189 | 189 | */ |
| 190 | 190 | function spip_mysql_get_charset($charset = [], $serveur = '', $requeter = true) { |
| 191 | - $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 192 | - $connexion['last'] = $c = 'SHOW CHARACTER SET' |
|
| 193 | - . (!$charset ? '' : (' LIKE ' . _q($charset['charset']))); |
|
| 191 | + $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 192 | + $connexion['last'] = $c = 'SHOW CHARACTER SET' |
|
| 193 | + . (!$charset ? '' : (' LIKE ' . _q($charset['charset']))); |
|
| 194 | 194 | |
| 195 | - return spip_mysql_fetch(mysqli_query($connexion['link'], $c), null, $serveur); |
|
| 195 | + return spip_mysql_fetch(mysqli_query($connexion['link'], $c), null, $serveur); |
|
| 196 | 196 | } |
| 197 | 197 | |
| 198 | 198 | /** |
@@ -208,80 +208,80 @@ discard block |
||
| 208 | 208 | */ |
| 209 | 209 | function spip_mysql_query($query, $serveur = '', $requeter = true) { |
| 210 | 210 | |
| 211 | - $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 212 | - $prefixe = $connexion['prefixe']; |
|
| 213 | - $link = $connexion['link']; |
|
| 214 | - $db = $connexion['db']; |
|
| 215 | - |
|
| 216 | - $query = _mysql_traite_query($query, $db, $prefixe); |
|
| 217 | - |
|
| 218 | - // renvoyer la requete inerte si demandee |
|
| 219 | - if (!$requeter) { |
|
| 220 | - return $query; |
|
| 221 | - } |
|
| 222 | - |
|
| 223 | - if (isset($_GET['var_profile']) or (defined('_DEBUG_TRACE_QUERIES') and _DEBUG_TRACE_QUERIES)) { |
|
| 224 | - include_spip('public/tracer'); |
|
| 225 | - $t = trace_query_start(); |
|
| 226 | - } else { |
|
| 227 | - $t = 0; |
|
| 228 | - } |
|
| 229 | - |
|
| 230 | - $connexion['last'] = $query; |
|
| 231 | - $connexion['total_requetes']++; |
|
| 232 | - |
|
| 233 | - // ajouter un debug utile dans log/mysql-slow.log ? |
|
| 234 | - $debug = ''; |
|
| 235 | - if (defined('_DEBUG_SLOW_QUERIES') and _DEBUG_SLOW_QUERIES) { |
|
| 236 | - if (isset($GLOBALS['debug']['aucasou'])) { |
|
| 237 | - [, $id, , $infos] = $GLOBALS['debug']['aucasou']; |
|
| 238 | - $debug .= "BOUCLE$id @ " . ($infos[0] ?? '') . ' | '; |
|
| 239 | - } |
|
| 240 | - if (isset($_SERVER['REQUEST_URI'])) { |
|
| 241 | - $debug .= $_SERVER['REQUEST_URI']; |
|
| 242 | - } |
|
| 243 | - if (!empty($GLOBALS['ip'])) { |
|
| 244 | - $debug .= ' + ' . $GLOBALS['ip']; |
|
| 245 | - } |
|
| 246 | - $debug = ' /* ' . mysqli_real_escape_string($link, str_replace('*/', '@/', $debug)) . ' */'; |
|
| 247 | - } |
|
| 248 | - try { |
|
| 249 | - $r = mysqli_query($link, $query . $debug); |
|
| 250 | - } catch (\mysqli_sql_exception $e) { |
|
| 251 | - spip_log('mysqli_sql_exception: ' . $e->getMessage(), 'mysql.' . _LOG_DEBUG); |
|
| 252 | - $r = false; |
|
| 253 | - // TODO: utiliser l’exception ensuite plutôt que les appels à spip_mysql_errno() |
|
| 254 | - // mais il faut pour php < 8.1 forcer les exeptions via mysqli_report(). |
|
| 255 | - } |
|
| 256 | - |
|
| 257 | - //Eviter de propager le GoneAway sur les autres requetes d'un même processus PHP |
|
| 258 | - if ($e = spip_mysql_errno($serveur)) { // Log d'un Gone Away |
|
| 259 | - if ($e == 2006) { //Si Gone Away on relance une connexion vierge |
|
| 260 | - //Fermer la connexion defaillante |
|
| 261 | - mysqli_close($connexion['link']); |
|
| 262 | - unset($GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]); |
|
| 263 | - //Relancer une connexion vierge |
|
| 264 | - spip_connect($serveur); |
|
| 265 | - $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 266 | - $link = $connexion['link']; |
|
| 267 | - //On retente au cas où |
|
| 268 | - try { |
|
| 269 | - $r = mysqli_query($link, $query . $debug); |
|
| 270 | - } catch (\mysqli_sql_exception $e) { |
|
| 271 | - spip_log('mysqli_sql_exception: ' . $e->getMessage(), 'mysql.' . _LOG_DEBUG); |
|
| 272 | - $r = false; |
|
| 273 | - // TODO: utiliser l’exception ensuite plutôt que les appels à spip_mysql_errno() |
|
| 274 | - // mais il faut pour php < 8.1 forcer les exeptions via mysqli_report(). |
|
| 275 | - } |
|
| 276 | - } |
|
| 277 | - } |
|
| 278 | - |
|
| 279 | - // Log de l'erreur eventuelle |
|
| 280 | - if ($e = spip_mysql_errno($serveur)) { |
|
| 281 | - // et du fautif |
|
| 282 | - $e .= spip_mysql_error($query, $serveur); |
|
| 283 | - } |
|
| 284 | - return $t ? trace_query_end($query, $t, $r, $e, $serveur) : $r; |
|
| 211 | + $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 212 | + $prefixe = $connexion['prefixe']; |
|
| 213 | + $link = $connexion['link']; |
|
| 214 | + $db = $connexion['db']; |
|
| 215 | + |
|
| 216 | + $query = _mysql_traite_query($query, $db, $prefixe); |
|
| 217 | + |
|
| 218 | + // renvoyer la requete inerte si demandee |
|
| 219 | + if (!$requeter) { |
|
| 220 | + return $query; |
|
| 221 | + } |
|
| 222 | + |
|
| 223 | + if (isset($_GET['var_profile']) or (defined('_DEBUG_TRACE_QUERIES') and _DEBUG_TRACE_QUERIES)) { |
|
| 224 | + include_spip('public/tracer'); |
|
| 225 | + $t = trace_query_start(); |
|
| 226 | + } else { |
|
| 227 | + $t = 0; |
|
| 228 | + } |
|
| 229 | + |
|
| 230 | + $connexion['last'] = $query; |
|
| 231 | + $connexion['total_requetes']++; |
|
| 232 | + |
|
| 233 | + // ajouter un debug utile dans log/mysql-slow.log ? |
|
| 234 | + $debug = ''; |
|
| 235 | + if (defined('_DEBUG_SLOW_QUERIES') and _DEBUG_SLOW_QUERIES) { |
|
| 236 | + if (isset($GLOBALS['debug']['aucasou'])) { |
|
| 237 | + [, $id, , $infos] = $GLOBALS['debug']['aucasou']; |
|
| 238 | + $debug .= "BOUCLE$id @ " . ($infos[0] ?? '') . ' | '; |
|
| 239 | + } |
|
| 240 | + if (isset($_SERVER['REQUEST_URI'])) { |
|
| 241 | + $debug .= $_SERVER['REQUEST_URI']; |
|
| 242 | + } |
|
| 243 | + if (!empty($GLOBALS['ip'])) { |
|
| 244 | + $debug .= ' + ' . $GLOBALS['ip']; |
|
| 245 | + } |
|
| 246 | + $debug = ' /* ' . mysqli_real_escape_string($link, str_replace('*/', '@/', $debug)) . ' */'; |
|
| 247 | + } |
|
| 248 | + try { |
|
| 249 | + $r = mysqli_query($link, $query . $debug); |
|
| 250 | + } catch (\mysqli_sql_exception $e) { |
|
| 251 | + spip_log('mysqli_sql_exception: ' . $e->getMessage(), 'mysql.' . _LOG_DEBUG); |
|
| 252 | + $r = false; |
|
| 253 | + // TODO: utiliser l’exception ensuite plutôt que les appels à spip_mysql_errno() |
|
| 254 | + // mais il faut pour php < 8.1 forcer les exeptions via mysqli_report(). |
|
| 255 | + } |
|
| 256 | + |
|
| 257 | + //Eviter de propager le GoneAway sur les autres requetes d'un même processus PHP |
|
| 258 | + if ($e = spip_mysql_errno($serveur)) { // Log d'un Gone Away |
|
| 259 | + if ($e == 2006) { //Si Gone Away on relance une connexion vierge |
|
| 260 | + //Fermer la connexion defaillante |
|
| 261 | + mysqli_close($connexion['link']); |
|
| 262 | + unset($GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]); |
|
| 263 | + //Relancer une connexion vierge |
|
| 264 | + spip_connect($serveur); |
|
| 265 | + $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 266 | + $link = $connexion['link']; |
|
| 267 | + //On retente au cas où |
|
| 268 | + try { |
|
| 269 | + $r = mysqli_query($link, $query . $debug); |
|
| 270 | + } catch (\mysqli_sql_exception $e) { |
|
| 271 | + spip_log('mysqli_sql_exception: ' . $e->getMessage(), 'mysql.' . _LOG_DEBUG); |
|
| 272 | + $r = false; |
|
| 273 | + // TODO: utiliser l’exception ensuite plutôt que les appels à spip_mysql_errno() |
|
| 274 | + // mais il faut pour php < 8.1 forcer les exeptions via mysqli_report(). |
|
| 275 | + } |
|
| 276 | + } |
|
| 277 | + } |
|
| 278 | + |
|
| 279 | + // Log de l'erreur eventuelle |
|
| 280 | + if ($e = spip_mysql_errno($serveur)) { |
|
| 281 | + // et du fautif |
|
| 282 | + $e .= spip_mysql_error($query, $serveur); |
|
| 283 | + } |
|
| 284 | + return $t ? trace_query_end($query, $t, $r, $e, $serveur) : $r; |
|
| 285 | 285 | } |
| 286 | 286 | |
| 287 | 287 | /** |
@@ -296,12 +296,12 @@ discard block |
||
| 296 | 296 | * - array : Tableau décrivant requête et temps d'exécution si var_profile actif pour tracer. |
| 297 | 297 | */ |
| 298 | 298 | function spip_mysql_alter($query, $serveur = '', $requeter = true) { |
| 299 | - // ici on supprime les ` entourant le nom de table pour permettre |
|
| 300 | - // la transposition du prefixe, compte tenu que les plugins ont la mauvaise habitude |
|
| 301 | - // d'utiliser ceux-ci, copie-colle de phpmyadmin |
|
| 302 | - $query = preg_replace(',^TABLE\s*`([^`]*)`,i', "TABLE \\1", $query); |
|
| 299 | + // ici on supprime les ` entourant le nom de table pour permettre |
|
| 300 | + // la transposition du prefixe, compte tenu que les plugins ont la mauvaise habitude |
|
| 301 | + // d'utiliser ceux-ci, copie-colle de phpmyadmin |
|
| 302 | + $query = preg_replace(',^TABLE\s*`([^`]*)`,i', "TABLE \\1", $query); |
|
| 303 | 303 | |
| 304 | - return spip_mysql_query('ALTER ' . $query, $serveur, $requeter); # i.e. que PG se debrouille |
|
| 304 | + return spip_mysql_query('ALTER ' . $query, $serveur, $requeter); # i.e. que PG se debrouille |
|
| 305 | 305 | } |
| 306 | 306 | |
| 307 | 307 | |
@@ -314,9 +314,9 @@ discard block |
||
| 314 | 314 | * @return bool Toujours true |
| 315 | 315 | */ |
| 316 | 316 | function spip_mysql_optimize($table, $serveur = '', $requeter = true) { |
| 317 | - spip_mysql_query('OPTIMIZE TABLE ' . $table); |
|
| 317 | + spip_mysql_query('OPTIMIZE TABLE ' . $table); |
|
| 318 | 318 | |
| 319 | - return true; |
|
| 319 | + return true; |
|
| 320 | 320 | } |
| 321 | 321 | |
| 322 | 322 | |
@@ -329,18 +329,18 @@ discard block |
||
| 329 | 329 | * @return array Tableau de l'explication |
| 330 | 330 | */ |
| 331 | 331 | function spip_mysql_explain($query, $serveur = '', $requeter = true) { |
| 332 | - if (strpos(ltrim($query), 'SELECT') !== 0) { |
|
| 333 | - return []; |
|
| 334 | - } |
|
| 335 | - $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 336 | - $prefixe = $connexion['prefixe']; |
|
| 337 | - $link = $connexion['link']; |
|
| 338 | - $db = $connexion['db']; |
|
| 339 | - |
|
| 340 | - $query = 'EXPLAIN ' . _mysql_traite_query($query, $db, $prefixe); |
|
| 341 | - $r = mysqli_query($link, $query); |
|
| 342 | - |
|
| 343 | - return spip_mysql_fetch($r, null, $serveur); |
|
| 332 | + if (strpos(ltrim($query), 'SELECT') !== 0) { |
|
| 333 | + return []; |
|
| 334 | + } |
|
| 335 | + $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 336 | + $prefixe = $connexion['prefixe']; |
|
| 337 | + $link = $connexion['link']; |
|
| 338 | + $db = $connexion['db']; |
|
| 339 | + |
|
| 340 | + $query = 'EXPLAIN ' . _mysql_traite_query($query, $db, $prefixe); |
|
| 341 | + $r = mysqli_query($link, $query); |
|
| 342 | + |
|
| 343 | + return spip_mysql_fetch($r, null, $serveur); |
|
| 344 | 344 | } |
| 345 | 345 | |
| 346 | 346 | |
@@ -369,35 +369,35 @@ discard block |
||
| 369 | 369 | * - array : Tableau décrivant requête et temps d'exécution si var_profile actif pour tracer. |
| 370 | 370 | */ |
| 371 | 371 | function spip_mysql_select( |
| 372 | - $select, |
|
| 373 | - $from, |
|
| 374 | - $where = '', |
|
| 375 | - $groupby = '', |
|
| 376 | - $orderby = '', |
|
| 377 | - $limit = '', |
|
| 378 | - $having = '', |
|
| 379 | - $serveur = '', |
|
| 380 | - $requeter = true |
|
| 372 | + $select, |
|
| 373 | + $from, |
|
| 374 | + $where = '', |
|
| 375 | + $groupby = '', |
|
| 376 | + $orderby = '', |
|
| 377 | + $limit = '', |
|
| 378 | + $having = '', |
|
| 379 | + $serveur = '', |
|
| 380 | + $requeter = true |
|
| 381 | 381 | ) { |
| 382 | 382 | |
| 383 | 383 | |
| 384 | - $from = (!is_array($from) ? $from : spip_mysql_select_as($from)); |
|
| 385 | - $query = |
|
| 386 | - calculer_mysql_expression('SELECT', $select, ', ') |
|
| 387 | - . calculer_mysql_expression('FROM', $from, ', ') |
|
| 388 | - . calculer_mysql_expression('WHERE', $where) |
|
| 389 | - . calculer_mysql_expression('GROUP BY', $groupby, ',') |
|
| 390 | - . calculer_mysql_expression('HAVING', $having) |
|
| 391 | - . ($orderby ? ("\nORDER BY " . spip_mysql_order($orderby)) : '') |
|
| 392 | - . ($limit ? "\nLIMIT $limit" : ''); |
|
| 384 | + $from = (!is_array($from) ? $from : spip_mysql_select_as($from)); |
|
| 385 | + $query = |
|
| 386 | + calculer_mysql_expression('SELECT', $select, ', ') |
|
| 387 | + . calculer_mysql_expression('FROM', $from, ', ') |
|
| 388 | + . calculer_mysql_expression('WHERE', $where) |
|
| 389 | + . calculer_mysql_expression('GROUP BY', $groupby, ',') |
|
| 390 | + . calculer_mysql_expression('HAVING', $having) |
|
| 391 | + . ($orderby ? ("\nORDER BY " . spip_mysql_order($orderby)) : '') |
|
| 392 | + . ($limit ? "\nLIMIT $limit" : ''); |
|
| 393 | 393 | |
| 394 | - // renvoyer la requete inerte si demandee |
|
| 395 | - if ($requeter === false) { |
|
| 396 | - return $query; |
|
| 397 | - } |
|
| 398 | - $r = spip_mysql_query($query, $serveur, $requeter); |
|
| 394 | + // renvoyer la requete inerte si demandee |
|
| 395 | + if ($requeter === false) { |
|
| 396 | + return $query; |
|
| 397 | + } |
|
| 398 | + $r = spip_mysql_query($query, $serveur, $requeter); |
|
| 399 | 399 | |
| 400 | - return $r ?: $query; |
|
| 400 | + return $r ?: $query; |
|
| 401 | 401 | } |
| 402 | 402 | |
| 403 | 403 | |
@@ -414,7 +414,7 @@ discard block |
||
| 414 | 414 | * @return string Texte du orderby préparé |
| 415 | 415 | */ |
| 416 | 416 | function spip_mysql_order($orderby) { |
| 417 | - return (is_array($orderby)) ? join(', ', $orderby) : $orderby; |
|
| 417 | + return (is_array($orderby)) ? join(', ', $orderby) : $orderby; |
|
| 418 | 418 | } |
| 419 | 419 | |
| 420 | 420 | |
@@ -437,26 +437,26 @@ discard block |
||
| 437 | 437 | * Contrainte pour clause WHERE |
| 438 | 438 | */ |
| 439 | 439 | function calculer_mysql_where($v) { |
| 440 | - if (!is_array($v)) { |
|
| 441 | - return $v; |
|
| 442 | - } |
|
| 443 | - |
|
| 444 | - $op = array_shift($v); |
|
| 445 | - if (!($n = count($v))) { |
|
| 446 | - return $op; |
|
| 447 | - } else { |
|
| 448 | - $arg = calculer_mysql_where(array_shift($v)); |
|
| 449 | - if ($n == 1) { |
|
| 450 | - return "$op($arg)"; |
|
| 451 | - } else { |
|
| 452 | - $arg2 = calculer_mysql_where(array_shift($v)); |
|
| 453 | - if ($n == 2) { |
|
| 454 | - return "($arg $op $arg2)"; |
|
| 455 | - } else { |
|
| 456 | - return "($arg $op ($arg2) : $v[0])"; |
|
| 457 | - } |
|
| 458 | - } |
|
| 459 | - } |
|
| 440 | + if (!is_array($v)) { |
|
| 441 | + return $v; |
|
| 442 | + } |
|
| 443 | + |
|
| 444 | + $op = array_shift($v); |
|
| 445 | + if (!($n = count($v))) { |
|
| 446 | + return $op; |
|
| 447 | + } else { |
|
| 448 | + $arg = calculer_mysql_where(array_shift($v)); |
|
| 449 | + if ($n == 1) { |
|
| 450 | + return "$op($arg)"; |
|
| 451 | + } else { |
|
| 452 | + $arg2 = calculer_mysql_where(array_shift($v)); |
|
| 453 | + if ($n == 2) { |
|
| 454 | + return "($arg $op $arg2)"; |
|
| 455 | + } else { |
|
| 456 | + return "($arg $op ($arg2) : $v[0])"; |
|
| 457 | + } |
|
| 458 | + } |
|
| 459 | + } |
|
| 460 | 460 | } |
| 461 | 461 | |
| 462 | 462 | /** |
@@ -471,21 +471,21 @@ discard block |
||
| 471 | 471 | * @return string Texte de l'expression, une partie donc, du texte la requête. |
| 472 | 472 | */ |
| 473 | 473 | function calculer_mysql_expression($expression, $v, $join = 'AND') { |
| 474 | - if (empty($v)) { |
|
| 475 | - return ''; |
|
| 476 | - } |
|
| 477 | - |
|
| 478 | - $exp = "\n$expression "; |
|
| 479 | - |
|
| 480 | - if (!is_array($v)) { |
|
| 481 | - return $exp . $v; |
|
| 482 | - } else { |
|
| 483 | - if (strtoupper($join) === 'AND') { |
|
| 484 | - return $exp . join("\n\t$join ", array_map('calculer_mysql_where', $v)); |
|
| 485 | - } else { |
|
| 486 | - return $exp . join($join, $v); |
|
| 487 | - } |
|
| 488 | - } |
|
| 474 | + if (empty($v)) { |
|
| 475 | + return ''; |
|
| 476 | + } |
|
| 477 | + |
|
| 478 | + $exp = "\n$expression "; |
|
| 479 | + |
|
| 480 | + if (!is_array($v)) { |
|
| 481 | + return $exp . $v; |
|
| 482 | + } else { |
|
| 483 | + if (strtoupper($join) === 'AND') { |
|
| 484 | + return $exp . join("\n\t$join ", array_map('calculer_mysql_where', $v)); |
|
| 485 | + } else { |
|
| 486 | + return $exp . join($join, $v); |
|
| 487 | + } |
|
| 488 | + } |
|
| 489 | 489 | } |
| 490 | 490 | |
| 491 | 491 | |
@@ -496,26 +496,26 @@ discard block |
||
| 496 | 496 | * @return string Sélection de colonnes pour une clause SELECT |
| 497 | 497 | */ |
| 498 | 498 | function spip_mysql_select_as($args) { |
| 499 | - $res = ''; |
|
| 500 | - foreach ($args as $k => $v) { |
|
| 501 | - if (substr($k, -1) == '@') { |
|
| 502 | - // c'est une jointure qui se refere au from precedent |
|
| 503 | - // pas de virgule |
|
| 504 | - $res .= ' ' . $v; |
|
| 505 | - } else { |
|
| 506 | - if (!is_numeric($k)) { |
|
| 507 | - $p = strpos($v, ' '); |
|
| 508 | - if ($p) { |
|
| 509 | - $v = substr($v, 0, $p) . " AS `$k`" . substr($v, $p); |
|
| 510 | - } else { |
|
| 511 | - $v .= " AS `$k`"; |
|
| 512 | - } |
|
| 513 | - } |
|
| 514 | - $res .= ', ' . $v; |
|
| 515 | - } |
|
| 516 | - } |
|
| 517 | - |
|
| 518 | - return substr($res, 2); |
|
| 499 | + $res = ''; |
|
| 500 | + foreach ($args as $k => $v) { |
|
| 501 | + if (substr($k, -1) == '@') { |
|
| 502 | + // c'est une jointure qui se refere au from precedent |
|
| 503 | + // pas de virgule |
|
| 504 | + $res .= ' ' . $v; |
|
| 505 | + } else { |
|
| 506 | + if (!is_numeric($k)) { |
|
| 507 | + $p = strpos($v, ' '); |
|
| 508 | + if ($p) { |
|
| 509 | + $v = substr($v, 0, $p) . " AS `$k`" . substr($v, $p); |
|
| 510 | + } else { |
|
| 511 | + $v .= " AS `$k`"; |
|
| 512 | + } |
|
| 513 | + } |
|
| 514 | + $res .= ', ' . $v; |
|
| 515 | + } |
|
| 516 | + } |
|
| 517 | + |
|
| 518 | + return substr($res, 2); |
|
| 519 | 519 | } |
| 520 | 520 | |
| 521 | 521 | |
@@ -540,58 +540,58 @@ discard block |
||
| 540 | 540 | */ |
| 541 | 541 | function _mysql_traite_query($query, $db = '', $prefixe = '', $echappe_textes = true) { |
| 542 | 542 | |
| 543 | - if ($GLOBALS['mysql_rappel_nom_base'] and $db) { |
|
| 544 | - $pref = '`' . $db . '`.'; |
|
| 545 | - } else { |
|
| 546 | - $pref = ''; |
|
| 547 | - } |
|
| 548 | - |
|
| 549 | - if ($prefixe) { |
|
| 550 | - $pref .= $prefixe . '_'; |
|
| 551 | - } |
|
| 552 | - |
|
| 553 | - if (!preg_match('/\s(SET|VALUES|WHERE|DATABASE)\s/i', $query, $regs)) { |
|
| 554 | - $suite = ''; |
|
| 555 | - } else { |
|
| 556 | - $suite = strstr($query, (string) $regs[0]); |
|
| 557 | - $query = substr($query, 0, -strlen($suite)); |
|
| 558 | - // propager le prefixe en cas de requete imbriquee |
|
| 559 | - // il faut alors echapper les chaine avant de le faire, pour ne pas risquer de |
|
| 560 | - // modifier une requete qui est en fait juste du texte dans un champ |
|
| 561 | - if (stripos($suite, 'SELECT') !== false) { |
|
| 562 | - if ($echappe_textes) { |
|
| 563 | - [$suite_echap, $textes] = query_echappe_textes($suite); |
|
| 564 | - } |
|
| 565 | - else { |
|
| 566 | - $suite_echap = $suite; |
|
| 567 | - } |
|
| 568 | - if (preg_match('/^(.*?)([(]\s*SELECT\b.*)$/si', $suite_echap, $r)) { |
|
| 569 | - $suite_echap = $r[1] . _mysql_traite_query($r[2], $db, $prefixe, false); |
|
| 570 | - if ($echappe_textes) { |
|
| 571 | - $suite = query_reinjecte_textes($suite_echap, $textes); |
|
| 572 | - } |
|
| 573 | - else { |
|
| 574 | - $suite = $suite_echap; |
|
| 575 | - } |
|
| 576 | - } |
|
| 577 | - } |
|
| 578 | - } |
|
| 579 | - $r = preg_replace(_SQL_PREFIXE_TABLE_MYSQL, '\1' . $pref, $query) . $suite; |
|
| 580 | - |
|
| 581 | - // en option, remplacer les emoji (que mysql ne sait pas gérer) en 💩 |
|
| 582 | - // remplacer les emoji (que mysql ne sait pas gérer) en 💩 |
|
| 583 | - if ( |
|
| 584 | - defined('_MYSQL_NOPLANES') |
|
| 585 | - and _MYSQL_NOPLANES |
|
| 586 | - and !empty($GLOBALS['meta']['charset_sql_connexion']) |
|
| 587 | - and $GLOBALS['meta']['charset_sql_connexion'] == 'utf8' |
|
| 588 | - ) { |
|
| 589 | - include_spip('inc/charsets'); |
|
| 590 | - $r = utf8_noplanes($r); |
|
| 591 | - } |
|
| 592 | - |
|
| 593 | - #spip_log("_mysql_traite_query: " . substr($r,0, 50) . ".... $db, $prefixe", _LOG_DEBUG); |
|
| 594 | - return $r; |
|
| 543 | + if ($GLOBALS['mysql_rappel_nom_base'] and $db) { |
|
| 544 | + $pref = '`' . $db . '`.'; |
|
| 545 | + } else { |
|
| 546 | + $pref = ''; |
|
| 547 | + } |
|
| 548 | + |
|
| 549 | + if ($prefixe) { |
|
| 550 | + $pref .= $prefixe . '_'; |
|
| 551 | + } |
|
| 552 | + |
|
| 553 | + if (!preg_match('/\s(SET|VALUES|WHERE|DATABASE)\s/i', $query, $regs)) { |
|
| 554 | + $suite = ''; |
|
| 555 | + } else { |
|
| 556 | + $suite = strstr($query, (string) $regs[0]); |
|
| 557 | + $query = substr($query, 0, -strlen($suite)); |
|
| 558 | + // propager le prefixe en cas de requete imbriquee |
|
| 559 | + // il faut alors echapper les chaine avant de le faire, pour ne pas risquer de |
|
| 560 | + // modifier une requete qui est en fait juste du texte dans un champ |
|
| 561 | + if (stripos($suite, 'SELECT') !== false) { |
|
| 562 | + if ($echappe_textes) { |
|
| 563 | + [$suite_echap, $textes] = query_echappe_textes($suite); |
|
| 564 | + } |
|
| 565 | + else { |
|
| 566 | + $suite_echap = $suite; |
|
| 567 | + } |
|
| 568 | + if (preg_match('/^(.*?)([(]\s*SELECT\b.*)$/si', $suite_echap, $r)) { |
|
| 569 | + $suite_echap = $r[1] . _mysql_traite_query($r[2], $db, $prefixe, false); |
|
| 570 | + if ($echappe_textes) { |
|
| 571 | + $suite = query_reinjecte_textes($suite_echap, $textes); |
|
| 572 | + } |
|
| 573 | + else { |
|
| 574 | + $suite = $suite_echap; |
|
| 575 | + } |
|
| 576 | + } |
|
| 577 | + } |
|
| 578 | + } |
|
| 579 | + $r = preg_replace(_SQL_PREFIXE_TABLE_MYSQL, '\1' . $pref, $query) . $suite; |
|
| 580 | + |
|
| 581 | + // en option, remplacer les emoji (que mysql ne sait pas gérer) en 💩 |
|
| 582 | + // remplacer les emoji (que mysql ne sait pas gérer) en 💩 |
|
| 583 | + if ( |
|
| 584 | + defined('_MYSQL_NOPLANES') |
|
| 585 | + and _MYSQL_NOPLANES |
|
| 586 | + and !empty($GLOBALS['meta']['charset_sql_connexion']) |
|
| 587 | + and $GLOBALS['meta']['charset_sql_connexion'] == 'utf8' |
|
| 588 | + ) { |
|
| 589 | + include_spip('inc/charsets'); |
|
| 590 | + $r = utf8_noplanes($r); |
|
| 591 | + } |
|
| 592 | + |
|
| 593 | + #spip_log("_mysql_traite_query: " . substr($r,0, 50) . ".... $db, $prefixe", _LOG_DEBUG); |
|
| 594 | + return $r; |
|
| 595 | 595 | } |
| 596 | 596 | |
| 597 | 597 | /** |
@@ -609,13 +609,13 @@ discard block |
||
| 609 | 609 | * - False en cas d'erreur. |
| 610 | 610 | **/ |
| 611 | 611 | function spip_mysql_selectdb($db, $serveur = '', $requeter = true) { |
| 612 | - $link = _mysql_link($serveur); |
|
| 613 | - $ok = mysqli_select_db($link, $db); |
|
| 614 | - if (!$ok) { |
|
| 615 | - spip_log('Echec mysqli_selectdb. Erreur : ' . mysqli_error($link), 'mysql.' . _LOG_CRITIQUE); |
|
| 616 | - } |
|
| 612 | + $link = _mysql_link($serveur); |
|
| 613 | + $ok = mysqli_select_db($link, $db); |
|
| 614 | + if (!$ok) { |
|
| 615 | + spip_log('Echec mysqli_selectdb. Erreur : ' . mysqli_error($link), 'mysql.' . _LOG_CRITIQUE); |
|
| 616 | + } |
|
| 617 | 617 | |
| 618 | - return $ok; |
|
| 618 | + return $ok; |
|
| 619 | 619 | } |
| 620 | 620 | |
| 621 | 621 | |
@@ -636,14 +636,14 @@ discard block |
||
| 636 | 636 | * Liste de noms de bases de données |
| 637 | 637 | **/ |
| 638 | 638 | function spip_mysql_listdbs($serveur = '', $requeter = true) { |
| 639 | - $dbs = []; |
|
| 640 | - if ($res = spip_mysql_query('SHOW DATABASES', $serveur)) { |
|
| 641 | - while ($row = mysqli_fetch_assoc($res)) { |
|
| 642 | - $dbs[] = $row['Database']; |
|
| 643 | - } |
|
| 644 | - } |
|
| 645 | - |
|
| 646 | - return $dbs; |
|
| 639 | + $dbs = []; |
|
| 640 | + if ($res = spip_mysql_query('SHOW DATABASES', $serveur)) { |
|
| 641 | + while ($row = mysqli_fetch_assoc($res)) { |
|
| 642 | + $dbs[] = $row['Database']; |
|
| 643 | + } |
|
| 644 | + } |
|
| 645 | + |
|
| 646 | + return $dbs; |
|
| 647 | 647 | } |
| 648 | 648 | |
| 649 | 649 | |
@@ -666,73 +666,73 @@ discard block |
||
| 666 | 666 | * - true si la requête réussie, false sinon. |
| 667 | 667 | */ |
| 668 | 668 | function spip_mysql_create( |
| 669 | - $nom, |
|
| 670 | - $champs, |
|
| 671 | - $cles, |
|
| 672 | - $autoinc = false, |
|
| 673 | - $temporary = false, |
|
| 674 | - $serveur = '', |
|
| 675 | - $requeter = true |
|
| 669 | + $nom, |
|
| 670 | + $champs, |
|
| 671 | + $cles, |
|
| 672 | + $autoinc = false, |
|
| 673 | + $temporary = false, |
|
| 674 | + $serveur = '', |
|
| 675 | + $requeter = true |
|
| 676 | 676 | ) { |
| 677 | 677 | |
| 678 | - $query = ''; |
|
| 679 | - $keys = ''; |
|
| 680 | - $s = ''; |
|
| 681 | - $p = ''; |
|
| 682 | - |
|
| 683 | - // certains plugins declarent les tables (permet leur inclusion dans le dump) |
|
| 684 | - // sans les renseigner (laisse le compilo recuperer la description) |
|
| 685 | - if (!is_array($champs) || !is_array($cles)) { |
|
| 686 | - return; |
|
| 687 | - } |
|
| 688 | - |
|
| 689 | - $res = spip_mysql_query('SELECT version() as v', $serveur); |
|
| 690 | - if (($row = mysqli_fetch_array($res)) && (version_compare($row['v'], '5.0', '>='))) { |
|
| 691 | - spip_mysql_query("SET sql_mode=''", $serveur); |
|
| 692 | - } |
|
| 693 | - |
|
| 694 | - foreach ($cles as $k => $v) { |
|
| 695 | - $keys .= "$s\n\t\t$k ($v)"; |
|
| 696 | - if ($k == 'PRIMARY KEY') { |
|
| 697 | - $p = $v; |
|
| 698 | - } |
|
| 699 | - $s = ','; |
|
| 700 | - } |
|
| 701 | - $s = ''; |
|
| 702 | - |
|
| 703 | - $character_set = ''; |
|
| 704 | - if (@$GLOBALS['meta']['charset_sql_base']) { |
|
| 705 | - $character_set .= ' CHARACTER SET ' . $GLOBALS['meta']['charset_sql_base']; |
|
| 706 | - } |
|
| 707 | - if (@$GLOBALS['meta']['charset_collation_sql_base']) { |
|
| 708 | - $character_set .= ' COLLATE ' . $GLOBALS['meta']['charset_collation_sql_base']; |
|
| 709 | - } |
|
| 710 | - |
|
| 711 | - foreach ($champs as $k => $v) { |
|
| 712 | - $v = _mysql_remplacements_definitions_table($v); |
|
| 713 | - if (preg_match(',([a-z]*\s*(\(\s*[0-9]*\s*\))?(\s*binary)?),i', $v, $defs)) { |
|
| 714 | - if ( |
|
| 715 | - preg_match(',(char|text),i', $defs[1]) |
|
| 716 | - and !preg_match(',(binary|CHARACTER|COLLATE),i', $v) |
|
| 717 | - ) { |
|
| 718 | - $v = $defs[1] . $character_set . ' ' . substr($v, strlen($defs[1])); |
|
| 719 | - } |
|
| 720 | - } |
|
| 721 | - |
|
| 722 | - $query .= "$s\n\t\t$k $v" |
|
| 723 | - . (($autoinc && ($p == $k) && preg_match(',\b(big|small|medium)?int\b,i', $v)) |
|
| 724 | - ? ' auto_increment' |
|
| 725 | - : '' |
|
| 726 | - ); |
|
| 727 | - $s = ','; |
|
| 728 | - } |
|
| 729 | - $temporary = $temporary ? 'TEMPORARY' : ''; |
|
| 730 | - $q = "CREATE $temporary TABLE IF NOT EXISTS $nom ($query" . ($keys ? ",$keys" : '') . ')' |
|
| 731 | - . ' ENGINE=MyISAM' |
|
| 732 | - . ($character_set ? " DEFAULT $character_set" : '') |
|
| 733 | - . "\n"; |
|
| 734 | - |
|
| 735 | - return spip_mysql_query($q, $serveur); |
|
| 678 | + $query = ''; |
|
| 679 | + $keys = ''; |
|
| 680 | + $s = ''; |
|
| 681 | + $p = ''; |
|
| 682 | + |
|
| 683 | + // certains plugins declarent les tables (permet leur inclusion dans le dump) |
|
| 684 | + // sans les renseigner (laisse le compilo recuperer la description) |
|
| 685 | + if (!is_array($champs) || !is_array($cles)) { |
|
| 686 | + return; |
|
| 687 | + } |
|
| 688 | + |
|
| 689 | + $res = spip_mysql_query('SELECT version() as v', $serveur); |
|
| 690 | + if (($row = mysqli_fetch_array($res)) && (version_compare($row['v'], '5.0', '>='))) { |
|
| 691 | + spip_mysql_query("SET sql_mode=''", $serveur); |
|
| 692 | + } |
|
| 693 | + |
|
| 694 | + foreach ($cles as $k => $v) { |
|
| 695 | + $keys .= "$s\n\t\t$k ($v)"; |
|
| 696 | + if ($k == 'PRIMARY KEY') { |
|
| 697 | + $p = $v; |
|
| 698 | + } |
|
| 699 | + $s = ','; |
|
| 700 | + } |
|
| 701 | + $s = ''; |
|
| 702 | + |
|
| 703 | + $character_set = ''; |
|
| 704 | + if (@$GLOBALS['meta']['charset_sql_base']) { |
|
| 705 | + $character_set .= ' CHARACTER SET ' . $GLOBALS['meta']['charset_sql_base']; |
|
| 706 | + } |
|
| 707 | + if (@$GLOBALS['meta']['charset_collation_sql_base']) { |
|
| 708 | + $character_set .= ' COLLATE ' . $GLOBALS['meta']['charset_collation_sql_base']; |
|
| 709 | + } |
|
| 710 | + |
|
| 711 | + foreach ($champs as $k => $v) { |
|
| 712 | + $v = _mysql_remplacements_definitions_table($v); |
|
| 713 | + if (preg_match(',([a-z]*\s*(\(\s*[0-9]*\s*\))?(\s*binary)?),i', $v, $defs)) { |
|
| 714 | + if ( |
|
| 715 | + preg_match(',(char|text),i', $defs[1]) |
|
| 716 | + and !preg_match(',(binary|CHARACTER|COLLATE),i', $v) |
|
| 717 | + ) { |
|
| 718 | + $v = $defs[1] . $character_set . ' ' . substr($v, strlen($defs[1])); |
|
| 719 | + } |
|
| 720 | + } |
|
| 721 | + |
|
| 722 | + $query .= "$s\n\t\t$k $v" |
|
| 723 | + . (($autoinc && ($p == $k) && preg_match(',\b(big|small|medium)?int\b,i', $v)) |
|
| 724 | + ? ' auto_increment' |
|
| 725 | + : '' |
|
| 726 | + ); |
|
| 727 | + $s = ','; |
|
| 728 | + } |
|
| 729 | + $temporary = $temporary ? 'TEMPORARY' : ''; |
|
| 730 | + $q = "CREATE $temporary TABLE IF NOT EXISTS $nom ($query" . ($keys ? ",$keys" : '') . ')' |
|
| 731 | + . ' ENGINE=MyISAM' |
|
| 732 | + . ($character_set ? " DEFAULT $character_set" : '') |
|
| 733 | + . "\n"; |
|
| 734 | + |
|
| 735 | + return spip_mysql_query($q, $serveur); |
|
| 736 | 736 | } |
| 737 | 737 | |
| 738 | 738 | |
@@ -745,25 +745,25 @@ discard block |
||
| 745 | 745 | * Définition SQL adaptée pour MySQL d'un champ de table |
| 746 | 746 | */ |
| 747 | 747 | function _mysql_remplacements_definitions_table($query) { |
| 748 | - // quelques remplacements |
|
| 749 | - $num = '(\s*\([0-9]*\))?'; |
|
| 750 | - $enum = '(\s*\([^\)]*\))?'; |
|
| 751 | - |
|
| 752 | - $remplace = [ |
|
| 753 | - '/VARCHAR(\s*[^\s\(])/is' => 'VARCHAR(255)\\1', |
|
| 754 | - '/^TIMESTAMP($| NULL DEFAULT NULL)/is' => 'TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP', |
|
| 755 | - ]; |
|
| 756 | - |
|
| 757 | - if (is_string($query)) { |
|
| 758 | - $query = preg_replace(array_keys($remplace), $remplace, $query); |
|
| 759 | - } elseif (is_array($query)) { |
|
| 760 | - $keys = array_keys($remplace); |
|
| 761 | - foreach ($query as $k => $q) { |
|
| 762 | - $query[$k] = preg_replace($keys, $remplace, $q); |
|
| 763 | - } |
|
| 764 | - } |
|
| 765 | - |
|
| 766 | - return $query; |
|
| 748 | + // quelques remplacements |
|
| 749 | + $num = '(\s*\([0-9]*\))?'; |
|
| 750 | + $enum = '(\s*\([^\)]*\))?'; |
|
| 751 | + |
|
| 752 | + $remplace = [ |
|
| 753 | + '/VARCHAR(\s*[^\s\(])/is' => 'VARCHAR(255)\\1', |
|
| 754 | + '/^TIMESTAMP($| NULL DEFAULT NULL)/is' => 'TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP', |
|
| 755 | + ]; |
|
| 756 | + |
|
| 757 | + if (is_string($query)) { |
|
| 758 | + $query = preg_replace(array_keys($remplace), $remplace, $query); |
|
| 759 | + } elseif (is_array($query)) { |
|
| 760 | + $keys = array_keys($remplace); |
|
| 761 | + foreach ($query as $k => $q) { |
|
| 762 | + $query[$k] = preg_replace($keys, $remplace, $q); |
|
| 763 | + } |
|
| 764 | + } |
|
| 765 | + |
|
| 766 | + return $query; |
|
| 767 | 767 | } |
| 768 | 768 | |
| 769 | 769 | |
@@ -776,7 +776,7 @@ discard block |
||
| 776 | 776 | * @return bool true si la base est créee. |
| 777 | 777 | **/ |
| 778 | 778 | function spip_mysql_create_base($nom, $serveur = '', $requeter = true) { |
| 779 | - return spip_mysql_query("CREATE DATABASE `$nom`", $serveur, $requeter); |
|
| 779 | + return spip_mysql_query("CREATE DATABASE `$nom`", $serveur, $requeter); |
|
| 780 | 780 | } |
| 781 | 781 | |
| 782 | 782 | |
@@ -797,19 +797,19 @@ discard block |
||
| 797 | 797 | * - string texte de la requête si $requeter vaut false |
| 798 | 798 | */ |
| 799 | 799 | function spip_mysql_create_view($nom, $query_select, $serveur = '', $requeter = true) { |
| 800 | - if (!$query_select) { |
|
| 801 | - return false; |
|
| 802 | - } |
|
| 803 | - // vue deja presente |
|
| 804 | - if (sql_showtable($nom, false, $serveur)) { |
|
| 805 | - spip_log("Echec creation d'une vue sql ($nom) car celle-ci existe deja (serveur:$serveur)", _LOG_ERREUR); |
|
| 800 | + if (!$query_select) { |
|
| 801 | + return false; |
|
| 802 | + } |
|
| 803 | + // vue deja presente |
|
| 804 | + if (sql_showtable($nom, false, $serveur)) { |
|
| 805 | + spip_log("Echec creation d'une vue sql ($nom) car celle-ci existe deja (serveur:$serveur)", _LOG_ERREUR); |
|
| 806 | 806 | |
| 807 | - return false; |
|
| 808 | - } |
|
| 807 | + return false; |
|
| 808 | + } |
|
| 809 | 809 | |
| 810 | - $query = "CREATE VIEW $nom AS " . $query_select; |
|
| 810 | + $query = "CREATE VIEW $nom AS " . $query_select; |
|
| 811 | 811 | |
| 812 | - return spip_mysql_query($query, $serveur, $requeter); |
|
| 812 | + return spip_mysql_query($query, $serveur, $requeter); |
|
| 813 | 813 | } |
| 814 | 814 | |
| 815 | 815 | |
@@ -825,11 +825,11 @@ discard block |
||
| 825 | 825 | * - true si la requête a réussie, false sinon |
| 826 | 826 | */ |
| 827 | 827 | function spip_mysql_drop_table($table, $exist = '', $serveur = '', $requeter = true) { |
| 828 | - if ($exist) { |
|
| 829 | - $exist = ' IF EXISTS'; |
|
| 830 | - } |
|
| 828 | + if ($exist) { |
|
| 829 | + $exist = ' IF EXISTS'; |
|
| 830 | + } |
|
| 831 | 831 | |
| 832 | - return spip_mysql_query("DROP TABLE$exist $table", $serveur, $requeter); |
|
| 832 | + return spip_mysql_query("DROP TABLE$exist $table", $serveur, $requeter); |
|
| 833 | 833 | } |
| 834 | 834 | |
| 835 | 835 | /** |
@@ -844,11 +844,11 @@ discard block |
||
| 844 | 844 | * - true si la requête a réussie, false sinon |
| 845 | 845 | */ |
| 846 | 846 | function spip_mysql_drop_view($view, $exist = '', $serveur = '', $requeter = true) { |
| 847 | - if ($exist) { |
|
| 848 | - $exist = ' IF EXISTS'; |
|
| 849 | - } |
|
| 847 | + if ($exist) { |
|
| 848 | + $exist = ' IF EXISTS'; |
|
| 849 | + } |
|
| 850 | 850 | |
| 851 | - return spip_mysql_query("DROP VIEW$exist $view", $serveur, $requeter); |
|
| 851 | + return spip_mysql_query("DROP VIEW$exist $view", $serveur, $requeter); |
|
| 852 | 852 | } |
| 853 | 853 | |
| 854 | 854 | /** |
@@ -865,7 +865,7 @@ discard block |
||
| 865 | 865 | * Ressource à utiliser avec sql_fetch() |
| 866 | 866 | **/ |
| 867 | 867 | function spip_mysql_showbase($match, $serveur = '', $requeter = true) { |
| 868 | - return spip_mysql_query('SHOW TABLES LIKE ' . _q($match), $serveur, $requeter); |
|
| 868 | + return spip_mysql_query('SHOW TABLES LIKE ' . _q($match), $serveur, $requeter); |
|
| 869 | 869 | } |
| 870 | 870 | |
| 871 | 871 | /** |
@@ -881,7 +881,7 @@ discard block |
||
| 881 | 881 | * - true si la requête a réussie, false sinon |
| 882 | 882 | */ |
| 883 | 883 | function spip_mysql_repair($table, $serveur = '', $requeter = true) { |
| 884 | - return spip_mysql_query("REPAIR TABLE `$table`", $serveur, $requeter); |
|
| 884 | + return spip_mysql_query("REPAIR TABLE `$table`", $serveur, $requeter); |
|
| 885 | 885 | } |
| 886 | 886 | |
| 887 | 887 | /** |
@@ -898,12 +898,12 @@ discard block |
||
| 898 | 898 | * Ressource à utiliser avec sql_fetch() |
| 899 | 899 | **/ |
| 900 | 900 | function spip_mysql_table_exists(string $table, $serveur = '', $requeter = true) { |
| 901 | - $r = spip_mysql_query('SHOW TABLES LIKE ' . _q($table), $serveur, $requeter); |
|
| 902 | - if (!$requeter) { |
|
| 903 | - return $r; |
|
| 904 | - } |
|
| 905 | - $res = spip_mysql_fetch($r); |
|
| 906 | - return (bool) $res; |
|
| 901 | + $r = spip_mysql_query('SHOW TABLES LIKE ' . _q($table), $serveur, $requeter); |
|
| 902 | + if (!$requeter) { |
|
| 903 | + return $r; |
|
| 904 | + } |
|
| 905 | + $res = spip_mysql_fetch($r); |
|
| 906 | + return (bool) $res; |
|
| 907 | 907 | } |
| 908 | 908 | |
| 909 | 909 | define('_MYSQL_RE_SHOW_TABLE', '/^[^(),]*\(((?:[^()]*\((?:[^()]*\([^()]*\))?[^()]*\)[^()]*)*[^()]*)\)[^()]*$/'); |
@@ -926,86 +926,86 @@ discard block |
||
| 926 | 926 | * - array description de la table sinon |
| 927 | 927 | */ |
| 928 | 928 | function spip_mysql_showtable($nom_table, $serveur = '', $requeter = true) { |
| 929 | - $s = spip_mysql_query("SHOW CREATE TABLE `$nom_table`", $serveur, $requeter); |
|
| 930 | - if (!$s) { |
|
| 931 | - return ''; |
|
| 932 | - } |
|
| 933 | - if (!$requeter) { |
|
| 934 | - return $s; |
|
| 935 | - } |
|
| 936 | - |
|
| 937 | - [, $a] = mysqli_fetch_array($s, MYSQLI_NUM); |
|
| 938 | - if (preg_match(_MYSQL_RE_SHOW_TABLE, $a, $r)) { |
|
| 939 | - $desc = $r[1]; |
|
| 940 | - // extraction d'une KEY éventuelle en prenant garde de ne pas |
|
| 941 | - // relever un champ dont le nom contient KEY (ex. ID_WHISKEY) |
|
| 942 | - if (preg_match('/^(.*?),([^,]*\sKEY[ (].*)$/s', $desc, $r)) { |
|
| 943 | - $namedkeys = $r[2]; |
|
| 944 | - $desc = $r[1]; |
|
| 945 | - } else { |
|
| 946 | - $namedkeys = ''; |
|
| 947 | - } |
|
| 948 | - |
|
| 949 | - $fields = []; |
|
| 950 | - foreach (preg_split('/,\s*`/', $desc) as $v) { |
|
| 951 | - preg_match('/^\s*`?([^`]*)`\s*(.*)/', $v, $r); |
|
| 952 | - $fields[strtolower($r[1])] = $r[2]; |
|
| 953 | - } |
|
| 954 | - $keys = []; |
|
| 955 | - |
|
| 956 | - foreach (preg_split('/\)\s*(,|$)/', $namedkeys) as $v) { |
|
| 957 | - if (preg_match('/^\s*([^(]*)\(([^(]*(\(\d+\))?)$/', $v, $r)) { |
|
| 958 | - $k = str_replace('`', '', trim($r[1])); |
|
| 959 | - $t = strtolower(str_replace('`', '', $r[2])); |
|
| 960 | - if ($k && !isset($keys[$k])) { |
|
| 961 | - $keys[$k] = $t; |
|
| 962 | - } else { |
|
| 963 | - $keys[] = $t; |
|
| 964 | - } |
|
| 965 | - } |
|
| 966 | - } |
|
| 967 | - spip_mysql_free($s); |
|
| 968 | - |
|
| 969 | - return ['field' => $fields, 'key' => $keys]; |
|
| 970 | - } |
|
| 971 | - |
|
| 972 | - $res = spip_mysql_query("SHOW COLUMNS FROM `$nom_table`", $serveur); |
|
| 973 | - if ($res) { |
|
| 974 | - $nfields = []; |
|
| 975 | - $nkeys = []; |
|
| 976 | - while ($val = spip_mysql_fetch($res)) { |
|
| 977 | - $nfields[$val['Field']] = $val['Type']; |
|
| 978 | - if ($val['Null'] == 'NO') { |
|
| 979 | - $nfields[$val['Field']] .= ' NOT NULL'; |
|
| 980 | - } |
|
| 981 | - if ($val['Default'] === '0' || $val['Default']) { |
|
| 982 | - if (preg_match('/[A-Z_]/', $val['Default'])) { |
|
| 983 | - $nfields[$val['Field']] .= ' DEFAULT ' . $val['Default']; |
|
| 984 | - } else { |
|
| 985 | - $nfields[$val['Field']] .= " DEFAULT '" . $val['Default'] . "'"; |
|
| 986 | - } |
|
| 987 | - } |
|
| 988 | - if ($val['Extra']) { |
|
| 989 | - $nfields[$val['Field']] .= ' ' . $val['Extra']; |
|
| 990 | - } |
|
| 991 | - if ($val['Key'] == 'PRI') { |
|
| 992 | - $nkeys['PRIMARY KEY'] = $val['Field']; |
|
| 993 | - } else { |
|
| 994 | - if ($val['Key'] == 'MUL') { |
|
| 995 | - $nkeys['KEY ' . $val['Field']] = $val['Field']; |
|
| 996 | - } else { |
|
| 997 | - if ($val['Key'] == 'UNI') { |
|
| 998 | - $nkeys['UNIQUE KEY ' . $val['Field']] = $val['Field']; |
|
| 999 | - } |
|
| 1000 | - } |
|
| 1001 | - } |
|
| 1002 | - } |
|
| 1003 | - spip_mysql_free($res); |
|
| 1004 | - |
|
| 1005 | - return ['field' => $nfields, 'key' => $nkeys]; |
|
| 1006 | - } |
|
| 1007 | - |
|
| 1008 | - return ''; |
|
| 929 | + $s = spip_mysql_query("SHOW CREATE TABLE `$nom_table`", $serveur, $requeter); |
|
| 930 | + if (!$s) { |
|
| 931 | + return ''; |
|
| 932 | + } |
|
| 933 | + if (!$requeter) { |
|
| 934 | + return $s; |
|
| 935 | + } |
|
| 936 | + |
|
| 937 | + [, $a] = mysqli_fetch_array($s, MYSQLI_NUM); |
|
| 938 | + if (preg_match(_MYSQL_RE_SHOW_TABLE, $a, $r)) { |
|
| 939 | + $desc = $r[1]; |
|
| 940 | + // extraction d'une KEY éventuelle en prenant garde de ne pas |
|
| 941 | + // relever un champ dont le nom contient KEY (ex. ID_WHISKEY) |
|
| 942 | + if (preg_match('/^(.*?),([^,]*\sKEY[ (].*)$/s', $desc, $r)) { |
|
| 943 | + $namedkeys = $r[2]; |
|
| 944 | + $desc = $r[1]; |
|
| 945 | + } else { |
|
| 946 | + $namedkeys = ''; |
|
| 947 | + } |
|
| 948 | + |
|
| 949 | + $fields = []; |
|
| 950 | + foreach (preg_split('/,\s*`/', $desc) as $v) { |
|
| 951 | + preg_match('/^\s*`?([^`]*)`\s*(.*)/', $v, $r); |
|
| 952 | + $fields[strtolower($r[1])] = $r[2]; |
|
| 953 | + } |
|
| 954 | + $keys = []; |
|
| 955 | + |
|
| 956 | + foreach (preg_split('/\)\s*(,|$)/', $namedkeys) as $v) { |
|
| 957 | + if (preg_match('/^\s*([^(]*)\(([^(]*(\(\d+\))?)$/', $v, $r)) { |
|
| 958 | + $k = str_replace('`', '', trim($r[1])); |
|
| 959 | + $t = strtolower(str_replace('`', '', $r[2])); |
|
| 960 | + if ($k && !isset($keys[$k])) { |
|
| 961 | + $keys[$k] = $t; |
|
| 962 | + } else { |
|
| 963 | + $keys[] = $t; |
|
| 964 | + } |
|
| 965 | + } |
|
| 966 | + } |
|
| 967 | + spip_mysql_free($s); |
|
| 968 | + |
|
| 969 | + return ['field' => $fields, 'key' => $keys]; |
|
| 970 | + } |
|
| 971 | + |
|
| 972 | + $res = spip_mysql_query("SHOW COLUMNS FROM `$nom_table`", $serveur); |
|
| 973 | + if ($res) { |
|
| 974 | + $nfields = []; |
|
| 975 | + $nkeys = []; |
|
| 976 | + while ($val = spip_mysql_fetch($res)) { |
|
| 977 | + $nfields[$val['Field']] = $val['Type']; |
|
| 978 | + if ($val['Null'] == 'NO') { |
|
| 979 | + $nfields[$val['Field']] .= ' NOT NULL'; |
|
| 980 | + } |
|
| 981 | + if ($val['Default'] === '0' || $val['Default']) { |
|
| 982 | + if (preg_match('/[A-Z_]/', $val['Default'])) { |
|
| 983 | + $nfields[$val['Field']] .= ' DEFAULT ' . $val['Default']; |
|
| 984 | + } else { |
|
| 985 | + $nfields[$val['Field']] .= " DEFAULT '" . $val['Default'] . "'"; |
|
| 986 | + } |
|
| 987 | + } |
|
| 988 | + if ($val['Extra']) { |
|
| 989 | + $nfields[$val['Field']] .= ' ' . $val['Extra']; |
|
| 990 | + } |
|
| 991 | + if ($val['Key'] == 'PRI') { |
|
| 992 | + $nkeys['PRIMARY KEY'] = $val['Field']; |
|
| 993 | + } else { |
|
| 994 | + if ($val['Key'] == 'MUL') { |
|
| 995 | + $nkeys['KEY ' . $val['Field']] = $val['Field']; |
|
| 996 | + } else { |
|
| 997 | + if ($val['Key'] == 'UNI') { |
|
| 998 | + $nkeys['UNIQUE KEY ' . $val['Field']] = $val['Field']; |
|
| 999 | + } |
|
| 1000 | + } |
|
| 1001 | + } |
|
| 1002 | + } |
|
| 1003 | + spip_mysql_free($res); |
|
| 1004 | + |
|
| 1005 | + return ['field' => $nfields, 'key' => $nkeys]; |
|
| 1006 | + } |
|
| 1007 | + |
|
| 1008 | + return ''; |
|
| 1009 | 1009 | } |
| 1010 | 1010 | |
| 1011 | 1011 | |
@@ -1021,12 +1021,12 @@ discard block |
||
| 1021 | 1021 | * @return array Ligne de résultat |
| 1022 | 1022 | */ |
| 1023 | 1023 | function spip_mysql_fetch($r, $t = '', $serveur = '', $requeter = true) { |
| 1024 | - if (!$t) { |
|
| 1025 | - $t = MYSQLI_ASSOC; |
|
| 1026 | - } |
|
| 1027 | - if ($r) { |
|
| 1028 | - return mysqli_fetch_array($r, $t); |
|
| 1029 | - } |
|
| 1024 | + if (!$t) { |
|
| 1025 | + $t = MYSQLI_ASSOC; |
|
| 1026 | + } |
|
| 1027 | + if ($r) { |
|
| 1028 | + return mysqli_fetch_array($r, $t); |
|
| 1029 | + } |
|
| 1030 | 1030 | } |
| 1031 | 1031 | |
| 1032 | 1032 | /** |
@@ -1039,9 +1039,9 @@ discard block |
||
| 1039 | 1039 | * @return bool True si déplacement réussi, false sinon. |
| 1040 | 1040 | **/ |
| 1041 | 1041 | function spip_mysql_seek($r, $row_number, $serveur = '', $requeter = true) { |
| 1042 | - if ($r and mysqli_num_rows($r)) { |
|
| 1043 | - return mysqli_data_seek($r, $row_number); |
|
| 1044 | - } |
|
| 1042 | + if ($r and mysqli_num_rows($r)) { |
|
| 1043 | + return mysqli_data_seek($r, $row_number); |
|
| 1044 | + } |
|
| 1045 | 1045 | } |
| 1046 | 1046 | |
| 1047 | 1047 | |
@@ -1059,26 +1059,26 @@ discard block |
||
| 1059 | 1059 | * - int Nombre de lignes (0 si la requête n'a pas réussie) |
| 1060 | 1060 | **/ |
| 1061 | 1061 | function spip_mysql_countsel( |
| 1062 | - $from = [], |
|
| 1063 | - $where = [], |
|
| 1064 | - $groupby = '', |
|
| 1065 | - $having = [], |
|
| 1066 | - $serveur = '', |
|
| 1067 | - $requeter = true |
|
| 1062 | + $from = [], |
|
| 1063 | + $where = [], |
|
| 1064 | + $groupby = '', |
|
| 1065 | + $having = [], |
|
| 1066 | + $serveur = '', |
|
| 1067 | + $requeter = true |
|
| 1068 | 1068 | ) { |
| 1069 | - $c = !$groupby ? '*' : ('DISTINCT ' . (is_string($groupby) ? $groupby : join(',', $groupby))); |
|
| 1070 | - |
|
| 1071 | - $r = spip_mysql_select("COUNT($c)", $from, $where, '', '', '', $having, $serveur, $requeter); |
|
| 1072 | - if (!$requeter) { |
|
| 1073 | - return $r; |
|
| 1074 | - } |
|
| 1075 | - if (!$r instanceof mysqli_result) { |
|
| 1076 | - return 0; |
|
| 1077 | - } |
|
| 1078 | - [$c] = mysqli_fetch_array($r, MYSQLI_NUM); |
|
| 1079 | - mysqli_free_result($r); |
|
| 1080 | - |
|
| 1081 | - return $c; |
|
| 1069 | + $c = !$groupby ? '*' : ('DISTINCT ' . (is_string($groupby) ? $groupby : join(',', $groupby))); |
|
| 1070 | + |
|
| 1071 | + $r = spip_mysql_select("COUNT($c)", $from, $where, '', '', '', $having, $serveur, $requeter); |
|
| 1072 | + if (!$requeter) { |
|
| 1073 | + return $r; |
|
| 1074 | + } |
|
| 1075 | + if (!$r instanceof mysqli_result) { |
|
| 1076 | + return 0; |
|
| 1077 | + } |
|
| 1078 | + [$c] = mysqli_fetch_array($r, MYSQLI_NUM); |
|
| 1079 | + mysqli_free_result($r); |
|
| 1080 | + |
|
| 1081 | + return $c; |
|
| 1082 | 1082 | } |
| 1083 | 1083 | |
| 1084 | 1084 | |
@@ -1101,16 +1101,16 @@ discard block |
||
| 1101 | 1101 | * Erreur eventuelle |
| 1102 | 1102 | **/ |
| 1103 | 1103 | function spip_mysql_error($query = '', $serveur = '', $requeter = true) { |
| 1104 | - $link = $GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]['link']; |
|
| 1105 | - $s = mysqli_error($link); |
|
| 1106 | - if ($s) { |
|
| 1107 | - $trace = debug_backtrace(); |
|
| 1108 | - if ($trace[0]['function'] != 'spip_mysql_error') { |
|
| 1109 | - spip_log("$s - $query - " . sql_error_backtrace(), 'mysql.' . _LOG_ERREUR); |
|
| 1110 | - } |
|
| 1111 | - } |
|
| 1112 | - |
|
| 1113 | - return $s; |
|
| 1104 | + $link = $GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]['link']; |
|
| 1105 | + $s = mysqli_error($link); |
|
| 1106 | + if ($s) { |
|
| 1107 | + $trace = debug_backtrace(); |
|
| 1108 | + if ($trace[0]['function'] != 'spip_mysql_error') { |
|
| 1109 | + spip_log("$s - $query - " . sql_error_backtrace(), 'mysql.' . _LOG_ERREUR); |
|
| 1110 | + } |
|
| 1111 | + } |
|
| 1112 | + |
|
| 1113 | + return $s; |
|
| 1114 | 1114 | } |
| 1115 | 1115 | |
| 1116 | 1116 | |
@@ -1125,18 +1125,18 @@ discard block |
||
| 1125 | 1125 | * 0, pas d'erreur. Autre, numéro de l'erreur. |
| 1126 | 1126 | **/ |
| 1127 | 1127 | function spip_mysql_errno($serveur = '', $requeter = true) { |
| 1128 | - $link = $GLOBALS['connexions'][$serveur ?: 0]['link']; |
|
| 1129 | - $s = mysqli_errno($link); |
|
| 1130 | - // 2006 MySQL server has gone away |
|
| 1131 | - // 2013 Lost connection to MySQL server during query |
|
| 1132 | - if (in_array($s, [2006, 2013])) { |
|
| 1133 | - define('spip_interdire_cache', true); |
|
| 1134 | - } |
|
| 1135 | - if ($s) { |
|
| 1136 | - spip_log("Erreur mysql $s", _LOG_ERREUR); |
|
| 1137 | - } |
|
| 1138 | - |
|
| 1139 | - return $s; |
|
| 1128 | + $link = $GLOBALS['connexions'][$serveur ?: 0]['link']; |
|
| 1129 | + $s = mysqli_errno($link); |
|
| 1130 | + // 2006 MySQL server has gone away |
|
| 1131 | + // 2013 Lost connection to MySQL server during query |
|
| 1132 | + if (in_array($s, [2006, 2013])) { |
|
| 1133 | + define('spip_interdire_cache', true); |
|
| 1134 | + } |
|
| 1135 | + if ($s) { |
|
| 1136 | + spip_log("Erreur mysql $s", _LOG_ERREUR); |
|
| 1137 | + } |
|
| 1138 | + |
|
| 1139 | + return $s; |
|
| 1140 | 1140 | } |
| 1141 | 1141 | |
| 1142 | 1142 | |
@@ -1150,9 +1150,9 @@ discard block |
||
| 1150 | 1150 | * @return int Nombre de lignes |
| 1151 | 1151 | */ |
| 1152 | 1152 | function spip_mysql_count($r, $serveur = '', $requeter = true) { |
| 1153 | - if ($r) { |
|
| 1154 | - return mysqli_num_rows($r); |
|
| 1155 | - } |
|
| 1153 | + if ($r) { |
|
| 1154 | + return mysqli_num_rows($r); |
|
| 1155 | + } |
|
| 1156 | 1156 | } |
| 1157 | 1157 | |
| 1158 | 1158 | |
@@ -1168,7 +1168,7 @@ discard block |
||
| 1168 | 1168 | * @return bool True si réussi |
| 1169 | 1169 | */ |
| 1170 | 1170 | function spip_mysql_free($r, $serveur = '', $requeter = true) { |
| 1171 | - return (($r instanceof mysqli_result) ? mysqli_free_result($r) : false); |
|
| 1171 | + return (($r instanceof mysqli_result) ? mysqli_free_result($r) : false); |
|
| 1172 | 1172 | } |
| 1173 | 1173 | |
| 1174 | 1174 | |
@@ -1196,59 +1196,59 @@ discard block |
||
| 1196 | 1196 | **/ |
| 1197 | 1197 | function spip_mysql_insert($table, $champs, $valeurs, $desc = [], $serveur = '', $requeter = true) { |
| 1198 | 1198 | |
| 1199 | - $e = null; |
|
| 1200 | - $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 1201 | - $link = $connexion['link']; |
|
| 1202 | - $table = prefixer_table_spip($table, $connexion['prefixe']); |
|
| 1203 | - |
|
| 1204 | - // remplacer les emoji (que mysql ne sait pas gérer) en 💩 |
|
| 1205 | - if ( |
|
| 1206 | - defined('_MYSQL_NOPLANES') |
|
| 1207 | - and _MYSQL_NOPLANES |
|
| 1208 | - and !empty($GLOBALS['meta']['charset_sql_connexion']) |
|
| 1209 | - and $GLOBALS['meta']['charset_sql_connexion'] == 'utf8' |
|
| 1210 | - ) { |
|
| 1211 | - include_spip('inc/charsets'); |
|
| 1212 | - $valeurs = utf8_noplanes($valeurs); |
|
| 1213 | - } |
|
| 1214 | - |
|
| 1215 | - $query = "INSERT INTO $table $champs VALUES $valeurs"; |
|
| 1216 | - if (!$requeter) { |
|
| 1217 | - return $query; |
|
| 1218 | - } |
|
| 1219 | - |
|
| 1220 | - if (isset($_GET['var_profile'])) { |
|
| 1221 | - include_spip('public/tracer'); |
|
| 1222 | - $t = trace_query_start(); |
|
| 1223 | - $e = ''; |
|
| 1224 | - } else { |
|
| 1225 | - $t = 0; |
|
| 1226 | - } |
|
| 1227 | - |
|
| 1228 | - $connexion['last'] = $query; |
|
| 1229 | - #spip_log($query, 'mysql.'._LOG_DEBUG); |
|
| 1230 | - $r = false; |
|
| 1231 | - $insert = false; |
|
| 1232 | - try { |
|
| 1233 | - $insert = mysqli_query($link, $query); |
|
| 1234 | - } catch (\mysqli_sql_exception $e) { |
|
| 1235 | - spip_log('mysqli_sql_exception: ' . $e->getMessage(), 'mysql.' . _LOG_DEBUG); |
|
| 1236 | - // TODO: utiliser l’exception ensuite plutôt que les appels à spip_mysql_errno() |
|
| 1237 | - // mais il faut pour php < 8.1 forcer les exeptions via mysqli_report(). |
|
| 1238 | - } |
|
| 1239 | - if ($insert) { |
|
| 1240 | - $r = mysqli_insert_id($link); |
|
| 1241 | - } else { |
|
| 1242 | - // Log de l'erreur eventuelle |
|
| 1243 | - if ($e = spip_mysql_errno($serveur)) { |
|
| 1244 | - // et du fautif |
|
| 1245 | - $e .= spip_mysql_error($query, $serveur); |
|
| 1246 | - } |
|
| 1247 | - } |
|
| 1248 | - |
|
| 1249 | - return $t ? trace_query_end($query, $t, $r, $e, $serveur) : $r; |
|
| 1250 | - |
|
| 1251 | - // return $r ? $r : (($r===0) ? -1 : 0); pb avec le multi-base. |
|
| 1199 | + $e = null; |
|
| 1200 | + $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 1201 | + $link = $connexion['link']; |
|
| 1202 | + $table = prefixer_table_spip($table, $connexion['prefixe']); |
|
| 1203 | + |
|
| 1204 | + // remplacer les emoji (que mysql ne sait pas gérer) en 💩 |
|
| 1205 | + if ( |
|
| 1206 | + defined('_MYSQL_NOPLANES') |
|
| 1207 | + and _MYSQL_NOPLANES |
|
| 1208 | + and !empty($GLOBALS['meta']['charset_sql_connexion']) |
|
| 1209 | + and $GLOBALS['meta']['charset_sql_connexion'] == 'utf8' |
|
| 1210 | + ) { |
|
| 1211 | + include_spip('inc/charsets'); |
|
| 1212 | + $valeurs = utf8_noplanes($valeurs); |
|
| 1213 | + } |
|
| 1214 | + |
|
| 1215 | + $query = "INSERT INTO $table $champs VALUES $valeurs"; |
|
| 1216 | + if (!$requeter) { |
|
| 1217 | + return $query; |
|
| 1218 | + } |
|
| 1219 | + |
|
| 1220 | + if (isset($_GET['var_profile'])) { |
|
| 1221 | + include_spip('public/tracer'); |
|
| 1222 | + $t = trace_query_start(); |
|
| 1223 | + $e = ''; |
|
| 1224 | + } else { |
|
| 1225 | + $t = 0; |
|
| 1226 | + } |
|
| 1227 | + |
|
| 1228 | + $connexion['last'] = $query; |
|
| 1229 | + #spip_log($query, 'mysql.'._LOG_DEBUG); |
|
| 1230 | + $r = false; |
|
| 1231 | + $insert = false; |
|
| 1232 | + try { |
|
| 1233 | + $insert = mysqli_query($link, $query); |
|
| 1234 | + } catch (\mysqli_sql_exception $e) { |
|
| 1235 | + spip_log('mysqli_sql_exception: ' . $e->getMessage(), 'mysql.' . _LOG_DEBUG); |
|
| 1236 | + // TODO: utiliser l’exception ensuite plutôt que les appels à spip_mysql_errno() |
|
| 1237 | + // mais il faut pour php < 8.1 forcer les exeptions via mysqli_report(). |
|
| 1238 | + } |
|
| 1239 | + if ($insert) { |
|
| 1240 | + $r = mysqli_insert_id($link); |
|
| 1241 | + } else { |
|
| 1242 | + // Log de l'erreur eventuelle |
|
| 1243 | + if ($e = spip_mysql_errno($serveur)) { |
|
| 1244 | + // et du fautif |
|
| 1245 | + $e .= spip_mysql_error($query, $serveur); |
|
| 1246 | + } |
|
| 1247 | + } |
|
| 1248 | + |
|
| 1249 | + return $t ? trace_query_end($query, $t, $r, $e, $serveur) : $r; |
|
| 1250 | + |
|
| 1251 | + // return $r ? $r : (($r===0) ? -1 : 0); pb avec le multi-base. |
|
| 1252 | 1252 | } |
| 1253 | 1253 | |
| 1254 | 1254 | /** |
@@ -1273,26 +1273,26 @@ discard block |
||
| 1273 | 1273 | **/ |
| 1274 | 1274 | function spip_mysql_insertq($table, $couples = [], $desc = [], $serveur = '', $requeter = true) { |
| 1275 | 1275 | |
| 1276 | - if (!$desc) { |
|
| 1277 | - $desc = description_table($table, $serveur); |
|
| 1278 | - } |
|
| 1279 | - if (!$desc) { |
|
| 1280 | - $couples = []; |
|
| 1281 | - } |
|
| 1282 | - $fields = $desc['field'] ?? []; |
|
| 1283 | - |
|
| 1284 | - foreach ($couples as $champ => $val) { |
|
| 1285 | - $couples[$champ] = spip_mysql_cite($val, $fields[$champ]); |
|
| 1286 | - } |
|
| 1287 | - |
|
| 1288 | - return spip_mysql_insert( |
|
| 1289 | - $table, |
|
| 1290 | - '(' . join(',', array_keys($couples)) . ')', |
|
| 1291 | - '(' . join(',', $couples) . ')', |
|
| 1292 | - $desc, |
|
| 1293 | - $serveur, |
|
| 1294 | - $requeter |
|
| 1295 | - ); |
|
| 1276 | + if (!$desc) { |
|
| 1277 | + $desc = description_table($table, $serveur); |
|
| 1278 | + } |
|
| 1279 | + if (!$desc) { |
|
| 1280 | + $couples = []; |
|
| 1281 | + } |
|
| 1282 | + $fields = $desc['field'] ?? []; |
|
| 1283 | + |
|
| 1284 | + foreach ($couples as $champ => $val) { |
|
| 1285 | + $couples[$champ] = spip_mysql_cite($val, $fields[$champ]); |
|
| 1286 | + } |
|
| 1287 | + |
|
| 1288 | + return spip_mysql_insert( |
|
| 1289 | + $table, |
|
| 1290 | + '(' . join(',', array_keys($couples)) . ')', |
|
| 1291 | + '(' . join(',', $couples) . ')', |
|
| 1292 | + $desc, |
|
| 1293 | + $serveur, |
|
| 1294 | + $requeter |
|
| 1295 | + ); |
|
| 1296 | 1296 | } |
| 1297 | 1297 | |
| 1298 | 1298 | |
@@ -1317,34 +1317,34 @@ discard block |
||
| 1317 | 1317 | **/ |
| 1318 | 1318 | function spip_mysql_insertq_multi($table, $tab_couples = [], $desc = [], $serveur = '', $requeter = true) { |
| 1319 | 1319 | |
| 1320 | - if (!$desc) { |
|
| 1321 | - $desc = description_table($table, $serveur); |
|
| 1322 | - } |
|
| 1323 | - if (!$desc) { |
|
| 1324 | - $tab_couples = []; |
|
| 1325 | - } |
|
| 1326 | - $fields = $desc['field'] ?? []; |
|
| 1327 | - |
|
| 1328 | - $cles = '(' . join(',', array_keys(reset($tab_couples))) . ')'; |
|
| 1329 | - $valeurs = []; |
|
| 1330 | - $r = false; |
|
| 1331 | - |
|
| 1332 | - // Quoter et Inserer par groupes de 100 max pour eviter un debordement de pile |
|
| 1333 | - foreach ($tab_couples as $couples) { |
|
| 1334 | - foreach ($couples as $champ => $val) { |
|
| 1335 | - $couples[$champ] = spip_mysql_cite($val, $fields[$champ]); |
|
| 1336 | - } |
|
| 1337 | - $valeurs[] = '(' . join(',', $couples) . ')'; |
|
| 1338 | - if (count($valeurs) >= 100) { |
|
| 1339 | - $r = spip_mysql_insert($table, $cles, join(', ', $valeurs), $desc, $serveur, $requeter); |
|
| 1340 | - $valeurs = []; |
|
| 1341 | - } |
|
| 1342 | - } |
|
| 1343 | - if (count($valeurs)) { |
|
| 1344 | - $r = spip_mysql_insert($table, $cles, join(', ', $valeurs), $desc, $serveur, $requeter); |
|
| 1345 | - } |
|
| 1346 | - |
|
| 1347 | - return $r; // dans le cas d'une table auto_increment, le dernier insert_id |
|
| 1320 | + if (!$desc) { |
|
| 1321 | + $desc = description_table($table, $serveur); |
|
| 1322 | + } |
|
| 1323 | + if (!$desc) { |
|
| 1324 | + $tab_couples = []; |
|
| 1325 | + } |
|
| 1326 | + $fields = $desc['field'] ?? []; |
|
| 1327 | + |
|
| 1328 | + $cles = '(' . join(',', array_keys(reset($tab_couples))) . ')'; |
|
| 1329 | + $valeurs = []; |
|
| 1330 | + $r = false; |
|
| 1331 | + |
|
| 1332 | + // Quoter et Inserer par groupes de 100 max pour eviter un debordement de pile |
|
| 1333 | + foreach ($tab_couples as $couples) { |
|
| 1334 | + foreach ($couples as $champ => $val) { |
|
| 1335 | + $couples[$champ] = spip_mysql_cite($val, $fields[$champ]); |
|
| 1336 | + } |
|
| 1337 | + $valeurs[] = '(' . join(',', $couples) . ')'; |
|
| 1338 | + if (count($valeurs) >= 100) { |
|
| 1339 | + $r = spip_mysql_insert($table, $cles, join(', ', $valeurs), $desc, $serveur, $requeter); |
|
| 1340 | + $valeurs = []; |
|
| 1341 | + } |
|
| 1342 | + } |
|
| 1343 | + if (count($valeurs)) { |
|
| 1344 | + $r = spip_mysql_insert($table, $cles, join(', ', $valeurs), $desc, $serveur, $requeter); |
|
| 1345 | + } |
|
| 1346 | + |
|
| 1347 | + return $r; // dans le cas d'une table auto_increment, le dernier insert_id |
|
| 1348 | 1348 | } |
| 1349 | 1349 | |
| 1350 | 1350 | /** |
@@ -1369,19 +1369,19 @@ discard block |
||
| 1369 | 1369 | * - array Tableau décrivant la requête et son temps d'exécution si var_profile est actif |
| 1370 | 1370 | */ |
| 1371 | 1371 | function spip_mysql_update($table, $champs, $where = '', $desc = [], $serveur = '', $requeter = true) { |
| 1372 | - $set = []; |
|
| 1373 | - foreach ($champs as $champ => $val) { |
|
| 1374 | - $set[] = $champ . "=$val"; |
|
| 1375 | - } |
|
| 1376 | - if (!empty($set)) { |
|
| 1377 | - return spip_mysql_query( |
|
| 1378 | - calculer_mysql_expression('UPDATE', $table, ',') |
|
| 1379 | - . calculer_mysql_expression('SET', $set, ',') |
|
| 1380 | - . calculer_mysql_expression('WHERE', $where), |
|
| 1381 | - $serveur, |
|
| 1382 | - $requeter |
|
| 1383 | - ); |
|
| 1384 | - } |
|
| 1372 | + $set = []; |
|
| 1373 | + foreach ($champs as $champ => $val) { |
|
| 1374 | + $set[] = $champ . "=$val"; |
|
| 1375 | + } |
|
| 1376 | + if (!empty($set)) { |
|
| 1377 | + return spip_mysql_query( |
|
| 1378 | + calculer_mysql_expression('UPDATE', $table, ',') |
|
| 1379 | + . calculer_mysql_expression('SET', $set, ',') |
|
| 1380 | + . calculer_mysql_expression('WHERE', $where), |
|
| 1381 | + $serveur, |
|
| 1382 | + $requeter |
|
| 1383 | + ); |
|
| 1384 | + } |
|
| 1385 | 1385 | } |
| 1386 | 1386 | |
| 1387 | 1387 | /** |
@@ -1414,29 +1414,29 @@ discard block |
||
| 1414 | 1414 | */ |
| 1415 | 1415 | function spip_mysql_updateq($table, $champs, $where = '', $desc = [], $serveur = '', $requeter = true) { |
| 1416 | 1416 | |
| 1417 | - if (!$champs) { |
|
| 1418 | - return; |
|
| 1419 | - } |
|
| 1420 | - if (!$desc) { |
|
| 1421 | - $desc = description_table($table, $serveur); |
|
| 1422 | - } |
|
| 1423 | - if (!$desc) { |
|
| 1424 | - $champs = []; |
|
| 1425 | - } else { |
|
| 1426 | - $fields = $desc['field']; |
|
| 1427 | - } |
|
| 1428 | - $set = []; |
|
| 1429 | - foreach ($champs as $champ => $val) { |
|
| 1430 | - $set[] = $champ . '=' . spip_mysql_cite($val, @$fields[$champ]); |
|
| 1431 | - } |
|
| 1432 | - |
|
| 1433 | - return spip_mysql_query( |
|
| 1434 | - calculer_mysql_expression('UPDATE', $table, ',') |
|
| 1435 | - . calculer_mysql_expression('SET', $set, ',') |
|
| 1436 | - . calculer_mysql_expression('WHERE', $where), |
|
| 1437 | - $serveur, |
|
| 1438 | - $requeter |
|
| 1439 | - ); |
|
| 1417 | + if (!$champs) { |
|
| 1418 | + return; |
|
| 1419 | + } |
|
| 1420 | + if (!$desc) { |
|
| 1421 | + $desc = description_table($table, $serveur); |
|
| 1422 | + } |
|
| 1423 | + if (!$desc) { |
|
| 1424 | + $champs = []; |
|
| 1425 | + } else { |
|
| 1426 | + $fields = $desc['field']; |
|
| 1427 | + } |
|
| 1428 | + $set = []; |
|
| 1429 | + foreach ($champs as $champ => $val) { |
|
| 1430 | + $set[] = $champ . '=' . spip_mysql_cite($val, @$fields[$champ]); |
|
| 1431 | + } |
|
| 1432 | + |
|
| 1433 | + return spip_mysql_query( |
|
| 1434 | + calculer_mysql_expression('UPDATE', $table, ',') |
|
| 1435 | + . calculer_mysql_expression('SET', $set, ',') |
|
| 1436 | + . calculer_mysql_expression('WHERE', $where), |
|
| 1437 | + $serveur, |
|
| 1438 | + $requeter |
|
| 1439 | + ); |
|
| 1440 | 1440 | } |
| 1441 | 1441 | |
| 1442 | 1442 | /** |
@@ -1452,22 +1452,22 @@ discard block |
||
| 1452 | 1452 | * - False en cas d'erreur. |
| 1453 | 1453 | **/ |
| 1454 | 1454 | function spip_mysql_delete($table, $where = '', $serveur = '', $requeter = true) { |
| 1455 | - $res = spip_mysql_query( |
|
| 1456 | - calculer_mysql_expression('DELETE FROM', $table, ',') |
|
| 1457 | - . calculer_mysql_expression('WHERE', $where), |
|
| 1458 | - $serveur, |
|
| 1459 | - $requeter |
|
| 1460 | - ); |
|
| 1461 | - if (!$requeter) { |
|
| 1462 | - return $res; |
|
| 1463 | - } |
|
| 1464 | - if ($res) { |
|
| 1465 | - $link = _mysql_link($serveur); |
|
| 1466 | - |
|
| 1467 | - return mysqli_affected_rows($link); |
|
| 1468 | - } else { |
|
| 1469 | - return false; |
|
| 1470 | - } |
|
| 1455 | + $res = spip_mysql_query( |
|
| 1456 | + calculer_mysql_expression('DELETE FROM', $table, ',') |
|
| 1457 | + . calculer_mysql_expression('WHERE', $where), |
|
| 1458 | + $serveur, |
|
| 1459 | + $requeter |
|
| 1460 | + ); |
|
| 1461 | + if (!$requeter) { |
|
| 1462 | + return $res; |
|
| 1463 | + } |
|
| 1464 | + if ($res) { |
|
| 1465 | + $link = _mysql_link($serveur); |
|
| 1466 | + |
|
| 1467 | + return mysqli_affected_rows($link); |
|
| 1468 | + } else { |
|
| 1469 | + return false; |
|
| 1470 | + } |
|
| 1471 | 1471 | } |
| 1472 | 1472 | |
| 1473 | 1473 | |
@@ -1496,10 +1496,10 @@ discard block |
||
| 1496 | 1496 | * - False en cas d'erreur. |
| 1497 | 1497 | **/ |
| 1498 | 1498 | function spip_mysql_replace($table, $couples, $desc = [], $serveur = '', $requeter = true) { |
| 1499 | - return spip_mysql_query("REPLACE $table (" . join(',', array_keys($couples)) . ') VALUES (' . join( |
|
| 1500 | - ',', |
|
| 1501 | - array_map('_q', $couples) |
|
| 1502 | - ) . ')', $serveur, $requeter); |
|
| 1499 | + return spip_mysql_query("REPLACE $table (" . join(',', array_keys($couples)) . ') VALUES (' . join( |
|
| 1500 | + ',', |
|
| 1501 | + array_map('_q', $couples) |
|
| 1502 | + ) . ')', $serveur, $requeter); |
|
| 1503 | 1503 | } |
| 1504 | 1504 | |
| 1505 | 1505 | |
@@ -1528,14 +1528,14 @@ discard block |
||
| 1528 | 1528 | * - False en cas d'erreur. |
| 1529 | 1529 | **/ |
| 1530 | 1530 | function spip_mysql_replace_multi($table, $tab_couples, $desc = [], $serveur = '', $requeter = true) { |
| 1531 | - $cles = '(' . join(',', array_keys($tab_couples[0])) . ')'; |
|
| 1532 | - $valeurs = []; |
|
| 1533 | - foreach ($tab_couples as $couples) { |
|
| 1534 | - $valeurs[] = '(' . join(',', array_map('_q', $couples)) . ')'; |
|
| 1535 | - } |
|
| 1536 | - $valeurs = implode(', ', $valeurs); |
|
| 1537 | - |
|
| 1538 | - return spip_mysql_query("REPLACE $table $cles VALUES $valeurs", $serveur, $requeter); |
|
| 1531 | + $cles = '(' . join(',', array_keys($tab_couples[0])) . ')'; |
|
| 1532 | + $valeurs = []; |
|
| 1533 | + foreach ($tab_couples as $couples) { |
|
| 1534 | + $valeurs[] = '(' . join(',', array_map('_q', $couples)) . ')'; |
|
| 1535 | + } |
|
| 1536 | + $valeurs = implode(', ', $valeurs); |
|
| 1537 | + |
|
| 1538 | + return spip_mysql_query("REPLACE $table $cles VALUES $valeurs", $serveur, $requeter); |
|
| 1539 | 1539 | } |
| 1540 | 1540 | |
| 1541 | 1541 | |
@@ -1550,32 +1550,32 @@ discard block |
||
| 1550 | 1550 | * @return string Texte de sélection pour la requête |
| 1551 | 1551 | */ |
| 1552 | 1552 | function spip_mysql_multi($objet, $lang) { |
| 1553 | - $lengthlang = strlen("[$lang]"); |
|
| 1554 | - $posmulti = 'INSTR(' . $objet . ", '<multi>')"; |
|
| 1555 | - $posfinmulti = 'INSTR(' . $objet . ", '</multi>')"; |
|
| 1556 | - $debutchaine = 'LEFT(' . $objet . ", $posmulti-1)"; |
|
| 1557 | - $finchaine = 'RIGHT(' . $objet . ', CHAR_LENGTH(' . $objet . ") -(7+$posfinmulti))"; |
|
| 1558 | - $chainemulti = 'TRIM(SUBSTRING(' . $objet . ", $posmulti+7, $posfinmulti -(7+$posmulti)))"; |
|
| 1559 | - $poslang = "INSTR($chainemulti,'[" . $lang . "]')"; |
|
| 1560 | - $poslang = "IF($poslang=0,INSTR($chainemulti,']')+1,$poslang+$lengthlang)"; |
|
| 1561 | - $chainelang = 'TRIM(SUBSTRING(' . $objet . ", $posmulti+7+$poslang-1,$posfinmulti -($posmulti+7+$poslang-1) ))"; |
|
| 1562 | - $posfinlang = 'INSTR(' . $chainelang . ", '[')"; |
|
| 1563 | - $chainelang = "IF($posfinlang>0,LEFT($chainelang,$posfinlang-1),$chainelang)"; |
|
| 1564 | - //$chainelang = "LEFT($chainelang,$posfinlang-1)"; |
|
| 1565 | - $retour = "(TRIM(IF($posmulti = 0 , " . |
|
| 1566 | - ' TRIM(' . $objet . '), ' . |
|
| 1567 | - ' CONCAT( ' . |
|
| 1568 | - " $debutchaine, " . |
|
| 1569 | - ' IF( ' . |
|
| 1570 | - " $poslang = 0, " . |
|
| 1571 | - " $chainemulti, " . |
|
| 1572 | - " $chainelang" . |
|
| 1573 | - ' ), ' . |
|
| 1574 | - " $finchaine" . |
|
| 1575 | - ' ) ' . |
|
| 1576 | - '))) AS multi'; |
|
| 1577 | - |
|
| 1578 | - return $retour; |
|
| 1553 | + $lengthlang = strlen("[$lang]"); |
|
| 1554 | + $posmulti = 'INSTR(' . $objet . ", '<multi>')"; |
|
| 1555 | + $posfinmulti = 'INSTR(' . $objet . ", '</multi>')"; |
|
| 1556 | + $debutchaine = 'LEFT(' . $objet . ", $posmulti-1)"; |
|
| 1557 | + $finchaine = 'RIGHT(' . $objet . ', CHAR_LENGTH(' . $objet . ") -(7+$posfinmulti))"; |
|
| 1558 | + $chainemulti = 'TRIM(SUBSTRING(' . $objet . ", $posmulti+7, $posfinmulti -(7+$posmulti)))"; |
|
| 1559 | + $poslang = "INSTR($chainemulti,'[" . $lang . "]')"; |
|
| 1560 | + $poslang = "IF($poslang=0,INSTR($chainemulti,']')+1,$poslang+$lengthlang)"; |
|
| 1561 | + $chainelang = 'TRIM(SUBSTRING(' . $objet . ", $posmulti+7+$poslang-1,$posfinmulti -($posmulti+7+$poslang-1) ))"; |
|
| 1562 | + $posfinlang = 'INSTR(' . $chainelang . ", '[')"; |
|
| 1563 | + $chainelang = "IF($posfinlang>0,LEFT($chainelang,$posfinlang-1),$chainelang)"; |
|
| 1564 | + //$chainelang = "LEFT($chainelang,$posfinlang-1)"; |
|
| 1565 | + $retour = "(TRIM(IF($posmulti = 0 , " . |
|
| 1566 | + ' TRIM(' . $objet . '), ' . |
|
| 1567 | + ' CONCAT( ' . |
|
| 1568 | + " $debutchaine, " . |
|
| 1569 | + ' IF( ' . |
|
| 1570 | + " $poslang = 0, " . |
|
| 1571 | + " $chainemulti, " . |
|
| 1572 | + " $chainelang" . |
|
| 1573 | + ' ), ' . |
|
| 1574 | + " $finchaine" . |
|
| 1575 | + ' ) ' . |
|
| 1576 | + '))) AS multi'; |
|
| 1577 | + |
|
| 1578 | + return $retour; |
|
| 1579 | 1579 | } |
| 1580 | 1580 | |
| 1581 | 1581 | /** |
@@ -1589,7 +1589,7 @@ discard block |
||
| 1589 | 1589 | * Valeur hexadécimale pour MySQL |
| 1590 | 1590 | **/ |
| 1591 | 1591 | function spip_mysql_hex($v) { |
| 1592 | - return '0x' . $v; |
|
| 1592 | + return '0x' . $v; |
|
| 1593 | 1593 | } |
| 1594 | 1594 | |
| 1595 | 1595 | /** |
@@ -1605,15 +1605,15 @@ discard block |
||
| 1605 | 1605 | * Donnée prête à être utilisée par le gestionnaire SQL |
| 1606 | 1606 | */ |
| 1607 | 1607 | function spip_mysql_quote($v, $type = '') { |
| 1608 | - if (!is_array($v)) { |
|
| 1609 | - return spip_mysql_cite($v, $type); |
|
| 1610 | - } |
|
| 1611 | - |
|
| 1612 | - // si c'est un tableau, le parcourir en propageant le type |
|
| 1613 | - foreach ($v as $k => $r) { |
|
| 1614 | - $v[$k] = spip_mysql_quote($r, $type); |
|
| 1615 | - } |
|
| 1616 | - return implode(',', $v); |
|
| 1608 | + if (!is_array($v)) { |
|
| 1609 | + return spip_mysql_cite($v, $type); |
|
| 1610 | + } |
|
| 1611 | + |
|
| 1612 | + // si c'est un tableau, le parcourir en propageant le type |
|
| 1613 | + foreach ($v as $k => $r) { |
|
| 1614 | + $v[$k] = spip_mysql_quote($r, $type); |
|
| 1615 | + } |
|
| 1616 | + return implode(',', $v); |
|
| 1617 | 1617 | } |
| 1618 | 1618 | |
| 1619 | 1619 | /** |
@@ -1629,18 +1629,18 @@ discard block |
||
| 1629 | 1629 | * Expression SQL |
| 1630 | 1630 | **/ |
| 1631 | 1631 | function spip_mysql_date_proche($champ, $interval, $unite) { |
| 1632 | - $use_now = ( ($champ === 'maj' or strpos($champ, '.maj')) ? true : false ); |
|
| 1633 | - return '(' |
|
| 1634 | - . $champ |
|
| 1635 | - . (($interval <= 0) ? '>' : '<') |
|
| 1636 | - . (($interval <= 0) ? 'DATE_SUB' : 'DATE_ADD') |
|
| 1637 | - . '(' |
|
| 1638 | - . ($use_now ? 'NOW()' : sql_quote(date('Y-m-d H:i:s'))) |
|
| 1639 | - . ', INTERVAL ' |
|
| 1640 | - . (($interval > 0) ? $interval : (0 - $interval)) |
|
| 1641 | - . ' ' |
|
| 1642 | - . $unite |
|
| 1643 | - . '))'; |
|
| 1632 | + $use_now = ( ($champ === 'maj' or strpos($champ, '.maj')) ? true : false ); |
|
| 1633 | + return '(' |
|
| 1634 | + . $champ |
|
| 1635 | + . (($interval <= 0) ? '>' : '<') |
|
| 1636 | + . (($interval <= 0) ? 'DATE_SUB' : 'DATE_ADD') |
|
| 1637 | + . '(' |
|
| 1638 | + . ($use_now ? 'NOW()' : sql_quote(date('Y-m-d H:i:s'))) |
|
| 1639 | + . ', INTERVAL ' |
|
| 1640 | + . (($interval > 0) ? $interval : (0 - $interval)) |
|
| 1641 | + . ' ' |
|
| 1642 | + . $unite |
|
| 1643 | + . '))'; |
|
| 1644 | 1644 | } |
| 1645 | 1645 | |
| 1646 | 1646 | |
@@ -1664,7 +1664,7 @@ discard block |
||
| 1664 | 1664 | * Expression de requête SQL |
| 1665 | 1665 | **/ |
| 1666 | 1666 | function spip_mysql_in($val, $valeurs, $not = '', $serveur = '', $requeter = true) { |
| 1667 | - return "($val $not IN ($valeurs))"; |
|
| 1667 | + return "($val $not IN ($valeurs))"; |
|
| 1668 | 1668 | } |
| 1669 | 1669 | |
| 1670 | 1670 | |
@@ -1676,39 +1676,39 @@ discard block |
||
| 1676 | 1676 | * @return string|number Texte ou nombre échappé |
| 1677 | 1677 | */ |
| 1678 | 1678 | function spip_mysql_cite($v, $type) { |
| 1679 | - if (!$type) { |
|
| 1680 | - if (is_bool($v)) { |
|
| 1681 | - return strval(intval($v)); |
|
| 1682 | - } elseif (is_numeric($v)) { |
|
| 1683 | - return strval($v); |
|
| 1684 | - } elseif ($v === null) { |
|
| 1685 | - return "''"; |
|
| 1686 | - } |
|
| 1687 | - return "'" . addslashes($v) . "'"; |
|
| 1688 | - } |
|
| 1689 | - |
|
| 1690 | - if ($v === null) { |
|
| 1691 | - if (stripos($type, 'NOT NULL') === false) { |
|
| 1692 | - // null php se traduit en NULL SQL |
|
| 1693 | - return 'NULL'; |
|
| 1694 | - } else { |
|
| 1695 | - return "''"; |
|
| 1696 | - } |
|
| 1697 | - } elseif (sql_test_date($type) and preg_match('/^\w+\(/', $v)) { |
|
| 1698 | - return $v; |
|
| 1699 | - } elseif (sql_test_int($type)) { |
|
| 1700 | - if ( |
|
| 1701 | - is_numeric($v) |
|
| 1702 | - or ($v and ctype_xdigit(substr($v, 2)) and $v[0] === '0' and $v[1] === 'x') |
|
| 1703 | - ) { |
|
| 1704 | - return $v; |
|
| 1705 | - } else { |
|
| 1706 | - // si pas numerique, forcer le intval |
|
| 1707 | - return intval($v); |
|
| 1708 | - } |
|
| 1709 | - } |
|
| 1710 | - |
|
| 1711 | - return ("'" . addslashes($v) . "'"); |
|
| 1679 | + if (!$type) { |
|
| 1680 | + if (is_bool($v)) { |
|
| 1681 | + return strval(intval($v)); |
|
| 1682 | + } elseif (is_numeric($v)) { |
|
| 1683 | + return strval($v); |
|
| 1684 | + } elseif ($v === null) { |
|
| 1685 | + return "''"; |
|
| 1686 | + } |
|
| 1687 | + return "'" . addslashes($v) . "'"; |
|
| 1688 | + } |
|
| 1689 | + |
|
| 1690 | + if ($v === null) { |
|
| 1691 | + if (stripos($type, 'NOT NULL') === false) { |
|
| 1692 | + // null php se traduit en NULL SQL |
|
| 1693 | + return 'NULL'; |
|
| 1694 | + } else { |
|
| 1695 | + return "''"; |
|
| 1696 | + } |
|
| 1697 | + } elseif (sql_test_date($type) and preg_match('/^\w+\(/', $v)) { |
|
| 1698 | + return $v; |
|
| 1699 | + } elseif (sql_test_int($type)) { |
|
| 1700 | + if ( |
|
| 1701 | + is_numeric($v) |
|
| 1702 | + or ($v and ctype_xdigit(substr($v, 2)) and $v[0] === '0' and $v[1] === 'x') |
|
| 1703 | + ) { |
|
| 1704 | + return $v; |
|
| 1705 | + } else { |
|
| 1706 | + // si pas numerique, forcer le intval |
|
| 1707 | + return intval($v); |
|
| 1708 | + } |
|
| 1709 | + } |
|
| 1710 | + |
|
| 1711 | + return ("'" . addslashes($v) . "'"); |
|
| 1712 | 1712 | } |
| 1713 | 1713 | |
| 1714 | 1714 | /** |
@@ -1718,7 +1718,7 @@ discard block |
||
| 1718 | 1718 | * True si on a les fonctions, false sinon |
| 1719 | 1719 | */ |
| 1720 | 1720 | function spip_versions_mysql() { |
| 1721 | - return function_exists('mysqli_query'); |
|
| 1721 | + return function_exists('mysqli_query'); |
|
| 1722 | 1722 | } |
| 1723 | 1723 | |
| 1724 | 1724 | |
@@ -1731,20 +1731,20 @@ discard block |
||
| 1731 | 1731 | * - chaîne : code compilé pour le faire désactiver par SPIP sinon |
| 1732 | 1732 | */ |
| 1733 | 1733 | function test_rappel_nom_base_mysql($server_db) { |
| 1734 | - $GLOBALS['mysql_rappel_nom_base'] = true; |
|
| 1735 | - sql_delete('spip_meta', "nom='mysql_rappel_nom_base'", $server_db); |
|
| 1736 | - $ok = spip_query("INSERT INTO spip_meta (nom,valeur) VALUES ('mysql_rappel_nom_base', 'test')", $server_db); |
|
| 1734 | + $GLOBALS['mysql_rappel_nom_base'] = true; |
|
| 1735 | + sql_delete('spip_meta', "nom='mysql_rappel_nom_base'", $server_db); |
|
| 1736 | + $ok = spip_query("INSERT INTO spip_meta (nom,valeur) VALUES ('mysql_rappel_nom_base', 'test')", $server_db); |
|
| 1737 | 1737 | |
| 1738 | - if ($ok) { |
|
| 1739 | - sql_delete('spip_meta', "nom='mysql_rappel_nom_base'", $server_db); |
|
| 1738 | + if ($ok) { |
|
| 1739 | + sql_delete('spip_meta', "nom='mysql_rappel_nom_base'", $server_db); |
|
| 1740 | 1740 | |
| 1741 | - return ''; |
|
| 1742 | - } else { |
|
| 1743 | - $GLOBALS['mysql_rappel_nom_base'] = false; |
|
| 1741 | + return ''; |
|
| 1742 | + } else { |
|
| 1743 | + $GLOBALS['mysql_rappel_nom_base'] = false; |
|
| 1744 | 1744 | |
| 1745 | - return "\$GLOBALS['mysql_rappel_nom_base'] = false; " . |
|
| 1746 | - "/* echec de test_rappel_nom_base_mysql a l'installation. */\n"; |
|
| 1747 | - } |
|
| 1745 | + return "\$GLOBALS['mysql_rappel_nom_base'] = false; " . |
|
| 1746 | + "/* echec de test_rappel_nom_base_mysql a l'installation. */\n"; |
|
| 1747 | + } |
|
| 1748 | 1748 | } |
| 1749 | 1749 | |
| 1750 | 1750 | /** |
@@ -1758,13 +1758,13 @@ discard block |
||
| 1758 | 1758 | * - chaîne : code compilé pour l'indiquer le résultat du test à SPIP |
| 1759 | 1759 | */ |
| 1760 | 1760 | function test_sql_mode_mysql($server_db) { |
| 1761 | - $res = sql_select('version() as v', '', '', '', '', '', '', $server_db); |
|
| 1762 | - $row = sql_fetch($res, $server_db); |
|
| 1763 | - if (version_compare($row['v'], '5.0.0', '>=')) { |
|
| 1764 | - defined('_MYSQL_SET_SQL_MODE') || define('_MYSQL_SET_SQL_MODE', true); |
|
| 1761 | + $res = sql_select('version() as v', '', '', '', '', '', '', $server_db); |
|
| 1762 | + $row = sql_fetch($res, $server_db); |
|
| 1763 | + if (version_compare($row['v'], '5.0.0', '>=')) { |
|
| 1764 | + defined('_MYSQL_SET_SQL_MODE') || define('_MYSQL_SET_SQL_MODE', true); |
|
| 1765 | 1765 | |
| 1766 | - return "defined('_MYSQL_SET_SQL_MODE') || define('_MYSQL_SET_SQL_MODE',true);\n"; |
|
| 1767 | - } |
|
| 1766 | + return "defined('_MYSQL_SET_SQL_MODE') || define('_MYSQL_SET_SQL_MODE',true);\n"; |
|
| 1767 | + } |
|
| 1768 | 1768 | |
| 1769 | - return ''; |
|
| 1769 | + return ''; |
|
| 1770 | 1770 | } |
@@ -58,12 +58,12 @@ discard block |
||
| 58 | 58 | $link = @mysqli_connect($host, $login, $pass); |
| 59 | 59 | } |
| 60 | 60 | } catch (\mysqli_sql_exception $e) { |
| 61 | - spip_log('mysqli_sql_exception: ' . $e->getMessage(), 'mysql.' . _LOG_DEBUG); |
|
| 61 | + spip_log('mysqli_sql_exception: '.$e->getMessage(), 'mysql.'._LOG_DEBUG); |
|
| 62 | 62 | $link = false; |
| 63 | 63 | } |
| 64 | 64 | |
| 65 | 65 | if (!$link) { |
| 66 | - spip_log('Echec mysqli_connect. Erreur : ' . mysqli_connect_error(), 'mysql.' . _LOG_HS); |
|
| 66 | + spip_log('Echec mysqli_connect. Erreur : '.mysqli_connect_error(), 'mysql.'._LOG_HS); |
|
| 67 | 67 | |
| 68 | 68 | return false; |
| 69 | 69 | } |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | } |
| 83 | 83 | |
| 84 | 84 | spip_log( |
| 85 | - "Connexion MySQLi vers $host, base $db, prefixe $prefixe " . ($ok ? 'operationnelle' : 'impossible'), |
|
| 85 | + "Connexion MySQLi vers $host, base $db, prefixe $prefixe ".($ok ? 'operationnelle' : 'impossible'), |
|
| 86 | 86 | _LOG_DEBUG |
| 87 | 87 | ); |
| 88 | 88 | |
@@ -173,9 +173,9 @@ discard block |
||
| 173 | 173 | */ |
| 174 | 174 | function spip_mysql_set_charset($charset, $serveur = '', $requeter = true) { |
| 175 | 175 | $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
| 176 | - spip_log('changement de charset sql : ' . 'SET NAMES ' . _q($charset), _LOG_DEBUG); |
|
| 176 | + spip_log('changement de charset sql : '.'SET NAMES '._q($charset), _LOG_DEBUG); |
|
| 177 | 177 | |
| 178 | - return mysqli_query($connexion['link'], $connexion['last'] = 'SET NAMES ' . _q($charset)); |
|
| 178 | + return mysqli_query($connexion['link'], $connexion['last'] = 'SET NAMES '._q($charset)); |
|
| 179 | 179 | } |
| 180 | 180 | |
| 181 | 181 | |
@@ -190,7 +190,7 @@ discard block |
||
| 190 | 190 | function spip_mysql_get_charset($charset = [], $serveur = '', $requeter = true) { |
| 191 | 191 | $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
| 192 | 192 | $connexion['last'] = $c = 'SHOW CHARACTER SET' |
| 193 | - . (!$charset ? '' : (' LIKE ' . _q($charset['charset']))); |
|
| 193 | + . (!$charset ? '' : (' LIKE '._q($charset['charset']))); |
|
| 194 | 194 | |
| 195 | 195 | return spip_mysql_fetch(mysqli_query($connexion['link'], $c), null, $serveur); |
| 196 | 196 | } |
@@ -234,21 +234,21 @@ discard block |
||
| 234 | 234 | $debug = ''; |
| 235 | 235 | if (defined('_DEBUG_SLOW_QUERIES') and _DEBUG_SLOW_QUERIES) { |
| 236 | 236 | if (isset($GLOBALS['debug']['aucasou'])) { |
| 237 | - [, $id, , $infos] = $GLOBALS['debug']['aucasou']; |
|
| 238 | - $debug .= "BOUCLE$id @ " . ($infos[0] ?? '') . ' | '; |
|
| 237 | + [, $id,, $infos] = $GLOBALS['debug']['aucasou']; |
|
| 238 | + $debug .= "BOUCLE$id @ ".($infos[0] ?? '').' | '; |
|
| 239 | 239 | } |
| 240 | 240 | if (isset($_SERVER['REQUEST_URI'])) { |
| 241 | 241 | $debug .= $_SERVER['REQUEST_URI']; |
| 242 | 242 | } |
| 243 | 243 | if (!empty($GLOBALS['ip'])) { |
| 244 | - $debug .= ' + ' . $GLOBALS['ip']; |
|
| 244 | + $debug .= ' + '.$GLOBALS['ip']; |
|
| 245 | 245 | } |
| 246 | - $debug = ' /* ' . mysqli_real_escape_string($link, str_replace('*/', '@/', $debug)) . ' */'; |
|
| 246 | + $debug = ' /* '.mysqli_real_escape_string($link, str_replace('*/', '@/', $debug)).' */'; |
|
| 247 | 247 | } |
| 248 | 248 | try { |
| 249 | - $r = mysqli_query($link, $query . $debug); |
|
| 249 | + $r = mysqli_query($link, $query.$debug); |
|
| 250 | 250 | } catch (\mysqli_sql_exception $e) { |
| 251 | - spip_log('mysqli_sql_exception: ' . $e->getMessage(), 'mysql.' . _LOG_DEBUG); |
|
| 251 | + spip_log('mysqli_sql_exception: '.$e->getMessage(), 'mysql.'._LOG_DEBUG); |
|
| 252 | 252 | $r = false; |
| 253 | 253 | // TODO: utiliser l’exception ensuite plutôt que les appels à spip_mysql_errno() |
| 254 | 254 | // mais il faut pour php < 8.1 forcer les exeptions via mysqli_report(). |
@@ -266,9 +266,9 @@ discard block |
||
| 266 | 266 | $link = $connexion['link']; |
| 267 | 267 | //On retente au cas où |
| 268 | 268 | try { |
| 269 | - $r = mysqli_query($link, $query . $debug); |
|
| 269 | + $r = mysqli_query($link, $query.$debug); |
|
| 270 | 270 | } catch (\mysqli_sql_exception $e) { |
| 271 | - spip_log('mysqli_sql_exception: ' . $e->getMessage(), 'mysql.' . _LOG_DEBUG); |
|
| 271 | + spip_log('mysqli_sql_exception: '.$e->getMessage(), 'mysql.'._LOG_DEBUG); |
|
| 272 | 272 | $r = false; |
| 273 | 273 | // TODO: utiliser l’exception ensuite plutôt que les appels à spip_mysql_errno() |
| 274 | 274 | // mais il faut pour php < 8.1 forcer les exeptions via mysqli_report(). |
@@ -301,7 +301,7 @@ discard block |
||
| 301 | 301 | // d'utiliser ceux-ci, copie-colle de phpmyadmin |
| 302 | 302 | $query = preg_replace(',^TABLE\s*`([^`]*)`,i', "TABLE \\1", $query); |
| 303 | 303 | |
| 304 | - return spip_mysql_query('ALTER ' . $query, $serveur, $requeter); # i.e. que PG se debrouille |
|
| 304 | + return spip_mysql_query('ALTER '.$query, $serveur, $requeter); # i.e. que PG se debrouille |
|
| 305 | 305 | } |
| 306 | 306 | |
| 307 | 307 | |
@@ -314,7 +314,7 @@ discard block |
||
| 314 | 314 | * @return bool Toujours true |
| 315 | 315 | */ |
| 316 | 316 | function spip_mysql_optimize($table, $serveur = '', $requeter = true) { |
| 317 | - spip_mysql_query('OPTIMIZE TABLE ' . $table); |
|
| 317 | + spip_mysql_query('OPTIMIZE TABLE '.$table); |
|
| 318 | 318 | |
| 319 | 319 | return true; |
| 320 | 320 | } |
@@ -337,7 +337,7 @@ discard block |
||
| 337 | 337 | $link = $connexion['link']; |
| 338 | 338 | $db = $connexion['db']; |
| 339 | 339 | |
| 340 | - $query = 'EXPLAIN ' . _mysql_traite_query($query, $db, $prefixe); |
|
| 340 | + $query = 'EXPLAIN '._mysql_traite_query($query, $db, $prefixe); |
|
| 341 | 341 | $r = mysqli_query($link, $query); |
| 342 | 342 | |
| 343 | 343 | return spip_mysql_fetch($r, null, $serveur); |
@@ -388,7 +388,7 @@ discard block |
||
| 388 | 388 | . calculer_mysql_expression('WHERE', $where) |
| 389 | 389 | . calculer_mysql_expression('GROUP BY', $groupby, ',') |
| 390 | 390 | . calculer_mysql_expression('HAVING', $having) |
| 391 | - . ($orderby ? ("\nORDER BY " . spip_mysql_order($orderby)) : '') |
|
| 391 | + . ($orderby ? ("\nORDER BY ".spip_mysql_order($orderby)) : '') |
|
| 392 | 392 | . ($limit ? "\nLIMIT $limit" : ''); |
| 393 | 393 | |
| 394 | 394 | // renvoyer la requete inerte si demandee |
@@ -478,12 +478,12 @@ discard block |
||
| 478 | 478 | $exp = "\n$expression "; |
| 479 | 479 | |
| 480 | 480 | if (!is_array($v)) { |
| 481 | - return $exp . $v; |
|
| 481 | + return $exp.$v; |
|
| 482 | 482 | } else { |
| 483 | 483 | if (strtoupper($join) === 'AND') { |
| 484 | - return $exp . join("\n\t$join ", array_map('calculer_mysql_where', $v)); |
|
| 484 | + return $exp.join("\n\t$join ", array_map('calculer_mysql_where', $v)); |
|
| 485 | 485 | } else { |
| 486 | - return $exp . join($join, $v); |
|
| 486 | + return $exp.join($join, $v); |
|
| 487 | 487 | } |
| 488 | 488 | } |
| 489 | 489 | } |
@@ -501,17 +501,17 @@ discard block |
||
| 501 | 501 | if (substr($k, -1) == '@') { |
| 502 | 502 | // c'est une jointure qui se refere au from precedent |
| 503 | 503 | // pas de virgule |
| 504 | - $res .= ' ' . $v; |
|
| 504 | + $res .= ' '.$v; |
|
| 505 | 505 | } else { |
| 506 | 506 | if (!is_numeric($k)) { |
| 507 | 507 | $p = strpos($v, ' '); |
| 508 | 508 | if ($p) { |
| 509 | - $v = substr($v, 0, $p) . " AS `$k`" . substr($v, $p); |
|
| 509 | + $v = substr($v, 0, $p)." AS `$k`".substr($v, $p); |
|
| 510 | 510 | } else { |
| 511 | 511 | $v .= " AS `$k`"; |
| 512 | 512 | } |
| 513 | 513 | } |
| 514 | - $res .= ', ' . $v; |
|
| 514 | + $res .= ', '.$v; |
|
| 515 | 515 | } |
| 516 | 516 | } |
| 517 | 517 | |
@@ -541,13 +541,13 @@ discard block |
||
| 541 | 541 | function _mysql_traite_query($query, $db = '', $prefixe = '', $echappe_textes = true) { |
| 542 | 542 | |
| 543 | 543 | if ($GLOBALS['mysql_rappel_nom_base'] and $db) { |
| 544 | - $pref = '`' . $db . '`.'; |
|
| 544 | + $pref = '`'.$db.'`.'; |
|
| 545 | 545 | } else { |
| 546 | 546 | $pref = ''; |
| 547 | 547 | } |
| 548 | 548 | |
| 549 | 549 | if ($prefixe) { |
| 550 | - $pref .= $prefixe . '_'; |
|
| 550 | + $pref .= $prefixe.'_'; |
|
| 551 | 551 | } |
| 552 | 552 | |
| 553 | 553 | if (!preg_match('/\s(SET|VALUES|WHERE|DATABASE)\s/i', $query, $regs)) { |
@@ -566,7 +566,7 @@ discard block |
||
| 566 | 566 | $suite_echap = $suite; |
| 567 | 567 | } |
| 568 | 568 | if (preg_match('/^(.*?)([(]\s*SELECT\b.*)$/si', $suite_echap, $r)) { |
| 569 | - $suite_echap = $r[1] . _mysql_traite_query($r[2], $db, $prefixe, false); |
|
| 569 | + $suite_echap = $r[1]._mysql_traite_query($r[2], $db, $prefixe, false); |
|
| 570 | 570 | if ($echappe_textes) { |
| 571 | 571 | $suite = query_reinjecte_textes($suite_echap, $textes); |
| 572 | 572 | } |
@@ -576,7 +576,7 @@ discard block |
||
| 576 | 576 | } |
| 577 | 577 | } |
| 578 | 578 | } |
| 579 | - $r = preg_replace(_SQL_PREFIXE_TABLE_MYSQL, '\1' . $pref, $query) . $suite; |
|
| 579 | + $r = preg_replace(_SQL_PREFIXE_TABLE_MYSQL, '\1'.$pref, $query).$suite; |
|
| 580 | 580 | |
| 581 | 581 | // en option, remplacer les emoji (que mysql ne sait pas gérer) en 💩 |
| 582 | 582 | // remplacer les emoji (que mysql ne sait pas gérer) en 💩 |
@@ -612,7 +612,7 @@ discard block |
||
| 612 | 612 | $link = _mysql_link($serveur); |
| 613 | 613 | $ok = mysqli_select_db($link, $db); |
| 614 | 614 | if (!$ok) { |
| 615 | - spip_log('Echec mysqli_selectdb. Erreur : ' . mysqli_error($link), 'mysql.' . _LOG_CRITIQUE); |
|
| 615 | + spip_log('Echec mysqli_selectdb. Erreur : '.mysqli_error($link), 'mysql.'._LOG_CRITIQUE); |
|
| 616 | 616 | } |
| 617 | 617 | |
| 618 | 618 | return $ok; |
@@ -702,10 +702,10 @@ discard block |
||
| 702 | 702 | |
| 703 | 703 | $character_set = ''; |
| 704 | 704 | if (@$GLOBALS['meta']['charset_sql_base']) { |
| 705 | - $character_set .= ' CHARACTER SET ' . $GLOBALS['meta']['charset_sql_base']; |
|
| 705 | + $character_set .= ' CHARACTER SET '.$GLOBALS['meta']['charset_sql_base']; |
|
| 706 | 706 | } |
| 707 | 707 | if (@$GLOBALS['meta']['charset_collation_sql_base']) { |
| 708 | - $character_set .= ' COLLATE ' . $GLOBALS['meta']['charset_collation_sql_base']; |
|
| 708 | + $character_set .= ' COLLATE '.$GLOBALS['meta']['charset_collation_sql_base']; |
|
| 709 | 709 | } |
| 710 | 710 | |
| 711 | 711 | foreach ($champs as $k => $v) { |
@@ -715,7 +715,7 @@ discard block |
||
| 715 | 715 | preg_match(',(char|text),i', $defs[1]) |
| 716 | 716 | and !preg_match(',(binary|CHARACTER|COLLATE),i', $v) |
| 717 | 717 | ) { |
| 718 | - $v = $defs[1] . $character_set . ' ' . substr($v, strlen($defs[1])); |
|
| 718 | + $v = $defs[1].$character_set.' '.substr($v, strlen($defs[1])); |
|
| 719 | 719 | } |
| 720 | 720 | } |
| 721 | 721 | |
@@ -727,7 +727,7 @@ discard block |
||
| 727 | 727 | $s = ','; |
| 728 | 728 | } |
| 729 | 729 | $temporary = $temporary ? 'TEMPORARY' : ''; |
| 730 | - $q = "CREATE $temporary TABLE IF NOT EXISTS $nom ($query" . ($keys ? ",$keys" : '') . ')' |
|
| 730 | + $q = "CREATE $temporary TABLE IF NOT EXISTS $nom ($query".($keys ? ",$keys" : '').')' |
|
| 731 | 731 | . ' ENGINE=MyISAM' |
| 732 | 732 | . ($character_set ? " DEFAULT $character_set" : '') |
| 733 | 733 | . "\n"; |
@@ -807,7 +807,7 @@ discard block |
||
| 807 | 807 | return false; |
| 808 | 808 | } |
| 809 | 809 | |
| 810 | - $query = "CREATE VIEW $nom AS " . $query_select; |
|
| 810 | + $query = "CREATE VIEW $nom AS ".$query_select; |
|
| 811 | 811 | |
| 812 | 812 | return spip_mysql_query($query, $serveur, $requeter); |
| 813 | 813 | } |
@@ -865,7 +865,7 @@ discard block |
||
| 865 | 865 | * Ressource à utiliser avec sql_fetch() |
| 866 | 866 | **/ |
| 867 | 867 | function spip_mysql_showbase($match, $serveur = '', $requeter = true) { |
| 868 | - return spip_mysql_query('SHOW TABLES LIKE ' . _q($match), $serveur, $requeter); |
|
| 868 | + return spip_mysql_query('SHOW TABLES LIKE '._q($match), $serveur, $requeter); |
|
| 869 | 869 | } |
| 870 | 870 | |
| 871 | 871 | /** |
@@ -898,7 +898,7 @@ discard block |
||
| 898 | 898 | * Ressource à utiliser avec sql_fetch() |
| 899 | 899 | **/ |
| 900 | 900 | function spip_mysql_table_exists(string $table, $serveur = '', $requeter = true) { |
| 901 | - $r = spip_mysql_query('SHOW TABLES LIKE ' . _q($table), $serveur, $requeter); |
|
| 901 | + $r = spip_mysql_query('SHOW TABLES LIKE '._q($table), $serveur, $requeter); |
|
| 902 | 902 | if (!$requeter) { |
| 903 | 903 | return $r; |
| 904 | 904 | } |
@@ -980,22 +980,22 @@ discard block |
||
| 980 | 980 | } |
| 981 | 981 | if ($val['Default'] === '0' || $val['Default']) { |
| 982 | 982 | if (preg_match('/[A-Z_]/', $val['Default'])) { |
| 983 | - $nfields[$val['Field']] .= ' DEFAULT ' . $val['Default']; |
|
| 983 | + $nfields[$val['Field']] .= ' DEFAULT '.$val['Default']; |
|
| 984 | 984 | } else { |
| 985 | - $nfields[$val['Field']] .= " DEFAULT '" . $val['Default'] . "'"; |
|
| 985 | + $nfields[$val['Field']] .= " DEFAULT '".$val['Default']."'"; |
|
| 986 | 986 | } |
| 987 | 987 | } |
| 988 | 988 | if ($val['Extra']) { |
| 989 | - $nfields[$val['Field']] .= ' ' . $val['Extra']; |
|
| 989 | + $nfields[$val['Field']] .= ' '.$val['Extra']; |
|
| 990 | 990 | } |
| 991 | 991 | if ($val['Key'] == 'PRI') { |
| 992 | 992 | $nkeys['PRIMARY KEY'] = $val['Field']; |
| 993 | 993 | } else { |
| 994 | 994 | if ($val['Key'] == 'MUL') { |
| 995 | - $nkeys['KEY ' . $val['Field']] = $val['Field']; |
|
| 995 | + $nkeys['KEY '.$val['Field']] = $val['Field']; |
|
| 996 | 996 | } else { |
| 997 | 997 | if ($val['Key'] == 'UNI') { |
| 998 | - $nkeys['UNIQUE KEY ' . $val['Field']] = $val['Field']; |
|
| 998 | + $nkeys['UNIQUE KEY '.$val['Field']] = $val['Field']; |
|
| 999 | 999 | } |
| 1000 | 1000 | } |
| 1001 | 1001 | } |
@@ -1066,7 +1066,7 @@ discard block |
||
| 1066 | 1066 | $serveur = '', |
| 1067 | 1067 | $requeter = true |
| 1068 | 1068 | ) { |
| 1069 | - $c = !$groupby ? '*' : ('DISTINCT ' . (is_string($groupby) ? $groupby : join(',', $groupby))); |
|
| 1069 | + $c = !$groupby ? '*' : ('DISTINCT '.(is_string($groupby) ? $groupby : join(',', $groupby))); |
|
| 1070 | 1070 | |
| 1071 | 1071 | $r = spip_mysql_select("COUNT($c)", $from, $where, '', '', '', $having, $serveur, $requeter); |
| 1072 | 1072 | if (!$requeter) { |
@@ -1106,7 +1106,7 @@ discard block |
||
| 1106 | 1106 | if ($s) { |
| 1107 | 1107 | $trace = debug_backtrace(); |
| 1108 | 1108 | if ($trace[0]['function'] != 'spip_mysql_error') { |
| 1109 | - spip_log("$s - $query - " . sql_error_backtrace(), 'mysql.' . _LOG_ERREUR); |
|
| 1109 | + spip_log("$s - $query - ".sql_error_backtrace(), 'mysql.'._LOG_ERREUR); |
|
| 1110 | 1110 | } |
| 1111 | 1111 | } |
| 1112 | 1112 | |
@@ -1232,7 +1232,7 @@ discard block |
||
| 1232 | 1232 | try { |
| 1233 | 1233 | $insert = mysqli_query($link, $query); |
| 1234 | 1234 | } catch (\mysqli_sql_exception $e) { |
| 1235 | - spip_log('mysqli_sql_exception: ' . $e->getMessage(), 'mysql.' . _LOG_DEBUG); |
|
| 1235 | + spip_log('mysqli_sql_exception: '.$e->getMessage(), 'mysql.'._LOG_DEBUG); |
|
| 1236 | 1236 | // TODO: utiliser l’exception ensuite plutôt que les appels à spip_mysql_errno() |
| 1237 | 1237 | // mais il faut pour php < 8.1 forcer les exeptions via mysqli_report(). |
| 1238 | 1238 | } |
@@ -1287,8 +1287,8 @@ discard block |
||
| 1287 | 1287 | |
| 1288 | 1288 | return spip_mysql_insert( |
| 1289 | 1289 | $table, |
| 1290 | - '(' . join(',', array_keys($couples)) . ')', |
|
| 1291 | - '(' . join(',', $couples) . ')', |
|
| 1290 | + '('.join(',', array_keys($couples)).')', |
|
| 1291 | + '('.join(',', $couples).')', |
|
| 1292 | 1292 | $desc, |
| 1293 | 1293 | $serveur, |
| 1294 | 1294 | $requeter |
@@ -1325,7 +1325,7 @@ discard block |
||
| 1325 | 1325 | } |
| 1326 | 1326 | $fields = $desc['field'] ?? []; |
| 1327 | 1327 | |
| 1328 | - $cles = '(' . join(',', array_keys(reset($tab_couples))) . ')'; |
|
| 1328 | + $cles = '('.join(',', array_keys(reset($tab_couples))).')'; |
|
| 1329 | 1329 | $valeurs = []; |
| 1330 | 1330 | $r = false; |
| 1331 | 1331 | |
@@ -1334,7 +1334,7 @@ discard block |
||
| 1334 | 1334 | foreach ($couples as $champ => $val) { |
| 1335 | 1335 | $couples[$champ] = spip_mysql_cite($val, $fields[$champ]); |
| 1336 | 1336 | } |
| 1337 | - $valeurs[] = '(' . join(',', $couples) . ')'; |
|
| 1337 | + $valeurs[] = '('.join(',', $couples).')'; |
|
| 1338 | 1338 | if (count($valeurs) >= 100) { |
| 1339 | 1339 | $r = spip_mysql_insert($table, $cles, join(', ', $valeurs), $desc, $serveur, $requeter); |
| 1340 | 1340 | $valeurs = []; |
@@ -1371,7 +1371,7 @@ discard block |
||
| 1371 | 1371 | function spip_mysql_update($table, $champs, $where = '', $desc = [], $serveur = '', $requeter = true) { |
| 1372 | 1372 | $set = []; |
| 1373 | 1373 | foreach ($champs as $champ => $val) { |
| 1374 | - $set[] = $champ . "=$val"; |
|
| 1374 | + $set[] = $champ."=$val"; |
|
| 1375 | 1375 | } |
| 1376 | 1376 | if (!empty($set)) { |
| 1377 | 1377 | return spip_mysql_query( |
@@ -1427,7 +1427,7 @@ discard block |
||
| 1427 | 1427 | } |
| 1428 | 1428 | $set = []; |
| 1429 | 1429 | foreach ($champs as $champ => $val) { |
| 1430 | - $set[] = $champ . '=' . spip_mysql_cite($val, @$fields[$champ]); |
|
| 1430 | + $set[] = $champ.'='.spip_mysql_cite($val, @$fields[$champ]); |
|
| 1431 | 1431 | } |
| 1432 | 1432 | |
| 1433 | 1433 | return spip_mysql_query( |
@@ -1496,10 +1496,10 @@ discard block |
||
| 1496 | 1496 | * - False en cas d'erreur. |
| 1497 | 1497 | **/ |
| 1498 | 1498 | function spip_mysql_replace($table, $couples, $desc = [], $serveur = '', $requeter = true) { |
| 1499 | - return spip_mysql_query("REPLACE $table (" . join(',', array_keys($couples)) . ') VALUES (' . join( |
|
| 1499 | + return spip_mysql_query("REPLACE $table (".join(',', array_keys($couples)).') VALUES ('.join( |
|
| 1500 | 1500 | ',', |
| 1501 | 1501 | array_map('_q', $couples) |
| 1502 | - ) . ')', $serveur, $requeter); |
|
| 1502 | + ).')', $serveur, $requeter); |
|
| 1503 | 1503 | } |
| 1504 | 1504 | |
| 1505 | 1505 | |
@@ -1528,10 +1528,10 @@ discard block |
||
| 1528 | 1528 | * - False en cas d'erreur. |
| 1529 | 1529 | **/ |
| 1530 | 1530 | function spip_mysql_replace_multi($table, $tab_couples, $desc = [], $serveur = '', $requeter = true) { |
| 1531 | - $cles = '(' . join(',', array_keys($tab_couples[0])) . ')'; |
|
| 1531 | + $cles = '('.join(',', array_keys($tab_couples[0])).')'; |
|
| 1532 | 1532 | $valeurs = []; |
| 1533 | 1533 | foreach ($tab_couples as $couples) { |
| 1534 | - $valeurs[] = '(' . join(',', array_map('_q', $couples)) . ')'; |
|
| 1534 | + $valeurs[] = '('.join(',', array_map('_q', $couples)).')'; |
|
| 1535 | 1535 | } |
| 1536 | 1536 | $valeurs = implode(', ', $valeurs); |
| 1537 | 1537 | |
@@ -1551,28 +1551,28 @@ discard block |
||
| 1551 | 1551 | */ |
| 1552 | 1552 | function spip_mysql_multi($objet, $lang) { |
| 1553 | 1553 | $lengthlang = strlen("[$lang]"); |
| 1554 | - $posmulti = 'INSTR(' . $objet . ", '<multi>')"; |
|
| 1555 | - $posfinmulti = 'INSTR(' . $objet . ", '</multi>')"; |
|
| 1556 | - $debutchaine = 'LEFT(' . $objet . ", $posmulti-1)"; |
|
| 1557 | - $finchaine = 'RIGHT(' . $objet . ', CHAR_LENGTH(' . $objet . ") -(7+$posfinmulti))"; |
|
| 1558 | - $chainemulti = 'TRIM(SUBSTRING(' . $objet . ", $posmulti+7, $posfinmulti -(7+$posmulti)))"; |
|
| 1559 | - $poslang = "INSTR($chainemulti,'[" . $lang . "]')"; |
|
| 1554 | + $posmulti = 'INSTR('.$objet.", '<multi>')"; |
|
| 1555 | + $posfinmulti = 'INSTR('.$objet.", '</multi>')"; |
|
| 1556 | + $debutchaine = 'LEFT('.$objet.", $posmulti-1)"; |
|
| 1557 | + $finchaine = 'RIGHT('.$objet.', CHAR_LENGTH('.$objet.") -(7+$posfinmulti))"; |
|
| 1558 | + $chainemulti = 'TRIM(SUBSTRING('.$objet.", $posmulti+7, $posfinmulti -(7+$posmulti)))"; |
|
| 1559 | + $poslang = "INSTR($chainemulti,'[".$lang."]')"; |
|
| 1560 | 1560 | $poslang = "IF($poslang=0,INSTR($chainemulti,']')+1,$poslang+$lengthlang)"; |
| 1561 | - $chainelang = 'TRIM(SUBSTRING(' . $objet . ", $posmulti+7+$poslang-1,$posfinmulti -($posmulti+7+$poslang-1) ))"; |
|
| 1562 | - $posfinlang = 'INSTR(' . $chainelang . ", '[')"; |
|
| 1561 | + $chainelang = 'TRIM(SUBSTRING('.$objet.", $posmulti+7+$poslang-1,$posfinmulti -($posmulti+7+$poslang-1) ))"; |
|
| 1562 | + $posfinlang = 'INSTR('.$chainelang.", '[')"; |
|
| 1563 | 1563 | $chainelang = "IF($posfinlang>0,LEFT($chainelang,$posfinlang-1),$chainelang)"; |
| 1564 | 1564 | //$chainelang = "LEFT($chainelang,$posfinlang-1)"; |
| 1565 | - $retour = "(TRIM(IF($posmulti = 0 , " . |
|
| 1566 | - ' TRIM(' . $objet . '), ' . |
|
| 1567 | - ' CONCAT( ' . |
|
| 1568 | - " $debutchaine, " . |
|
| 1569 | - ' IF( ' . |
|
| 1570 | - " $poslang = 0, " . |
|
| 1571 | - " $chainemulti, " . |
|
| 1572 | - " $chainelang" . |
|
| 1573 | - ' ), ' . |
|
| 1574 | - " $finchaine" . |
|
| 1575 | - ' ) ' . |
|
| 1565 | + $retour = "(TRIM(IF($posmulti = 0 , ". |
|
| 1566 | + ' TRIM('.$objet.'), '. |
|
| 1567 | + ' CONCAT( '. |
|
| 1568 | + " $debutchaine, ". |
|
| 1569 | + ' IF( '. |
|
| 1570 | + " $poslang = 0, ". |
|
| 1571 | + " $chainemulti, ". |
|
| 1572 | + " $chainelang". |
|
| 1573 | + ' ), '. |
|
| 1574 | + " $finchaine". |
|
| 1575 | + ' ) '. |
|
| 1576 | 1576 | '))) AS multi'; |
| 1577 | 1577 | |
| 1578 | 1578 | return $retour; |
@@ -1589,7 +1589,7 @@ discard block |
||
| 1589 | 1589 | * Valeur hexadécimale pour MySQL |
| 1590 | 1590 | **/ |
| 1591 | 1591 | function spip_mysql_hex($v) { |
| 1592 | - return '0x' . $v; |
|
| 1592 | + return '0x'.$v; |
|
| 1593 | 1593 | } |
| 1594 | 1594 | |
| 1595 | 1595 | /** |
@@ -1629,7 +1629,7 @@ discard block |
||
| 1629 | 1629 | * Expression SQL |
| 1630 | 1630 | **/ |
| 1631 | 1631 | function spip_mysql_date_proche($champ, $interval, $unite) { |
| 1632 | - $use_now = ( ($champ === 'maj' or strpos($champ, '.maj')) ? true : false ); |
|
| 1632 | + $use_now = (($champ === 'maj' or strpos($champ, '.maj')) ? true : false); |
|
| 1633 | 1633 | return '(' |
| 1634 | 1634 | . $champ |
| 1635 | 1635 | . (($interval <= 0) ? '>' : '<') |
@@ -1684,7 +1684,7 @@ discard block |
||
| 1684 | 1684 | } elseif ($v === null) { |
| 1685 | 1685 | return "''"; |
| 1686 | 1686 | } |
| 1687 | - return "'" . addslashes($v) . "'"; |
|
| 1687 | + return "'".addslashes($v)."'"; |
|
| 1688 | 1688 | } |
| 1689 | 1689 | |
| 1690 | 1690 | if ($v === null) { |
@@ -1708,7 +1708,7 @@ discard block |
||
| 1708 | 1708 | } |
| 1709 | 1709 | } |
| 1710 | 1710 | |
| 1711 | - return ("'" . addslashes($v) . "'"); |
|
| 1711 | + return ("'".addslashes($v)."'"); |
|
| 1712 | 1712 | } |
| 1713 | 1713 | |
| 1714 | 1714 | /** |
@@ -1742,7 +1742,7 @@ discard block |
||
| 1742 | 1742 | } else { |
| 1743 | 1743 | $GLOBALS['mysql_rappel_nom_base'] = false; |
| 1744 | 1744 | |
| 1745 | - return "\$GLOBALS['mysql_rappel_nom_base'] = false; " . |
|
| 1745 | + return "\$GLOBALS['mysql_rappel_nom_base'] = false; ". |
|
| 1746 | 1746 | "/* echec de test_rappel_nom_base_mysql a l'installation. */\n"; |
| 1747 | 1747 | } |
| 1748 | 1748 | } |
