spip /
SPIP
@@ -553,16 +553,14 @@ |
||
| 553 | 553 | if (stripos($suite, 'SELECT') !== false) { |
| 554 | 554 | if ($echappe_textes) { |
| 555 | 555 | [$suite_echap, $textes] = query_echappe_textes($suite); |
| 556 | - } |
|
| 557 | - else { |
|
| 556 | + } else { |
|
| 558 | 557 | $suite_echap = $suite; |
| 559 | 558 | } |
| 560 | 559 | if (preg_match('/^(.*?)([(]\s*SELECT\b.*)$/si', $suite_echap, $r)) { |
| 561 | 560 | $suite_echap = $r[1] . _mysql_traite_query($r[2], $db, $prefixe, false); |
| 562 | 561 | if ($echappe_textes) { |
| 563 | 562 | $suite = query_reinjecte_textes($suite_echap, $textes); |
| 564 | - } |
|
| 565 | - else { |
|
| 563 | + } else { |
|
| 566 | 564 | $suite = $suite_echap; |
| 567 | 565 | } |
| 568 | 566 | } |
@@ -62,12 +62,12 @@ discard block |
||
| 62 | 62 | $link = @mysqli_connect($host, $login, $pass); |
| 63 | 63 | } |
| 64 | 64 | } catch (\mysqli_sql_exception $e) { |
| 65 | - spip_log('mysqli_sql_exception: ' . $e->getMessage(), 'mysql.' . _LOG_DEBUG); |
|
| 65 | + spip_log('mysqli_sql_exception: '.$e->getMessage(), 'mysql.'._LOG_DEBUG); |
|
| 66 | 66 | $link = false; |
| 67 | 67 | } |
| 68 | 68 | |
| 69 | 69 | if (!$link) { |
| 70 | - spip_log('Echec mysqli_connect. Erreur : ' . mysqli_connect_error(), 'mysql.' . _LOG_HS); |
|
| 70 | + spip_log('Echec mysqli_connect. Erreur : '.mysqli_connect_error(), 'mysql.'._LOG_HS); |
|
| 71 | 71 | |
| 72 | 72 | return false; |
| 73 | 73 | } |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | } |
| 87 | 87 | |
| 88 | 88 | spip_log( |
| 89 | - "Connexion MySQLi vers $host, base $db, prefixe $prefixe " . ($ok ? 'operationnelle' : 'impossible'), |
|
| 89 | + "Connexion MySQLi vers $host, base $db, prefixe $prefixe ".($ok ? 'operationnelle' : 'impossible'), |
|
| 90 | 90 | _LOG_DEBUG |
| 91 | 91 | ); |
| 92 | 92 | |
@@ -177,9 +177,9 @@ discard block |
||
| 177 | 177 | */ |
| 178 | 178 | function spip_mysql_set_charset($charset, $serveur = '', $requeter = true) { |
| 179 | 179 | $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
| 180 | - spip_log('changement de charset sql : ' . 'SET NAMES ' . _q($charset), _LOG_DEBUG); |
|
| 180 | + spip_log('changement de charset sql : '.'SET NAMES '._q($charset), _LOG_DEBUG); |
|
| 181 | 181 | |
| 182 | - return mysqli_query($connexion['link'], $connexion['last'] = 'SET NAMES ' . _q($charset)); |
|
| 182 | + return mysqli_query($connexion['link'], $connexion['last'] = 'SET NAMES '._q($charset)); |
|
| 183 | 183 | } |
| 184 | 184 | |
| 185 | 185 | |
@@ -194,7 +194,7 @@ discard block |
||
| 194 | 194 | function spip_mysql_get_charset($charset = [], $serveur = '', $requeter = true) { |
| 195 | 195 | $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
| 196 | 196 | $connexion['last'] = $c = 'SHOW CHARACTER SET' |
| 197 | - . (!$charset ? '' : (' LIKE ' . _q($charset['charset']))); |
|
| 197 | + . (!$charset ? '' : (' LIKE '._q($charset['charset']))); |
|
| 198 | 198 | |
| 199 | 199 | return spip_mysql_fetch(mysqli_query($connexion['link'], $c), null, $serveur); |
| 200 | 200 | } |
@@ -238,21 +238,21 @@ discard block |
||
| 238 | 238 | $debug = ''; |
| 239 | 239 | if (defined('_DEBUG_SLOW_QUERIES') and _DEBUG_SLOW_QUERIES) { |
| 240 | 240 | if (isset($GLOBALS['debug']['aucasou'])) { |
| 241 | - [, $id, , $infos] = $GLOBALS['debug']['aucasou']; |
|
| 242 | - $debug .= "BOUCLE$id @ " . ($infos[0] ?? '') . ' | '; |
|
| 241 | + [, $id,, $infos] = $GLOBALS['debug']['aucasou']; |
|
| 242 | + $debug .= "BOUCLE$id @ ".($infos[0] ?? '').' | '; |
|
| 243 | 243 | } |
| 244 | 244 | if (isset($_SERVER['REQUEST_URI'])) { |
| 245 | 245 | $debug .= $_SERVER['REQUEST_URI']; |
| 246 | 246 | } |
| 247 | 247 | if (!empty($GLOBALS['ip'])) { |
| 248 | - $debug .= ' + ' . $GLOBALS['ip']; |
|
| 248 | + $debug .= ' + '.$GLOBALS['ip']; |
|
| 249 | 249 | } |
| 250 | - $debug = ' /* ' . mysqli_real_escape_string($link, str_replace('*/', '@/', $debug)) . ' */'; |
|
| 250 | + $debug = ' /* '.mysqli_real_escape_string($link, str_replace('*/', '@/', $debug)).' */'; |
|
| 251 | 251 | } |
| 252 | 252 | try { |
| 253 | - $r = mysqli_query($link, $query . $debug); |
|
| 253 | + $r = mysqli_query($link, $query.$debug); |
|
| 254 | 254 | } catch (\mysqli_sql_exception $e) { |
| 255 | - spip_log('mysqli_sql_exception: ' . $e->getMessage(), 'mysql.' . _LOG_DEBUG); |
|
| 255 | + spip_log('mysqli_sql_exception: '.$e->getMessage(), 'mysql.'._LOG_DEBUG); |
|
| 256 | 256 | $r = false; |
| 257 | 257 | // TODO: utiliser l’exception ensuite plutôt que les appels à spip_mysql_errno() |
| 258 | 258 | // mais il faut pour php < 8.1 forcer les exeptions via mysqli_report(). |
@@ -270,9 +270,9 @@ discard block |
||
| 270 | 270 | $link = $connexion['link']; |
| 271 | 271 | //On retente au cas où |
| 272 | 272 | try { |
| 273 | - $r = mysqli_query($link, $query . $debug); |
|
| 273 | + $r = mysqli_query($link, $query.$debug); |
|
| 274 | 274 | } catch (\mysqli_sql_exception $e) { |
| 275 | - spip_log('mysqli_sql_exception: ' . $e->getMessage(), 'mysql.' . _LOG_DEBUG); |
|
| 275 | + spip_log('mysqli_sql_exception: '.$e->getMessage(), 'mysql.'._LOG_DEBUG); |
|
| 276 | 276 | $r = false; |
| 277 | 277 | // TODO: utiliser l’exception ensuite plutôt que les appels à spip_mysql_errno() |
| 278 | 278 | // mais il faut pour php < 8.1 forcer les exeptions via mysqli_report(). |
@@ -305,7 +305,7 @@ discard block |
||
| 305 | 305 | // d'utiliser ceux-ci, copie-colle de phpmyadmin |
| 306 | 306 | $query = preg_replace(',^TABLE\s*`([^`]*)`,i', "TABLE \\1", $query); |
| 307 | 307 | |
| 308 | - return spip_mysql_query('ALTER ' . $query, $serveur, $requeter); # i.e. que PG se debrouille |
|
| 308 | + return spip_mysql_query('ALTER '.$query, $serveur, $requeter); # i.e. que PG se debrouille |
|
| 309 | 309 | } |
| 310 | 310 | |
| 311 | 311 | |
@@ -318,7 +318,7 @@ discard block |
||
| 318 | 318 | * @return bool Toujours true |
| 319 | 319 | */ |
| 320 | 320 | function spip_mysql_optimize($table, $serveur = '', $requeter = true) { |
| 321 | - spip_mysql_query('OPTIMIZE TABLE ' . $table); |
|
| 321 | + spip_mysql_query('OPTIMIZE TABLE '.$table); |
|
| 322 | 322 | |
| 323 | 323 | return true; |
| 324 | 324 | } |
@@ -341,7 +341,7 @@ discard block |
||
| 341 | 341 | $link = $connexion['link']; |
| 342 | 342 | $db = $connexion['db']; |
| 343 | 343 | |
| 344 | - $query = 'EXPLAIN ' . _mysql_traite_query($query, $db, $prefixe); |
|
| 344 | + $query = 'EXPLAIN '._mysql_traite_query($query, $db, $prefixe); |
|
| 345 | 345 | $r = mysqli_query($link, $query); |
| 346 | 346 | |
| 347 | 347 | return spip_mysql_fetch($r, null, $serveur); |
@@ -392,7 +392,7 @@ discard block |
||
| 392 | 392 | . calculer_mysql_expression('WHERE', $where) |
| 393 | 393 | . calculer_mysql_expression('GROUP BY', $groupby, ',') |
| 394 | 394 | . calculer_mysql_expression('HAVING', $having) |
| 395 | - . ($orderby ? ("\nORDER BY " . spip_mysql_order($orderby)) : '') |
|
| 395 | + . ($orderby ? ("\nORDER BY ".spip_mysql_order($orderby)) : '') |
|
| 396 | 396 | . ($limit ? "\nLIMIT $limit" : ''); |
| 397 | 397 | |
| 398 | 398 | // renvoyer la requete inerte si demandee |
@@ -482,12 +482,12 @@ discard block |
||
| 482 | 482 | $exp = "\n$expression "; |
| 483 | 483 | |
| 484 | 484 | if (!is_array($v)) { |
| 485 | - return $exp . $v; |
|
| 485 | + return $exp.$v; |
|
| 486 | 486 | } else { |
| 487 | 487 | if (strtoupper($join) === 'AND') { |
| 488 | - return $exp . join("\n\t$join ", array_map('calculer_mysql_where', $v)); |
|
| 488 | + return $exp.join("\n\t$join ", array_map('calculer_mysql_where', $v)); |
|
| 489 | 489 | } else { |
| 490 | - return $exp . join($join, $v); |
|
| 490 | + return $exp.join($join, $v); |
|
| 491 | 491 | } |
| 492 | 492 | } |
| 493 | 493 | } |
@@ -505,17 +505,17 @@ discard block |
||
| 505 | 505 | if (substr($k, -1) == '@') { |
| 506 | 506 | // c'est une jointure qui se refere au from precedent |
| 507 | 507 | // pas de virgule |
| 508 | - $res .= ' ' . $v; |
|
| 508 | + $res .= ' '.$v; |
|
| 509 | 509 | } else { |
| 510 | 510 | if (!is_numeric($k)) { |
| 511 | 511 | $p = strpos($v, ' '); |
| 512 | 512 | if ($p) { |
| 513 | - $v = substr($v, 0, $p) . " AS `$k`" . substr($v, $p); |
|
| 513 | + $v = substr($v, 0, $p)." AS `$k`".substr($v, $p); |
|
| 514 | 514 | } else { |
| 515 | 515 | $v .= " AS `$k`"; |
| 516 | 516 | } |
| 517 | 517 | } |
| 518 | - $res .= ', ' . $v; |
|
| 518 | + $res .= ', '.$v; |
|
| 519 | 519 | } |
| 520 | 520 | } |
| 521 | 521 | |
@@ -545,13 +545,13 @@ discard block |
||
| 545 | 545 | function _mysql_traite_query($query, $db = '', $prefixe = '', $echappe_textes = true) { |
| 546 | 546 | |
| 547 | 547 | if ($GLOBALS['mysql_rappel_nom_base'] and $db) { |
| 548 | - $pref = '`' . $db . '`.'; |
|
| 548 | + $pref = '`'.$db.'`.'; |
|
| 549 | 549 | } else { |
| 550 | 550 | $pref = ''; |
| 551 | 551 | } |
| 552 | 552 | |
| 553 | 553 | if ($prefixe) { |
| 554 | - $pref .= $prefixe . '_'; |
|
| 554 | + $pref .= $prefixe.'_'; |
|
| 555 | 555 | } |
| 556 | 556 | |
| 557 | 557 | if (!preg_match('/\s(SET|VALUES|WHERE|DATABASE)\s/i', $query, $regs)) { |
@@ -570,7 +570,7 @@ discard block |
||
| 570 | 570 | $suite_echap = $suite; |
| 571 | 571 | } |
| 572 | 572 | if (preg_match('/^(.*?)([(]\s*SELECT\b.*)$/si', $suite_echap, $r)) { |
| 573 | - $suite_echap = $r[1] . _mysql_traite_query($r[2], $db, $prefixe, false); |
|
| 573 | + $suite_echap = $r[1]._mysql_traite_query($r[2], $db, $prefixe, false); |
|
| 574 | 574 | if ($echappe_textes) { |
| 575 | 575 | $suite = query_reinjecte_textes($suite_echap, $textes); |
| 576 | 576 | } |
@@ -580,7 +580,7 @@ discard block |
||
| 580 | 580 | } |
| 581 | 581 | } |
| 582 | 582 | } |
| 583 | - $r = preg_replace(_SQL_PREFIXE_TABLE_MYSQL, '\1' . $pref, $query) . $suite; |
|
| 583 | + $r = preg_replace(_SQL_PREFIXE_TABLE_MYSQL, '\1'.$pref, $query).$suite; |
|
| 584 | 584 | |
| 585 | 585 | // en option, remplacer les emoji (que mysql ne sait pas gérer) en 💩 |
| 586 | 586 | // remplacer les emoji (que mysql ne sait pas gérer) en 💩 |
@@ -620,7 +620,7 @@ discard block |
||
| 620 | 620 | $ok = false; |
| 621 | 621 | } |
| 622 | 622 | if (!$ok) { |
| 623 | - spip_log('Echec mysqli_selectdb. Erreur : ' . mysqli_error($link), 'mysql.' . _LOG_CRITIQUE); |
|
| 623 | + spip_log('Echec mysqli_selectdb. Erreur : '.mysqli_error($link), 'mysql.'._LOG_CRITIQUE); |
|
| 624 | 624 | } |
| 625 | 625 | |
| 626 | 626 | return $ok; |
@@ -710,10 +710,10 @@ discard block |
||
| 710 | 710 | |
| 711 | 711 | $character_set = ''; |
| 712 | 712 | if (@$GLOBALS['meta']['charset_sql_base']) { |
| 713 | - $character_set .= ' CHARACTER SET ' . $GLOBALS['meta']['charset_sql_base']; |
|
| 713 | + $character_set .= ' CHARACTER SET '.$GLOBALS['meta']['charset_sql_base']; |
|
| 714 | 714 | } |
| 715 | 715 | if (@$GLOBALS['meta']['charset_collation_sql_base']) { |
| 716 | - $character_set .= ' COLLATE ' . $GLOBALS['meta']['charset_collation_sql_base']; |
|
| 716 | + $character_set .= ' COLLATE '.$GLOBALS['meta']['charset_collation_sql_base']; |
|
| 717 | 717 | } |
| 718 | 718 | |
| 719 | 719 | foreach ($champs as $k => $v) { |
@@ -723,7 +723,7 @@ discard block |
||
| 723 | 723 | preg_match(',(char|text),i', $defs[1]) |
| 724 | 724 | and !preg_match(',(binary|CHARACTER|COLLATE),i', $v) |
| 725 | 725 | ) { |
| 726 | - $v = $defs[1] . $character_set . ' ' . substr($v, strlen($defs[1])); |
|
| 726 | + $v = $defs[1].$character_set.' '.substr($v, strlen($defs[1])); |
|
| 727 | 727 | } |
| 728 | 728 | } |
| 729 | 729 | |
@@ -735,8 +735,8 @@ discard block |
||
| 735 | 735 | $s = ','; |
| 736 | 736 | } |
| 737 | 737 | $temporary = $temporary ? 'TEMPORARY' : ''; |
| 738 | - $q = "CREATE $temporary TABLE IF NOT EXISTS $nom ($query" . ($keys ? ",$keys" : '') . ')' |
|
| 739 | - . ' ENGINE=' . _MYSQL_ENGINE |
|
| 738 | + $q = "CREATE $temporary TABLE IF NOT EXISTS $nom ($query".($keys ? ",$keys" : '').')' |
|
| 739 | + . ' ENGINE='._MYSQL_ENGINE |
|
| 740 | 740 | . ($character_set ? " DEFAULT $character_set" : '') |
| 741 | 741 | . "\n"; |
| 742 | 742 | |
@@ -815,7 +815,7 @@ discard block |
||
| 815 | 815 | return false; |
| 816 | 816 | } |
| 817 | 817 | |
| 818 | - $query = "CREATE VIEW $nom AS " . $query_select; |
|
| 818 | + $query = "CREATE VIEW $nom AS ".$query_select; |
|
| 819 | 819 | |
| 820 | 820 | return spip_mysql_query($query, $serveur, $requeter); |
| 821 | 821 | } |
@@ -873,7 +873,7 @@ discard block |
||
| 873 | 873 | * Ressource à utiliser avec sql_fetch() |
| 874 | 874 | **/ |
| 875 | 875 | function spip_mysql_showbase($match, $serveur = '', $requeter = true) { |
| 876 | - return spip_mysql_query('SHOW TABLES LIKE ' . _q($match), $serveur, $requeter); |
|
| 876 | + return spip_mysql_query('SHOW TABLES LIKE '._q($match), $serveur, $requeter); |
|
| 877 | 877 | } |
| 878 | 878 | |
| 879 | 879 | /** |
@@ -889,7 +889,7 @@ discard block |
||
| 889 | 889 | * - true si la requête a réussie, false sinon |
| 890 | 890 | */ |
| 891 | 891 | function spip_mysql_repair($table, $serveur = '', $requeter = true) { |
| 892 | - $table_status = spip_mysql_fetch(spip_mysql_query('SHOW TABLE STATUS WHERE Name = ' . _q($table), $serveur, true)); |
|
| 892 | + $table_status = spip_mysql_fetch(spip_mysql_query('SHOW TABLE STATUS WHERE Name = '._q($table), $serveur, true)); |
|
| 893 | 893 | $engine = $table_status['Engine']; |
| 894 | 894 | if ($engine == 'InnoDB') { |
| 895 | 895 | if (spip_mysql_alter("TABLE $table ENGINE = InnoDB", $serveur, $requeter)) { |
@@ -898,7 +898,7 @@ discard block |
||
| 898 | 898 | } elseif ($engine == 'MyISAM') { |
| 899 | 899 | return spip_mysql_query("REPAIR TABLE `$table`", $serveur, $requeter); |
| 900 | 900 | } else { |
| 901 | - spip_log("spip_mysql_repair impossible pour la table $table engine $engine", 'mysql.' . _LOG_DEBUG); |
|
| 901 | + spip_log("spip_mysql_repair impossible pour la table $table engine $engine", 'mysql.'._LOG_DEBUG); |
|
| 902 | 902 | } |
| 903 | 903 | } |
| 904 | 904 | |
@@ -917,7 +917,7 @@ discard block |
||
| 917 | 917 | * - string : requete sql, si $requeter = true |
| 918 | 918 | **/ |
| 919 | 919 | function spip_mysql_table_exists(string $table, $serveur = '', $requeter = true) { |
| 920 | - $r = spip_mysql_query('SHOW TABLES LIKE ' . _q($table), $serveur, $requeter); |
|
| 920 | + $r = spip_mysql_query('SHOW TABLES LIKE '._q($table), $serveur, $requeter); |
|
| 921 | 921 | if (!$requeter) { |
| 922 | 922 | return $r; |
| 923 | 923 | } |
@@ -999,22 +999,22 @@ discard block |
||
| 999 | 999 | } |
| 1000 | 1000 | if ($val['Default'] === '0' || $val['Default']) { |
| 1001 | 1001 | if (preg_match('/[A-Z_]/', $val['Default'])) { |
| 1002 | - $nfields[$val['Field']] .= ' DEFAULT ' . $val['Default']; |
|
| 1002 | + $nfields[$val['Field']] .= ' DEFAULT '.$val['Default']; |
|
| 1003 | 1003 | } else { |
| 1004 | - $nfields[$val['Field']] .= " DEFAULT '" . $val['Default'] . "'"; |
|
| 1004 | + $nfields[$val['Field']] .= " DEFAULT '".$val['Default']."'"; |
|
| 1005 | 1005 | } |
| 1006 | 1006 | } |
| 1007 | 1007 | if ($val['Extra']) { |
| 1008 | - $nfields[$val['Field']] .= ' ' . $val['Extra']; |
|
| 1008 | + $nfields[$val['Field']] .= ' '.$val['Extra']; |
|
| 1009 | 1009 | } |
| 1010 | 1010 | if ($val['Key'] == 'PRI') { |
| 1011 | 1011 | $nkeys['PRIMARY KEY'] = $val['Field']; |
| 1012 | 1012 | } else { |
| 1013 | 1013 | if ($val['Key'] == 'MUL') { |
| 1014 | - $nkeys['KEY ' . $val['Field']] = $val['Field']; |
|
| 1014 | + $nkeys['KEY '.$val['Field']] = $val['Field']; |
|
| 1015 | 1015 | } else { |
| 1016 | 1016 | if ($val['Key'] == 'UNI') { |
| 1017 | - $nkeys['UNIQUE KEY ' . $val['Field']] = $val['Field']; |
|
| 1017 | + $nkeys['UNIQUE KEY '.$val['Field']] = $val['Field']; |
|
| 1018 | 1018 | } |
| 1019 | 1019 | } |
| 1020 | 1020 | } |
@@ -1085,7 +1085,7 @@ discard block |
||
| 1085 | 1085 | $serveur = '', |
| 1086 | 1086 | $requeter = true |
| 1087 | 1087 | ) { |
| 1088 | - $c = !$groupby ? '*' : ('DISTINCT ' . (is_string($groupby) ? $groupby : join(',', $groupby))); |
|
| 1088 | + $c = !$groupby ? '*' : ('DISTINCT '.(is_string($groupby) ? $groupby : join(',', $groupby))); |
|
| 1089 | 1089 | |
| 1090 | 1090 | $r = spip_mysql_select("COUNT($c)", $from, $where, '', '', '', $having, $serveur, $requeter); |
| 1091 | 1091 | if (!$requeter) { |
@@ -1125,7 +1125,7 @@ discard block |
||
| 1125 | 1125 | if ($s) { |
| 1126 | 1126 | $trace = debug_backtrace(); |
| 1127 | 1127 | if ($trace[0]['function'] != 'spip_mysql_error') { |
| 1128 | - spip_log("$s - $query - " . sql_error_backtrace(), 'mysql.' . _LOG_ERREUR); |
|
| 1128 | + spip_log("$s - $query - ".sql_error_backtrace(), 'mysql.'._LOG_ERREUR); |
|
| 1129 | 1129 | } |
| 1130 | 1130 | } |
| 1131 | 1131 | |
@@ -1251,7 +1251,7 @@ discard block |
||
| 1251 | 1251 | try { |
| 1252 | 1252 | $insert = mysqli_query($link, $query); |
| 1253 | 1253 | } catch (\mysqli_sql_exception $e) { |
| 1254 | - spip_log('mysqli_sql_exception: ' . $e->getMessage(), 'mysql.' . _LOG_DEBUG); |
|
| 1254 | + spip_log('mysqli_sql_exception: '.$e->getMessage(), 'mysql.'._LOG_DEBUG); |
|
| 1255 | 1255 | // TODO: utiliser l’exception ensuite plutôt que les appels à spip_mysql_errno() |
| 1256 | 1256 | // mais il faut pour php < 8.1 forcer les exeptions via mysqli_report(). |
| 1257 | 1257 | } |
@@ -1306,8 +1306,8 @@ discard block |
||
| 1306 | 1306 | |
| 1307 | 1307 | return spip_mysql_insert( |
| 1308 | 1308 | $table, |
| 1309 | - '(' . join(',', array_keys($couples)) . ')', |
|
| 1310 | - '(' . join(',', $couples) . ')', |
|
| 1309 | + '('.join(',', array_keys($couples)).')', |
|
| 1310 | + '('.join(',', $couples).')', |
|
| 1311 | 1311 | $desc, |
| 1312 | 1312 | $serveur, |
| 1313 | 1313 | $requeter |
@@ -1344,7 +1344,7 @@ discard block |
||
| 1344 | 1344 | } |
| 1345 | 1345 | $fields = $desc['field'] ?? []; |
| 1346 | 1346 | |
| 1347 | - $cles = '(' . join(',', array_keys(reset($tab_couples))) . ')'; |
|
| 1347 | + $cles = '('.join(',', array_keys(reset($tab_couples))).')'; |
|
| 1348 | 1348 | $valeurs = []; |
| 1349 | 1349 | $r = false; |
| 1350 | 1350 | |
@@ -1353,7 +1353,7 @@ discard block |
||
| 1353 | 1353 | foreach ($couples as $champ => $val) { |
| 1354 | 1354 | $couples[$champ] = spip_mysql_cite($val, $fields[$champ]); |
| 1355 | 1355 | } |
| 1356 | - $valeurs[] = '(' . join(',', $couples) . ')'; |
|
| 1356 | + $valeurs[] = '('.join(',', $couples).')'; |
|
| 1357 | 1357 | if (count($valeurs) >= 100) { |
| 1358 | 1358 | $r = spip_mysql_insert($table, $cles, join(', ', $valeurs), $desc, $serveur, $requeter); |
| 1359 | 1359 | $valeurs = []; |
@@ -1390,7 +1390,7 @@ discard block |
||
| 1390 | 1390 | function spip_mysql_update($table, $champs, $where = '', $desc = [], $serveur = '', $requeter = true) { |
| 1391 | 1391 | $set = []; |
| 1392 | 1392 | foreach ($champs as $champ => $val) { |
| 1393 | - $set[] = $champ . "=$val"; |
|
| 1393 | + $set[] = $champ."=$val"; |
|
| 1394 | 1394 | } |
| 1395 | 1395 | if (!empty($set)) { |
| 1396 | 1396 | return spip_mysql_query( |
@@ -1446,7 +1446,7 @@ discard block |
||
| 1446 | 1446 | } |
| 1447 | 1447 | $set = []; |
| 1448 | 1448 | foreach ($champs as $champ => $val) { |
| 1449 | - $set[] = $champ . '=' . spip_mysql_cite($val, @$fields[$champ]); |
|
| 1449 | + $set[] = $champ.'='.spip_mysql_cite($val, @$fields[$champ]); |
|
| 1450 | 1450 | } |
| 1451 | 1451 | |
| 1452 | 1452 | return spip_mysql_query( |
@@ -1515,10 +1515,10 @@ discard block |
||
| 1515 | 1515 | * - False en cas d'erreur. |
| 1516 | 1516 | **/ |
| 1517 | 1517 | function spip_mysql_replace($table, $couples, $desc = [], $serveur = '', $requeter = true) { |
| 1518 | - return spip_mysql_query("REPLACE $table (" . join(',', array_keys($couples)) . ') VALUES (' . join( |
|
| 1518 | + return spip_mysql_query("REPLACE $table (".join(',', array_keys($couples)).') VALUES ('.join( |
|
| 1519 | 1519 | ',', |
| 1520 | 1520 | array_map('_q', $couples) |
| 1521 | - ) . ')', $serveur, $requeter); |
|
| 1521 | + ).')', $serveur, $requeter); |
|
| 1522 | 1522 | } |
| 1523 | 1523 | |
| 1524 | 1524 | |
@@ -1547,10 +1547,10 @@ discard block |
||
| 1547 | 1547 | * - False en cas d'erreur. |
| 1548 | 1548 | **/ |
| 1549 | 1549 | function spip_mysql_replace_multi($table, $tab_couples, $desc = [], $serveur = '', $requeter = true) { |
| 1550 | - $cles = '(' . join(',', array_keys($tab_couples[0])) . ')'; |
|
| 1550 | + $cles = '('.join(',', array_keys($tab_couples[0])).')'; |
|
| 1551 | 1551 | $valeurs = []; |
| 1552 | 1552 | foreach ($tab_couples as $couples) { |
| 1553 | - $valeurs[] = '(' . join(',', array_map('_q', $couples)) . ')'; |
|
| 1553 | + $valeurs[] = '('.join(',', array_map('_q', $couples)).')'; |
|
| 1554 | 1554 | } |
| 1555 | 1555 | $valeurs = implode(', ', $valeurs); |
| 1556 | 1556 | |
@@ -1570,28 +1570,28 @@ discard block |
||
| 1570 | 1570 | */ |
| 1571 | 1571 | function spip_mysql_multi($objet, $lang) { |
| 1572 | 1572 | $lengthlang = strlen("[$lang]"); |
| 1573 | - $posmulti = 'INSTR(' . $objet . ", '<multi>')"; |
|
| 1574 | - $posfinmulti = 'INSTR(' . $objet . ", '</multi>')"; |
|
| 1575 | - $debutchaine = 'LEFT(' . $objet . ", $posmulti-1)"; |
|
| 1576 | - $finchaine = 'RIGHT(' . $objet . ', CHAR_LENGTH(' . $objet . ") -(7+$posfinmulti))"; |
|
| 1577 | - $chainemulti = 'TRIM(SUBSTRING(' . $objet . ", $posmulti+7, $posfinmulti -(7+$posmulti)))"; |
|
| 1578 | - $poslang = "INSTR($chainemulti,'[" . $lang . "]')"; |
|
| 1573 | + $posmulti = 'INSTR('.$objet.", '<multi>')"; |
|
| 1574 | + $posfinmulti = 'INSTR('.$objet.", '</multi>')"; |
|
| 1575 | + $debutchaine = 'LEFT('.$objet.", $posmulti-1)"; |
|
| 1576 | + $finchaine = 'RIGHT('.$objet.', CHAR_LENGTH('.$objet.") -(7+$posfinmulti))"; |
|
| 1577 | + $chainemulti = 'TRIM(SUBSTRING('.$objet.", $posmulti+7, $posfinmulti -(7+$posmulti)))"; |
|
| 1578 | + $poslang = "INSTR($chainemulti,'[".$lang."]')"; |
|
| 1579 | 1579 | $poslang = "IF($poslang=0,INSTR($chainemulti,']')+1,$poslang+$lengthlang)"; |
| 1580 | - $chainelang = 'TRIM(SUBSTRING(' . $objet . ", $posmulti+7+$poslang-1,$posfinmulti -($posmulti+7+$poslang-1) ))"; |
|
| 1581 | - $posfinlang = 'INSTR(' . $chainelang . ", '[')"; |
|
| 1580 | + $chainelang = 'TRIM(SUBSTRING('.$objet.", $posmulti+7+$poslang-1,$posfinmulti -($posmulti+7+$poslang-1) ))"; |
|
| 1581 | + $posfinlang = 'INSTR('.$chainelang.", '[')"; |
|
| 1582 | 1582 | $chainelang = "IF($posfinlang>0,LEFT($chainelang,$posfinlang-1),$chainelang)"; |
| 1583 | 1583 | //$chainelang = "LEFT($chainelang,$posfinlang-1)"; |
| 1584 | - $retour = "(TRIM(IF($posmulti = 0 , " . |
|
| 1585 | - ' TRIM(' . $objet . '), ' . |
|
| 1586 | - ' CONCAT( ' . |
|
| 1587 | - " $debutchaine, " . |
|
| 1588 | - ' IF( ' . |
|
| 1589 | - " $poslang = 0, " . |
|
| 1590 | - " $chainemulti, " . |
|
| 1591 | - " $chainelang" . |
|
| 1592 | - ' ), ' . |
|
| 1593 | - " $finchaine" . |
|
| 1594 | - ' ) ' . |
|
| 1584 | + $retour = "(TRIM(IF($posmulti = 0 , ". |
|
| 1585 | + ' TRIM('.$objet.'), '. |
|
| 1586 | + ' CONCAT( '. |
|
| 1587 | + " $debutchaine, ". |
|
| 1588 | + ' IF( '. |
|
| 1589 | + " $poslang = 0, ". |
|
| 1590 | + " $chainemulti, ". |
|
| 1591 | + " $chainelang". |
|
| 1592 | + ' ), '. |
|
| 1593 | + " $finchaine". |
|
| 1594 | + ' ) '. |
|
| 1595 | 1595 | '))) AS multi'; |
| 1596 | 1596 | |
| 1597 | 1597 | return $retour; |
@@ -1608,7 +1608,7 @@ discard block |
||
| 1608 | 1608 | * Valeur hexadécimale pour MySQL |
| 1609 | 1609 | **/ |
| 1610 | 1610 | function spip_mysql_hex($v) { |
| 1611 | - return '0x' . $v; |
|
| 1611 | + return '0x'.$v; |
|
| 1612 | 1612 | } |
| 1613 | 1613 | |
| 1614 | 1614 | /** |
@@ -1648,7 +1648,7 @@ discard block |
||
| 1648 | 1648 | * Expression SQL |
| 1649 | 1649 | **/ |
| 1650 | 1650 | function spip_mysql_date_proche($champ, $interval, $unite) { |
| 1651 | - $use_now = ( ($champ === 'maj' or strpos($champ, '.maj')) ? true : false ); |
|
| 1651 | + $use_now = (($champ === 'maj' or strpos($champ, '.maj')) ? true : false); |
|
| 1652 | 1652 | return '(' |
| 1653 | 1653 | . $champ |
| 1654 | 1654 | . (($interval <= 0) ? '>' : '<') |
@@ -1703,7 +1703,7 @@ discard block |
||
| 1703 | 1703 | } elseif ($v === null) { |
| 1704 | 1704 | return "''"; |
| 1705 | 1705 | } |
| 1706 | - return "'" . addslashes($v) . "'"; |
|
| 1706 | + return "'".addslashes($v)."'"; |
|
| 1707 | 1707 | } |
| 1708 | 1708 | |
| 1709 | 1709 | if ($v === null) { |
@@ -1727,7 +1727,7 @@ discard block |
||
| 1727 | 1727 | } |
| 1728 | 1728 | } |
| 1729 | 1729 | |
| 1730 | - return ("'" . addslashes($v) . "'"); |
|
| 1730 | + return ("'".addslashes($v)."'"); |
|
| 1731 | 1731 | } |
| 1732 | 1732 | |
| 1733 | 1733 | /** |
@@ -1761,7 +1761,7 @@ discard block |
||
| 1761 | 1761 | } else { |
| 1762 | 1762 | $GLOBALS['mysql_rappel_nom_base'] = false; |
| 1763 | 1763 | |
| 1764 | - return "\$GLOBALS['mysql_rappel_nom_base'] = false; " . |
|
| 1764 | + return "\$GLOBALS['mysql_rappel_nom_base'] = false; ". |
|
| 1765 | 1765 | "/* echec de test_rappel_nom_base_mysql a l'installation. */\n"; |
| 1766 | 1766 | } |
| 1767 | 1767 | } |
@@ -20,15 +20,15 @@ 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 | if (!defined('_MYSQL_ENGINE')) { |
| 31 | - define('_MYSQL_ENGINE', 'MyISAM'); |
|
| 31 | + define('_MYSQL_ENGINE', 'MyISAM'); |
|
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | /** |
@@ -45,112 +45,112 @@ discard block |
||
| 45 | 45 | * - tableau décrivant la connexion sinon |
| 46 | 46 | */ |
| 47 | 47 | function req_mysql_dist($host, $port, $login, $pass, $db = '', $prefixe = '') { |
| 48 | - if (!extension_loaded(\mysqli::class)) { |
|
| 49 | - return false; |
|
| 50 | - } |
|
| 51 | - |
|
| 52 | - // si port est fourni mais pas host, c'est un socket -> compat avec vieille syntaxe de mysql_connect() et anciens fichiers connect.php |
|
| 53 | - try { |
|
| 54 | - if ( |
|
| 55 | - $port and !is_numeric($socket = $port) |
|
| 56 | - and (!$host or $host === 'localhost') |
|
| 57 | - ) { |
|
| 58 | - $link = @mysqli_connect($host, $login, $pass, '', null, $socket); |
|
| 59 | - } elseif ($port) { |
|
| 60 | - $link = @mysqli_connect($host, $login, $pass, '', $port); |
|
| 61 | - } else { |
|
| 62 | - $link = @mysqli_connect($host, $login, $pass); |
|
| 63 | - } |
|
| 64 | - } catch (\mysqli_sql_exception $e) { |
|
| 65 | - spip_log('mysqli_sql_exception: ' . $e->getMessage(), 'mysql.' . _LOG_DEBUG); |
|
| 66 | - $link = false; |
|
| 67 | - } |
|
| 68 | - |
|
| 69 | - if (!$link) { |
|
| 70 | - spip_log('Echec mysqli_connect. Erreur : ' . mysqli_connect_error(), 'mysql.' . _LOG_HS); |
|
| 71 | - |
|
| 72 | - return false; |
|
| 73 | - } |
|
| 74 | - $last = ''; |
|
| 75 | - if (!$db) { |
|
| 76 | - $ok = $link; |
|
| 77 | - $db = 'spip'; |
|
| 78 | - } else { |
|
| 79 | - $ok = mysqli_select_db($link, $db); |
|
| 80 | - if ( |
|
| 81 | - defined('_MYSQL_SET_SQL_MODE') |
|
| 82 | - or defined('_MYSQL_SQL_MODE_TEXT_NOT_NULL') // compatibilite |
|
| 83 | - ) { |
|
| 84 | - mysqli_query($link, $last = "set sql_mode=''"); |
|
| 85 | - } |
|
| 86 | - } |
|
| 87 | - |
|
| 88 | - spip_log( |
|
| 89 | - "Connexion MySQLi vers $host, base $db, prefixe $prefixe " . ($ok ? 'operationnelle' : 'impossible'), |
|
| 90 | - _LOG_DEBUG |
|
| 91 | - ); |
|
| 92 | - |
|
| 93 | - return !$ok ? false : [ |
|
| 94 | - 'db' => $db, |
|
| 95 | - 'last' => $last, |
|
| 96 | - 'prefixe' => $prefixe ?: $db, |
|
| 97 | - 'link' => $link, |
|
| 98 | - 'total_requetes' => 0, |
|
| 99 | - ]; |
|
| 48 | + if (!extension_loaded(\mysqli::class)) { |
|
| 49 | + return false; |
|
| 50 | + } |
|
| 51 | + |
|
| 52 | + // si port est fourni mais pas host, c'est un socket -> compat avec vieille syntaxe de mysql_connect() et anciens fichiers connect.php |
|
| 53 | + try { |
|
| 54 | + if ( |
|
| 55 | + $port and !is_numeric($socket = $port) |
|
| 56 | + and (!$host or $host === 'localhost') |
|
| 57 | + ) { |
|
| 58 | + $link = @mysqli_connect($host, $login, $pass, '', null, $socket); |
|
| 59 | + } elseif ($port) { |
|
| 60 | + $link = @mysqli_connect($host, $login, $pass, '', $port); |
|
| 61 | + } else { |
|
| 62 | + $link = @mysqli_connect($host, $login, $pass); |
|
| 63 | + } |
|
| 64 | + } catch (\mysqli_sql_exception $e) { |
|
| 65 | + spip_log('mysqli_sql_exception: ' . $e->getMessage(), 'mysql.' . _LOG_DEBUG); |
|
| 66 | + $link = false; |
|
| 67 | + } |
|
| 68 | + |
|
| 69 | + if (!$link) { |
|
| 70 | + spip_log('Echec mysqli_connect. Erreur : ' . mysqli_connect_error(), 'mysql.' . _LOG_HS); |
|
| 71 | + |
|
| 72 | + return false; |
|
| 73 | + } |
|
| 74 | + $last = ''; |
|
| 75 | + if (!$db) { |
|
| 76 | + $ok = $link; |
|
| 77 | + $db = 'spip'; |
|
| 78 | + } else { |
|
| 79 | + $ok = mysqli_select_db($link, $db); |
|
| 80 | + if ( |
|
| 81 | + defined('_MYSQL_SET_SQL_MODE') |
|
| 82 | + or defined('_MYSQL_SQL_MODE_TEXT_NOT_NULL') // compatibilite |
|
| 83 | + ) { |
|
| 84 | + mysqli_query($link, $last = "set sql_mode=''"); |
|
| 85 | + } |
|
| 86 | + } |
|
| 87 | + |
|
| 88 | + spip_log( |
|
| 89 | + "Connexion MySQLi vers $host, base $db, prefixe $prefixe " . ($ok ? 'operationnelle' : 'impossible'), |
|
| 90 | + _LOG_DEBUG |
|
| 91 | + ); |
|
| 92 | + |
|
| 93 | + return !$ok ? false : [ |
|
| 94 | + 'db' => $db, |
|
| 95 | + 'last' => $last, |
|
| 96 | + 'prefixe' => $prefixe ?: $db, |
|
| 97 | + 'link' => $link, |
|
| 98 | + 'total_requetes' => 0, |
|
| 99 | + ]; |
|
| 100 | 100 | } |
| 101 | 101 | |
| 102 | 102 | |
| 103 | 103 | $GLOBALS['spip_mysql_functions_1'] = [ |
| 104 | - 'alter' => 'spip_mysql_alter', |
|
| 105 | - 'count' => 'spip_mysql_count', |
|
| 106 | - 'countsel' => 'spip_mysql_countsel', |
|
| 107 | - 'create' => 'spip_mysql_create', |
|
| 108 | - 'create_base' => 'spip_mysql_create_base', |
|
| 109 | - 'create_view' => 'spip_mysql_create_view', |
|
| 110 | - 'date_proche' => 'spip_mysql_date_proche', |
|
| 111 | - 'delete' => 'spip_mysql_delete', |
|
| 112 | - 'drop_table' => 'spip_mysql_drop_table', |
|
| 113 | - 'drop_view' => 'spip_mysql_drop_view', |
|
| 114 | - 'errno' => 'spip_mysql_errno', |
|
| 115 | - 'error' => 'spip_mysql_error', |
|
| 116 | - 'explain' => 'spip_mysql_explain', |
|
| 117 | - 'fetch' => 'spip_mysql_fetch', |
|
| 118 | - 'seek' => 'spip_mysql_seek', |
|
| 119 | - 'free' => 'spip_mysql_free', |
|
| 120 | - 'hex' => 'spip_mysql_hex', |
|
| 121 | - 'in' => 'spip_mysql_in', |
|
| 122 | - 'insert' => 'spip_mysql_insert', |
|
| 123 | - 'insertq' => 'spip_mysql_insertq', |
|
| 124 | - 'insertq_multi' => 'spip_mysql_insertq_multi', |
|
| 125 | - 'listdbs' => 'spip_mysql_listdbs', |
|
| 126 | - 'multi' => 'spip_mysql_multi', |
|
| 127 | - 'optimize' => 'spip_mysql_optimize', |
|
| 128 | - 'query' => 'spip_mysql_query', |
|
| 129 | - 'quote' => 'spip_mysql_quote', |
|
| 130 | - 'replace' => 'spip_mysql_replace', |
|
| 131 | - 'replace_multi' => 'spip_mysql_replace_multi', |
|
| 132 | - 'repair' => 'spip_mysql_repair', |
|
| 133 | - 'select' => 'spip_mysql_select', |
|
| 134 | - 'selectdb' => 'spip_mysql_selectdb', |
|
| 135 | - 'set_charset' => 'spip_mysql_set_charset', |
|
| 136 | - 'get_charset' => 'spip_mysql_get_charset', |
|
| 137 | - 'showbase' => 'spip_mysql_showbase', |
|
| 138 | - 'showtable' => 'spip_mysql_showtable', |
|
| 139 | - 'table_exists' => 'spip_mysql_table_exists', |
|
| 140 | - 'update' => 'spip_mysql_update', |
|
| 141 | - 'updateq' => 'spip_mysql_updateq', |
|
| 142 | - |
|
| 143 | - // association de chaque nom http d'un charset aux couples MySQL |
|
| 144 | - 'charsets' => [ |
|
| 145 | - 'cp1250' => ['charset' => 'cp1250', 'collation' => 'cp1250_general_ci'], |
|
| 146 | - 'cp1251' => ['charset' => 'cp1251', 'collation' => 'cp1251_general_ci'], |
|
| 147 | - 'cp1256' => ['charset' => 'cp1256', 'collation' => 'cp1256_general_ci'], |
|
| 148 | - 'iso-8859-1' => ['charset' => 'latin1', 'collation' => 'latin1_swedish_ci'], |
|
| 104 | + 'alter' => 'spip_mysql_alter', |
|
| 105 | + 'count' => 'spip_mysql_count', |
|
| 106 | + 'countsel' => 'spip_mysql_countsel', |
|
| 107 | + 'create' => 'spip_mysql_create', |
|
| 108 | + 'create_base' => 'spip_mysql_create_base', |
|
| 109 | + 'create_view' => 'spip_mysql_create_view', |
|
| 110 | + 'date_proche' => 'spip_mysql_date_proche', |
|
| 111 | + 'delete' => 'spip_mysql_delete', |
|
| 112 | + 'drop_table' => 'spip_mysql_drop_table', |
|
| 113 | + 'drop_view' => 'spip_mysql_drop_view', |
|
| 114 | + 'errno' => 'spip_mysql_errno', |
|
| 115 | + 'error' => 'spip_mysql_error', |
|
| 116 | + 'explain' => 'spip_mysql_explain', |
|
| 117 | + 'fetch' => 'spip_mysql_fetch', |
|
| 118 | + 'seek' => 'spip_mysql_seek', |
|
| 119 | + 'free' => 'spip_mysql_free', |
|
| 120 | + 'hex' => 'spip_mysql_hex', |
|
| 121 | + 'in' => 'spip_mysql_in', |
|
| 122 | + 'insert' => 'spip_mysql_insert', |
|
| 123 | + 'insertq' => 'spip_mysql_insertq', |
|
| 124 | + 'insertq_multi' => 'spip_mysql_insertq_multi', |
|
| 125 | + 'listdbs' => 'spip_mysql_listdbs', |
|
| 126 | + 'multi' => 'spip_mysql_multi', |
|
| 127 | + 'optimize' => 'spip_mysql_optimize', |
|
| 128 | + 'query' => 'spip_mysql_query', |
|
| 129 | + 'quote' => 'spip_mysql_quote', |
|
| 130 | + 'replace' => 'spip_mysql_replace', |
|
| 131 | + 'replace_multi' => 'spip_mysql_replace_multi', |
|
| 132 | + 'repair' => 'spip_mysql_repair', |
|
| 133 | + 'select' => 'spip_mysql_select', |
|
| 134 | + 'selectdb' => 'spip_mysql_selectdb', |
|
| 135 | + 'set_charset' => 'spip_mysql_set_charset', |
|
| 136 | + 'get_charset' => 'spip_mysql_get_charset', |
|
| 137 | + 'showbase' => 'spip_mysql_showbase', |
|
| 138 | + 'showtable' => 'spip_mysql_showtable', |
|
| 139 | + 'table_exists' => 'spip_mysql_table_exists', |
|
| 140 | + 'update' => 'spip_mysql_update', |
|
| 141 | + 'updateq' => 'spip_mysql_updateq', |
|
| 142 | + |
|
| 143 | + // association de chaque nom http d'un charset aux couples MySQL |
|
| 144 | + 'charsets' => [ |
|
| 145 | + 'cp1250' => ['charset' => 'cp1250', 'collation' => 'cp1250_general_ci'], |
|
| 146 | + 'cp1251' => ['charset' => 'cp1251', 'collation' => 'cp1251_general_ci'], |
|
| 147 | + 'cp1256' => ['charset' => 'cp1256', 'collation' => 'cp1256_general_ci'], |
|
| 148 | + 'iso-8859-1' => ['charset' => 'latin1', 'collation' => 'latin1_swedish_ci'], |
|
| 149 | 149 | //'iso-8859-6'=>array('charset'=>'latin1','collation'=>'latin1_swedish_ci'), |
| 150 | - 'iso-8859-9' => ['charset' => 'latin5', 'collation' => 'latin5_turkish_ci'], |
|
| 150 | + 'iso-8859-9' => ['charset' => 'latin5', 'collation' => 'latin5_turkish_ci'], |
|
| 151 | 151 | //'iso-8859-15'=>array('charset'=>'latin1','collation'=>'latin1_swedish_ci'), |
| 152 | - 'utf-8' => ['charset' => 'utf8', 'collation' => 'utf8_general_ci'] |
|
| 153 | - ] |
|
| 152 | + 'utf-8' => ['charset' => 'utf8', 'collation' => 'utf8_general_ci'] |
|
| 153 | + ] |
|
| 154 | 154 | ]; |
| 155 | 155 | |
| 156 | 156 | |
@@ -161,9 +161,9 @@ discard block |
||
| 161 | 161 | * @return Object Information de connexion pour mysqli |
| 162 | 162 | */ |
| 163 | 163 | function _mysql_link($serveur = '') { |
| 164 | - $link = &$GLOBALS['connexions'][$serveur ?: 0]['link']; |
|
| 164 | + $link = &$GLOBALS['connexions'][$serveur ?: 0]['link']; |
|
| 165 | 165 | |
| 166 | - return $link; |
|
| 166 | + return $link; |
|
| 167 | 167 | } |
| 168 | 168 | |
| 169 | 169 | |
@@ -176,10 +176,10 @@ discard block |
||
| 176 | 176 | * @return mysqli_result|bool Jeu de résultats pour fetch() |
| 177 | 177 | */ |
| 178 | 178 | function spip_mysql_set_charset($charset, $serveur = '', $requeter = true) { |
| 179 | - $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 180 | - spip_log('changement de charset sql : ' . 'SET NAMES ' . _q($charset), _LOG_DEBUG); |
|
| 179 | + $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 180 | + spip_log('changement de charset sql : ' . 'SET NAMES ' . _q($charset), _LOG_DEBUG); |
|
| 181 | 181 | |
| 182 | - return mysqli_query($connexion['link'], $connexion['last'] = 'SET NAMES ' . _q($charset)); |
|
| 182 | + return mysqli_query($connexion['link'], $connexion['last'] = 'SET NAMES ' . _q($charset)); |
|
| 183 | 183 | } |
| 184 | 184 | |
| 185 | 185 | |
@@ -192,11 +192,11 @@ discard block |
||
| 192 | 192 | * @return array Description du charset (son nom est dans 'charset') |
| 193 | 193 | */ |
| 194 | 194 | function spip_mysql_get_charset($charset = [], $serveur = '', $requeter = true) { |
| 195 | - $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 196 | - $connexion['last'] = $c = 'SHOW CHARACTER SET' |
|
| 197 | - . (!$charset ? '' : (' LIKE ' . _q($charset['charset']))); |
|
| 195 | + $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 196 | + $connexion['last'] = $c = 'SHOW CHARACTER SET' |
|
| 197 | + . (!$charset ? '' : (' LIKE ' . _q($charset['charset']))); |
|
| 198 | 198 | |
| 199 | - return spip_mysql_fetch(mysqli_query($connexion['link'], $c), null, $serveur); |
|
| 199 | + return spip_mysql_fetch(mysqli_query($connexion['link'], $c), null, $serveur); |
|
| 200 | 200 | } |
| 201 | 201 | |
| 202 | 202 | /** |
@@ -212,80 +212,80 @@ discard block |
||
| 212 | 212 | */ |
| 213 | 213 | function spip_mysql_query($query, $serveur = '', $requeter = true) { |
| 214 | 214 | |
| 215 | - $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 216 | - $prefixe = $connexion['prefixe']; |
|
| 217 | - $link = $connexion['link']; |
|
| 218 | - $db = $connexion['db']; |
|
| 219 | - |
|
| 220 | - $query = _mysql_traite_query($query, $db, $prefixe); |
|
| 221 | - |
|
| 222 | - // renvoyer la requete inerte si demandee |
|
| 223 | - if (!$requeter) { |
|
| 224 | - return $query; |
|
| 225 | - } |
|
| 226 | - |
|
| 227 | - if (isset($_GET['var_profile']) or (defined('_DEBUG_TRACE_QUERIES') and _DEBUG_TRACE_QUERIES)) { |
|
| 228 | - include_spip('public/tracer'); |
|
| 229 | - $t = trace_query_start(); |
|
| 230 | - } else { |
|
| 231 | - $t = 0; |
|
| 232 | - } |
|
| 233 | - |
|
| 234 | - $connexion['last'] = $query; |
|
| 235 | - $connexion['total_requetes']++; |
|
| 236 | - |
|
| 237 | - // ajouter un debug utile dans log/mysql-slow.log ? |
|
| 238 | - $debug = ''; |
|
| 239 | - if (defined('_DEBUG_SLOW_QUERIES') and _DEBUG_SLOW_QUERIES) { |
|
| 240 | - if (isset($GLOBALS['debug']['aucasou'])) { |
|
| 241 | - [, $id, , $infos] = $GLOBALS['debug']['aucasou']; |
|
| 242 | - $debug .= "BOUCLE$id @ " . ($infos[0] ?? '') . ' | '; |
|
| 243 | - } |
|
| 244 | - if (isset($_SERVER['REQUEST_URI'])) { |
|
| 245 | - $debug .= $_SERVER['REQUEST_URI']; |
|
| 246 | - } |
|
| 247 | - if (!empty($GLOBALS['ip'])) { |
|
| 248 | - $debug .= ' + ' . $GLOBALS['ip']; |
|
| 249 | - } |
|
| 250 | - $debug = ' /* ' . mysqli_real_escape_string($link, str_replace('*/', '@/', $debug)) . ' */'; |
|
| 251 | - } |
|
| 252 | - try { |
|
| 253 | - $r = mysqli_query($link, $query . $debug); |
|
| 254 | - } catch (\mysqli_sql_exception $e) { |
|
| 255 | - spip_log('mysqli_sql_exception: ' . $e->getMessage(), 'mysql.' . _LOG_DEBUG); |
|
| 256 | - $r = false; |
|
| 257 | - // TODO: utiliser l’exception ensuite plutôt que les appels à spip_mysql_errno() |
|
| 258 | - // mais il faut pour php < 8.1 forcer les exeptions via mysqli_report(). |
|
| 259 | - } |
|
| 260 | - |
|
| 261 | - //Eviter de propager le GoneAway sur les autres requetes d'un même processus PHP |
|
| 262 | - if ($e = spip_mysql_errno($serveur)) { // Log d'un Gone Away |
|
| 263 | - if ($e == 2006) { //Si Gone Away on relance une connexion vierge |
|
| 264 | - //Fermer la connexion defaillante |
|
| 265 | - mysqli_close($connexion['link']); |
|
| 266 | - unset($GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]); |
|
| 267 | - //Relancer une connexion vierge |
|
| 268 | - spip_connect($serveur); |
|
| 269 | - $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 270 | - $link = $connexion['link']; |
|
| 271 | - //On retente au cas où |
|
| 272 | - try { |
|
| 273 | - $r = mysqli_query($link, $query . $debug); |
|
| 274 | - } catch (\mysqli_sql_exception $e) { |
|
| 275 | - spip_log('mysqli_sql_exception: ' . $e->getMessage(), 'mysql.' . _LOG_DEBUG); |
|
| 276 | - $r = false; |
|
| 277 | - // TODO: utiliser l’exception ensuite plutôt que les appels à spip_mysql_errno() |
|
| 278 | - // mais il faut pour php < 8.1 forcer les exeptions via mysqli_report(). |
|
| 279 | - } |
|
| 280 | - } |
|
| 281 | - } |
|
| 282 | - |
|
| 283 | - // Log de l'erreur eventuelle |
|
| 284 | - if ($e = spip_mysql_errno($serveur)) { |
|
| 285 | - // et du fautif |
|
| 286 | - $e .= spip_mysql_error($query, $serveur); |
|
| 287 | - } |
|
| 288 | - return $t ? trace_query_end($query, $t, $r, $e, $serveur) : $r; |
|
| 215 | + $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 216 | + $prefixe = $connexion['prefixe']; |
|
| 217 | + $link = $connexion['link']; |
|
| 218 | + $db = $connexion['db']; |
|
| 219 | + |
|
| 220 | + $query = _mysql_traite_query($query, $db, $prefixe); |
|
| 221 | + |
|
| 222 | + // renvoyer la requete inerte si demandee |
|
| 223 | + if (!$requeter) { |
|
| 224 | + return $query; |
|
| 225 | + } |
|
| 226 | + |
|
| 227 | + if (isset($_GET['var_profile']) or (defined('_DEBUG_TRACE_QUERIES') and _DEBUG_TRACE_QUERIES)) { |
|
| 228 | + include_spip('public/tracer'); |
|
| 229 | + $t = trace_query_start(); |
|
| 230 | + } else { |
|
| 231 | + $t = 0; |
|
| 232 | + } |
|
| 233 | + |
|
| 234 | + $connexion['last'] = $query; |
|
| 235 | + $connexion['total_requetes']++; |
|
| 236 | + |
|
| 237 | + // ajouter un debug utile dans log/mysql-slow.log ? |
|
| 238 | + $debug = ''; |
|
| 239 | + if (defined('_DEBUG_SLOW_QUERIES') and _DEBUG_SLOW_QUERIES) { |
|
| 240 | + if (isset($GLOBALS['debug']['aucasou'])) { |
|
| 241 | + [, $id, , $infos] = $GLOBALS['debug']['aucasou']; |
|
| 242 | + $debug .= "BOUCLE$id @ " . ($infos[0] ?? '') . ' | '; |
|
| 243 | + } |
|
| 244 | + if (isset($_SERVER['REQUEST_URI'])) { |
|
| 245 | + $debug .= $_SERVER['REQUEST_URI']; |
|
| 246 | + } |
|
| 247 | + if (!empty($GLOBALS['ip'])) { |
|
| 248 | + $debug .= ' + ' . $GLOBALS['ip']; |
|
| 249 | + } |
|
| 250 | + $debug = ' /* ' . mysqli_real_escape_string($link, str_replace('*/', '@/', $debug)) . ' */'; |
|
| 251 | + } |
|
| 252 | + try { |
|
| 253 | + $r = mysqli_query($link, $query . $debug); |
|
| 254 | + } catch (\mysqli_sql_exception $e) { |
|
| 255 | + spip_log('mysqli_sql_exception: ' . $e->getMessage(), 'mysql.' . _LOG_DEBUG); |
|
| 256 | + $r = false; |
|
| 257 | + // TODO: utiliser l’exception ensuite plutôt que les appels à spip_mysql_errno() |
|
| 258 | + // mais il faut pour php < 8.1 forcer les exeptions via mysqli_report(). |
|
| 259 | + } |
|
| 260 | + |
|
| 261 | + //Eviter de propager le GoneAway sur les autres requetes d'un même processus PHP |
|
| 262 | + if ($e = spip_mysql_errno($serveur)) { // Log d'un Gone Away |
|
| 263 | + if ($e == 2006) { //Si Gone Away on relance une connexion vierge |
|
| 264 | + //Fermer la connexion defaillante |
|
| 265 | + mysqli_close($connexion['link']); |
|
| 266 | + unset($GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]); |
|
| 267 | + //Relancer une connexion vierge |
|
| 268 | + spip_connect($serveur); |
|
| 269 | + $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 270 | + $link = $connexion['link']; |
|
| 271 | + //On retente au cas où |
|
| 272 | + try { |
|
| 273 | + $r = mysqli_query($link, $query . $debug); |
|
| 274 | + } catch (\mysqli_sql_exception $e) { |
|
| 275 | + spip_log('mysqli_sql_exception: ' . $e->getMessage(), 'mysql.' . _LOG_DEBUG); |
|
| 276 | + $r = false; |
|
| 277 | + // TODO: utiliser l’exception ensuite plutôt que les appels à spip_mysql_errno() |
|
| 278 | + // mais il faut pour php < 8.1 forcer les exeptions via mysqli_report(). |
|
| 279 | + } |
|
| 280 | + } |
|
| 281 | + } |
|
| 282 | + |
|
| 283 | + // Log de l'erreur eventuelle |
|
| 284 | + if ($e = spip_mysql_errno($serveur)) { |
|
| 285 | + // et du fautif |
|
| 286 | + $e .= spip_mysql_error($query, $serveur); |
|
| 287 | + } |
|
| 288 | + return $t ? trace_query_end($query, $t, $r, $e, $serveur) : $r; |
|
| 289 | 289 | } |
| 290 | 290 | |
| 291 | 291 | /** |
@@ -300,12 +300,12 @@ discard block |
||
| 300 | 300 | * - array : Tableau décrivant requête et temps d'exécution si var_profile actif pour tracer. |
| 301 | 301 | */ |
| 302 | 302 | function spip_mysql_alter($query, $serveur = '', $requeter = true) { |
| 303 | - // ici on supprime les ` entourant le nom de table pour permettre |
|
| 304 | - // la transposition du prefixe, compte tenu que les plugins ont la mauvaise habitude |
|
| 305 | - // d'utiliser ceux-ci, copie-colle de phpmyadmin |
|
| 306 | - $query = preg_replace(',^TABLE\s*`([^`]*)`,i', "TABLE \\1", $query); |
|
| 303 | + // ici on supprime les ` entourant le nom de table pour permettre |
|
| 304 | + // la transposition du prefixe, compte tenu que les plugins ont la mauvaise habitude |
|
| 305 | + // d'utiliser ceux-ci, copie-colle de phpmyadmin |
|
| 306 | + $query = preg_replace(',^TABLE\s*`([^`]*)`,i', "TABLE \\1", $query); |
|
| 307 | 307 | |
| 308 | - return spip_mysql_query('ALTER ' . $query, $serveur, $requeter); # i.e. que PG se debrouille |
|
| 308 | + return spip_mysql_query('ALTER ' . $query, $serveur, $requeter); # i.e. que PG se debrouille |
|
| 309 | 309 | } |
| 310 | 310 | |
| 311 | 311 | |
@@ -318,9 +318,9 @@ discard block |
||
| 318 | 318 | * @return bool Toujours true |
| 319 | 319 | */ |
| 320 | 320 | function spip_mysql_optimize($table, $serveur = '', $requeter = true) { |
| 321 | - spip_mysql_query('OPTIMIZE TABLE ' . $table); |
|
| 321 | + spip_mysql_query('OPTIMIZE TABLE ' . $table); |
|
| 322 | 322 | |
| 323 | - return true; |
|
| 323 | + return true; |
|
| 324 | 324 | } |
| 325 | 325 | |
| 326 | 326 | |
@@ -333,18 +333,18 @@ discard block |
||
| 333 | 333 | * @return array Tableau de l'explication |
| 334 | 334 | */ |
| 335 | 335 | function spip_mysql_explain($query, $serveur = '', $requeter = true) { |
| 336 | - if (strpos(ltrim($query), 'SELECT') !== 0) { |
|
| 337 | - return []; |
|
| 338 | - } |
|
| 339 | - $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 340 | - $prefixe = $connexion['prefixe']; |
|
| 341 | - $link = $connexion['link']; |
|
| 342 | - $db = $connexion['db']; |
|
| 343 | - |
|
| 344 | - $query = 'EXPLAIN ' . _mysql_traite_query($query, $db, $prefixe); |
|
| 345 | - $r = mysqli_query($link, $query); |
|
| 346 | - |
|
| 347 | - return spip_mysql_fetch($r, null, $serveur); |
|
| 336 | + if (strpos(ltrim($query), 'SELECT') !== 0) { |
|
| 337 | + return []; |
|
| 338 | + } |
|
| 339 | + $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 340 | + $prefixe = $connexion['prefixe']; |
|
| 341 | + $link = $connexion['link']; |
|
| 342 | + $db = $connexion['db']; |
|
| 343 | + |
|
| 344 | + $query = 'EXPLAIN ' . _mysql_traite_query($query, $db, $prefixe); |
|
| 345 | + $r = mysqli_query($link, $query); |
|
| 346 | + |
|
| 347 | + return spip_mysql_fetch($r, null, $serveur); |
|
| 348 | 348 | } |
| 349 | 349 | |
| 350 | 350 | |
@@ -373,35 +373,35 @@ discard block |
||
| 373 | 373 | * - array : Tableau décrivant requête et temps d'exécution si var_profile actif pour tracer. |
| 374 | 374 | */ |
| 375 | 375 | function spip_mysql_select( |
| 376 | - $select, |
|
| 377 | - $from, |
|
| 378 | - $where = '', |
|
| 379 | - $groupby = '', |
|
| 380 | - $orderby = '', |
|
| 381 | - $limit = '', |
|
| 382 | - $having = '', |
|
| 383 | - $serveur = '', |
|
| 384 | - $requeter = true |
|
| 376 | + $select, |
|
| 377 | + $from, |
|
| 378 | + $where = '', |
|
| 379 | + $groupby = '', |
|
| 380 | + $orderby = '', |
|
| 381 | + $limit = '', |
|
| 382 | + $having = '', |
|
| 383 | + $serveur = '', |
|
| 384 | + $requeter = true |
|
| 385 | 385 | ) { |
| 386 | 386 | |
| 387 | 387 | |
| 388 | - $from = (!is_array($from) ? $from : spip_mysql_select_as($from)); |
|
| 389 | - $query = |
|
| 390 | - calculer_mysql_expression('SELECT', $select, ', ') |
|
| 391 | - . calculer_mysql_expression('FROM', $from, ', ') |
|
| 392 | - . calculer_mysql_expression('WHERE', $where) |
|
| 393 | - . calculer_mysql_expression('GROUP BY', $groupby, ',') |
|
| 394 | - . calculer_mysql_expression('HAVING', $having) |
|
| 395 | - . ($orderby ? ("\nORDER BY " . spip_mysql_order($orderby)) : '') |
|
| 396 | - . ($limit ? "\nLIMIT $limit" : ''); |
|
| 388 | + $from = (!is_array($from) ? $from : spip_mysql_select_as($from)); |
|
| 389 | + $query = |
|
| 390 | + calculer_mysql_expression('SELECT', $select, ', ') |
|
| 391 | + . calculer_mysql_expression('FROM', $from, ', ') |
|
| 392 | + . calculer_mysql_expression('WHERE', $where) |
|
| 393 | + . calculer_mysql_expression('GROUP BY', $groupby, ',') |
|
| 394 | + . calculer_mysql_expression('HAVING', $having) |
|
| 395 | + . ($orderby ? ("\nORDER BY " . spip_mysql_order($orderby)) : '') |
|
| 396 | + . ($limit ? "\nLIMIT $limit" : ''); |
|
| 397 | 397 | |
| 398 | - // renvoyer la requete inerte si demandee |
|
| 399 | - if ($requeter === false) { |
|
| 400 | - return $query; |
|
| 401 | - } |
|
| 402 | - $r = spip_mysql_query($query, $serveur, $requeter); |
|
| 398 | + // renvoyer la requete inerte si demandee |
|
| 399 | + if ($requeter === false) { |
|
| 400 | + return $query; |
|
| 401 | + } |
|
| 402 | + $r = spip_mysql_query($query, $serveur, $requeter); |
|
| 403 | 403 | |
| 404 | - return $r ?: $query; |
|
| 404 | + return $r ?: $query; |
|
| 405 | 405 | } |
| 406 | 406 | |
| 407 | 407 | |
@@ -418,7 +418,7 @@ discard block |
||
| 418 | 418 | * @return string Texte du orderby préparé |
| 419 | 419 | */ |
| 420 | 420 | function spip_mysql_order($orderby) { |
| 421 | - return (is_array($orderby)) ? join(', ', $orderby) : $orderby; |
|
| 421 | + return (is_array($orderby)) ? join(', ', $orderby) : $orderby; |
|
| 422 | 422 | } |
| 423 | 423 | |
| 424 | 424 | |
@@ -441,26 +441,26 @@ discard block |
||
| 441 | 441 | * Contrainte pour clause WHERE |
| 442 | 442 | */ |
| 443 | 443 | function calculer_mysql_where($v) { |
| 444 | - if (!is_array($v)) { |
|
| 445 | - return $v; |
|
| 446 | - } |
|
| 447 | - |
|
| 448 | - $op = array_shift($v); |
|
| 449 | - if (!($n = count($v))) { |
|
| 450 | - return $op; |
|
| 451 | - } else { |
|
| 452 | - $arg = calculer_mysql_where(array_shift($v)); |
|
| 453 | - if ($n == 1) { |
|
| 454 | - return "$op($arg)"; |
|
| 455 | - } else { |
|
| 456 | - $arg2 = calculer_mysql_where(array_shift($v)); |
|
| 457 | - if ($n == 2) { |
|
| 458 | - return "($arg $op $arg2)"; |
|
| 459 | - } else { |
|
| 460 | - return "($arg $op ($arg2) : $v[0])"; |
|
| 461 | - } |
|
| 462 | - } |
|
| 463 | - } |
|
| 444 | + if (!is_array($v)) { |
|
| 445 | + return $v; |
|
| 446 | + } |
|
| 447 | + |
|
| 448 | + $op = array_shift($v); |
|
| 449 | + if (!($n = count($v))) { |
|
| 450 | + return $op; |
|
| 451 | + } else { |
|
| 452 | + $arg = calculer_mysql_where(array_shift($v)); |
|
| 453 | + if ($n == 1) { |
|
| 454 | + return "$op($arg)"; |
|
| 455 | + } else { |
|
| 456 | + $arg2 = calculer_mysql_where(array_shift($v)); |
|
| 457 | + if ($n == 2) { |
|
| 458 | + return "($arg $op $arg2)"; |
|
| 459 | + } else { |
|
| 460 | + return "($arg $op ($arg2) : $v[0])"; |
|
| 461 | + } |
|
| 462 | + } |
|
| 463 | + } |
|
| 464 | 464 | } |
| 465 | 465 | |
| 466 | 466 | /** |
@@ -475,21 +475,21 @@ discard block |
||
| 475 | 475 | * @return string Texte de l'expression, une partie donc, du texte la requête. |
| 476 | 476 | */ |
| 477 | 477 | function calculer_mysql_expression($expression, $v, $join = 'AND') { |
| 478 | - if (empty($v)) { |
|
| 479 | - return ''; |
|
| 480 | - } |
|
| 481 | - |
|
| 482 | - $exp = "\n$expression "; |
|
| 483 | - |
|
| 484 | - if (!is_array($v)) { |
|
| 485 | - return $exp . $v; |
|
| 486 | - } else { |
|
| 487 | - if (strtoupper($join) === 'AND') { |
|
| 488 | - return $exp . join("\n\t$join ", array_map('calculer_mysql_where', $v)); |
|
| 489 | - } else { |
|
| 490 | - return $exp . join($join, $v); |
|
| 491 | - } |
|
| 492 | - } |
|
| 478 | + if (empty($v)) { |
|
| 479 | + return ''; |
|
| 480 | + } |
|
| 481 | + |
|
| 482 | + $exp = "\n$expression "; |
|
| 483 | + |
|
| 484 | + if (!is_array($v)) { |
|
| 485 | + return $exp . $v; |
|
| 486 | + } else { |
|
| 487 | + if (strtoupper($join) === 'AND') { |
|
| 488 | + return $exp . join("\n\t$join ", array_map('calculer_mysql_where', $v)); |
|
| 489 | + } else { |
|
| 490 | + return $exp . join($join, $v); |
|
| 491 | + } |
|
| 492 | + } |
|
| 493 | 493 | } |
| 494 | 494 | |
| 495 | 495 | |
@@ -500,26 +500,26 @@ discard block |
||
| 500 | 500 | * @return string Sélection de colonnes pour une clause SELECT |
| 501 | 501 | */ |
| 502 | 502 | function spip_mysql_select_as($args) { |
| 503 | - $res = ''; |
|
| 504 | - foreach ($args as $k => $v) { |
|
| 505 | - if (substr($k, -1) == '@') { |
|
| 506 | - // c'est une jointure qui se refere au from precedent |
|
| 507 | - // pas de virgule |
|
| 508 | - $res .= ' ' . $v; |
|
| 509 | - } else { |
|
| 510 | - if (!is_numeric($k)) { |
|
| 511 | - $p = strpos($v, ' '); |
|
| 512 | - if ($p) { |
|
| 513 | - $v = substr($v, 0, $p) . " AS `$k`" . substr($v, $p); |
|
| 514 | - } else { |
|
| 515 | - $v .= " AS `$k`"; |
|
| 516 | - } |
|
| 517 | - } |
|
| 518 | - $res .= ', ' . $v; |
|
| 519 | - } |
|
| 520 | - } |
|
| 521 | - |
|
| 522 | - return substr($res, 2); |
|
| 503 | + $res = ''; |
|
| 504 | + foreach ($args as $k => $v) { |
|
| 505 | + if (substr($k, -1) == '@') { |
|
| 506 | + // c'est une jointure qui se refere au from precedent |
|
| 507 | + // pas de virgule |
|
| 508 | + $res .= ' ' . $v; |
|
| 509 | + } else { |
|
| 510 | + if (!is_numeric($k)) { |
|
| 511 | + $p = strpos($v, ' '); |
|
| 512 | + if ($p) { |
|
| 513 | + $v = substr($v, 0, $p) . " AS `$k`" . substr($v, $p); |
|
| 514 | + } else { |
|
| 515 | + $v .= " AS `$k`"; |
|
| 516 | + } |
|
| 517 | + } |
|
| 518 | + $res .= ', ' . $v; |
|
| 519 | + } |
|
| 520 | + } |
|
| 521 | + |
|
| 522 | + return substr($res, 2); |
|
| 523 | 523 | } |
| 524 | 524 | |
| 525 | 525 | |
@@ -544,58 +544,58 @@ discard block |
||
| 544 | 544 | */ |
| 545 | 545 | function _mysql_traite_query($query, $db = '', $prefixe = '', $echappe_textes = true) { |
| 546 | 546 | |
| 547 | - if ($GLOBALS['mysql_rappel_nom_base'] and $db) { |
|
| 548 | - $pref = '`' . $db . '`.'; |
|
| 549 | - } else { |
|
| 550 | - $pref = ''; |
|
| 551 | - } |
|
| 552 | - |
|
| 553 | - if ($prefixe) { |
|
| 554 | - $pref .= $prefixe . '_'; |
|
| 555 | - } |
|
| 556 | - |
|
| 557 | - if (!preg_match('/\s(SET|VALUES|WHERE|DATABASE)\s/i', $query, $regs)) { |
|
| 558 | - $suite = ''; |
|
| 559 | - } else { |
|
| 560 | - $suite = strstr($query, (string) $regs[0]); |
|
| 561 | - $query = substr($query, 0, -strlen($suite)); |
|
| 562 | - // propager le prefixe en cas de requete imbriquee |
|
| 563 | - // il faut alors echapper les chaine avant de le faire, pour ne pas risquer de |
|
| 564 | - // modifier une requete qui est en fait juste du texte dans un champ |
|
| 565 | - if (stripos($suite, 'SELECT') !== false) { |
|
| 566 | - if ($echappe_textes) { |
|
| 567 | - [$suite_echap, $textes] = query_echappe_textes($suite); |
|
| 568 | - } |
|
| 569 | - else { |
|
| 570 | - $suite_echap = $suite; |
|
| 571 | - } |
|
| 572 | - if (preg_match('/^(.*?)([(]\s*SELECT\b.*)$/si', $suite_echap, $r)) { |
|
| 573 | - $suite_echap = $r[1] . _mysql_traite_query($r[2], $db, $prefixe, false); |
|
| 574 | - if ($echappe_textes) { |
|
| 575 | - $suite = query_reinjecte_textes($suite_echap, $textes); |
|
| 576 | - } |
|
| 577 | - else { |
|
| 578 | - $suite = $suite_echap; |
|
| 579 | - } |
|
| 580 | - } |
|
| 581 | - } |
|
| 582 | - } |
|
| 583 | - $r = preg_replace(_SQL_PREFIXE_TABLE_MYSQL, '\1' . $pref, $query) . $suite; |
|
| 584 | - |
|
| 585 | - // en option, remplacer les emoji (que mysql ne sait pas gérer) en 💩 |
|
| 586 | - // remplacer les emoji (que mysql ne sait pas gérer) en 💩 |
|
| 587 | - if ( |
|
| 588 | - defined('_MYSQL_NOPLANES') |
|
| 589 | - and _MYSQL_NOPLANES |
|
| 590 | - and !empty($GLOBALS['meta']['charset_sql_connexion']) |
|
| 591 | - and $GLOBALS['meta']['charset_sql_connexion'] == 'utf8' |
|
| 592 | - ) { |
|
| 593 | - include_spip('inc/charsets'); |
|
| 594 | - $r = utf8_noplanes($r); |
|
| 595 | - } |
|
| 596 | - |
|
| 597 | - #spip_log("_mysql_traite_query: " . substr($r,0, 50) . ".... $db, $prefixe", _LOG_DEBUG); |
|
| 598 | - return $r; |
|
| 547 | + if ($GLOBALS['mysql_rappel_nom_base'] and $db) { |
|
| 548 | + $pref = '`' . $db . '`.'; |
|
| 549 | + } else { |
|
| 550 | + $pref = ''; |
|
| 551 | + } |
|
| 552 | + |
|
| 553 | + if ($prefixe) { |
|
| 554 | + $pref .= $prefixe . '_'; |
|
| 555 | + } |
|
| 556 | + |
|
| 557 | + if (!preg_match('/\s(SET|VALUES|WHERE|DATABASE)\s/i', $query, $regs)) { |
|
| 558 | + $suite = ''; |
|
| 559 | + } else { |
|
| 560 | + $suite = strstr($query, (string) $regs[0]); |
|
| 561 | + $query = substr($query, 0, -strlen($suite)); |
|
| 562 | + // propager le prefixe en cas de requete imbriquee |
|
| 563 | + // il faut alors echapper les chaine avant de le faire, pour ne pas risquer de |
|
| 564 | + // modifier une requete qui est en fait juste du texte dans un champ |
|
| 565 | + if (stripos($suite, 'SELECT') !== false) { |
|
| 566 | + if ($echappe_textes) { |
|
| 567 | + [$suite_echap, $textes] = query_echappe_textes($suite); |
|
| 568 | + } |
|
| 569 | + else { |
|
| 570 | + $suite_echap = $suite; |
|
| 571 | + } |
|
| 572 | + if (preg_match('/^(.*?)([(]\s*SELECT\b.*)$/si', $suite_echap, $r)) { |
|
| 573 | + $suite_echap = $r[1] . _mysql_traite_query($r[2], $db, $prefixe, false); |
|
| 574 | + if ($echappe_textes) { |
|
| 575 | + $suite = query_reinjecte_textes($suite_echap, $textes); |
|
| 576 | + } |
|
| 577 | + else { |
|
| 578 | + $suite = $suite_echap; |
|
| 579 | + } |
|
| 580 | + } |
|
| 581 | + } |
|
| 582 | + } |
|
| 583 | + $r = preg_replace(_SQL_PREFIXE_TABLE_MYSQL, '\1' . $pref, $query) . $suite; |
|
| 584 | + |
|
| 585 | + // en option, remplacer les emoji (que mysql ne sait pas gérer) en 💩 |
|
| 586 | + // remplacer les emoji (que mysql ne sait pas gérer) en 💩 |
|
| 587 | + if ( |
|
| 588 | + defined('_MYSQL_NOPLANES') |
|
| 589 | + and _MYSQL_NOPLANES |
|
| 590 | + and !empty($GLOBALS['meta']['charset_sql_connexion']) |
|
| 591 | + and $GLOBALS['meta']['charset_sql_connexion'] == 'utf8' |
|
| 592 | + ) { |
|
| 593 | + include_spip('inc/charsets'); |
|
| 594 | + $r = utf8_noplanes($r); |
|
| 595 | + } |
|
| 596 | + |
|
| 597 | + #spip_log("_mysql_traite_query: " . substr($r,0, 50) . ".... $db, $prefixe", _LOG_DEBUG); |
|
| 598 | + return $r; |
|
| 599 | 599 | } |
| 600 | 600 | |
| 601 | 601 | /** |
@@ -613,17 +613,17 @@ discard block |
||
| 613 | 613 | * - False en cas d'erreur. |
| 614 | 614 | **/ |
| 615 | 615 | function spip_mysql_selectdb($db, $serveur = '', $requeter = true) { |
| 616 | - $link = _mysql_link($serveur); |
|
| 617 | - try { |
|
| 618 | - $ok = mysqli_select_db($link, $db); |
|
| 619 | - } catch (\mysqli_sql_exception $e) { |
|
| 620 | - $ok = false; |
|
| 621 | - } |
|
| 622 | - if (!$ok) { |
|
| 623 | - spip_log('Echec mysqli_selectdb. Erreur : ' . mysqli_error($link), 'mysql.' . _LOG_CRITIQUE); |
|
| 624 | - } |
|
| 625 | - |
|
| 626 | - return $ok; |
|
| 616 | + $link = _mysql_link($serveur); |
|
| 617 | + try { |
|
| 618 | + $ok = mysqli_select_db($link, $db); |
|
| 619 | + } catch (\mysqli_sql_exception $e) { |
|
| 620 | + $ok = false; |
|
| 621 | + } |
|
| 622 | + if (!$ok) { |
|
| 623 | + spip_log('Echec mysqli_selectdb. Erreur : ' . mysqli_error($link), 'mysql.' . _LOG_CRITIQUE); |
|
| 624 | + } |
|
| 625 | + |
|
| 626 | + return $ok; |
|
| 627 | 627 | } |
| 628 | 628 | |
| 629 | 629 | |
@@ -644,14 +644,14 @@ discard block |
||
| 644 | 644 | * Liste de noms de bases de données |
| 645 | 645 | **/ |
| 646 | 646 | function spip_mysql_listdbs($serveur = '', $requeter = true) { |
| 647 | - $dbs = []; |
|
| 648 | - if ($res = spip_mysql_query('SHOW DATABASES', $serveur)) { |
|
| 649 | - while ($row = mysqli_fetch_assoc($res)) { |
|
| 650 | - $dbs[] = $row['Database']; |
|
| 651 | - } |
|
| 652 | - } |
|
| 653 | - |
|
| 654 | - return $dbs; |
|
| 647 | + $dbs = []; |
|
| 648 | + if ($res = spip_mysql_query('SHOW DATABASES', $serveur)) { |
|
| 649 | + while ($row = mysqli_fetch_assoc($res)) { |
|
| 650 | + $dbs[] = $row['Database']; |
|
| 651 | + } |
|
| 652 | + } |
|
| 653 | + |
|
| 654 | + return $dbs; |
|
| 655 | 655 | } |
| 656 | 656 | |
| 657 | 657 | |
@@ -674,73 +674,73 @@ discard block |
||
| 674 | 674 | * - true si la requête réussie, false sinon. |
| 675 | 675 | */ |
| 676 | 676 | function spip_mysql_create( |
| 677 | - $nom, |
|
| 678 | - $champs, |
|
| 679 | - $cles, |
|
| 680 | - $autoinc = false, |
|
| 681 | - $temporary = false, |
|
| 682 | - $serveur = '', |
|
| 683 | - $requeter = true |
|
| 677 | + $nom, |
|
| 678 | + $champs, |
|
| 679 | + $cles, |
|
| 680 | + $autoinc = false, |
|
| 681 | + $temporary = false, |
|
| 682 | + $serveur = '', |
|
| 683 | + $requeter = true |
|
| 684 | 684 | ) { |
| 685 | 685 | |
| 686 | - $query = ''; |
|
| 687 | - $keys = ''; |
|
| 688 | - $s = ''; |
|
| 689 | - $p = ''; |
|
| 690 | - |
|
| 691 | - // certains plugins declarent les tables (permet leur inclusion dans le dump) |
|
| 692 | - // sans les renseigner (laisse le compilo recuperer la description) |
|
| 693 | - if (!is_array($champs) || !is_array($cles)) { |
|
| 694 | - return; |
|
| 695 | - } |
|
| 696 | - |
|
| 697 | - $res = spip_mysql_query('SELECT version() as v', $serveur); |
|
| 698 | - if (($row = mysqli_fetch_array($res)) && (version_compare($row['v'], '5.0', '>='))) { |
|
| 699 | - spip_mysql_query("SET sql_mode=''", $serveur); |
|
| 700 | - } |
|
| 701 | - |
|
| 702 | - foreach ($cles as $k => $v) { |
|
| 703 | - $keys .= "$s\n\t\t$k ($v)"; |
|
| 704 | - if ($k == 'PRIMARY KEY') { |
|
| 705 | - $p = $v; |
|
| 706 | - } |
|
| 707 | - $s = ','; |
|
| 708 | - } |
|
| 709 | - $s = ''; |
|
| 710 | - |
|
| 711 | - $character_set = ''; |
|
| 712 | - if (@$GLOBALS['meta']['charset_sql_base']) { |
|
| 713 | - $character_set .= ' CHARACTER SET ' . $GLOBALS['meta']['charset_sql_base']; |
|
| 714 | - } |
|
| 715 | - if (@$GLOBALS['meta']['charset_collation_sql_base']) { |
|
| 716 | - $character_set .= ' COLLATE ' . $GLOBALS['meta']['charset_collation_sql_base']; |
|
| 717 | - } |
|
| 718 | - |
|
| 719 | - foreach ($champs as $k => $v) { |
|
| 720 | - $v = _mysql_remplacements_definitions_table($v); |
|
| 721 | - if (preg_match(',([a-z]*\s*(\(\s*[0-9]*\s*\))?(\s*binary)?),i', $v, $defs)) { |
|
| 722 | - if ( |
|
| 723 | - preg_match(',(char|text),i', $defs[1]) |
|
| 724 | - and !preg_match(',(binary|CHARACTER|COLLATE),i', $v) |
|
| 725 | - ) { |
|
| 726 | - $v = $defs[1] . $character_set . ' ' . substr($v, strlen($defs[1])); |
|
| 727 | - } |
|
| 728 | - } |
|
| 729 | - |
|
| 730 | - $query .= "$s\n\t\t$k $v" |
|
| 731 | - . (($autoinc && ($p == $k) && preg_match(',\b(big|small|medium)?int\b,i', $v)) |
|
| 732 | - ? ' auto_increment' |
|
| 733 | - : '' |
|
| 734 | - ); |
|
| 735 | - $s = ','; |
|
| 736 | - } |
|
| 737 | - $temporary = $temporary ? 'TEMPORARY' : ''; |
|
| 738 | - $q = "CREATE $temporary TABLE IF NOT EXISTS $nom ($query" . ($keys ? ",$keys" : '') . ')' |
|
| 739 | - . ' ENGINE=' . _MYSQL_ENGINE |
|
| 740 | - . ($character_set ? " DEFAULT $character_set" : '') |
|
| 741 | - . "\n"; |
|
| 742 | - |
|
| 743 | - return spip_mysql_query($q, $serveur); |
|
| 686 | + $query = ''; |
|
| 687 | + $keys = ''; |
|
| 688 | + $s = ''; |
|
| 689 | + $p = ''; |
|
| 690 | + |
|
| 691 | + // certains plugins declarent les tables (permet leur inclusion dans le dump) |
|
| 692 | + // sans les renseigner (laisse le compilo recuperer la description) |
|
| 693 | + if (!is_array($champs) || !is_array($cles)) { |
|
| 694 | + return; |
|
| 695 | + } |
|
| 696 | + |
|
| 697 | + $res = spip_mysql_query('SELECT version() as v', $serveur); |
|
| 698 | + if (($row = mysqli_fetch_array($res)) && (version_compare($row['v'], '5.0', '>='))) { |
|
| 699 | + spip_mysql_query("SET sql_mode=''", $serveur); |
|
| 700 | + } |
|
| 701 | + |
|
| 702 | + foreach ($cles as $k => $v) { |
|
| 703 | + $keys .= "$s\n\t\t$k ($v)"; |
|
| 704 | + if ($k == 'PRIMARY KEY') { |
|
| 705 | + $p = $v; |
|
| 706 | + } |
|
| 707 | + $s = ','; |
|
| 708 | + } |
|
| 709 | + $s = ''; |
|
| 710 | + |
|
| 711 | + $character_set = ''; |
|
| 712 | + if (@$GLOBALS['meta']['charset_sql_base']) { |
|
| 713 | + $character_set .= ' CHARACTER SET ' . $GLOBALS['meta']['charset_sql_base']; |
|
| 714 | + } |
|
| 715 | + if (@$GLOBALS['meta']['charset_collation_sql_base']) { |
|
| 716 | + $character_set .= ' COLLATE ' . $GLOBALS['meta']['charset_collation_sql_base']; |
|
| 717 | + } |
|
| 718 | + |
|
| 719 | + foreach ($champs as $k => $v) { |
|
| 720 | + $v = _mysql_remplacements_definitions_table($v); |
|
| 721 | + if (preg_match(',([a-z]*\s*(\(\s*[0-9]*\s*\))?(\s*binary)?),i', $v, $defs)) { |
|
| 722 | + if ( |
|
| 723 | + preg_match(',(char|text),i', $defs[1]) |
|
| 724 | + and !preg_match(',(binary|CHARACTER|COLLATE),i', $v) |
|
| 725 | + ) { |
|
| 726 | + $v = $defs[1] . $character_set . ' ' . substr($v, strlen($defs[1])); |
|
| 727 | + } |
|
| 728 | + } |
|
| 729 | + |
|
| 730 | + $query .= "$s\n\t\t$k $v" |
|
| 731 | + . (($autoinc && ($p == $k) && preg_match(',\b(big|small|medium)?int\b,i', $v)) |
|
| 732 | + ? ' auto_increment' |
|
| 733 | + : '' |
|
| 734 | + ); |
|
| 735 | + $s = ','; |
|
| 736 | + } |
|
| 737 | + $temporary = $temporary ? 'TEMPORARY' : ''; |
|
| 738 | + $q = "CREATE $temporary TABLE IF NOT EXISTS $nom ($query" . ($keys ? ",$keys" : '') . ')' |
|
| 739 | + . ' ENGINE=' . _MYSQL_ENGINE |
|
| 740 | + . ($character_set ? " DEFAULT $character_set" : '') |
|
| 741 | + . "\n"; |
|
| 742 | + |
|
| 743 | + return spip_mysql_query($q, $serveur); |
|
| 744 | 744 | } |
| 745 | 745 | |
| 746 | 746 | |
@@ -753,25 +753,25 @@ discard block |
||
| 753 | 753 | * Définition SQL adaptée pour MySQL d'un champ de table |
| 754 | 754 | */ |
| 755 | 755 | function _mysql_remplacements_definitions_table($query) { |
| 756 | - // quelques remplacements |
|
| 757 | - $num = '(\s*\([0-9]*\))?'; |
|
| 758 | - $enum = '(\s*\([^\)]*\))?'; |
|
| 759 | - |
|
| 760 | - $remplace = [ |
|
| 761 | - '/VARCHAR(\s*[^\s\(])/is' => 'VARCHAR(255)\\1', |
|
| 762 | - '/^TIMESTAMP($| NULL DEFAULT NULL)/is' => 'TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP', |
|
| 763 | - ]; |
|
| 764 | - |
|
| 765 | - if (is_string($query)) { |
|
| 766 | - $query = preg_replace(array_keys($remplace), $remplace, $query); |
|
| 767 | - } elseif (is_array($query)) { |
|
| 768 | - $keys = array_keys($remplace); |
|
| 769 | - foreach ($query as $k => $q) { |
|
| 770 | - $query[$k] = preg_replace($keys, $remplace, $q); |
|
| 771 | - } |
|
| 772 | - } |
|
| 773 | - |
|
| 774 | - return $query; |
|
| 756 | + // quelques remplacements |
|
| 757 | + $num = '(\s*\([0-9]*\))?'; |
|
| 758 | + $enum = '(\s*\([^\)]*\))?'; |
|
| 759 | + |
|
| 760 | + $remplace = [ |
|
| 761 | + '/VARCHAR(\s*[^\s\(])/is' => 'VARCHAR(255)\\1', |
|
| 762 | + '/^TIMESTAMP($| NULL DEFAULT NULL)/is' => 'TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP', |
|
| 763 | + ]; |
|
| 764 | + |
|
| 765 | + if (is_string($query)) { |
|
| 766 | + $query = preg_replace(array_keys($remplace), $remplace, $query); |
|
| 767 | + } elseif (is_array($query)) { |
|
| 768 | + $keys = array_keys($remplace); |
|
| 769 | + foreach ($query as $k => $q) { |
|
| 770 | + $query[$k] = preg_replace($keys, $remplace, $q); |
|
| 771 | + } |
|
| 772 | + } |
|
| 773 | + |
|
| 774 | + return $query; |
|
| 775 | 775 | } |
| 776 | 776 | |
| 777 | 777 | |
@@ -784,7 +784,7 @@ discard block |
||
| 784 | 784 | * @return bool true si la base est créee. |
| 785 | 785 | **/ |
| 786 | 786 | function spip_mysql_create_base($nom, $serveur = '', $requeter = true) { |
| 787 | - return spip_mysql_query("CREATE DATABASE `$nom`", $serveur, $requeter); |
|
| 787 | + return spip_mysql_query("CREATE DATABASE `$nom`", $serveur, $requeter); |
|
| 788 | 788 | } |
| 789 | 789 | |
| 790 | 790 | |
@@ -805,19 +805,19 @@ discard block |
||
| 805 | 805 | * - string texte de la requête si $requeter vaut false |
| 806 | 806 | */ |
| 807 | 807 | function spip_mysql_create_view($nom, $query_select, $serveur = '', $requeter = true) { |
| 808 | - if (!$query_select) { |
|
| 809 | - return false; |
|
| 810 | - } |
|
| 811 | - // vue deja presente |
|
| 812 | - if (sql_showtable($nom, false, $serveur)) { |
|
| 813 | - spip_log("Echec creation d'une vue sql ($nom) car celle-ci existe deja (serveur:$serveur)", _LOG_ERREUR); |
|
| 808 | + if (!$query_select) { |
|
| 809 | + return false; |
|
| 810 | + } |
|
| 811 | + // vue deja presente |
|
| 812 | + if (sql_showtable($nom, false, $serveur)) { |
|
| 813 | + spip_log("Echec creation d'une vue sql ($nom) car celle-ci existe deja (serveur:$serveur)", _LOG_ERREUR); |
|
| 814 | 814 | |
| 815 | - return false; |
|
| 816 | - } |
|
| 815 | + return false; |
|
| 816 | + } |
|
| 817 | 817 | |
| 818 | - $query = "CREATE VIEW $nom AS " . $query_select; |
|
| 818 | + $query = "CREATE VIEW $nom AS " . $query_select; |
|
| 819 | 819 | |
| 820 | - return spip_mysql_query($query, $serveur, $requeter); |
|
| 820 | + return spip_mysql_query($query, $serveur, $requeter); |
|
| 821 | 821 | } |
| 822 | 822 | |
| 823 | 823 | |
@@ -833,11 +833,11 @@ discard block |
||
| 833 | 833 | * - true si la requête a réussie, false sinon |
| 834 | 834 | */ |
| 835 | 835 | function spip_mysql_drop_table($table, $exist = '', $serveur = '', $requeter = true) { |
| 836 | - if ($exist) { |
|
| 837 | - $exist = ' IF EXISTS'; |
|
| 838 | - } |
|
| 836 | + if ($exist) { |
|
| 837 | + $exist = ' IF EXISTS'; |
|
| 838 | + } |
|
| 839 | 839 | |
| 840 | - return spip_mysql_query("DROP TABLE$exist $table", $serveur, $requeter); |
|
| 840 | + return spip_mysql_query("DROP TABLE$exist $table", $serveur, $requeter); |
|
| 841 | 841 | } |
| 842 | 842 | |
| 843 | 843 | /** |
@@ -852,11 +852,11 @@ discard block |
||
| 852 | 852 | * - true si la requête a réussie, false sinon |
| 853 | 853 | */ |
| 854 | 854 | function spip_mysql_drop_view($view, $exist = '', $serveur = '', $requeter = true) { |
| 855 | - if ($exist) { |
|
| 856 | - $exist = ' IF EXISTS'; |
|
| 857 | - } |
|
| 855 | + if ($exist) { |
|
| 856 | + $exist = ' IF EXISTS'; |
|
| 857 | + } |
|
| 858 | 858 | |
| 859 | - return spip_mysql_query("DROP VIEW$exist $view", $serveur, $requeter); |
|
| 859 | + return spip_mysql_query("DROP VIEW$exist $view", $serveur, $requeter); |
|
| 860 | 860 | } |
| 861 | 861 | |
| 862 | 862 | /** |
@@ -873,7 +873,7 @@ discard block |
||
| 873 | 873 | * Ressource à utiliser avec sql_fetch() |
| 874 | 874 | **/ |
| 875 | 875 | function spip_mysql_showbase($match, $serveur = '', $requeter = true) { |
| 876 | - return spip_mysql_query('SHOW TABLES LIKE ' . _q($match), $serveur, $requeter); |
|
| 876 | + return spip_mysql_query('SHOW TABLES LIKE ' . _q($match), $serveur, $requeter); |
|
| 877 | 877 | } |
| 878 | 878 | |
| 879 | 879 | /** |
@@ -889,17 +889,17 @@ discard block |
||
| 889 | 889 | * - true si la requête a réussie, false sinon |
| 890 | 890 | */ |
| 891 | 891 | function spip_mysql_repair($table, $serveur = '', $requeter = true) { |
| 892 | - $table_status = spip_mysql_fetch(spip_mysql_query('SHOW TABLE STATUS WHERE Name = ' . _q($table), $serveur, true)); |
|
| 893 | - $engine = $table_status['Engine']; |
|
| 894 | - if ($engine == 'InnoDB') { |
|
| 895 | - if (spip_mysql_alter("TABLE $table ENGINE = InnoDB", $serveur, $requeter)) { |
|
| 896 | - return [' OK ']; |
|
| 897 | - } |
|
| 898 | - } elseif ($engine == 'MyISAM') { |
|
| 899 | - return spip_mysql_query("REPAIR TABLE `$table`", $serveur, $requeter); |
|
| 900 | - } else { |
|
| 901 | - spip_log("spip_mysql_repair impossible pour la table $table engine $engine", 'mysql.' . _LOG_DEBUG); |
|
| 902 | - } |
|
| 892 | + $table_status = spip_mysql_fetch(spip_mysql_query('SHOW TABLE STATUS WHERE Name = ' . _q($table), $serveur, true)); |
|
| 893 | + $engine = $table_status['Engine']; |
|
| 894 | + if ($engine == 'InnoDB') { |
|
| 895 | + if (spip_mysql_alter("TABLE $table ENGINE = InnoDB", $serveur, $requeter)) { |
|
| 896 | + return [' OK ']; |
|
| 897 | + } |
|
| 898 | + } elseif ($engine == 'MyISAM') { |
|
| 899 | + return spip_mysql_query("REPAIR TABLE `$table`", $serveur, $requeter); |
|
| 900 | + } else { |
|
| 901 | + spip_log("spip_mysql_repair impossible pour la table $table engine $engine", 'mysql.' . _LOG_DEBUG); |
|
| 902 | + } |
|
| 903 | 903 | } |
| 904 | 904 | |
| 905 | 905 | /** |
@@ -917,12 +917,12 @@ discard block |
||
| 917 | 917 | * - string : requete sql, si $requeter = true |
| 918 | 918 | **/ |
| 919 | 919 | function spip_mysql_table_exists(string $table, $serveur = '', $requeter = true) { |
| 920 | - $r = spip_mysql_query('SHOW TABLES LIKE ' . _q($table), $serveur, $requeter); |
|
| 921 | - if (!$requeter) { |
|
| 922 | - return $r; |
|
| 923 | - } |
|
| 924 | - $res = spip_mysql_fetch($r); |
|
| 925 | - return (bool) $res; |
|
| 920 | + $r = spip_mysql_query('SHOW TABLES LIKE ' . _q($table), $serveur, $requeter); |
|
| 921 | + if (!$requeter) { |
|
| 922 | + return $r; |
|
| 923 | + } |
|
| 924 | + $res = spip_mysql_fetch($r); |
|
| 925 | + return (bool) $res; |
|
| 926 | 926 | } |
| 927 | 927 | |
| 928 | 928 | define('_MYSQL_RE_SHOW_TABLE', '/^[^(),]*\(((?:[^()]*\((?:[^()]*\([^()]*\))?[^()]*\)[^()]*)*[^()]*)\)[^()]*$/'); |
@@ -945,86 +945,86 @@ discard block |
||
| 945 | 945 | * - array description de la table sinon |
| 946 | 946 | */ |
| 947 | 947 | function spip_mysql_showtable($nom_table, $serveur = '', $requeter = true) { |
| 948 | - $s = spip_mysql_query("SHOW CREATE TABLE `$nom_table`", $serveur, $requeter); |
|
| 949 | - if (!$s) { |
|
| 950 | - return ''; |
|
| 951 | - } |
|
| 952 | - if (!$requeter) { |
|
| 953 | - return $s; |
|
| 954 | - } |
|
| 955 | - |
|
| 956 | - [, $a] = mysqli_fetch_array($s, MYSQLI_NUM); |
|
| 957 | - if (preg_match(_MYSQL_RE_SHOW_TABLE, $a, $r)) { |
|
| 958 | - $desc = $r[1]; |
|
| 959 | - // extraction d'une KEY éventuelle en prenant garde de ne pas |
|
| 960 | - // relever un champ dont le nom contient KEY (ex. ID_WHISKEY) |
|
| 961 | - if (preg_match('/^(.*?),([^,]*\sKEY[ (].*)$/s', $desc, $r)) { |
|
| 962 | - $namedkeys = $r[2]; |
|
| 963 | - $desc = $r[1]; |
|
| 964 | - } else { |
|
| 965 | - $namedkeys = ''; |
|
| 966 | - } |
|
| 967 | - |
|
| 968 | - $fields = []; |
|
| 969 | - foreach (preg_split('/,\s*`/', $desc) as $v) { |
|
| 970 | - preg_match('/^\s*`?([^`]*)`\s*(.*)/', $v, $r); |
|
| 971 | - $fields[strtolower($r[1])] = $r[2]; |
|
| 972 | - } |
|
| 973 | - $keys = []; |
|
| 974 | - |
|
| 975 | - foreach (preg_split('/\)\s*(,|$)/', $namedkeys) as $v) { |
|
| 976 | - if (preg_match('/^\s*([^(]*)\(([^(]*(\(\d+\))?)$/', $v, $r)) { |
|
| 977 | - $k = str_replace('`', '', trim($r[1])); |
|
| 978 | - $t = strtolower(str_replace('`', '', $r[2])); |
|
| 979 | - if ($k && !isset($keys[$k])) { |
|
| 980 | - $keys[$k] = $t; |
|
| 981 | - } else { |
|
| 982 | - $keys[] = $t; |
|
| 983 | - } |
|
| 984 | - } |
|
| 985 | - } |
|
| 986 | - spip_mysql_free($s); |
|
| 987 | - |
|
| 988 | - return ['field' => $fields, 'key' => $keys]; |
|
| 989 | - } |
|
| 990 | - |
|
| 991 | - $res = spip_mysql_query("SHOW COLUMNS FROM `$nom_table`", $serveur); |
|
| 992 | - if ($res) { |
|
| 993 | - $nfields = []; |
|
| 994 | - $nkeys = []; |
|
| 995 | - while ($val = spip_mysql_fetch($res)) { |
|
| 996 | - $nfields[$val['Field']] = $val['Type']; |
|
| 997 | - if ($val['Null'] == 'NO') { |
|
| 998 | - $nfields[$val['Field']] .= ' NOT NULL'; |
|
| 999 | - } |
|
| 1000 | - if ($val['Default'] === '0' || $val['Default']) { |
|
| 1001 | - if (preg_match('/[A-Z_]/', $val['Default'])) { |
|
| 1002 | - $nfields[$val['Field']] .= ' DEFAULT ' . $val['Default']; |
|
| 1003 | - } else { |
|
| 1004 | - $nfields[$val['Field']] .= " DEFAULT '" . $val['Default'] . "'"; |
|
| 1005 | - } |
|
| 1006 | - } |
|
| 1007 | - if ($val['Extra']) { |
|
| 1008 | - $nfields[$val['Field']] .= ' ' . $val['Extra']; |
|
| 1009 | - } |
|
| 1010 | - if ($val['Key'] == 'PRI') { |
|
| 1011 | - $nkeys['PRIMARY KEY'] = $val['Field']; |
|
| 1012 | - } else { |
|
| 1013 | - if ($val['Key'] == 'MUL') { |
|
| 1014 | - $nkeys['KEY ' . $val['Field']] = $val['Field']; |
|
| 1015 | - } else { |
|
| 1016 | - if ($val['Key'] == 'UNI') { |
|
| 1017 | - $nkeys['UNIQUE KEY ' . $val['Field']] = $val['Field']; |
|
| 1018 | - } |
|
| 1019 | - } |
|
| 1020 | - } |
|
| 1021 | - } |
|
| 1022 | - spip_mysql_free($res); |
|
| 1023 | - |
|
| 1024 | - return ['field' => $nfields, 'key' => $nkeys]; |
|
| 1025 | - } |
|
| 1026 | - |
|
| 1027 | - return ''; |
|
| 948 | + $s = spip_mysql_query("SHOW CREATE TABLE `$nom_table`", $serveur, $requeter); |
|
| 949 | + if (!$s) { |
|
| 950 | + return ''; |
|
| 951 | + } |
|
| 952 | + if (!$requeter) { |
|
| 953 | + return $s; |
|
| 954 | + } |
|
| 955 | + |
|
| 956 | + [, $a] = mysqli_fetch_array($s, MYSQLI_NUM); |
|
| 957 | + if (preg_match(_MYSQL_RE_SHOW_TABLE, $a, $r)) { |
|
| 958 | + $desc = $r[1]; |
|
| 959 | + // extraction d'une KEY éventuelle en prenant garde de ne pas |
|
| 960 | + // relever un champ dont le nom contient KEY (ex. ID_WHISKEY) |
|
| 961 | + if (preg_match('/^(.*?),([^,]*\sKEY[ (].*)$/s', $desc, $r)) { |
|
| 962 | + $namedkeys = $r[2]; |
|
| 963 | + $desc = $r[1]; |
|
| 964 | + } else { |
|
| 965 | + $namedkeys = ''; |
|
| 966 | + } |
|
| 967 | + |
|
| 968 | + $fields = []; |
|
| 969 | + foreach (preg_split('/,\s*`/', $desc) as $v) { |
|
| 970 | + preg_match('/^\s*`?([^`]*)`\s*(.*)/', $v, $r); |
|
| 971 | + $fields[strtolower($r[1])] = $r[2]; |
|
| 972 | + } |
|
| 973 | + $keys = []; |
|
| 974 | + |
|
| 975 | + foreach (preg_split('/\)\s*(,|$)/', $namedkeys) as $v) { |
|
| 976 | + if (preg_match('/^\s*([^(]*)\(([^(]*(\(\d+\))?)$/', $v, $r)) { |
|
| 977 | + $k = str_replace('`', '', trim($r[1])); |
|
| 978 | + $t = strtolower(str_replace('`', '', $r[2])); |
|
| 979 | + if ($k && !isset($keys[$k])) { |
|
| 980 | + $keys[$k] = $t; |
|
| 981 | + } else { |
|
| 982 | + $keys[] = $t; |
|
| 983 | + } |
|
| 984 | + } |
|
| 985 | + } |
|
| 986 | + spip_mysql_free($s); |
|
| 987 | + |
|
| 988 | + return ['field' => $fields, 'key' => $keys]; |
|
| 989 | + } |
|
| 990 | + |
|
| 991 | + $res = spip_mysql_query("SHOW COLUMNS FROM `$nom_table`", $serveur); |
|
| 992 | + if ($res) { |
|
| 993 | + $nfields = []; |
|
| 994 | + $nkeys = []; |
|
| 995 | + while ($val = spip_mysql_fetch($res)) { |
|
| 996 | + $nfields[$val['Field']] = $val['Type']; |
|
| 997 | + if ($val['Null'] == 'NO') { |
|
| 998 | + $nfields[$val['Field']] .= ' NOT NULL'; |
|
| 999 | + } |
|
| 1000 | + if ($val['Default'] === '0' || $val['Default']) { |
|
| 1001 | + if (preg_match('/[A-Z_]/', $val['Default'])) { |
|
| 1002 | + $nfields[$val['Field']] .= ' DEFAULT ' . $val['Default']; |
|
| 1003 | + } else { |
|
| 1004 | + $nfields[$val['Field']] .= " DEFAULT '" . $val['Default'] . "'"; |
|
| 1005 | + } |
|
| 1006 | + } |
|
| 1007 | + if ($val['Extra']) { |
|
| 1008 | + $nfields[$val['Field']] .= ' ' . $val['Extra']; |
|
| 1009 | + } |
|
| 1010 | + if ($val['Key'] == 'PRI') { |
|
| 1011 | + $nkeys['PRIMARY KEY'] = $val['Field']; |
|
| 1012 | + } else { |
|
| 1013 | + if ($val['Key'] == 'MUL') { |
|
| 1014 | + $nkeys['KEY ' . $val['Field']] = $val['Field']; |
|
| 1015 | + } else { |
|
| 1016 | + if ($val['Key'] == 'UNI') { |
|
| 1017 | + $nkeys['UNIQUE KEY ' . $val['Field']] = $val['Field']; |
|
| 1018 | + } |
|
| 1019 | + } |
|
| 1020 | + } |
|
| 1021 | + } |
|
| 1022 | + spip_mysql_free($res); |
|
| 1023 | + |
|
| 1024 | + return ['field' => $nfields, 'key' => $nkeys]; |
|
| 1025 | + } |
|
| 1026 | + |
|
| 1027 | + return ''; |
|
| 1028 | 1028 | } |
| 1029 | 1029 | |
| 1030 | 1030 | |
@@ -1043,13 +1043,13 @@ discard block |
||
| 1043 | 1043 | * - false Erreur |
| 1044 | 1044 | */ |
| 1045 | 1045 | function spip_mysql_fetch($r, $t = '', $serveur = '', $requeter = true) { |
| 1046 | - if (!$t) { |
|
| 1047 | - $t = \MYSQLI_ASSOC; |
|
| 1048 | - } |
|
| 1049 | - if ($r) { |
|
| 1050 | - return mysqli_fetch_array($r, $t); |
|
| 1051 | - } |
|
| 1052 | - return false; |
|
| 1046 | + if (!$t) { |
|
| 1047 | + $t = \MYSQLI_ASSOC; |
|
| 1048 | + } |
|
| 1049 | + if ($r) { |
|
| 1050 | + return mysqli_fetch_array($r, $t); |
|
| 1051 | + } |
|
| 1052 | + return false; |
|
| 1053 | 1053 | } |
| 1054 | 1054 | |
| 1055 | 1055 | /** |
@@ -1062,9 +1062,9 @@ discard block |
||
| 1062 | 1062 | * @return bool True si déplacement réussi, false sinon. |
| 1063 | 1063 | **/ |
| 1064 | 1064 | function spip_mysql_seek($r, $row_number, $serveur = '', $requeter = true) { |
| 1065 | - if ($r and mysqli_num_rows($r)) { |
|
| 1066 | - return mysqli_data_seek($r, $row_number); |
|
| 1067 | - } |
|
| 1065 | + if ($r and mysqli_num_rows($r)) { |
|
| 1066 | + return mysqli_data_seek($r, $row_number); |
|
| 1067 | + } |
|
| 1068 | 1068 | } |
| 1069 | 1069 | |
| 1070 | 1070 | |
@@ -1082,26 +1082,26 @@ discard block |
||
| 1082 | 1082 | * - int Nombre de lignes (0 si la requête n'a pas réussie) |
| 1083 | 1083 | **/ |
| 1084 | 1084 | function spip_mysql_countsel( |
| 1085 | - $from = [], |
|
| 1086 | - $where = [], |
|
| 1087 | - $groupby = '', |
|
| 1088 | - $having = [], |
|
| 1089 | - $serveur = '', |
|
| 1090 | - $requeter = true |
|
| 1085 | + $from = [], |
|
| 1086 | + $where = [], |
|
| 1087 | + $groupby = '', |
|
| 1088 | + $having = [], |
|
| 1089 | + $serveur = '', |
|
| 1090 | + $requeter = true |
|
| 1091 | 1091 | ) { |
| 1092 | - $c = !$groupby ? '*' : ('DISTINCT ' . (is_string($groupby) ? $groupby : join(',', $groupby))); |
|
| 1093 | - |
|
| 1094 | - $r = spip_mysql_select("COUNT($c)", $from, $where, '', '', '', $having, $serveur, $requeter); |
|
| 1095 | - if (!$requeter) { |
|
| 1096 | - return $r; |
|
| 1097 | - } |
|
| 1098 | - if (!$r instanceof mysqli_result) { |
|
| 1099 | - return 0; |
|
| 1100 | - } |
|
| 1101 | - [$c] = mysqli_fetch_array($r, MYSQLI_NUM); |
|
| 1102 | - mysqli_free_result($r); |
|
| 1103 | - |
|
| 1104 | - return $c; |
|
| 1092 | + $c = !$groupby ? '*' : ('DISTINCT ' . (is_string($groupby) ? $groupby : join(',', $groupby))); |
|
| 1093 | + |
|
| 1094 | + $r = spip_mysql_select("COUNT($c)", $from, $where, '', '', '', $having, $serveur, $requeter); |
|
| 1095 | + if (!$requeter) { |
|
| 1096 | + return $r; |
|
| 1097 | + } |
|
| 1098 | + if (!$r instanceof mysqli_result) { |
|
| 1099 | + return 0; |
|
| 1100 | + } |
|
| 1101 | + [$c] = mysqli_fetch_array($r, MYSQLI_NUM); |
|
| 1102 | + mysqli_free_result($r); |
|
| 1103 | + |
|
| 1104 | + return $c; |
|
| 1105 | 1105 | } |
| 1106 | 1106 | |
| 1107 | 1107 | |
@@ -1124,16 +1124,16 @@ discard block |
||
| 1124 | 1124 | * Erreur eventuelle |
| 1125 | 1125 | **/ |
| 1126 | 1126 | function spip_mysql_error($query = '', $serveur = '', $requeter = true) { |
| 1127 | - $link = $GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]['link']; |
|
| 1128 | - $s = mysqli_error($link); |
|
| 1129 | - if ($s) { |
|
| 1130 | - $trace = debug_backtrace(); |
|
| 1131 | - if ($trace[0]['function'] != 'spip_mysql_error') { |
|
| 1132 | - spip_log("$s - $query - " . sql_error_backtrace(), 'mysql.' . _LOG_ERREUR); |
|
| 1133 | - } |
|
| 1134 | - } |
|
| 1135 | - |
|
| 1136 | - return $s; |
|
| 1127 | + $link = $GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]['link']; |
|
| 1128 | + $s = mysqli_error($link); |
|
| 1129 | + if ($s) { |
|
| 1130 | + $trace = debug_backtrace(); |
|
| 1131 | + if ($trace[0]['function'] != 'spip_mysql_error') { |
|
| 1132 | + spip_log("$s - $query - " . sql_error_backtrace(), 'mysql.' . _LOG_ERREUR); |
|
| 1133 | + } |
|
| 1134 | + } |
|
| 1135 | + |
|
| 1136 | + return $s; |
|
| 1137 | 1137 | } |
| 1138 | 1138 | |
| 1139 | 1139 | |
@@ -1148,18 +1148,18 @@ discard block |
||
| 1148 | 1148 | * 0, pas d'erreur. Autre, numéro de l'erreur. |
| 1149 | 1149 | **/ |
| 1150 | 1150 | function spip_mysql_errno($serveur = '', $requeter = true) { |
| 1151 | - $link = $GLOBALS['connexions'][$serveur ?: 0]['link']; |
|
| 1152 | - $s = mysqli_errno($link); |
|
| 1153 | - // 2006 MySQL server has gone away |
|
| 1154 | - // 2013 Lost connection to MySQL server during query |
|
| 1155 | - if (in_array($s, [2006, 2013])) { |
|
| 1156 | - define('spip_interdire_cache', true); |
|
| 1157 | - } |
|
| 1158 | - if ($s) { |
|
| 1159 | - spip_log("Erreur mysql $s", _LOG_ERREUR); |
|
| 1160 | - } |
|
| 1161 | - |
|
| 1162 | - return $s; |
|
| 1151 | + $link = $GLOBALS['connexions'][$serveur ?: 0]['link']; |
|
| 1152 | + $s = mysqli_errno($link); |
|
| 1153 | + // 2006 MySQL server has gone away |
|
| 1154 | + // 2013 Lost connection to MySQL server during query |
|
| 1155 | + if (in_array($s, [2006, 2013])) { |
|
| 1156 | + define('spip_interdire_cache', true); |
|
| 1157 | + } |
|
| 1158 | + if ($s) { |
|
| 1159 | + spip_log("Erreur mysql $s", _LOG_ERREUR); |
|
| 1160 | + } |
|
| 1161 | + |
|
| 1162 | + return $s; |
|
| 1163 | 1163 | } |
| 1164 | 1164 | |
| 1165 | 1165 | |
@@ -1173,9 +1173,9 @@ discard block |
||
| 1173 | 1173 | * @return int Nombre de lignes |
| 1174 | 1174 | */ |
| 1175 | 1175 | function spip_mysql_count($r, $serveur = '', $requeter = true) { |
| 1176 | - if ($r) { |
|
| 1177 | - return mysqli_num_rows($r); |
|
| 1178 | - } |
|
| 1176 | + if ($r) { |
|
| 1177 | + return mysqli_num_rows($r); |
|
| 1178 | + } |
|
| 1179 | 1179 | } |
| 1180 | 1180 | |
| 1181 | 1181 | |
@@ -1191,7 +1191,7 @@ discard block |
||
| 1191 | 1191 | * @return bool True si réussi |
| 1192 | 1192 | */ |
| 1193 | 1193 | function spip_mysql_free($r, $serveur = '', $requeter = true) { |
| 1194 | - return (($r instanceof mysqli_result) ? mysqli_free_result($r) : false); |
|
| 1194 | + return (($r instanceof mysqli_result) ? mysqli_free_result($r) : false); |
|
| 1195 | 1195 | } |
| 1196 | 1196 | |
| 1197 | 1197 | |
@@ -1219,59 +1219,59 @@ discard block |
||
| 1219 | 1219 | **/ |
| 1220 | 1220 | function spip_mysql_insert($table, $champs, $valeurs, $desc = [], $serveur = '', $requeter = true) { |
| 1221 | 1221 | |
| 1222 | - $e = null; |
|
| 1223 | - $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 1224 | - $link = $connexion['link']; |
|
| 1225 | - $table = prefixer_table_spip($table, $connexion['prefixe']); |
|
| 1226 | - |
|
| 1227 | - // remplacer les emoji (que mysql ne sait pas gérer) en 💩 |
|
| 1228 | - if ( |
|
| 1229 | - defined('_MYSQL_NOPLANES') |
|
| 1230 | - and _MYSQL_NOPLANES |
|
| 1231 | - and !empty($GLOBALS['meta']['charset_sql_connexion']) |
|
| 1232 | - and $GLOBALS['meta']['charset_sql_connexion'] == 'utf8' |
|
| 1233 | - ) { |
|
| 1234 | - include_spip('inc/charsets'); |
|
| 1235 | - $valeurs = utf8_noplanes($valeurs); |
|
| 1236 | - } |
|
| 1237 | - |
|
| 1238 | - $query = "INSERT INTO $table $champs VALUES $valeurs"; |
|
| 1239 | - if (!$requeter) { |
|
| 1240 | - return $query; |
|
| 1241 | - } |
|
| 1242 | - |
|
| 1243 | - if (isset($_GET['var_profile'])) { |
|
| 1244 | - include_spip('public/tracer'); |
|
| 1245 | - $t = trace_query_start(); |
|
| 1246 | - $e = ''; |
|
| 1247 | - } else { |
|
| 1248 | - $t = 0; |
|
| 1249 | - } |
|
| 1250 | - |
|
| 1251 | - $connexion['last'] = $query; |
|
| 1252 | - #spip_log($query, 'mysql.'._LOG_DEBUG); |
|
| 1253 | - $r = false; |
|
| 1254 | - $insert = false; |
|
| 1255 | - try { |
|
| 1256 | - $insert = mysqli_query($link, $query); |
|
| 1257 | - } catch (\mysqli_sql_exception $e) { |
|
| 1258 | - spip_log('mysqli_sql_exception: ' . $e->getMessage(), 'mysql.' . _LOG_DEBUG); |
|
| 1259 | - // TODO: utiliser l’exception ensuite plutôt que les appels à spip_mysql_errno() |
|
| 1260 | - // mais il faut pour php < 8.1 forcer les exeptions via mysqli_report(). |
|
| 1261 | - } |
|
| 1262 | - if ($insert) { |
|
| 1263 | - $r = mysqli_insert_id($link); |
|
| 1264 | - } else { |
|
| 1265 | - // Log de l'erreur eventuelle |
|
| 1266 | - if ($e = spip_mysql_errno($serveur)) { |
|
| 1267 | - // et du fautif |
|
| 1268 | - $e .= spip_mysql_error($query, $serveur); |
|
| 1269 | - } |
|
| 1270 | - } |
|
| 1271 | - |
|
| 1272 | - return $t ? trace_query_end($query, $t, $r, $e, $serveur) : $r; |
|
| 1273 | - |
|
| 1274 | - // return $r ? $r : (($r===0) ? -1 : 0); pb avec le multi-base. |
|
| 1222 | + $e = null; |
|
| 1223 | + $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 1224 | + $link = $connexion['link']; |
|
| 1225 | + $table = prefixer_table_spip($table, $connexion['prefixe']); |
|
| 1226 | + |
|
| 1227 | + // remplacer les emoji (que mysql ne sait pas gérer) en 💩 |
|
| 1228 | + if ( |
|
| 1229 | + defined('_MYSQL_NOPLANES') |
|
| 1230 | + and _MYSQL_NOPLANES |
|
| 1231 | + and !empty($GLOBALS['meta']['charset_sql_connexion']) |
|
| 1232 | + and $GLOBALS['meta']['charset_sql_connexion'] == 'utf8' |
|
| 1233 | + ) { |
|
| 1234 | + include_spip('inc/charsets'); |
|
| 1235 | + $valeurs = utf8_noplanes($valeurs); |
|
| 1236 | + } |
|
| 1237 | + |
|
| 1238 | + $query = "INSERT INTO $table $champs VALUES $valeurs"; |
|
| 1239 | + if (!$requeter) { |
|
| 1240 | + return $query; |
|
| 1241 | + } |
|
| 1242 | + |
|
| 1243 | + if (isset($_GET['var_profile'])) { |
|
| 1244 | + include_spip('public/tracer'); |
|
| 1245 | + $t = trace_query_start(); |
|
| 1246 | + $e = ''; |
|
| 1247 | + } else { |
|
| 1248 | + $t = 0; |
|
| 1249 | + } |
|
| 1250 | + |
|
| 1251 | + $connexion['last'] = $query; |
|
| 1252 | + #spip_log($query, 'mysql.'._LOG_DEBUG); |
|
| 1253 | + $r = false; |
|
| 1254 | + $insert = false; |
|
| 1255 | + try { |
|
| 1256 | + $insert = mysqli_query($link, $query); |
|
| 1257 | + } catch (\mysqli_sql_exception $e) { |
|
| 1258 | + spip_log('mysqli_sql_exception: ' . $e->getMessage(), 'mysql.' . _LOG_DEBUG); |
|
| 1259 | + // TODO: utiliser l’exception ensuite plutôt que les appels à spip_mysql_errno() |
|
| 1260 | + // mais il faut pour php < 8.1 forcer les exeptions via mysqli_report(). |
|
| 1261 | + } |
|
| 1262 | + if ($insert) { |
|
| 1263 | + $r = mysqli_insert_id($link); |
|
| 1264 | + } else { |
|
| 1265 | + // Log de l'erreur eventuelle |
|
| 1266 | + if ($e = spip_mysql_errno($serveur)) { |
|
| 1267 | + // et du fautif |
|
| 1268 | + $e .= spip_mysql_error($query, $serveur); |
|
| 1269 | + } |
|
| 1270 | + } |
|
| 1271 | + |
|
| 1272 | + return $t ? trace_query_end($query, $t, $r, $e, $serveur) : $r; |
|
| 1273 | + |
|
| 1274 | + // return $r ? $r : (($r===0) ? -1 : 0); pb avec le multi-base. |
|
| 1275 | 1275 | } |
| 1276 | 1276 | |
| 1277 | 1277 | /** |
@@ -1296,26 +1296,26 @@ discard block |
||
| 1296 | 1296 | **/ |
| 1297 | 1297 | function spip_mysql_insertq($table, $couples = [], $desc = [], $serveur = '', $requeter = true) { |
| 1298 | 1298 | |
| 1299 | - if (!$desc) { |
|
| 1300 | - $desc = description_table($table, $serveur); |
|
| 1301 | - } |
|
| 1302 | - if (!$desc) { |
|
| 1303 | - $couples = []; |
|
| 1304 | - } |
|
| 1305 | - $fields = $desc['field'] ?? []; |
|
| 1306 | - |
|
| 1307 | - foreach ($couples as $champ => $val) { |
|
| 1308 | - $couples[$champ] = spip_mysql_cite($val, $fields[$champ]); |
|
| 1309 | - } |
|
| 1310 | - |
|
| 1311 | - return spip_mysql_insert( |
|
| 1312 | - $table, |
|
| 1313 | - '(' . join(',', array_keys($couples)) . ')', |
|
| 1314 | - '(' . join(',', $couples) . ')', |
|
| 1315 | - $desc, |
|
| 1316 | - $serveur, |
|
| 1317 | - $requeter |
|
| 1318 | - ); |
|
| 1299 | + if (!$desc) { |
|
| 1300 | + $desc = description_table($table, $serveur); |
|
| 1301 | + } |
|
| 1302 | + if (!$desc) { |
|
| 1303 | + $couples = []; |
|
| 1304 | + } |
|
| 1305 | + $fields = $desc['field'] ?? []; |
|
| 1306 | + |
|
| 1307 | + foreach ($couples as $champ => $val) { |
|
| 1308 | + $couples[$champ] = spip_mysql_cite($val, $fields[$champ]); |
|
| 1309 | + } |
|
| 1310 | + |
|
| 1311 | + return spip_mysql_insert( |
|
| 1312 | + $table, |
|
| 1313 | + '(' . join(',', array_keys($couples)) . ')', |
|
| 1314 | + '(' . join(',', $couples) . ')', |
|
| 1315 | + $desc, |
|
| 1316 | + $serveur, |
|
| 1317 | + $requeter |
|
| 1318 | + ); |
|
| 1319 | 1319 | } |
| 1320 | 1320 | |
| 1321 | 1321 | |
@@ -1340,34 +1340,34 @@ discard block |
||
| 1340 | 1340 | **/ |
| 1341 | 1341 | function spip_mysql_insertq_multi($table, $tab_couples = [], $desc = [], $serveur = '', $requeter = true) { |
| 1342 | 1342 | |
| 1343 | - if (!$desc) { |
|
| 1344 | - $desc = description_table($table, $serveur); |
|
| 1345 | - } |
|
| 1346 | - if (!$desc) { |
|
| 1347 | - $tab_couples = []; |
|
| 1348 | - } |
|
| 1349 | - $fields = $desc['field'] ?? []; |
|
| 1350 | - |
|
| 1351 | - $cles = '(' . join(',', array_keys(reset($tab_couples))) . ')'; |
|
| 1352 | - $valeurs = []; |
|
| 1353 | - $r = false; |
|
| 1354 | - |
|
| 1355 | - // Quoter et Inserer par groupes de 100 max pour eviter un debordement de pile |
|
| 1356 | - foreach ($tab_couples as $couples) { |
|
| 1357 | - foreach ($couples as $champ => $val) { |
|
| 1358 | - $couples[$champ] = spip_mysql_cite($val, $fields[$champ]); |
|
| 1359 | - } |
|
| 1360 | - $valeurs[] = '(' . join(',', $couples) . ')'; |
|
| 1361 | - if (count($valeurs) >= 100) { |
|
| 1362 | - $r = spip_mysql_insert($table, $cles, join(', ', $valeurs), $desc, $serveur, $requeter); |
|
| 1363 | - $valeurs = []; |
|
| 1364 | - } |
|
| 1365 | - } |
|
| 1366 | - if (count($valeurs)) { |
|
| 1367 | - $r = spip_mysql_insert($table, $cles, join(', ', $valeurs), $desc, $serveur, $requeter); |
|
| 1368 | - } |
|
| 1369 | - |
|
| 1370 | - return $r; // dans le cas d'une table auto_increment, le dernier insert_id |
|
| 1343 | + if (!$desc) { |
|
| 1344 | + $desc = description_table($table, $serveur); |
|
| 1345 | + } |
|
| 1346 | + if (!$desc) { |
|
| 1347 | + $tab_couples = []; |
|
| 1348 | + } |
|
| 1349 | + $fields = $desc['field'] ?? []; |
|
| 1350 | + |
|
| 1351 | + $cles = '(' . join(',', array_keys(reset($tab_couples))) . ')'; |
|
| 1352 | + $valeurs = []; |
|
| 1353 | + $r = false; |
|
| 1354 | + |
|
| 1355 | + // Quoter et Inserer par groupes de 100 max pour eviter un debordement de pile |
|
| 1356 | + foreach ($tab_couples as $couples) { |
|
| 1357 | + foreach ($couples as $champ => $val) { |
|
| 1358 | + $couples[$champ] = spip_mysql_cite($val, $fields[$champ]); |
|
| 1359 | + } |
|
| 1360 | + $valeurs[] = '(' . join(',', $couples) . ')'; |
|
| 1361 | + if (count($valeurs) >= 100) { |
|
| 1362 | + $r = spip_mysql_insert($table, $cles, join(', ', $valeurs), $desc, $serveur, $requeter); |
|
| 1363 | + $valeurs = []; |
|
| 1364 | + } |
|
| 1365 | + } |
|
| 1366 | + if (count($valeurs)) { |
|
| 1367 | + $r = spip_mysql_insert($table, $cles, join(', ', $valeurs), $desc, $serveur, $requeter); |
|
| 1368 | + } |
|
| 1369 | + |
|
| 1370 | + return $r; // dans le cas d'une table auto_increment, le dernier insert_id |
|
| 1371 | 1371 | } |
| 1372 | 1372 | |
| 1373 | 1373 | /** |
@@ -1392,19 +1392,19 @@ discard block |
||
| 1392 | 1392 | * - array Tableau décrivant la requête et son temps d'exécution si var_profile est actif |
| 1393 | 1393 | */ |
| 1394 | 1394 | function spip_mysql_update($table, $champs, $where = '', $desc = [], $serveur = '', $requeter = true) { |
| 1395 | - $set = []; |
|
| 1396 | - foreach ($champs as $champ => $val) { |
|
| 1397 | - $set[] = $champ . "=$val"; |
|
| 1398 | - } |
|
| 1399 | - if (!empty($set)) { |
|
| 1400 | - return spip_mysql_query( |
|
| 1401 | - calculer_mysql_expression('UPDATE', $table, ',') |
|
| 1402 | - . calculer_mysql_expression('SET', $set, ',') |
|
| 1403 | - . calculer_mysql_expression('WHERE', $where), |
|
| 1404 | - $serveur, |
|
| 1405 | - $requeter |
|
| 1406 | - ); |
|
| 1407 | - } |
|
| 1395 | + $set = []; |
|
| 1396 | + foreach ($champs as $champ => $val) { |
|
| 1397 | + $set[] = $champ . "=$val"; |
|
| 1398 | + } |
|
| 1399 | + if (!empty($set)) { |
|
| 1400 | + return spip_mysql_query( |
|
| 1401 | + calculer_mysql_expression('UPDATE', $table, ',') |
|
| 1402 | + . calculer_mysql_expression('SET', $set, ',') |
|
| 1403 | + . calculer_mysql_expression('WHERE', $where), |
|
| 1404 | + $serveur, |
|
| 1405 | + $requeter |
|
| 1406 | + ); |
|
| 1407 | + } |
|
| 1408 | 1408 | } |
| 1409 | 1409 | |
| 1410 | 1410 | /** |
@@ -1437,29 +1437,29 @@ discard block |
||
| 1437 | 1437 | */ |
| 1438 | 1438 | function spip_mysql_updateq($table, $champs, $where = '', $desc = [], $serveur = '', $requeter = true) { |
| 1439 | 1439 | |
| 1440 | - if (!$champs) { |
|
| 1441 | - return; |
|
| 1442 | - } |
|
| 1443 | - if (!$desc) { |
|
| 1444 | - $desc = description_table($table, $serveur); |
|
| 1445 | - } |
|
| 1446 | - if (!$desc) { |
|
| 1447 | - $champs = []; |
|
| 1448 | - } else { |
|
| 1449 | - $fields = $desc['field']; |
|
| 1450 | - } |
|
| 1451 | - $set = []; |
|
| 1452 | - foreach ($champs as $champ => $val) { |
|
| 1453 | - $set[] = $champ . '=' . spip_mysql_cite($val, @$fields[$champ]); |
|
| 1454 | - } |
|
| 1455 | - |
|
| 1456 | - return spip_mysql_query( |
|
| 1457 | - calculer_mysql_expression('UPDATE', $table, ',') |
|
| 1458 | - . calculer_mysql_expression('SET', $set, ',') |
|
| 1459 | - . calculer_mysql_expression('WHERE', $where), |
|
| 1460 | - $serveur, |
|
| 1461 | - $requeter |
|
| 1462 | - ); |
|
| 1440 | + if (!$champs) { |
|
| 1441 | + return; |
|
| 1442 | + } |
|
| 1443 | + if (!$desc) { |
|
| 1444 | + $desc = description_table($table, $serveur); |
|
| 1445 | + } |
|
| 1446 | + if (!$desc) { |
|
| 1447 | + $champs = []; |
|
| 1448 | + } else { |
|
| 1449 | + $fields = $desc['field']; |
|
| 1450 | + } |
|
| 1451 | + $set = []; |
|
| 1452 | + foreach ($champs as $champ => $val) { |
|
| 1453 | + $set[] = $champ . '=' . spip_mysql_cite($val, @$fields[$champ]); |
|
| 1454 | + } |
|
| 1455 | + |
|
| 1456 | + return spip_mysql_query( |
|
| 1457 | + calculer_mysql_expression('UPDATE', $table, ',') |
|
| 1458 | + . calculer_mysql_expression('SET', $set, ',') |
|
| 1459 | + . calculer_mysql_expression('WHERE', $where), |
|
| 1460 | + $serveur, |
|
| 1461 | + $requeter |
|
| 1462 | + ); |
|
| 1463 | 1463 | } |
| 1464 | 1464 | |
| 1465 | 1465 | /** |
@@ -1475,22 +1475,22 @@ discard block |
||
| 1475 | 1475 | * - False en cas d'erreur. |
| 1476 | 1476 | **/ |
| 1477 | 1477 | function spip_mysql_delete($table, $where = '', $serveur = '', $requeter = true) { |
| 1478 | - $res = spip_mysql_query( |
|
| 1479 | - calculer_mysql_expression('DELETE FROM', $table, ',') |
|
| 1480 | - . calculer_mysql_expression('WHERE', $where), |
|
| 1481 | - $serveur, |
|
| 1482 | - $requeter |
|
| 1483 | - ); |
|
| 1484 | - if (!$requeter) { |
|
| 1485 | - return $res; |
|
| 1486 | - } |
|
| 1487 | - if ($res) { |
|
| 1488 | - $link = _mysql_link($serveur); |
|
| 1489 | - |
|
| 1490 | - return mysqli_affected_rows($link); |
|
| 1491 | - } else { |
|
| 1492 | - return false; |
|
| 1493 | - } |
|
| 1478 | + $res = spip_mysql_query( |
|
| 1479 | + calculer_mysql_expression('DELETE FROM', $table, ',') |
|
| 1480 | + . calculer_mysql_expression('WHERE', $where), |
|
| 1481 | + $serveur, |
|
| 1482 | + $requeter |
|
| 1483 | + ); |
|
| 1484 | + if (!$requeter) { |
|
| 1485 | + return $res; |
|
| 1486 | + } |
|
| 1487 | + if ($res) { |
|
| 1488 | + $link = _mysql_link($serveur); |
|
| 1489 | + |
|
| 1490 | + return mysqli_affected_rows($link); |
|
| 1491 | + } else { |
|
| 1492 | + return false; |
|
| 1493 | + } |
|
| 1494 | 1494 | } |
| 1495 | 1495 | |
| 1496 | 1496 | |
@@ -1519,10 +1519,10 @@ discard block |
||
| 1519 | 1519 | * - False en cas d'erreur. |
| 1520 | 1520 | **/ |
| 1521 | 1521 | function spip_mysql_replace($table, $couples, $desc = [], $serveur = '', $requeter = true) { |
| 1522 | - return spip_mysql_query("REPLACE $table (" . join(',', array_keys($couples)) . ') VALUES (' . join( |
|
| 1523 | - ',', |
|
| 1524 | - array_map('_q', $couples) |
|
| 1525 | - ) . ')', $serveur, $requeter); |
|
| 1522 | + return spip_mysql_query("REPLACE $table (" . join(',', array_keys($couples)) . ') VALUES (' . join( |
|
| 1523 | + ',', |
|
| 1524 | + array_map('_q', $couples) |
|
| 1525 | + ) . ')', $serveur, $requeter); |
|
| 1526 | 1526 | } |
| 1527 | 1527 | |
| 1528 | 1528 | |
@@ -1551,14 +1551,14 @@ discard block |
||
| 1551 | 1551 | * - False en cas d'erreur. |
| 1552 | 1552 | **/ |
| 1553 | 1553 | function spip_mysql_replace_multi($table, $tab_couples, $desc = [], $serveur = '', $requeter = true) { |
| 1554 | - $cles = '(' . join(',', array_keys($tab_couples[0])) . ')'; |
|
| 1555 | - $valeurs = []; |
|
| 1556 | - foreach ($tab_couples as $couples) { |
|
| 1557 | - $valeurs[] = '(' . join(',', array_map('_q', $couples)) . ')'; |
|
| 1558 | - } |
|
| 1559 | - $valeurs = implode(', ', $valeurs); |
|
| 1560 | - |
|
| 1561 | - return spip_mysql_query("REPLACE $table $cles VALUES $valeurs", $serveur, $requeter); |
|
| 1554 | + $cles = '(' . join(',', array_keys($tab_couples[0])) . ')'; |
|
| 1555 | + $valeurs = []; |
|
| 1556 | + foreach ($tab_couples as $couples) { |
|
| 1557 | + $valeurs[] = '(' . join(',', array_map('_q', $couples)) . ')'; |
|
| 1558 | + } |
|
| 1559 | + $valeurs = implode(', ', $valeurs); |
|
| 1560 | + |
|
| 1561 | + return spip_mysql_query("REPLACE $table $cles VALUES $valeurs", $serveur, $requeter); |
|
| 1562 | 1562 | } |
| 1563 | 1563 | |
| 1564 | 1564 | |
@@ -1573,32 +1573,32 @@ discard block |
||
| 1573 | 1573 | * @return string Texte de sélection pour la requête |
| 1574 | 1574 | */ |
| 1575 | 1575 | function spip_mysql_multi($objet, $lang) { |
| 1576 | - $lengthlang = strlen("[$lang]"); |
|
| 1577 | - $posmulti = 'INSTR(' . $objet . ", '<multi>')"; |
|
| 1578 | - $posfinmulti = 'INSTR(' . $objet . ", '</multi>')"; |
|
| 1579 | - $debutchaine = 'LEFT(' . $objet . ", $posmulti-1)"; |
|
| 1580 | - $finchaine = 'RIGHT(' . $objet . ', CHAR_LENGTH(' . $objet . ") -(7+$posfinmulti))"; |
|
| 1581 | - $chainemulti = 'TRIM(SUBSTRING(' . $objet . ", $posmulti+7, $posfinmulti -(7+$posmulti)))"; |
|
| 1582 | - $poslang = "INSTR($chainemulti,'[" . $lang . "]')"; |
|
| 1583 | - $poslang = "IF($poslang=0,INSTR($chainemulti,']')+1,$poslang+$lengthlang)"; |
|
| 1584 | - $chainelang = 'TRIM(SUBSTRING(' . $objet . ", $posmulti+7+$poslang-1,$posfinmulti -($posmulti+7+$poslang-1) ))"; |
|
| 1585 | - $posfinlang = 'INSTR(' . $chainelang . ", '[')"; |
|
| 1586 | - $chainelang = "IF($posfinlang>0,LEFT($chainelang,$posfinlang-1),$chainelang)"; |
|
| 1587 | - //$chainelang = "LEFT($chainelang,$posfinlang-1)"; |
|
| 1588 | - $retour = "(TRIM(IF($posmulti = 0 , " . |
|
| 1589 | - ' TRIM(' . $objet . '), ' . |
|
| 1590 | - ' CONCAT( ' . |
|
| 1591 | - " $debutchaine, " . |
|
| 1592 | - ' IF( ' . |
|
| 1593 | - " $poslang = 0, " . |
|
| 1594 | - " $chainemulti, " . |
|
| 1595 | - " $chainelang" . |
|
| 1596 | - ' ), ' . |
|
| 1597 | - " $finchaine" . |
|
| 1598 | - ' ) ' . |
|
| 1599 | - '))) AS multi'; |
|
| 1600 | - |
|
| 1601 | - return $retour; |
|
| 1576 | + $lengthlang = strlen("[$lang]"); |
|
| 1577 | + $posmulti = 'INSTR(' . $objet . ", '<multi>')"; |
|
| 1578 | + $posfinmulti = 'INSTR(' . $objet . ", '</multi>')"; |
|
| 1579 | + $debutchaine = 'LEFT(' . $objet . ", $posmulti-1)"; |
|
| 1580 | + $finchaine = 'RIGHT(' . $objet . ', CHAR_LENGTH(' . $objet . ") -(7+$posfinmulti))"; |
|
| 1581 | + $chainemulti = 'TRIM(SUBSTRING(' . $objet . ", $posmulti+7, $posfinmulti -(7+$posmulti)))"; |
|
| 1582 | + $poslang = "INSTR($chainemulti,'[" . $lang . "]')"; |
|
| 1583 | + $poslang = "IF($poslang=0,INSTR($chainemulti,']')+1,$poslang+$lengthlang)"; |
|
| 1584 | + $chainelang = 'TRIM(SUBSTRING(' . $objet . ", $posmulti+7+$poslang-1,$posfinmulti -($posmulti+7+$poslang-1) ))"; |
|
| 1585 | + $posfinlang = 'INSTR(' . $chainelang . ", '[')"; |
|
| 1586 | + $chainelang = "IF($posfinlang>0,LEFT($chainelang,$posfinlang-1),$chainelang)"; |
|
| 1587 | + //$chainelang = "LEFT($chainelang,$posfinlang-1)"; |
|
| 1588 | + $retour = "(TRIM(IF($posmulti = 0 , " . |
|
| 1589 | + ' TRIM(' . $objet . '), ' . |
|
| 1590 | + ' CONCAT( ' . |
|
| 1591 | + " $debutchaine, " . |
|
| 1592 | + ' IF( ' . |
|
| 1593 | + " $poslang = 0, " . |
|
| 1594 | + " $chainemulti, " . |
|
| 1595 | + " $chainelang" . |
|
| 1596 | + ' ), ' . |
|
| 1597 | + " $finchaine" . |
|
| 1598 | + ' ) ' . |
|
| 1599 | + '))) AS multi'; |
|
| 1600 | + |
|
| 1601 | + return $retour; |
|
| 1602 | 1602 | } |
| 1603 | 1603 | |
| 1604 | 1604 | /** |
@@ -1612,7 +1612,7 @@ discard block |
||
| 1612 | 1612 | * Valeur hexadécimale pour MySQL |
| 1613 | 1613 | **/ |
| 1614 | 1614 | function spip_mysql_hex($v) { |
| 1615 | - return '0x' . $v; |
|
| 1615 | + return '0x' . $v; |
|
| 1616 | 1616 | } |
| 1617 | 1617 | |
| 1618 | 1618 | /** |
@@ -1628,15 +1628,15 @@ discard block |
||
| 1628 | 1628 | * Donnée prête à être utilisée par le gestionnaire SQL |
| 1629 | 1629 | */ |
| 1630 | 1630 | function spip_mysql_quote($v, $type = '') { |
| 1631 | - if (!is_array($v)) { |
|
| 1632 | - return spip_mysql_cite($v, $type); |
|
| 1633 | - } |
|
| 1634 | - |
|
| 1635 | - // si c'est un tableau, le parcourir en propageant le type |
|
| 1636 | - foreach ($v as $k => $r) { |
|
| 1637 | - $v[$k] = spip_mysql_quote($r, $type); |
|
| 1638 | - } |
|
| 1639 | - return implode(',', $v); |
|
| 1631 | + if (!is_array($v)) { |
|
| 1632 | + return spip_mysql_cite($v, $type); |
|
| 1633 | + } |
|
| 1634 | + |
|
| 1635 | + // si c'est un tableau, le parcourir en propageant le type |
|
| 1636 | + foreach ($v as $k => $r) { |
|
| 1637 | + $v[$k] = spip_mysql_quote($r, $type); |
|
| 1638 | + } |
|
| 1639 | + return implode(',', $v); |
|
| 1640 | 1640 | } |
| 1641 | 1641 | |
| 1642 | 1642 | /** |
@@ -1652,18 +1652,18 @@ discard block |
||
| 1652 | 1652 | * Expression SQL |
| 1653 | 1653 | **/ |
| 1654 | 1654 | function spip_mysql_date_proche($champ, $interval, $unite) { |
| 1655 | - $use_now = ( ($champ === 'maj' or strpos($champ, '.maj')) ? true : false ); |
|
| 1656 | - return '(' |
|
| 1657 | - . $champ |
|
| 1658 | - . (($interval <= 0) ? '>' : '<') |
|
| 1659 | - . (($interval <= 0) ? 'DATE_SUB' : 'DATE_ADD') |
|
| 1660 | - . '(' |
|
| 1661 | - . ($use_now ? 'NOW()' : sql_quote(date('Y-m-d H:i:s'))) |
|
| 1662 | - . ', INTERVAL ' |
|
| 1663 | - . (($interval > 0) ? $interval : (0 - $interval)) |
|
| 1664 | - . ' ' |
|
| 1665 | - . $unite |
|
| 1666 | - . '))'; |
|
| 1655 | + $use_now = ( ($champ === 'maj' or strpos($champ, '.maj')) ? true : false ); |
|
| 1656 | + return '(' |
|
| 1657 | + . $champ |
|
| 1658 | + . (($interval <= 0) ? '>' : '<') |
|
| 1659 | + . (($interval <= 0) ? 'DATE_SUB' : 'DATE_ADD') |
|
| 1660 | + . '(' |
|
| 1661 | + . ($use_now ? 'NOW()' : sql_quote(date('Y-m-d H:i:s'))) |
|
| 1662 | + . ', INTERVAL ' |
|
| 1663 | + . (($interval > 0) ? $interval : (0 - $interval)) |
|
| 1664 | + . ' ' |
|
| 1665 | + . $unite |
|
| 1666 | + . '))'; |
|
| 1667 | 1667 | } |
| 1668 | 1668 | |
| 1669 | 1669 | |
@@ -1687,7 +1687,7 @@ discard block |
||
| 1687 | 1687 | * Expression de requête SQL |
| 1688 | 1688 | **/ |
| 1689 | 1689 | function spip_mysql_in($val, $valeurs, $not = '', $serveur = '', $requeter = true) { |
| 1690 | - return "($val $not IN ($valeurs))"; |
|
| 1690 | + return "($val $not IN ($valeurs))"; |
|
| 1691 | 1691 | } |
| 1692 | 1692 | |
| 1693 | 1693 | |
@@ -1699,39 +1699,39 @@ discard block |
||
| 1699 | 1699 | * @return string|number Texte ou nombre échappé |
| 1700 | 1700 | */ |
| 1701 | 1701 | function spip_mysql_cite($v, $type) { |
| 1702 | - if (!$type) { |
|
| 1703 | - if (is_bool($v)) { |
|
| 1704 | - return strval(intval($v)); |
|
| 1705 | - } elseif (is_numeric($v)) { |
|
| 1706 | - return strval($v); |
|
| 1707 | - } elseif ($v === null) { |
|
| 1708 | - return "''"; |
|
| 1709 | - } |
|
| 1710 | - return "'" . addslashes($v) . "'"; |
|
| 1711 | - } |
|
| 1712 | - |
|
| 1713 | - if ($v === null) { |
|
| 1714 | - if (stripos($type, 'NOT NULL') === false) { |
|
| 1715 | - // null php se traduit en NULL SQL |
|
| 1716 | - return 'NULL'; |
|
| 1717 | - } else { |
|
| 1718 | - return "''"; |
|
| 1719 | - } |
|
| 1720 | - } elseif (sql_test_date($type) and preg_match('/^\w+\(/', $v)) { |
|
| 1721 | - return $v; |
|
| 1722 | - } elseif (sql_test_int($type)) { |
|
| 1723 | - if ( |
|
| 1724 | - is_numeric($v) |
|
| 1725 | - or ($v and ctype_xdigit(substr($v, 2)) and $v[0] === '0' and $v[1] === 'x') |
|
| 1726 | - ) { |
|
| 1727 | - return $v; |
|
| 1728 | - } else { |
|
| 1729 | - // si pas numerique, forcer le intval |
|
| 1730 | - return intval($v); |
|
| 1731 | - } |
|
| 1732 | - } |
|
| 1733 | - |
|
| 1734 | - return ("'" . addslashes($v) . "'"); |
|
| 1702 | + if (!$type) { |
|
| 1703 | + if (is_bool($v)) { |
|
| 1704 | + return strval(intval($v)); |
|
| 1705 | + } elseif (is_numeric($v)) { |
|
| 1706 | + return strval($v); |
|
| 1707 | + } elseif ($v === null) { |
|
| 1708 | + return "''"; |
|
| 1709 | + } |
|
| 1710 | + return "'" . addslashes($v) . "'"; |
|
| 1711 | + } |
|
| 1712 | + |
|
| 1713 | + if ($v === null) { |
|
| 1714 | + if (stripos($type, 'NOT NULL') === false) { |
|
| 1715 | + // null php se traduit en NULL SQL |
|
| 1716 | + return 'NULL'; |
|
| 1717 | + } else { |
|
| 1718 | + return "''"; |
|
| 1719 | + } |
|
| 1720 | + } elseif (sql_test_date($type) and preg_match('/^\w+\(/', $v)) { |
|
| 1721 | + return $v; |
|
| 1722 | + } elseif (sql_test_int($type)) { |
|
| 1723 | + if ( |
|
| 1724 | + is_numeric($v) |
|
| 1725 | + or ($v and ctype_xdigit(substr($v, 2)) and $v[0] === '0' and $v[1] === 'x') |
|
| 1726 | + ) { |
|
| 1727 | + return $v; |
|
| 1728 | + } else { |
|
| 1729 | + // si pas numerique, forcer le intval |
|
| 1730 | + return intval($v); |
|
| 1731 | + } |
|
| 1732 | + } |
|
| 1733 | + |
|
| 1734 | + return ("'" . addslashes($v) . "'"); |
|
| 1735 | 1735 | } |
| 1736 | 1736 | |
| 1737 | 1737 | /** |
@@ -1741,7 +1741,7 @@ discard block |
||
| 1741 | 1741 | * True si on a les fonctions, false sinon |
| 1742 | 1742 | */ |
| 1743 | 1743 | function spip_versions_mysql() { |
| 1744 | - return function_exists('mysqli_query'); |
|
| 1744 | + return function_exists('mysqli_query'); |
|
| 1745 | 1745 | } |
| 1746 | 1746 | |
| 1747 | 1747 | |
@@ -1754,20 +1754,20 @@ discard block |
||
| 1754 | 1754 | * - chaîne : code compilé pour le faire désactiver par SPIP sinon |
| 1755 | 1755 | */ |
| 1756 | 1756 | function test_rappel_nom_base_mysql($server_db) { |
| 1757 | - $GLOBALS['mysql_rappel_nom_base'] = true; |
|
| 1758 | - sql_delete('spip_meta', "nom='mysql_rappel_nom_base'", $server_db); |
|
| 1759 | - $ok = spip_query("INSERT INTO spip_meta (nom,valeur) VALUES ('mysql_rappel_nom_base', 'test')", $server_db); |
|
| 1757 | + $GLOBALS['mysql_rappel_nom_base'] = true; |
|
| 1758 | + sql_delete('spip_meta', "nom='mysql_rappel_nom_base'", $server_db); |
|
| 1759 | + $ok = spip_query("INSERT INTO spip_meta (nom,valeur) VALUES ('mysql_rappel_nom_base', 'test')", $server_db); |
|
| 1760 | 1760 | |
| 1761 | - if ($ok) { |
|
| 1762 | - sql_delete('spip_meta', "nom='mysql_rappel_nom_base'", $server_db); |
|
| 1761 | + if ($ok) { |
|
| 1762 | + sql_delete('spip_meta', "nom='mysql_rappel_nom_base'", $server_db); |
|
| 1763 | 1763 | |
| 1764 | - return ''; |
|
| 1765 | - } else { |
|
| 1766 | - $GLOBALS['mysql_rappel_nom_base'] = false; |
|
| 1764 | + return ''; |
|
| 1765 | + } else { |
|
| 1766 | + $GLOBALS['mysql_rappel_nom_base'] = false; |
|
| 1767 | 1767 | |
| 1768 | - return "\$GLOBALS['mysql_rappel_nom_base'] = false; " . |
|
| 1769 | - "/* echec de test_rappel_nom_base_mysql a l'installation. */\n"; |
|
| 1770 | - } |
|
| 1768 | + return "\$GLOBALS['mysql_rappel_nom_base'] = false; " . |
|
| 1769 | + "/* echec de test_rappel_nom_base_mysql a l'installation. */\n"; |
|
| 1770 | + } |
|
| 1771 | 1771 | } |
| 1772 | 1772 | |
| 1773 | 1773 | /** |
@@ -1781,13 +1781,13 @@ discard block |
||
| 1781 | 1781 | * - chaîne : code compilé pour l'indiquer le résultat du test à SPIP |
| 1782 | 1782 | */ |
| 1783 | 1783 | function test_sql_mode_mysql($server_db) { |
| 1784 | - $res = sql_select('version() as v', '', '', '', '', '', '', $server_db); |
|
| 1785 | - $row = sql_fetch($res, $server_db); |
|
| 1786 | - if (version_compare($row['v'], '5.0.0', '>=')) { |
|
| 1787 | - defined('_MYSQL_SET_SQL_MODE') || define('_MYSQL_SET_SQL_MODE', true); |
|
| 1784 | + $res = sql_select('version() as v', '', '', '', '', '', '', $server_db); |
|
| 1785 | + $row = sql_fetch($res, $server_db); |
|
| 1786 | + if (version_compare($row['v'], '5.0.0', '>=')) { |
|
| 1787 | + defined('_MYSQL_SET_SQL_MODE') || define('_MYSQL_SET_SQL_MODE', true); |
|
| 1788 | 1788 | |
| 1789 | - return "defined('_MYSQL_SET_SQL_MODE') || define('_MYSQL_SET_SQL_MODE',true);\n"; |
|
| 1790 | - } |
|
| 1789 | + return "defined('_MYSQL_SET_SQL_MODE') || define('_MYSQL_SET_SQL_MODE',true);\n"; |
|
| 1790 | + } |
|
| 1791 | 1791 | |
| 1792 | - return ''; |
|
| 1792 | + return ''; |
|
| 1793 | 1793 | } |
@@ -63,9 +63,9 @@ |
||
| 63 | 63 | $f = new IndenteurXML(); |
| 64 | 64 | $sax($page, $apply, $f); |
| 65 | 65 | if (!$f->err) { |
| 66 | - return $f->entete . $f->res; |
|
| 66 | + return $f->entete.$f->res; |
|
| 67 | 67 | } |
| 68 | - spip_log('indentation impossible ' . (is_countable($f->err) ? count($f->err) : 0) . ' erreurs de validation'); |
|
| 68 | + spip_log('indentation impossible '.(is_countable($f->err) ? count($f->err) : 0).' erreurs de validation'); |
|
| 69 | 69 | |
| 70 | - return $f->entete . $f->page; |
|
| 70 | + return $f->entete.$f->page; |
|
| 71 | 71 | } |
@@ -11,55 +11,55 @@ |
||
| 11 | 11 | \***************************************************************************/ |
| 12 | 12 | |
| 13 | 13 | if (!defined('_ECRIRE_INC_VERSION')) { |
| 14 | - return; |
|
| 14 | + return; |
|
| 15 | 15 | } |
| 16 | 16 | |
| 17 | 17 | class IndenteurXML { |
| 18 | 18 | |
| 19 | - public function debutElement($phraseur, $name, $attrs) { |
|
| 20 | - xml_debutElement($this, $name, $attrs); |
|
| 21 | - } |
|
| 19 | + public function debutElement($phraseur, $name, $attrs) { |
|
| 20 | + xml_debutElement($this, $name, $attrs); |
|
| 21 | + } |
|
| 22 | 22 | |
| 23 | - public function finElement($phraseur, $name) { |
|
| 24 | - xml_finElement($this, $name); |
|
| 25 | - } |
|
| 23 | + public function finElement($phraseur, $name) { |
|
| 24 | + xml_finElement($this, $name); |
|
| 25 | + } |
|
| 26 | 26 | |
| 27 | - public function textElement($phraseur, $data) { |
|
| 28 | - xml_textElement($this, $data); |
|
| 29 | - } |
|
| 27 | + public function textElement($phraseur, $data) { |
|
| 28 | + xml_textElement($this, $data); |
|
| 29 | + } |
|
| 30 | 30 | |
| 31 | - public function piElement($phraseur, $target, $data) { |
|
| 32 | - xml_PiElement($this, $target, $data); |
|
| 33 | - } |
|
| 31 | + public function piElement($phraseur, $target, $data) { |
|
| 32 | + xml_PiElement($this, $target, $data); |
|
| 33 | + } |
|
| 34 | 34 | |
| 35 | - public function defaultElement($phraseur, $data) { |
|
| 36 | - xml_defaultElement($this, $data); |
|
| 37 | - } |
|
| 35 | + public function defaultElement($phraseur, $data) { |
|
| 36 | + xml_defaultElement($this, $data); |
|
| 37 | + } |
|
| 38 | 38 | |
| 39 | - public function phraserTout($phraseur, $data) { |
|
| 40 | - xml_parsestring($this, $data); |
|
| 41 | - } |
|
| 39 | + public function phraserTout($phraseur, $data) { |
|
| 40 | + xml_parsestring($this, $data); |
|
| 41 | + } |
|
| 42 | 42 | |
| 43 | - public $depth = ''; |
|
| 44 | - public $res = ''; |
|
| 45 | - public $err = []; |
|
| 46 | - public $contenu = []; |
|
| 47 | - public $ouvrant = []; |
|
| 48 | - public $reperes = []; |
|
| 49 | - public $entete = ''; |
|
| 50 | - public $page = ''; |
|
| 51 | - public $dtc = null; |
|
| 52 | - public $sax = null; |
|
| 43 | + public $depth = ''; |
|
| 44 | + public $res = ''; |
|
| 45 | + public $err = []; |
|
| 46 | + public $contenu = []; |
|
| 47 | + public $ouvrant = []; |
|
| 48 | + public $reperes = []; |
|
| 49 | + public $entete = ''; |
|
| 50 | + public $page = ''; |
|
| 51 | + public $dtc = null; |
|
| 52 | + public $sax = null; |
|
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | function xml_indenter_dist($page, $apply = false) { |
| 56 | - $sax = charger_fonction('sax', 'xml'); |
|
| 57 | - $f = new IndenteurXML(); |
|
| 58 | - $sax($page, $apply, $f); |
|
| 59 | - if (!$f->err) { |
|
| 60 | - return $f->entete . $f->res; |
|
| 61 | - } |
|
| 62 | - spip_log('indentation impossible ' . (is_countable($f->err) ? count($f->err) : 0) . ' erreurs de validation'); |
|
| 56 | + $sax = charger_fonction('sax', 'xml'); |
|
| 57 | + $f = new IndenteurXML(); |
|
| 58 | + $sax($page, $apply, $f); |
|
| 59 | + if (!$f->err) { |
|
| 60 | + return $f->entete . $f->res; |
|
| 61 | + } |
|
| 62 | + spip_log('indentation impossible ' . (is_countable($f->err) ? count($f->err) : 0) . ' erreurs de validation'); |
|
| 63 | 63 | |
| 64 | - return $f->entete . $f->page; |
|
| 64 | + return $f->entete . $f->page; |
|
| 65 | 65 | } |
@@ -46,8 +46,8 @@ discard block |
||
| 46 | 46 | $t = $phraseur->ouvrant[$depth] ?? ' '; |
| 47 | 47 | // espace initial signifie: deja integree au resultat |
| 48 | 48 | if ($t[0] != ' ') { |
| 49 | - $phraseur->res .= '<' . $t . '>'; |
|
| 50 | - $phraseur->ouvrant[$depth] = ' ' . $t; |
|
| 49 | + $phraseur->res .= '<'.$t.'>'; |
|
| 50 | + $phraseur->ouvrant[$depth] = ' '.$t; |
|
| 51 | 51 | } |
| 52 | 52 | $t = $phraseur->contenu[$depth]; |
| 53 | 53 | // n'indenter que s'il y a un separateur avant |
@@ -58,14 +58,14 @@ discard block |
||
| 58 | 58 | foreach ($attrs as $k => $v) { |
| 59 | 59 | $delim = strpos($v, "'") === false ? "'" : '"'; |
| 60 | 60 | $val = xml_entites_html($v); |
| 61 | - $att .= $sep . $k . '=' . $delim |
|
| 61 | + $att .= $sep.$k.'='.$delim |
|
| 62 | 62 | . ($delim !== '"' ? str_replace('"', '"', $val) : $val) |
| 63 | 63 | . $delim; |
| 64 | 64 | $sep = "\n $depth"; |
| 65 | 65 | } |
| 66 | 66 | $phraseur->depth .= ' '; |
| 67 | 67 | $phraseur->contenu[$phraseur->depth] = ''; |
| 68 | - $phraseur->ouvrant[$phraseur->depth] = $name . $att; |
|
| 68 | + $phraseur->ouvrant[$phraseur->depth] = $name.$att; |
|
| 69 | 69 | $phraseur->reperes[$phraseur->depth] = xml_get_current_line_number($phraseur->sax); |
| 70 | 70 | } |
| 71 | 71 | |
@@ -74,13 +74,13 @@ discard block |
||
| 74 | 74 | $ouv = $phraseur->ouvrant[$phraseur->depth]; |
| 75 | 75 | |
| 76 | 76 | if ($ouv[0] != ' ') { |
| 77 | - $phraseur->ouvrant[$phraseur->depth] = ' ' . $ouv; |
|
| 77 | + $phraseur->ouvrant[$phraseur->depth] = ' '.$ouv; |
|
| 78 | 78 | } else { |
| 79 | 79 | $ouv = ''; |
| 80 | 80 | } |
| 81 | 81 | $t = $phraseur->contenu[$phraseur->depth]; |
| 82 | 82 | $phraseur->depth = substr($phraseur->depth, 2); |
| 83 | - $t = preg_replace("/[\n\t ]+$/", "\n" . $phraseur->depth, $t); |
|
| 83 | + $t = preg_replace("/[\n\t ]+$/", "\n".$phraseur->depth, $t); |
|
| 84 | 84 | |
| 85 | 85 | // fusion <balise></balise> en <balise />. |
| 86 | 86 | // ATTENTION, certains clients http croient que fusion ==> pas d'atttributs |
@@ -89,9 +89,9 @@ discard block |
||
| 89 | 89 | // (param fusion_bal) |
| 90 | 90 | |
| 91 | 91 | if ($t || (($ouv != $name) and !$fusion_bal)) { |
| 92 | - $phraseur->res .= ($ouv ? ('<' . $ouv . '>') : '') . $t . '</' . $name . '>'; |
|
| 92 | + $phraseur->res .= ($ouv ? ('<'.$ouv.'>') : '').$t.'</'.$name.'>'; |
|
| 93 | 93 | } else { |
| 94 | - $phraseur->res .= ($ouv ? ('<' . $ouv . ' />') : ('</' . $name . '>')); |
|
| 94 | + $phraseur->res .= ($ouv ? ('<'.$ouv.' />') : ('</'.$name.'>')); |
|
| 95 | 95 | } |
| 96 | 96 | } |
| 97 | 97 | |
@@ -136,16 +136,15 @@ discard block |
||
| 136 | 136 | coordonnees_erreur( |
| 137 | 137 | $phraseur, |
| 138 | 138 | xml_error_string(xml_get_error_code($phraseur->sax)) |
| 139 | - . "<br />\n" . |
|
| 140 | - (!$phraseur->depth ? '' : |
|
| 141 | - ('(' . |
|
| 142 | - _T('erreur_balise_non_fermee') . |
|
| 143 | - ' <tt>' . |
|
| 144 | - $phraseur->ouvrant[$phraseur->depth] . |
|
| 145 | - '</tt> ' . |
|
| 146 | - _T('ligne') . |
|
| 147 | - ' ' . |
|
| 148 | - $phraseur->reperes[$phraseur->depth] . |
|
| 139 | + . "<br />\n". |
|
| 140 | + (!$phraseur->depth ? '' : ('('. |
|
| 141 | + _T('erreur_balise_non_fermee'). |
|
| 142 | + ' <tt>'. |
|
| 143 | + $phraseur->ouvrant[$phraseur->depth]. |
|
| 144 | + '</tt> '. |
|
| 145 | + _T('ligne'). |
|
| 146 | + ' '. |
|
| 147 | + $phraseur->reperes[$phraseur->depth]. |
|
| 149 | 148 | ") <br />\n")) |
| 150 | 149 | ); |
| 151 | 150 | } |
@@ -188,7 +187,7 @@ discard block |
||
| 188 | 187 | // et escamoter le doctype que sax mange en php5 mais pas en php4 |
| 189 | 188 | if (!$doctype) { |
| 190 | 189 | if (!$r = analyser_doctype($page)) { |
| 191 | - $page = _MESSAGE_DOCTYPE . _DOCTYPE_ECRIRE |
|
| 190 | + $page = _MESSAGE_DOCTYPE._DOCTYPE_ECRIRE |
|
| 192 | 191 | . preg_replace(_REGEXP_DOCTYPE, '', $page); |
| 193 | 192 | $r = analyser_doctype($page); |
| 194 | 193 | } |
@@ -297,18 +296,18 @@ discard block |
||
| 297 | 296 | 'rss-0.91.dtd' |
| 298 | 297 | ]; |
| 299 | 298 | } else { |
| 300 | - $dtd = $topelement . '.dtd'; |
|
| 299 | + $dtd = $topelement.'.dtd'; |
|
| 301 | 300 | $f = find_in_path($dtd); |
| 302 | 301 | if (file_exists($f)) { |
| 303 | 302 | return [$entete, 'SYSTEM', $f, $dtd]; |
| 304 | 303 | } |
| 305 | 304 | } |
| 306 | 305 | } |
| 307 | - spip_log('Dtd pas vu pour ' . substr($data, 0, 100)); |
|
| 306 | + spip_log('Dtd pas vu pour '.substr($data, 0, 100)); |
|
| 308 | 307 | |
| 309 | 308 | return []; |
| 310 | 309 | } |
| 311 | - [$entete, , $topelement, $avail, $suite] = $page; |
|
| 310 | + [$entete,, $topelement, $avail, $suite] = $page; |
|
| 312 | 311 | |
| 313 | 312 | if (!preg_match('/^"([^"]*)"\s*(.*)$/', $suite, $r)) { |
| 314 | 313 | if (!preg_match("/^'([^']*)'\s*(.*)$/", $suite, $r)) { |
@@ -11,7 +11,7 @@ discard block |
||
| 11 | 11 | \***************************************************************************/ |
| 12 | 12 | |
| 13 | 13 | if (!defined('_ECRIRE_INC_VERSION')) { |
| 14 | - return; |
|
| 14 | + return; |
|
| 15 | 15 | } |
| 16 | 16 | |
| 17 | 17 | include_spip('inc/charsets'); |
@@ -24,222 +24,222 @@ discard block |
||
| 24 | 24 | * @return string |
| 25 | 25 | */ |
| 26 | 26 | function xml_entites_html($texte) { |
| 27 | - if ( |
|
| 28 | - !is_string($texte) or !$texte |
|
| 29 | - or strpbrk($texte, "&\"'<>") == false |
|
| 30 | - ) { |
|
| 31 | - return $texte; |
|
| 32 | - } |
|
| 33 | - |
|
| 34 | - if (!function_exists('spip_htmlspecialchars')) { |
|
| 35 | - include_spip('inc/filtres_mini'); |
|
| 36 | - } |
|
| 37 | - $texte = spip_htmlspecialchars($texte, ENT_QUOTES); |
|
| 38 | - |
|
| 39 | - return $texte; |
|
| 27 | + if ( |
|
| 28 | + !is_string($texte) or !$texte |
|
| 29 | + or strpbrk($texte, "&\"'<>") == false |
|
| 30 | + ) { |
|
| 31 | + return $texte; |
|
| 32 | + } |
|
| 33 | + |
|
| 34 | + if (!function_exists('spip_htmlspecialchars')) { |
|
| 35 | + include_spip('inc/filtres_mini'); |
|
| 36 | + } |
|
| 37 | + $texte = spip_htmlspecialchars($texte, ENT_QUOTES); |
|
| 38 | + |
|
| 39 | + return $texte; |
|
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | function xml_debutElement($phraseur, $name, $attrs) { |
| 43 | - $depth = $phraseur->depth; |
|
| 44 | - |
|
| 45 | - $t = $phraseur->ouvrant[$depth] ?? ' '; |
|
| 46 | - // espace initial signifie: deja integree au resultat |
|
| 47 | - if ($t[0] != ' ') { |
|
| 48 | - $phraseur->res .= '<' . $t . '>'; |
|
| 49 | - $phraseur->ouvrant[$depth] = ' ' . $t; |
|
| 50 | - } |
|
| 51 | - $t = $phraseur->contenu[$depth]; |
|
| 52 | - // n'indenter que s'il y a un separateur avant |
|
| 53 | - $phraseur->res .= preg_replace("/[\n\t ]+$/", "\n$depth", $t); |
|
| 54 | - $phraseur->contenu[$depth] = ''; |
|
| 55 | - $att = ''; |
|
| 56 | - $sep = ' '; |
|
| 57 | - foreach ($attrs as $k => $v) { |
|
| 58 | - $delim = strpos($v, "'") === false ? "'" : '"'; |
|
| 59 | - $val = xml_entites_html($v); |
|
| 60 | - $att .= $sep . $k . '=' . $delim |
|
| 61 | - . ($delim !== '"' ? str_replace('"', '"', $val) : $val) |
|
| 62 | - . $delim; |
|
| 63 | - $sep = "\n $depth"; |
|
| 64 | - } |
|
| 65 | - $phraseur->depth .= ' '; |
|
| 66 | - $phraseur->contenu[$phraseur->depth] = ''; |
|
| 67 | - $phraseur->ouvrant[$phraseur->depth] = $name . $att; |
|
| 68 | - $phraseur->reperes[$phraseur->depth] = xml_get_current_line_number($phraseur->sax); |
|
| 43 | + $depth = $phraseur->depth; |
|
| 44 | + |
|
| 45 | + $t = $phraseur->ouvrant[$depth] ?? ' '; |
|
| 46 | + // espace initial signifie: deja integree au resultat |
|
| 47 | + if ($t[0] != ' ') { |
|
| 48 | + $phraseur->res .= '<' . $t . '>'; |
|
| 49 | + $phraseur->ouvrant[$depth] = ' ' . $t; |
|
| 50 | + } |
|
| 51 | + $t = $phraseur->contenu[$depth]; |
|
| 52 | + // n'indenter que s'il y a un separateur avant |
|
| 53 | + $phraseur->res .= preg_replace("/[\n\t ]+$/", "\n$depth", $t); |
|
| 54 | + $phraseur->contenu[$depth] = ''; |
|
| 55 | + $att = ''; |
|
| 56 | + $sep = ' '; |
|
| 57 | + foreach ($attrs as $k => $v) { |
|
| 58 | + $delim = strpos($v, "'") === false ? "'" : '"'; |
|
| 59 | + $val = xml_entites_html($v); |
|
| 60 | + $att .= $sep . $k . '=' . $delim |
|
| 61 | + . ($delim !== '"' ? str_replace('"', '"', $val) : $val) |
|
| 62 | + . $delim; |
|
| 63 | + $sep = "\n $depth"; |
|
| 64 | + } |
|
| 65 | + $phraseur->depth .= ' '; |
|
| 66 | + $phraseur->contenu[$phraseur->depth] = ''; |
|
| 67 | + $phraseur->ouvrant[$phraseur->depth] = $name . $att; |
|
| 68 | + $phraseur->reperes[$phraseur->depth] = xml_get_current_line_number($phraseur->sax); |
|
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | function xml_finElement($phraseur, $name, $fusion_bal = false) { |
| 72 | - $ouv = $phraseur->ouvrant[$phraseur->depth]; |
|
| 73 | - |
|
| 74 | - if ($ouv[0] != ' ') { |
|
| 75 | - $phraseur->ouvrant[$phraseur->depth] = ' ' . $ouv; |
|
| 76 | - } else { |
|
| 77 | - $ouv = ''; |
|
| 78 | - } |
|
| 79 | - $t = $phraseur->contenu[$phraseur->depth]; |
|
| 80 | - $phraseur->depth = substr($phraseur->depth, 2); |
|
| 81 | - $t = preg_replace("/[\n\t ]+$/", "\n" . $phraseur->depth, $t); |
|
| 82 | - |
|
| 83 | - // fusion <balise></balise> en <balise />. |
|
| 84 | - // ATTENTION, certains clients http croient que fusion ==> pas d'atttributs |
|
| 85 | - // en particulier pour les balises Script et A. |
|
| 86 | - // en presence d'attributs ne le faire que si la DTD est dispo et d'accord |
|
| 87 | - // (param fusion_bal) |
|
| 88 | - |
|
| 89 | - if ($t || (($ouv != $name) and !$fusion_bal)) { |
|
| 90 | - $phraseur->res .= ($ouv ? ('<' . $ouv . '>') : '') . $t . '</' . $name . '>'; |
|
| 91 | - } else { |
|
| 92 | - $phraseur->res .= ($ouv ? ('<' . $ouv . ' />') : ('</' . $name . '>')); |
|
| 93 | - } |
|
| 72 | + $ouv = $phraseur->ouvrant[$phraseur->depth]; |
|
| 73 | + |
|
| 74 | + if ($ouv[0] != ' ') { |
|
| 75 | + $phraseur->ouvrant[$phraseur->depth] = ' ' . $ouv; |
|
| 76 | + } else { |
|
| 77 | + $ouv = ''; |
|
| 78 | + } |
|
| 79 | + $t = $phraseur->contenu[$phraseur->depth]; |
|
| 80 | + $phraseur->depth = substr($phraseur->depth, 2); |
|
| 81 | + $t = preg_replace("/[\n\t ]+$/", "\n" . $phraseur->depth, $t); |
|
| 82 | + |
|
| 83 | + // fusion <balise></balise> en <balise />. |
|
| 84 | + // ATTENTION, certains clients http croient que fusion ==> pas d'atttributs |
|
| 85 | + // en particulier pour les balises Script et A. |
|
| 86 | + // en presence d'attributs ne le faire que si la DTD est dispo et d'accord |
|
| 87 | + // (param fusion_bal) |
|
| 88 | + |
|
| 89 | + if ($t || (($ouv != $name) and !$fusion_bal)) { |
|
| 90 | + $phraseur->res .= ($ouv ? ('<' . $ouv . '>') : '') . $t . '</' . $name . '>'; |
|
| 91 | + } else { |
|
| 92 | + $phraseur->res .= ($ouv ? ('<' . $ouv . ' />') : ('</' . $name . '>')); |
|
| 93 | + } |
|
| 94 | 94 | } |
| 95 | 95 | |
| 96 | 96 | function xml_textElement($phraseur, $data) { |
| 97 | - $depth = $phraseur->depth; |
|
| 98 | - $phraseur->contenu[$depth] .= preg_match('/^script/', $phraseur->ouvrant[$depth]) |
|
| 99 | - ? $data |
|
| 100 | - : xml_entites_html($data); |
|
| 97 | + $depth = $phraseur->depth; |
|
| 98 | + $phraseur->contenu[$depth] .= preg_match('/^script/', $phraseur->ouvrant[$depth]) |
|
| 99 | + ? $data |
|
| 100 | + : xml_entites_html($data); |
|
| 101 | 101 | } |
| 102 | 102 | |
| 103 | 103 | function xml_piElement($phraseur, $target, $data) { |
| 104 | - $depth = $phraseur->depth; |
|
| 105 | - |
|
| 106 | - if (strtolower($target) != 'php') { |
|
| 107 | - $phraseur->contenu[$depth] .= $data; |
|
| 108 | - } else { |
|
| 109 | - ob_start(); |
|
| 110 | - eval($data); |
|
| 111 | - $data = ob_get_contents(); |
|
| 112 | - ob_end_clean(); |
|
| 113 | - $phraseur->contenu[$depth] .= $data; |
|
| 114 | - } |
|
| 104 | + $depth = $phraseur->depth; |
|
| 105 | + |
|
| 106 | + if (strtolower($target) != 'php') { |
|
| 107 | + $phraseur->contenu[$depth] .= $data; |
|
| 108 | + } else { |
|
| 109 | + ob_start(); |
|
| 110 | + eval($data); |
|
| 111 | + $data = ob_get_contents(); |
|
| 112 | + ob_end_clean(); |
|
| 113 | + $phraseur->contenu[$depth] .= $data; |
|
| 114 | + } |
|
| 115 | 115 | } |
| 116 | 116 | |
| 117 | 117 | |
| 118 | 118 | function xml_defaultElement($phraseur, $data) { |
| 119 | - $depth = $phraseur->depth; |
|
| 119 | + $depth = $phraseur->depth; |
|
| 120 | 120 | |
| 121 | - if (!isset($phraseur->contenu[$depth])) { |
|
| 122 | - $phraseur->contenu[$depth] = ''; |
|
| 123 | - } |
|
| 124 | - $phraseur->contenu[$depth] .= $data; |
|
| 121 | + if (!isset($phraseur->contenu[$depth])) { |
|
| 122 | + $phraseur->contenu[$depth] = ''; |
|
| 123 | + } |
|
| 124 | + $phraseur->contenu[$depth] .= $data; |
|
| 125 | 125 | } |
| 126 | 126 | |
| 127 | 127 | function xml_parsestring($phraseur, $data) { |
| 128 | - $phraseur->contenu[$phraseur->depth] = ''; |
|
| 129 | - |
|
| 130 | - if (!xml_parse($phraseur->sax, $data, true)) { |
|
| 131 | - coordonnees_erreur( |
|
| 132 | - $phraseur, |
|
| 133 | - xml_error_string(xml_get_error_code($phraseur->sax)) |
|
| 134 | - . "<br />\n" . |
|
| 135 | - (!$phraseur->depth ? '' : |
|
| 136 | - ('(' . |
|
| 137 | - _T('erreur_balise_non_fermee') . |
|
| 138 | - ' <tt>' . |
|
| 139 | - $phraseur->ouvrant[$phraseur->depth] . |
|
| 140 | - '</tt> ' . |
|
| 141 | - _T('ligne') . |
|
| 142 | - ' ' . |
|
| 143 | - $phraseur->reperes[$phraseur->depth] . |
|
| 144 | - ") <br />\n")) |
|
| 145 | - ); |
|
| 146 | - } |
|
| 128 | + $phraseur->contenu[$phraseur->depth] = ''; |
|
| 129 | + |
|
| 130 | + if (!xml_parse($phraseur->sax, $data, true)) { |
|
| 131 | + coordonnees_erreur( |
|
| 132 | + $phraseur, |
|
| 133 | + xml_error_string(xml_get_error_code($phraseur->sax)) |
|
| 134 | + . "<br />\n" . |
|
| 135 | + (!$phraseur->depth ? '' : |
|
| 136 | + ('(' . |
|
| 137 | + _T('erreur_balise_non_fermee') . |
|
| 138 | + ' <tt>' . |
|
| 139 | + $phraseur->ouvrant[$phraseur->depth] . |
|
| 140 | + '</tt> ' . |
|
| 141 | + _T('ligne') . |
|
| 142 | + ' ' . |
|
| 143 | + $phraseur->reperes[$phraseur->depth] . |
|
| 144 | + ") <br />\n")) |
|
| 145 | + ); |
|
| 146 | + } |
|
| 147 | 147 | } |
| 148 | 148 | |
| 149 | 149 | function coordonnees_erreur($phraseur, $msg) { |
| 150 | - $entete_length = substr_count($phraseur->entete, "\n"); |
|
| 151 | - $phraseur->err[] = [ |
|
| 152 | - $msg, |
|
| 153 | - xml_get_current_line_number($phraseur->sax) + $entete_length, |
|
| 154 | - xml_get_current_column_number($phraseur->sax) |
|
| 155 | - ]; |
|
| 150 | + $entete_length = substr_count($phraseur->entete, "\n"); |
|
| 151 | + $phraseur->err[] = [ |
|
| 152 | + $msg, |
|
| 153 | + xml_get_current_line_number($phraseur->sax) + $entete_length, |
|
| 154 | + xml_get_current_column_number($phraseur->sax) |
|
| 155 | + ]; |
|
| 156 | 156 | } |
| 157 | 157 | |
| 158 | 158 | function xml_sax_dist($page, $apply = false, $phraseur = null, $doctype = '', $charset = null) { |
| 159 | - if (is_null($charset)) { |
|
| 160 | - $charset = $GLOBALS['meta']['charset']; |
|
| 161 | - } |
|
| 162 | - if ($apply) { |
|
| 163 | - ob_start(); |
|
| 164 | - if (is_array($apply)) { |
|
| 165 | - $r = $page(...$apply); |
|
| 166 | - } else { |
|
| 167 | - $r = $page(); |
|
| 168 | - } |
|
| 169 | - $page = ob_get_contents(); |
|
| 170 | - ob_end_clean(); |
|
| 171 | - // fonction sans aucun "echo", ca doit etre le resultat |
|
| 172 | - if (!$page) { |
|
| 173 | - $page = $r; |
|
| 174 | - } |
|
| 175 | - } |
|
| 176 | - |
|
| 177 | - if (!$page) { |
|
| 178 | - return ''; |
|
| 179 | - } |
|
| 180 | - // charger la DTD et transcoder les entites, |
|
| 181 | - // et escamoter le doctype que sax mange en php5 mais pas en php4 |
|
| 182 | - if (!$doctype) { |
|
| 183 | - if (!$r = analyser_doctype($page)) { |
|
| 184 | - $page = _MESSAGE_DOCTYPE . _DOCTYPE_ECRIRE |
|
| 185 | - . preg_replace(_REGEXP_DOCTYPE, '', $page); |
|
| 186 | - $r = analyser_doctype($page); |
|
| 187 | - } |
|
| 188 | - [$entete, $avail, $grammaire, $rotlvl] = array_pad($r, 4, null); |
|
| 189 | - $page = substr($page, strlen($entete)); |
|
| 190 | - } else { |
|
| 191 | - $avail = 'SYSTEM'; |
|
| 192 | - $grammaire = $doctype; |
|
| 193 | - $rotlvl = basename($grammaire); |
|
| 194 | - } |
|
| 195 | - |
|
| 196 | - include_spip('xml/analyser_dtd'); |
|
| 197 | - $dtc = charger_dtd($grammaire, $avail, $rotlvl); |
|
| 198 | - $page = sax_bug($page, $dtc, $charset); |
|
| 199 | - |
|
| 200 | - // compatibilite Tidy espace public |
|
| 201 | - if (!$phraseur) { |
|
| 202 | - $indenter_xml = charger_fonction('indenter', 'xml'); |
|
| 203 | - |
|
| 204 | - return $indenter_xml($page, $apply); |
|
| 205 | - } |
|
| 206 | - |
|
| 207 | - $xml_parser = xml_parser_create($charset); |
|
| 208 | - |
|
| 209 | - xml_set_element_handler( |
|
| 210 | - $xml_parser, |
|
| 211 | - [$phraseur, 'debutElement'], |
|
| 212 | - [$phraseur, 'finElement'] |
|
| 213 | - ); |
|
| 214 | - |
|
| 215 | - xml_set_character_data_handler( |
|
| 216 | - $xml_parser, |
|
| 217 | - [$phraseur, 'textElement'] |
|
| 218 | - ); |
|
| 219 | - |
|
| 220 | - xml_set_processing_instruction_handler( |
|
| 221 | - $xml_parser, |
|
| 222 | - [$phraseur, 'piElement'] |
|
| 223 | - ); |
|
| 224 | - |
|
| 225 | - xml_set_default_handler( |
|
| 226 | - $xml_parser, |
|
| 227 | - [$phraseur, 'defaultElement'] |
|
| 228 | - ); |
|
| 229 | - |
|
| 230 | - xml_parser_set_option($xml_parser, XML_OPTION_CASE_FOLDING, false); |
|
| 231 | - |
|
| 232 | - $phraseur->sax = $xml_parser; |
|
| 233 | - if (isset($entete)) { |
|
| 234 | - $phraseur->entete = $entete; |
|
| 235 | - } |
|
| 236 | - $phraseur->page = $page; |
|
| 237 | - $phraseur->dtc = $dtc; |
|
| 238 | - $phraseur->phraserTout($xml_parser, $page); |
|
| 239 | - xml_parser_free($xml_parser); |
|
| 240 | - $phraseur->sax = ''; |
|
| 241 | - |
|
| 242 | - return $phraseur; |
|
| 159 | + if (is_null($charset)) { |
|
| 160 | + $charset = $GLOBALS['meta']['charset']; |
|
| 161 | + } |
|
| 162 | + if ($apply) { |
|
| 163 | + ob_start(); |
|
| 164 | + if (is_array($apply)) { |
|
| 165 | + $r = $page(...$apply); |
|
| 166 | + } else { |
|
| 167 | + $r = $page(); |
|
| 168 | + } |
|
| 169 | + $page = ob_get_contents(); |
|
| 170 | + ob_end_clean(); |
|
| 171 | + // fonction sans aucun "echo", ca doit etre le resultat |
|
| 172 | + if (!$page) { |
|
| 173 | + $page = $r; |
|
| 174 | + } |
|
| 175 | + } |
|
| 176 | + |
|
| 177 | + if (!$page) { |
|
| 178 | + return ''; |
|
| 179 | + } |
|
| 180 | + // charger la DTD et transcoder les entites, |
|
| 181 | + // et escamoter le doctype que sax mange en php5 mais pas en php4 |
|
| 182 | + if (!$doctype) { |
|
| 183 | + if (!$r = analyser_doctype($page)) { |
|
| 184 | + $page = _MESSAGE_DOCTYPE . _DOCTYPE_ECRIRE |
|
| 185 | + . preg_replace(_REGEXP_DOCTYPE, '', $page); |
|
| 186 | + $r = analyser_doctype($page); |
|
| 187 | + } |
|
| 188 | + [$entete, $avail, $grammaire, $rotlvl] = array_pad($r, 4, null); |
|
| 189 | + $page = substr($page, strlen($entete)); |
|
| 190 | + } else { |
|
| 191 | + $avail = 'SYSTEM'; |
|
| 192 | + $grammaire = $doctype; |
|
| 193 | + $rotlvl = basename($grammaire); |
|
| 194 | + } |
|
| 195 | + |
|
| 196 | + include_spip('xml/analyser_dtd'); |
|
| 197 | + $dtc = charger_dtd($grammaire, $avail, $rotlvl); |
|
| 198 | + $page = sax_bug($page, $dtc, $charset); |
|
| 199 | + |
|
| 200 | + // compatibilite Tidy espace public |
|
| 201 | + if (!$phraseur) { |
|
| 202 | + $indenter_xml = charger_fonction('indenter', 'xml'); |
|
| 203 | + |
|
| 204 | + return $indenter_xml($page, $apply); |
|
| 205 | + } |
|
| 206 | + |
|
| 207 | + $xml_parser = xml_parser_create($charset); |
|
| 208 | + |
|
| 209 | + xml_set_element_handler( |
|
| 210 | + $xml_parser, |
|
| 211 | + [$phraseur, 'debutElement'], |
|
| 212 | + [$phraseur, 'finElement'] |
|
| 213 | + ); |
|
| 214 | + |
|
| 215 | + xml_set_character_data_handler( |
|
| 216 | + $xml_parser, |
|
| 217 | + [$phraseur, 'textElement'] |
|
| 218 | + ); |
|
| 219 | + |
|
| 220 | + xml_set_processing_instruction_handler( |
|
| 221 | + $xml_parser, |
|
| 222 | + [$phraseur, 'piElement'] |
|
| 223 | + ); |
|
| 224 | + |
|
| 225 | + xml_set_default_handler( |
|
| 226 | + $xml_parser, |
|
| 227 | + [$phraseur, 'defaultElement'] |
|
| 228 | + ); |
|
| 229 | + |
|
| 230 | + xml_parser_set_option($xml_parser, XML_OPTION_CASE_FOLDING, false); |
|
| 231 | + |
|
| 232 | + $phraseur->sax = $xml_parser; |
|
| 233 | + if (isset($entete)) { |
|
| 234 | + $phraseur->entete = $entete; |
|
| 235 | + } |
|
| 236 | + $phraseur->page = $page; |
|
| 237 | + $phraseur->dtc = $dtc; |
|
| 238 | + $phraseur->phraserTout($xml_parser, $page); |
|
| 239 | + xml_parser_free($xml_parser); |
|
| 240 | + $phraseur->sax = ''; |
|
| 241 | + |
|
| 242 | + return $phraseur; |
|
| 243 | 243 | } |
| 244 | 244 | |
| 245 | 245 | // SAX ne dit pas si une Entite est dans un attribut ou non. |
@@ -250,24 +250,24 @@ discard block |
||
| 250 | 250 | // sinon on se rabat sur ce qu'en connait SPIP en standard. |
| 251 | 251 | |
| 252 | 252 | function sax_bug($data, $dtc, $charset = null) { |
| 253 | - if (is_null($charset)) { |
|
| 254 | - $charset = $GLOBALS['meta']['charset']; |
|
| 255 | - } |
|
| 256 | - |
|
| 257 | - if ($dtc) { |
|
| 258 | - $trans = []; |
|
| 259 | - |
|
| 260 | - foreach ($dtc->entites as $k => $v) { |
|
| 261 | - if (!strpos(' amp lt gt quot ', (string) $k)) { |
|
| 262 | - $trans["&$k;"] = $v; |
|
| 263 | - } |
|
| 264 | - } |
|
| 265 | - $data = strtr($data, $trans); |
|
| 266 | - } else { |
|
| 267 | - $data = html2unicode($data, true); |
|
| 268 | - } |
|
| 269 | - |
|
| 270 | - return unicode2charset($data, $charset); |
|
| 253 | + if (is_null($charset)) { |
|
| 254 | + $charset = $GLOBALS['meta']['charset']; |
|
| 255 | + } |
|
| 256 | + |
|
| 257 | + if ($dtc) { |
|
| 258 | + $trans = []; |
|
| 259 | + |
|
| 260 | + foreach ($dtc->entites as $k => $v) { |
|
| 261 | + if (!strpos(' amp lt gt quot ', (string) $k)) { |
|
| 262 | + $trans["&$k;"] = $v; |
|
| 263 | + } |
|
| 264 | + } |
|
| 265 | + $data = strtr($data, $trans); |
|
| 266 | + } else { |
|
| 267 | + $data = html2unicode($data, true); |
|
| 268 | + } |
|
| 269 | + |
|
| 270 | + return unicode2charset($data, $charset); |
|
| 271 | 271 | } |
| 272 | 272 | |
| 273 | 273 | // Retirer < ? xml... ? > et autre PI, ainsi que les commentaires en debut |
@@ -277,52 +277,52 @@ discard block |
||
| 277 | 277 | // les autres formats RSS n'ont pas de DTD, |
| 278 | 278 | // mais un XML Schema que SPIP ne fait pas encore lire. |
| 279 | 279 | function analyser_doctype($data) { |
| 280 | - if (!preg_match(_REGEXP_DOCTYPE, $data, $page)) { |
|
| 281 | - if (preg_match(_REGEXP_XML, $data, $page)) { |
|
| 282 | - [, $entete, $topelement] = $page; |
|
| 283 | - if ($topelement == 'rss') { |
|
| 284 | - return [ |
|
| 285 | - $entete, |
|
| 286 | - 'PUBLIC', |
|
| 287 | - _DOCTYPE_RSS, |
|
| 288 | - 'rss-0.91.dtd' |
|
| 289 | - ]; |
|
| 290 | - } else { |
|
| 291 | - $dtd = $topelement . '.dtd'; |
|
| 292 | - $f = find_in_path($dtd); |
|
| 293 | - if (file_exists($f)) { |
|
| 294 | - return [$entete, 'SYSTEM', $f, $dtd]; |
|
| 295 | - } |
|
| 296 | - } |
|
| 297 | - } |
|
| 298 | - spip_log('Dtd pas vu pour ' . substr($data, 0, 100)); |
|
| 299 | - |
|
| 300 | - return []; |
|
| 301 | - } |
|
| 302 | - [$entete, , $topelement, $avail, $suite] = $page; |
|
| 303 | - |
|
| 304 | - if (!preg_match('/^"([^"]*)"\s*(.*)$/', $suite, $r)) { |
|
| 305 | - if (!preg_match("/^'([^']*)'\s*(.*)$/", $suite, $r)) { |
|
| 306 | - return []; |
|
| 307 | - } |
|
| 308 | - } |
|
| 309 | - [, $rotlvl, $suite] = $r; |
|
| 310 | - |
|
| 311 | - if (!$suite) { |
|
| 312 | - if ($avail != 'SYSTEM') { |
|
| 313 | - return []; |
|
| 314 | - } |
|
| 315 | - $grammaire = $rotlvl; |
|
| 316 | - $rotlvl = ''; |
|
| 317 | - } else { |
|
| 318 | - if (!preg_match('/^"([^"]*)"\s*$/', $suite, $r)) { |
|
| 319 | - if (!preg_match("/^'([^']*)'\s*$/", $suite, $r)) { |
|
| 320 | - return []; |
|
| 321 | - } |
|
| 322 | - } |
|
| 323 | - |
|
| 324 | - $grammaire = $r[1]; |
|
| 325 | - } |
|
| 326 | - |
|
| 327 | - return [$entete, $avail, $grammaire, $rotlvl]; |
|
| 280 | + if (!preg_match(_REGEXP_DOCTYPE, $data, $page)) { |
|
| 281 | + if (preg_match(_REGEXP_XML, $data, $page)) { |
|
| 282 | + [, $entete, $topelement] = $page; |
|
| 283 | + if ($topelement == 'rss') { |
|
| 284 | + return [ |
|
| 285 | + $entete, |
|
| 286 | + 'PUBLIC', |
|
| 287 | + _DOCTYPE_RSS, |
|
| 288 | + 'rss-0.91.dtd' |
|
| 289 | + ]; |
|
| 290 | + } else { |
|
| 291 | + $dtd = $topelement . '.dtd'; |
|
| 292 | + $f = find_in_path($dtd); |
|
| 293 | + if (file_exists($f)) { |
|
| 294 | + return [$entete, 'SYSTEM', $f, $dtd]; |
|
| 295 | + } |
|
| 296 | + } |
|
| 297 | + } |
|
| 298 | + spip_log('Dtd pas vu pour ' . substr($data, 0, 100)); |
|
| 299 | + |
|
| 300 | + return []; |
|
| 301 | + } |
|
| 302 | + [$entete, , $topelement, $avail, $suite] = $page; |
|
| 303 | + |
|
| 304 | + if (!preg_match('/^"([^"]*)"\s*(.*)$/', $suite, $r)) { |
|
| 305 | + if (!preg_match("/^'([^']*)'\s*(.*)$/", $suite, $r)) { |
|
| 306 | + return []; |
|
| 307 | + } |
|
| 308 | + } |
|
| 309 | + [, $rotlvl, $suite] = $r; |
|
| 310 | + |
|
| 311 | + if (!$suite) { |
|
| 312 | + if ($avail != 'SYSTEM') { |
|
| 313 | + return []; |
|
| 314 | + } |
|
| 315 | + $grammaire = $rotlvl; |
|
| 316 | + $rotlvl = ''; |
|
| 317 | + } else { |
|
| 318 | + if (!preg_match('/^"([^"]*)"\s*$/', $suite, $r)) { |
|
| 319 | + if (!preg_match("/^'([^']*)'\s*$/", $suite, $r)) { |
|
| 320 | + return []; |
|
| 321 | + } |
|
| 322 | + } |
|
| 323 | + |
|
| 324 | + $grammaire = $r[1]; |
|
| 325 | + } |
|
| 326 | + |
|
| 327 | + return [$entete, $avail, $grammaire, $rotlvl]; |
|
| 328 | 328 | } |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | $grammaire = find_in_path($grammaire); |
| 30 | 30 | } |
| 31 | 31 | |
| 32 | - $file = _DIR_CACHE_XML . preg_replace('/[^\w.]/', '_', $rotlvl) . '.gz'; |
|
| 32 | + $file = _DIR_CACHE_XML.preg_replace('/[^\w.]/', '_', $rotlvl).'.gz'; |
|
| 33 | 33 | |
| 34 | 34 | if (lire_fichier($file, $r)) { |
| 35 | 35 | if (!$grammaire) { |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | $dtc->peres[$k] = $v; |
| 57 | 57 | } |
| 58 | 58 | |
| 59 | - spip_log("Analyser DTD $avail $grammaire (" . spip_timer('dtd') . ') ' . (is_countable($dtc->macros) ? count($dtc->macros) : 0) . ' macros, ' . (is_countable($dtc->elements) ? count($dtc->elements) : 0) . ' elements, ' . (is_countable($dtc->attributs) ? count($dtc->attributs) : 0) . " listes d'attributs, " . (is_countable($dtc->entites) ? count($dtc->entites) : 0) . ' entites'); |
|
| 59 | + spip_log("Analyser DTD $avail $grammaire (".spip_timer('dtd').') '.(is_countable($dtc->macros) ? count($dtc->macros) : 0).' macros, '.(is_countable($dtc->elements) ? count($dtc->elements) : 0).' elements, '.(is_countable($dtc->attributs) ? count($dtc->attributs) : 0)." listes d'attributs, ".(is_countable($dtc->entites) ? count($dtc->entites) : 0).' entites'); |
|
| 60 | 60 | # $r = $dtc->regles; ksort($r);foreach($r as $l => $v) {$t=array_keys($dtc->attributs[$l]);echo "<b>$l</b> '$v' ", count($t), " attributs: ", join (', ',$t);$t=$dtc->peres[$l];echo "<br />",count($t), " peres: ", @join (', ',$t), "<br />\n";}exit; |
| 61 | 61 | ecrire_fichier($file, serialize($dtc), true); |
| 62 | 62 | } |
@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | } |
| 174 | 174 | } |
| 175 | 175 | if (!is_string($r)) { |
| 176 | - spip_log("erreur $r dans la DTD " . substr($dtd, 0, 80) . '.....'); |
|
| 176 | + spip_log("erreur $r dans la DTD ".substr($dtd, 0, 80).'.....'); |
|
| 177 | 177 | |
| 178 | 178 | return false; |
| 179 | 179 | } |
@@ -221,7 +221,7 @@ discard block |
||
| 221 | 221 | ($n[0] == 'PUBLIC') |
| 222 | 222 | and !tester_url_absolue($n[1]) |
| 223 | 223 | ) { |
| 224 | - $n[1] = substr($grammaire, 0, strrpos($grammaire, '/') + 1) . $n[1]; |
|
| 224 | + $n[1] = substr($grammaire, 0, strrpos($grammaire, '/') + 1).$n[1]; |
|
| 225 | 225 | } |
| 226 | 226 | analyser_dtd($n[1], $n[0], $dtc); |
| 227 | 227 | } |
@@ -249,7 +249,7 @@ discard block |
||
| 249 | 249 | } |
| 250 | 250 | |
| 251 | 251 | if ($dtc->macros[$m[1]] == 'INCLUDE') { |
| 252 | - $retour = $r[1] . substr($m[2], strlen($r[0])); |
|
| 252 | + $retour = $r[1].substr($m[2], strlen($r[0])); |
|
| 253 | 253 | } else { |
| 254 | 254 | $retour = substr($m[2], strlen($r[0])); |
| 255 | 255 | } |
@@ -282,7 +282,7 @@ discard block |
||
| 282 | 282 | spip_log("redefinition de l'entite $nom"); |
| 283 | 283 | } |
| 284 | 284 | if ($k6) { |
| 285 | - return $k6 . $dtd; |
|
| 285 | + return $k6.$dtd; |
|
| 286 | 286 | } // cas du synonyme complet |
| 287 | 287 | $val = expanserEntite(($k2 ? $k3 : ($k4 ? $k5 : $k6)), $dtc->macros); |
| 288 | 288 | |
@@ -390,7 +390,7 @@ discard block |
||
| 390 | 390 | if (preg_match_all("/\s*(\S+)\s+(([(][^)]*[)])|(\S+))\s+([^\s']*)(\s*'[^']*')?/", $val, $r2, PREG_SET_ORDER)) { |
| 391 | 391 | foreach ($r2 as $m2) { |
| 392 | 392 | $v = preg_match('/^\w+$/', $m2[2]) ? $m2[2] |
| 393 | - : ('/^' . preg_replace('/\s+/', '', $m2[2]) . '$/'); |
|
| 393 | + : ('/^'.preg_replace('/\s+/', '', $m2[2]).'$/'); |
|
| 394 | 394 | $m21 = expanserEntite($m2[1], $dtc->macros); |
| 395 | 395 | $m25 = expanserEntite($m2[5], $dtc->macros); |
| 396 | 396 | $dtc->attributs[$nom][$m21] = [$v, $m25]; |
@@ -11,58 +11,58 @@ discard block |
||
| 11 | 11 | \***************************************************************************/ |
| 12 | 12 | |
| 13 | 13 | if (!defined('_ECRIRE_INC_VERSION')) { |
| 14 | - return; |
|
| 14 | + return; |
|
| 15 | 15 | } |
| 16 | 16 | |
| 17 | 17 | include_spip('xml/interfaces'); |
| 18 | 18 | |
| 19 | 19 | function charger_dtd($grammaire, $avail, $rotlvl) { |
| 20 | - $r = null; |
|
| 21 | - static $dtd = []; # cache bien utile pour le validateur en boucle |
|
| 22 | - |
|
| 23 | - if (isset($dtd[$grammaire])) { |
|
| 24 | - return $dtd[$grammaire]; |
|
| 25 | - } |
|
| 26 | - |
|
| 27 | - if ($avail == 'SYSTEM') { |
|
| 28 | - $grammaire = find_in_path($grammaire); |
|
| 29 | - } |
|
| 30 | - |
|
| 31 | - $file = _DIR_CACHE_XML . preg_replace('/[^\w.]/', '_', $rotlvl) . '.gz'; |
|
| 32 | - |
|
| 33 | - if (lire_fichier($file, $r)) { |
|
| 34 | - if (!$grammaire) { |
|
| 35 | - return []; |
|
| 36 | - } |
|
| 37 | - if (($avail == 'SYSTEM') and filemtime($file) < filemtime($grammaire)) { |
|
| 38 | - $r = false; |
|
| 39 | - } |
|
| 40 | - } |
|
| 41 | - |
|
| 42 | - if ($r) { |
|
| 43 | - $dtc = unserialize($r); |
|
| 44 | - } else { |
|
| 45 | - spip_timer('dtd'); |
|
| 46 | - $dtc = new DTC(); |
|
| 47 | - // L'analyseur retourne un booleen de reussite et modifie $dtc. |
|
| 48 | - // Retourner vide en cas d'echec |
|
| 49 | - if (!analyser_dtd($grammaire, $avail, $dtc)) { |
|
| 50 | - $dtc = []; |
|
| 51 | - } else { |
|
| 52 | - // tri final pour presenter les suggestions de corrections |
|
| 53 | - foreach ($dtc->peres as $k => $v) { |
|
| 54 | - asort($v); |
|
| 55 | - $dtc->peres[$k] = $v; |
|
| 56 | - } |
|
| 57 | - |
|
| 58 | - spip_log("Analyser DTD $avail $grammaire (" . spip_timer('dtd') . ') ' . (is_countable($dtc->macros) ? count($dtc->macros) : 0) . ' macros, ' . (is_countable($dtc->elements) ? count($dtc->elements) : 0) . ' elements, ' . (is_countable($dtc->attributs) ? count($dtc->attributs) : 0) . " listes d'attributs, " . (is_countable($dtc->entites) ? count($dtc->entites) : 0) . ' entites'); |
|
| 59 | - # $r = $dtc->regles; ksort($r);foreach($r as $l => $v) {$t=array_keys($dtc->attributs[$l]);echo "<b>$l</b> '$v' ", count($t), " attributs: ", join (', ',$t);$t=$dtc->peres[$l];echo "<br />",count($t), " peres: ", @join (', ',$t), "<br />\n";}exit; |
|
| 60 | - ecrire_fichier($file, serialize($dtc), true); |
|
| 61 | - } |
|
| 62 | - } |
|
| 63 | - $dtd[$grammaire] = $dtc; |
|
| 64 | - |
|
| 65 | - return $dtc; |
|
| 20 | + $r = null; |
|
| 21 | + static $dtd = []; # cache bien utile pour le validateur en boucle |
|
| 22 | + |
|
| 23 | + if (isset($dtd[$grammaire])) { |
|
| 24 | + return $dtd[$grammaire]; |
|
| 25 | + } |
|
| 26 | + |
|
| 27 | + if ($avail == 'SYSTEM') { |
|
| 28 | + $grammaire = find_in_path($grammaire); |
|
| 29 | + } |
|
| 30 | + |
|
| 31 | + $file = _DIR_CACHE_XML . preg_replace('/[^\w.]/', '_', $rotlvl) . '.gz'; |
|
| 32 | + |
|
| 33 | + if (lire_fichier($file, $r)) { |
|
| 34 | + if (!$grammaire) { |
|
| 35 | + return []; |
|
| 36 | + } |
|
| 37 | + if (($avail == 'SYSTEM') and filemtime($file) < filemtime($grammaire)) { |
|
| 38 | + $r = false; |
|
| 39 | + } |
|
| 40 | + } |
|
| 41 | + |
|
| 42 | + if ($r) { |
|
| 43 | + $dtc = unserialize($r); |
|
| 44 | + } else { |
|
| 45 | + spip_timer('dtd'); |
|
| 46 | + $dtc = new DTC(); |
|
| 47 | + // L'analyseur retourne un booleen de reussite et modifie $dtc. |
|
| 48 | + // Retourner vide en cas d'echec |
|
| 49 | + if (!analyser_dtd($grammaire, $avail, $dtc)) { |
|
| 50 | + $dtc = []; |
|
| 51 | + } else { |
|
| 52 | + // tri final pour presenter les suggestions de corrections |
|
| 53 | + foreach ($dtc->peres as $k => $v) { |
|
| 54 | + asort($v); |
|
| 55 | + $dtc->peres[$k] = $v; |
|
| 56 | + } |
|
| 57 | + |
|
| 58 | + spip_log("Analyser DTD $avail $grammaire (" . spip_timer('dtd') . ') ' . (is_countable($dtc->macros) ? count($dtc->macros) : 0) . ' macros, ' . (is_countable($dtc->elements) ? count($dtc->elements) : 0) . ' elements, ' . (is_countable($dtc->attributs) ? count($dtc->attributs) : 0) . " listes d'attributs, " . (is_countable($dtc->entites) ? count($dtc->entites) : 0) . ' entites'); |
|
| 59 | + # $r = $dtc->regles; ksort($r);foreach($r as $l => $v) {$t=array_keys($dtc->attributs[$l]);echo "<b>$l</b> '$v' ", count($t), " attributs: ", join (', ',$t);$t=$dtc->peres[$l];echo "<br />",count($t), " peres: ", @join (', ',$t), "<br />\n";}exit; |
|
| 60 | + ecrire_fichier($file, serialize($dtc), true); |
|
| 61 | + } |
|
| 62 | + } |
|
| 63 | + $dtd[$grammaire] = $dtc; |
|
| 64 | + |
|
| 65 | + return $dtc; |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | // Compiler une regle de production en une Regexp qu'on appliquera sur la |
@@ -74,153 +74,153 @@ discard block |
||
| 74 | 74 | // et parentheser le tout pour que | + * ? s'applique dessus. |
| 75 | 75 | |
| 76 | 76 | function compilerRegle($val) { |
| 77 | - $x = str_replace( |
|
| 78 | - '()', |
|
| 79 | - '', |
|
| 80 | - preg_replace( |
|
| 81 | - '/\s*,\s*/', |
|
| 82 | - '', |
|
| 83 | - preg_replace( |
|
| 84 | - '/(\w+)\s*/', |
|
| 85 | - '(?:\1 )', |
|
| 86 | - preg_replace( |
|
| 87 | - '/\s*\)/', |
|
| 88 | - ')', |
|
| 89 | - preg_replace( |
|
| 90 | - '/\s*([(+*|?])\s*/', |
|
| 91 | - '\1', |
|
| 92 | - preg_replace('/\s*#\w+\s*[,|]?\s*/', '', $val) |
|
| 93 | - ) |
|
| 94 | - ) |
|
| 95 | - ) |
|
| 96 | - ) |
|
| 97 | - ); |
|
| 98 | - |
|
| 99 | - return $x; |
|
| 77 | + $x = str_replace( |
|
| 78 | + '()', |
|
| 79 | + '', |
|
| 80 | + preg_replace( |
|
| 81 | + '/\s*,\s*/', |
|
| 82 | + '', |
|
| 83 | + preg_replace( |
|
| 84 | + '/(\w+)\s*/', |
|
| 85 | + '(?:\1 )', |
|
| 86 | + preg_replace( |
|
| 87 | + '/\s*\)/', |
|
| 88 | + ')', |
|
| 89 | + preg_replace( |
|
| 90 | + '/\s*([(+*|?])\s*/', |
|
| 91 | + '\1', |
|
| 92 | + preg_replace('/\s*#\w+\s*[,|]?\s*/', '', $val) |
|
| 93 | + ) |
|
| 94 | + ) |
|
| 95 | + ) |
|
| 96 | + ) |
|
| 97 | + ); |
|
| 98 | + |
|
| 99 | + return $x; |
|
| 100 | 100 | } |
| 101 | 101 | |
| 102 | 102 | |
| 103 | 103 | function analyser_dtd($loc, $avail, &$dtc) { |
| 104 | - // creer le repertoire de cache si ce n'est fait |
|
| 105 | - // (utile aussi pour le resultat de la compil) |
|
| 106 | - $file = sous_repertoire(_DIR_CACHE_XML); |
|
| 107 | - // si DTD locale, ignorer ce repertoire pour le moment |
|
| 108 | - if ($avail == 'SYSTEM') { |
|
| 109 | - $file = $loc; |
|
| 110 | - if (_DIR_RACINE and strncmp($file, _DIR_RACINE, strlen(_DIR_RACINE)) == 0) { |
|
| 111 | - $file = substr($file, strlen(_DIR_RACINE)); |
|
| 112 | - } |
|
| 113 | - $file = find_in_path($file); |
|
| 114 | - } else { |
|
| 115 | - $file .= preg_replace('/[^\w.]/', '_', $loc); |
|
| 116 | - } |
|
| 117 | - |
|
| 118 | - $dtd = ''; |
|
| 119 | - if (@is_readable($file)) { |
|
| 120 | - lire_fichier($file, $dtd); |
|
| 121 | - } else { |
|
| 122 | - if ($avail == 'PUBLIC') { |
|
| 123 | - include_spip('inc/distant'); |
|
| 124 | - $dtd = recuperer_url($loc); |
|
| 125 | - $dtd = trim($dtd['page'] ?? ''); |
|
| 126 | - if ($dtd) { |
|
| 127 | - ecrire_fichier($file, $dtd, true); |
|
| 128 | - } |
|
| 129 | - } |
|
| 130 | - } |
|
| 131 | - |
|
| 132 | - $dtd = ltrim($dtd); |
|
| 133 | - if (!$dtd) { |
|
| 134 | - spip_log("DTD '$loc' ($file) inaccessible"); |
|
| 135 | - |
|
| 136 | - return false; |
|
| 137 | - } else { |
|
| 138 | - spip_log("analyse de la DTD $loc "); |
|
| 139 | - } |
|
| 140 | - |
|
| 141 | - while ($dtd) { |
|
| 142 | - if ($dtd[0] != '<') { |
|
| 143 | - $r = analyser_dtd_lexeme($dtd, $dtc, $loc); |
|
| 144 | - } elseif ($dtd[1] != '!') { |
|
| 145 | - $r = analyser_dtd_pi($dtd, $dtc, $loc); |
|
| 146 | - } elseif ($dtd[2] == '[') { |
|
| 147 | - $r = analyser_dtd_data($dtd, $dtc, $loc); |
|
| 148 | - } else { |
|
| 149 | - switch ($dtd[3]) { |
|
| 150 | - case '%': |
|
| 151 | - $r = analyser_dtd_data($dtd, $dtc, $loc); |
|
| 152 | - break; |
|
| 153 | - case 'T': |
|
| 154 | - $r = analyser_dtd_attlist($dtd, $dtc, $loc); |
|
| 155 | - break; |
|
| 156 | - case 'L': |
|
| 157 | - $r = analyser_dtd_element($dtd, $dtc, $loc); |
|
| 158 | - break; |
|
| 159 | - case 'N': |
|
| 160 | - $r = analyser_dtd_entity($dtd, $dtc, $loc); |
|
| 161 | - break; |
|
| 162 | - case 'O': |
|
| 163 | - $r = analyser_dtd_notation($dtd, $dtc, $loc); |
|
| 164 | - break; |
|
| 165 | - case '-': |
|
| 166 | - $r = analyser_dtd_comment($dtd, $dtc, $loc); |
|
| 167 | - break; |
|
| 168 | - default: |
|
| 169 | - $r = -1; |
|
| 170 | - } |
|
| 171 | - } |
|
| 172 | - if (!is_string($r)) { |
|
| 173 | - spip_log("erreur $r dans la DTD " . substr($dtd, 0, 80) . '.....'); |
|
| 174 | - |
|
| 175 | - return false; |
|
| 176 | - } |
|
| 177 | - $dtd = $r; |
|
| 178 | - } |
|
| 179 | - |
|
| 180 | - return true; |
|
| 104 | + // creer le repertoire de cache si ce n'est fait |
|
| 105 | + // (utile aussi pour le resultat de la compil) |
|
| 106 | + $file = sous_repertoire(_DIR_CACHE_XML); |
|
| 107 | + // si DTD locale, ignorer ce repertoire pour le moment |
|
| 108 | + if ($avail == 'SYSTEM') { |
|
| 109 | + $file = $loc; |
|
| 110 | + if (_DIR_RACINE and strncmp($file, _DIR_RACINE, strlen(_DIR_RACINE)) == 0) { |
|
| 111 | + $file = substr($file, strlen(_DIR_RACINE)); |
|
| 112 | + } |
|
| 113 | + $file = find_in_path($file); |
|
| 114 | + } else { |
|
| 115 | + $file .= preg_replace('/[^\w.]/', '_', $loc); |
|
| 116 | + } |
|
| 117 | + |
|
| 118 | + $dtd = ''; |
|
| 119 | + if (@is_readable($file)) { |
|
| 120 | + lire_fichier($file, $dtd); |
|
| 121 | + } else { |
|
| 122 | + if ($avail == 'PUBLIC') { |
|
| 123 | + include_spip('inc/distant'); |
|
| 124 | + $dtd = recuperer_url($loc); |
|
| 125 | + $dtd = trim($dtd['page'] ?? ''); |
|
| 126 | + if ($dtd) { |
|
| 127 | + ecrire_fichier($file, $dtd, true); |
|
| 128 | + } |
|
| 129 | + } |
|
| 130 | + } |
|
| 131 | + |
|
| 132 | + $dtd = ltrim($dtd); |
|
| 133 | + if (!$dtd) { |
|
| 134 | + spip_log("DTD '$loc' ($file) inaccessible"); |
|
| 135 | + |
|
| 136 | + return false; |
|
| 137 | + } else { |
|
| 138 | + spip_log("analyse de la DTD $loc "); |
|
| 139 | + } |
|
| 140 | + |
|
| 141 | + while ($dtd) { |
|
| 142 | + if ($dtd[0] != '<') { |
|
| 143 | + $r = analyser_dtd_lexeme($dtd, $dtc, $loc); |
|
| 144 | + } elseif ($dtd[1] != '!') { |
|
| 145 | + $r = analyser_dtd_pi($dtd, $dtc, $loc); |
|
| 146 | + } elseif ($dtd[2] == '[') { |
|
| 147 | + $r = analyser_dtd_data($dtd, $dtc, $loc); |
|
| 148 | + } else { |
|
| 149 | + switch ($dtd[3]) { |
|
| 150 | + case '%': |
|
| 151 | + $r = analyser_dtd_data($dtd, $dtc, $loc); |
|
| 152 | + break; |
|
| 153 | + case 'T': |
|
| 154 | + $r = analyser_dtd_attlist($dtd, $dtc, $loc); |
|
| 155 | + break; |
|
| 156 | + case 'L': |
|
| 157 | + $r = analyser_dtd_element($dtd, $dtc, $loc); |
|
| 158 | + break; |
|
| 159 | + case 'N': |
|
| 160 | + $r = analyser_dtd_entity($dtd, $dtc, $loc); |
|
| 161 | + break; |
|
| 162 | + case 'O': |
|
| 163 | + $r = analyser_dtd_notation($dtd, $dtc, $loc); |
|
| 164 | + break; |
|
| 165 | + case '-': |
|
| 166 | + $r = analyser_dtd_comment($dtd, $dtc, $loc); |
|
| 167 | + break; |
|
| 168 | + default: |
|
| 169 | + $r = -1; |
|
| 170 | + } |
|
| 171 | + } |
|
| 172 | + if (!is_string($r)) { |
|
| 173 | + spip_log("erreur $r dans la DTD " . substr($dtd, 0, 80) . '.....'); |
|
| 174 | + |
|
| 175 | + return false; |
|
| 176 | + } |
|
| 177 | + $dtd = $r; |
|
| 178 | + } |
|
| 179 | + |
|
| 180 | + return true; |
|
| 181 | 181 | } |
| 182 | 182 | |
| 183 | 183 | function analyser_dtd_comment($dtd, &$dtc, $grammaire) { |
| 184 | - // ejecter les commentaires, surtout quand ils contiennent du code. |
|
| 185 | - // Option /s car sur plusieurs lignes parfois |
|
| 184 | + // ejecter les commentaires, surtout quand ils contiennent du code. |
|
| 185 | + // Option /s car sur plusieurs lignes parfois |
|
| 186 | 186 | |
| 187 | - if (!preg_match('/^<!--.*?-->\s*(.*)$/s', $dtd, $m)) { |
|
| 188 | - return -6; |
|
| 189 | - } |
|
| 187 | + if (!preg_match('/^<!--.*?-->\s*(.*)$/s', $dtd, $m)) { |
|
| 188 | + return -6; |
|
| 189 | + } |
|
| 190 | 190 | |
| 191 | - return $m[1]; |
|
| 191 | + return $m[1]; |
|
| 192 | 192 | } |
| 193 | 193 | |
| 194 | 194 | function analyser_dtd_pi($dtd, &$dtc, $grammaire) { |
| 195 | - if (!preg_match('/^<\?.*?>\s*(.*)$/s', $dtd, $m)) { |
|
| 196 | - return -10; |
|
| 197 | - } |
|
| 195 | + if (!preg_match('/^<\?.*?>\s*(.*)$/s', $dtd, $m)) { |
|
| 196 | + return -10; |
|
| 197 | + } |
|
| 198 | 198 | |
| 199 | - return $m[1]; |
|
| 199 | + return $m[1]; |
|
| 200 | 200 | } |
| 201 | 201 | |
| 202 | 202 | function analyser_dtd_lexeme($dtd, &$dtc, $grammaire) { |
| 203 | 203 | |
| 204 | - if (!preg_match(_REGEXP_ENTITY_DEF, $dtd, $m)) { |
|
| 205 | - return -9; |
|
| 206 | - } |
|
| 207 | - |
|
| 208 | - [, $s] = $m; |
|
| 209 | - $n = $dtc->macros[$s]; |
|
| 210 | - |
|
| 211 | - if (is_array($n)) { |
|
| 212 | - // en cas d'inclusion, l'espace de nom est le meme |
|
| 213 | - // mais gaffe aux DTD dont l'URL est relative a l'engloblante |
|
| 214 | - if ( |
|
| 215 | - ($n[0] == 'PUBLIC') |
|
| 216 | - and !tester_url_absolue($n[1]) |
|
| 217 | - ) { |
|
| 218 | - $n[1] = substr($grammaire, 0, strrpos($grammaire, '/') + 1) . $n[1]; |
|
| 219 | - } |
|
| 220 | - analyser_dtd($n[1], $n[0], $dtc); |
|
| 221 | - } |
|
| 222 | - |
|
| 223 | - return ltrim(substr($dtd, strlen($m[0]))); |
|
| 204 | + if (!preg_match(_REGEXP_ENTITY_DEF, $dtd, $m)) { |
|
| 205 | + return -9; |
|
| 206 | + } |
|
| 207 | + |
|
| 208 | + [, $s] = $m; |
|
| 209 | + $n = $dtc->macros[$s]; |
|
| 210 | + |
|
| 211 | + if (is_array($n)) { |
|
| 212 | + // en cas d'inclusion, l'espace de nom est le meme |
|
| 213 | + // mais gaffe aux DTD dont l'URL est relative a l'engloblante |
|
| 214 | + if ( |
|
| 215 | + ($n[0] == 'PUBLIC') |
|
| 216 | + and !tester_url_absolue($n[1]) |
|
| 217 | + ) { |
|
| 218 | + $n[1] = substr($grammaire, 0, strrpos($grammaire, '/') + 1) . $n[1]; |
|
| 219 | + } |
|
| 220 | + analyser_dtd($n[1], $n[0], $dtc); |
|
| 221 | + } |
|
| 222 | + |
|
| 223 | + return ltrim(substr($dtd, strlen($m[0]))); |
|
| 224 | 224 | } |
| 225 | 225 | |
| 226 | 226 | // il faudrait gerer plus proprement les niveaux d'inclusion: |
@@ -228,83 +228,83 @@ discard block |
||
| 228 | 228 | |
| 229 | 229 | function analyser_dtd_data($dtd, &$dtc, $grammaire) { |
| 230 | 230 | |
| 231 | - if (!preg_match(_REGEXP_INCLUDE_USE, $dtd, $m)) { |
|
| 232 | - return -11; |
|
| 233 | - } |
|
| 234 | - if ( |
|
| 235 | - !preg_match( |
|
| 236 | - '/^((\s*<!(\[\s*%\s*[^;]*;\s*\[([^]<]*<[^>]*>)*[^]<]*\]\]>)|([^]>]*>))*[^]<]*)\]\]>\s*/s', |
|
| 237 | - $m[2], |
|
| 238 | - $r |
|
| 239 | - ) |
|
| 240 | - ) { |
|
| 241 | - return -12; |
|
| 242 | - } |
|
| 243 | - |
|
| 244 | - if ($dtc->macros[$m[1]] == 'INCLUDE') { |
|
| 245 | - $retour = $r[1] . substr($m[2], strlen($r[0])); |
|
| 246 | - } else { |
|
| 247 | - $retour = substr($m[2], strlen($r[0])); |
|
| 248 | - } |
|
| 249 | - |
|
| 250 | - return $retour; |
|
| 231 | + if (!preg_match(_REGEXP_INCLUDE_USE, $dtd, $m)) { |
|
| 232 | + return -11; |
|
| 233 | + } |
|
| 234 | + if ( |
|
| 235 | + !preg_match( |
|
| 236 | + '/^((\s*<!(\[\s*%\s*[^;]*;\s*\[([^]<]*<[^>]*>)*[^]<]*\]\]>)|([^]>]*>))*[^]<]*)\]\]>\s*/s', |
|
| 237 | + $m[2], |
|
| 238 | + $r |
|
| 239 | + ) |
|
| 240 | + ) { |
|
| 241 | + return -12; |
|
| 242 | + } |
|
| 243 | + |
|
| 244 | + if ($dtc->macros[$m[1]] == 'INCLUDE') { |
|
| 245 | + $retour = $r[1] . substr($m[2], strlen($r[0])); |
|
| 246 | + } else { |
|
| 247 | + $retour = substr($m[2], strlen($r[0])); |
|
| 248 | + } |
|
| 249 | + |
|
| 250 | + return $retour; |
|
| 251 | 251 | } |
| 252 | 252 | |
| 253 | 253 | function analyser_dtd_notation($dtd, &$dtc, $grammaire) { |
| 254 | - if (!preg_match('/^<!NOTATION.*?>\s*(.*)$/s', $dtd, $m)) { |
|
| 255 | - return -8; |
|
| 256 | - } |
|
| 257 | - spip_log('analyser_dtd_notation a ecrire'); |
|
| 254 | + if (!preg_match('/^<!NOTATION.*?>\s*(.*)$/s', $dtd, $m)) { |
|
| 255 | + return -8; |
|
| 256 | + } |
|
| 257 | + spip_log('analyser_dtd_notation a ecrire'); |
|
| 258 | 258 | |
| 259 | - return $m[1]; |
|
| 259 | + return $m[1]; |
|
| 260 | 260 | } |
| 261 | 261 | |
| 262 | 262 | function analyser_dtd_entity($dtd, &$dtc, $grammaire) { |
| 263 | - if (!preg_match(_REGEXP_ENTITY_DECL, $dtd, $m)) { |
|
| 264 | - return -2; |
|
| 265 | - } |
|
| 266 | - |
|
| 267 | - [$t, $term, $nom, $type, $k1, $k2, $k3, $k4, $k5, $k6, $c, $q, $alt, $dtd] = $m; |
|
| 268 | - |
|
| 269 | - if (isset($dtc->macros[$nom]) and $dtc->macros[$nom]) { |
|
| 270 | - return $dtd; |
|
| 271 | - } |
|
| 272 | - if (isset($dtc->entites[$nom])) { |
|
| 273 | - spip_log("redefinition de l'entite $nom"); |
|
| 274 | - } |
|
| 275 | - if ($k6) { |
|
| 276 | - return $k6 . $dtd; |
|
| 277 | - } // cas du synonyme complet |
|
| 278 | - $val = expanserEntite(($k2 ? $k3 : ($k4 ? $k5 : $k6)), $dtc->macros); |
|
| 279 | - |
|
| 280 | - // cas particulier double evaluation: 'PUBLIC "..." "...."' |
|
| 281 | - if (preg_match('/(PUBLIC|SYSTEM)\s+"([^"]*)"\s*("([^"]*)")?\s*$/s', $val, $r)) { |
|
| 282 | - [$t, $type, $val, $q, $alt] = $r; |
|
| 283 | - } |
|
| 284 | - |
|
| 285 | - if (!$term) { |
|
| 286 | - $dtc->entites[$nom] = $val; |
|
| 287 | - } elseif (!$type) { |
|
| 288 | - $dtc->macros[$nom] = $val; |
|
| 289 | - } else { |
|
| 290 | - if (($type == 'SYSTEM') and !$alt) { |
|
| 291 | - $alt = $val; |
|
| 292 | - } |
|
| 293 | - if (!$alt) { |
|
| 294 | - $dtc->macros[$nom] = $val; |
|
| 295 | - } else { |
|
| 296 | - if ( |
|
| 297 | - ($type == 'PUBLIC') |
|
| 298 | - and (strpos($alt, '/') === false) |
|
| 299 | - ) { |
|
| 300 | - $alt = preg_replace(',/[^/]+$,', '/', $grammaire) |
|
| 301 | - . $alt; |
|
| 302 | - } |
|
| 303 | - $dtc->macros[$nom] = [$type, $alt]; |
|
| 304 | - } |
|
| 305 | - } |
|
| 306 | - |
|
| 307 | - return $dtd; |
|
| 263 | + if (!preg_match(_REGEXP_ENTITY_DECL, $dtd, $m)) { |
|
| 264 | + return -2; |
|
| 265 | + } |
|
| 266 | + |
|
| 267 | + [$t, $term, $nom, $type, $k1, $k2, $k3, $k4, $k5, $k6, $c, $q, $alt, $dtd] = $m; |
|
| 268 | + |
|
| 269 | + if (isset($dtc->macros[$nom]) and $dtc->macros[$nom]) { |
|
| 270 | + return $dtd; |
|
| 271 | + } |
|
| 272 | + if (isset($dtc->entites[$nom])) { |
|
| 273 | + spip_log("redefinition de l'entite $nom"); |
|
| 274 | + } |
|
| 275 | + if ($k6) { |
|
| 276 | + return $k6 . $dtd; |
|
| 277 | + } // cas du synonyme complet |
|
| 278 | + $val = expanserEntite(($k2 ? $k3 : ($k4 ? $k5 : $k6)), $dtc->macros); |
|
| 279 | + |
|
| 280 | + // cas particulier double evaluation: 'PUBLIC "..." "...."' |
|
| 281 | + if (preg_match('/(PUBLIC|SYSTEM)\s+"([^"]*)"\s*("([^"]*)")?\s*$/s', $val, $r)) { |
|
| 282 | + [$t, $type, $val, $q, $alt] = $r; |
|
| 283 | + } |
|
| 284 | + |
|
| 285 | + if (!$term) { |
|
| 286 | + $dtc->entites[$nom] = $val; |
|
| 287 | + } elseif (!$type) { |
|
| 288 | + $dtc->macros[$nom] = $val; |
|
| 289 | + } else { |
|
| 290 | + if (($type == 'SYSTEM') and !$alt) { |
|
| 291 | + $alt = $val; |
|
| 292 | + } |
|
| 293 | + if (!$alt) { |
|
| 294 | + $dtc->macros[$nom] = $val; |
|
| 295 | + } else { |
|
| 296 | + if ( |
|
| 297 | + ($type == 'PUBLIC') |
|
| 298 | + and (strpos($alt, '/') === false) |
|
| 299 | + ) { |
|
| 300 | + $alt = preg_replace(',/[^/]+$,', '/', $grammaire) |
|
| 301 | + . $alt; |
|
| 302 | + } |
|
| 303 | + $dtc->macros[$nom] = [$type, $alt]; |
|
| 304 | + } |
|
| 305 | + } |
|
| 306 | + |
|
| 307 | + return $dtd; |
|
| 308 | 308 | } |
| 309 | 309 | |
| 310 | 310 | // Dresser le tableau des filles potentielles de l'element |
@@ -317,76 +317,76 @@ discard block |
||
| 317 | 317 | // Fin du controle en finElement |
| 318 | 318 | |
| 319 | 319 | function analyser_dtd_element($dtd, &$dtc, $grammaire) { |
| 320 | - if (!preg_match('/^<!ELEMENT\s+([^>\s]+)([^>]*)>\s*(.*)$/s', $dtd, $m)) { |
|
| 321 | - return -3; |
|
| 322 | - } |
|
| 323 | - |
|
| 324 | - [, $nom, $contenu, $dtd] = $m; |
|
| 325 | - $nom = expanserEntite($nom, $dtc->macros); |
|
| 326 | - |
|
| 327 | - if (isset($dtc->elements[$nom])) { |
|
| 328 | - spip_log("redefinition de l'element $nom dans la DTD"); |
|
| 329 | - |
|
| 330 | - return -4; |
|
| 331 | - } |
|
| 332 | - $filles = []; |
|
| 333 | - $contenu = expanserEntite($contenu, $dtc->macros); |
|
| 334 | - $val = $contenu ? compilerRegle($contenu) : '(?:EMPTY )'; |
|
| 335 | - if ($val == '(?:EMPTY )') { |
|
| 336 | - $dtc->regles[$nom] = 'EMPTY'; |
|
| 337 | - } elseif ($val == '(?:ANY )') { |
|
| 338 | - $dtc->regles[$nom] = 'ANY'; |
|
| 339 | - } else { |
|
| 340 | - $last = substr($val, -1); |
|
| 341 | - if ( |
|
| 342 | - preg_match('/ \w/', $val) |
|
| 343 | - or (!empty($last) and strpos('*+?', $last) === false) |
|
| 344 | - ) { |
|
| 345 | - $dtc->regles[$nom] = "/^$val$/"; |
|
| 346 | - } else { |
|
| 347 | - $dtc->regles[$nom] = $last; |
|
| 348 | - } |
|
| 349 | - $filles = array_values(preg_split('/\W+/', $val, -1, PREG_SPLIT_NO_EMPTY)); |
|
| 350 | - |
|
| 351 | - foreach ($filles as $k) { |
|
| 352 | - if (!isset($dtc->peres[$k])) { |
|
| 353 | - $dtc->peres[$k] = []; |
|
| 354 | - } |
|
| 355 | - if (!in_array($nom, $dtc->peres[$k])) { |
|
| 356 | - $dtc->peres[$k][] = $nom; |
|
| 357 | - } |
|
| 358 | - } |
|
| 359 | - } |
|
| 360 | - $dtc->pcdata[$nom] = (strpos($contenu, '#PCDATA') === false); |
|
| 361 | - $dtc->elements[$nom] = $filles; |
|
| 362 | - |
|
| 363 | - return $dtd; |
|
| 320 | + if (!preg_match('/^<!ELEMENT\s+([^>\s]+)([^>]*)>\s*(.*)$/s', $dtd, $m)) { |
|
| 321 | + return -3; |
|
| 322 | + } |
|
| 323 | + |
|
| 324 | + [, $nom, $contenu, $dtd] = $m; |
|
| 325 | + $nom = expanserEntite($nom, $dtc->macros); |
|
| 326 | + |
|
| 327 | + if (isset($dtc->elements[$nom])) { |
|
| 328 | + spip_log("redefinition de l'element $nom dans la DTD"); |
|
| 329 | + |
|
| 330 | + return -4; |
|
| 331 | + } |
|
| 332 | + $filles = []; |
|
| 333 | + $contenu = expanserEntite($contenu, $dtc->macros); |
|
| 334 | + $val = $contenu ? compilerRegle($contenu) : '(?:EMPTY )'; |
|
| 335 | + if ($val == '(?:EMPTY )') { |
|
| 336 | + $dtc->regles[$nom] = 'EMPTY'; |
|
| 337 | + } elseif ($val == '(?:ANY )') { |
|
| 338 | + $dtc->regles[$nom] = 'ANY'; |
|
| 339 | + } else { |
|
| 340 | + $last = substr($val, -1); |
|
| 341 | + if ( |
|
| 342 | + preg_match('/ \w/', $val) |
|
| 343 | + or (!empty($last) and strpos('*+?', $last) === false) |
|
| 344 | + ) { |
|
| 345 | + $dtc->regles[$nom] = "/^$val$/"; |
|
| 346 | + } else { |
|
| 347 | + $dtc->regles[$nom] = $last; |
|
| 348 | + } |
|
| 349 | + $filles = array_values(preg_split('/\W+/', $val, -1, PREG_SPLIT_NO_EMPTY)); |
|
| 350 | + |
|
| 351 | + foreach ($filles as $k) { |
|
| 352 | + if (!isset($dtc->peres[$k])) { |
|
| 353 | + $dtc->peres[$k] = []; |
|
| 354 | + } |
|
| 355 | + if (!in_array($nom, $dtc->peres[$k])) { |
|
| 356 | + $dtc->peres[$k][] = $nom; |
|
| 357 | + } |
|
| 358 | + } |
|
| 359 | + } |
|
| 360 | + $dtc->pcdata[$nom] = (strpos($contenu, '#PCDATA') === false); |
|
| 361 | + $dtc->elements[$nom] = $filles; |
|
| 362 | + |
|
| 363 | + return $dtd; |
|
| 364 | 364 | } |
| 365 | 365 | |
| 366 | 366 | |
| 367 | 367 | function analyser_dtd_attlist($dtd, &$dtc, $grammaire) { |
| 368 | - if (!preg_match('/^<!ATTLIST\s+(\S+)\s+([^>]*)>\s*(.*)/s', $dtd, $m)) { |
|
| 369 | - return -5; |
|
| 370 | - } |
|
| 371 | - |
|
| 372 | - [, $nom, $val, $dtd] = $m; |
|
| 373 | - $nom = expanserEntite($nom, $dtc->macros); |
|
| 374 | - $val = expanserEntite($val, $dtc->macros); |
|
| 375 | - if (!isset($dtc->attributs[$nom])) { |
|
| 376 | - $dtc->attributs[$nom] = []; |
|
| 377 | - } |
|
| 378 | - |
|
| 379 | - if (preg_match_all("/\s*(\S+)\s+(([(][^)]*[)])|(\S+))\s+([^\s']*)(\s*'[^']*')?/", $val, $r2, PREG_SET_ORDER)) { |
|
| 380 | - foreach ($r2 as $m2) { |
|
| 381 | - $v = preg_match('/^\w+$/', $m2[2]) ? $m2[2] |
|
| 382 | - : ('/^' . preg_replace('/\s+/', '', $m2[2]) . '$/'); |
|
| 383 | - $m21 = expanserEntite($m2[1], $dtc->macros); |
|
| 384 | - $m25 = expanserEntite($m2[5], $dtc->macros); |
|
| 385 | - $dtc->attributs[$nom][$m21] = [$v, $m25]; |
|
| 386 | - } |
|
| 387 | - } |
|
| 388 | - |
|
| 389 | - return $dtd; |
|
| 368 | + if (!preg_match('/^<!ATTLIST\s+(\S+)\s+([^>]*)>\s*(.*)/s', $dtd, $m)) { |
|
| 369 | + return -5; |
|
| 370 | + } |
|
| 371 | + |
|
| 372 | + [, $nom, $val, $dtd] = $m; |
|
| 373 | + $nom = expanserEntite($nom, $dtc->macros); |
|
| 374 | + $val = expanserEntite($val, $dtc->macros); |
|
| 375 | + if (!isset($dtc->attributs[$nom])) { |
|
| 376 | + $dtc->attributs[$nom] = []; |
|
| 377 | + } |
|
| 378 | + |
|
| 379 | + if (preg_match_all("/\s*(\S+)\s+(([(][^)]*[)])|(\S+))\s+([^\s']*)(\s*'[^']*')?/", $val, $r2, PREG_SET_ORDER)) { |
|
| 380 | + foreach ($r2 as $m2) { |
|
| 381 | + $v = preg_match('/^\w+$/', $m2[2]) ? $m2[2] |
|
| 382 | + : ('/^' . preg_replace('/\s+/', '', $m2[2]) . '$/'); |
|
| 383 | + $m21 = expanserEntite($m2[1], $dtc->macros); |
|
| 384 | + $m25 = expanserEntite($m2[5], $dtc->macros); |
|
| 385 | + $dtc->attributs[$nom][$m21] = [$v, $m25]; |
|
| 386 | + } |
|
| 387 | + } |
|
| 388 | + |
|
| 389 | + return $dtd; |
|
| 390 | 390 | } |
| 391 | 391 | |
| 392 | 392 | |
@@ -402,26 +402,26 @@ discard block |
||
| 402 | 402 | * @return string|array |
| 403 | 403 | **/ |
| 404 | 404 | function expanserEntite($val, $macros = []) { |
| 405 | - static $vu = []; |
|
| 406 | - if (!is_string($val)) { |
|
| 407 | - return $vu; |
|
| 408 | - } |
|
| 409 | - |
|
| 410 | - if (preg_match_all(_REGEXP_ENTITY_USE, $val, $r, PREG_SET_ORDER)) { |
|
| 411 | - foreach ($r as $m) { |
|
| 412 | - $ent = $m[1]; |
|
| 413 | - // il peut valoir "" |
|
| 414 | - if (!isset($macros[$ent])) { |
|
| 415 | - spip_log("Entite $ent inconnu"); |
|
| 416 | - } else { |
|
| 417 | - if (!isset($vu[$ent])) { |
|
| 418 | - $vu[$ent] = 0; |
|
| 419 | - } |
|
| 420 | - ++$vu[$ent]; |
|
| 421 | - $val = str_replace($m[0], $macros[$ent], $val); |
|
| 422 | - } |
|
| 423 | - } |
|
| 424 | - } |
|
| 425 | - |
|
| 426 | - return trim(preg_replace('/\s+/', ' ', $val)); |
|
| 405 | + static $vu = []; |
|
| 406 | + if (!is_string($val)) { |
|
| 407 | + return $vu; |
|
| 408 | + } |
|
| 409 | + |
|
| 410 | + if (preg_match_all(_REGEXP_ENTITY_USE, $val, $r, PREG_SET_ORDER)) { |
|
| 411 | + foreach ($r as $m) { |
|
| 412 | + $ent = $m[1]; |
|
| 413 | + // il peut valoir "" |
|
| 414 | + if (!isset($macros[$ent])) { |
|
| 415 | + spip_log("Entite $ent inconnu"); |
|
| 416 | + } else { |
|
| 417 | + if (!isset($vu[$ent])) { |
|
| 418 | + $vu[$ent] = 0; |
|
| 419 | + } |
|
| 420 | + ++$vu[$ent]; |
|
| 421 | + $val = str_replace($m[0], $macros[$ent], $val); |
|
| 422 | + } |
|
| 423 | + } |
|
| 424 | + } |
|
| 425 | + |
|
| 426 | + return trim(preg_replace('/\s+/', ' ', $val)); |
|
| 427 | 427 | } |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | **/ |
| 18 | 18 | |
| 19 | 19 | if (!defined('_ECRIRE_INC_VERSION')) { |
| 20 | - return; |
|
| 20 | + return; |
|
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | include_spip('inc/editer'); |
@@ -32,17 +32,17 @@ discard block |
||
| 32 | 32 | * @return array |
| 33 | 33 | */ |
| 34 | 34 | function lister_statuts_proposes($desc, $publiable = true) { |
| 35 | - if (!isset($desc['statut_textes_instituer'])) { |
|
| 36 | - return false; |
|
| 37 | - } |
|
| 35 | + if (!isset($desc['statut_textes_instituer'])) { |
|
| 36 | + return false; |
|
| 37 | + } |
|
| 38 | 38 | |
| 39 | - $l = $desc['statut_textes_instituer']; |
|
| 40 | - if (!$publiable) { |
|
| 41 | - unset($l['publie']); |
|
| 42 | - unset($l['refuse']); |
|
| 43 | - } |
|
| 39 | + $l = $desc['statut_textes_instituer']; |
|
| 40 | + if (!$publiable) { |
|
| 41 | + unset($l['publie']); |
|
| 42 | + unset($l['refuse']); |
|
| 43 | + } |
|
| 44 | 44 | |
| 45 | - return $l; |
|
| 45 | + return $l; |
|
| 46 | 46 | } |
| 47 | 47 | |
| 48 | 48 | /** |
@@ -64,54 +64,54 @@ discard block |
||
| 64 | 64 | * Environnement du formulaire ou false si aucun affichage à faire. |
| 65 | 65 | */ |
| 66 | 66 | function formulaires_instituer_objet_charger_dist($objet, $id_objet, $retour = '', $editable = true) { |
| 67 | - $editable = ($editable ? true : false); |
|
| 68 | - |
|
| 69 | - $table = table_objet_sql($objet); |
|
| 70 | - $desc = lister_tables_objets_sql($table); |
|
| 71 | - |
|
| 72 | - if (!isset($desc['statut_textes_instituer'])) { |
|
| 73 | - return false; |
|
| 74 | - } |
|
| 75 | - |
|
| 76 | - if (!autoriser('modifier', $objet, $id_objet)) { |
|
| 77 | - $editable = false; |
|
| 78 | - } |
|
| 79 | - |
|
| 80 | - // charger le contenu de l'objet |
|
| 81 | - // dont son champ statut |
|
| 82 | - $v = formulaires_editer_objet_charger($objet, $id_objet, 0, 0, '', ''); |
|
| 83 | - |
|
| 84 | - $publiable = true; |
|
| 85 | - $statuts = lister_statuts_proposes($desc); |
|
| 86 | - // tester si on a le droit de publier, si un statut publie existe |
|
| 87 | - if (isset($statuts['publie'])) { |
|
| 88 | - if (!autoriser('instituer', $objet, $id_objet, null, ['statut' => 'publie'])) { |
|
| 89 | - if ($v['statut'] == 'publie') { |
|
| 90 | - $editable = false; |
|
| 91 | - } else { |
|
| 92 | - $publiable = false; |
|
| 93 | - } |
|
| 94 | - } |
|
| 95 | - } |
|
| 96 | - $statuts = lister_statuts_proposes($desc, $editable ? $publiable : true); |
|
| 97 | - if (count($statuts) == 1 and isset($statuts[$v['statut']])) { |
|
| 98 | - $editable = false; |
|
| 99 | - } |
|
| 100 | - |
|
| 101 | - $valeurs = [ |
|
| 102 | - 'editable' => $editable, |
|
| 103 | - 'statut' => $v['statut'], |
|
| 104 | - '_objet' => $objet, |
|
| 105 | - '_id_objet' => $id_objet, |
|
| 106 | - '_statuts' => $statuts, |
|
| 107 | - '_publiable' => $publiable, |
|
| 108 | - '_label' => $desc['texte_changer_statut'] ?? 'texte_article_statut', |
|
| 109 | - '_aide' => $desc['aide_changer_statut'] ?? '', |
|
| 110 | - '_hidden' => "<input type='hidden' name='statut_old' value='" . $v['statut'] . "' />", |
|
| 111 | - ]; |
|
| 112 | - |
|
| 113 | - #if (!count($valeurs['statuts'])) |
|
| 114 | - return $valeurs; |
|
| 67 | + $editable = ($editable ? true : false); |
|
| 68 | + |
|
| 69 | + $table = table_objet_sql($objet); |
|
| 70 | + $desc = lister_tables_objets_sql($table); |
|
| 71 | + |
|
| 72 | + if (!isset($desc['statut_textes_instituer'])) { |
|
| 73 | + return false; |
|
| 74 | + } |
|
| 75 | + |
|
| 76 | + if (!autoriser('modifier', $objet, $id_objet)) { |
|
| 77 | + $editable = false; |
|
| 78 | + } |
|
| 79 | + |
|
| 80 | + // charger le contenu de l'objet |
|
| 81 | + // dont son champ statut |
|
| 82 | + $v = formulaires_editer_objet_charger($objet, $id_objet, 0, 0, '', ''); |
|
| 83 | + |
|
| 84 | + $publiable = true; |
|
| 85 | + $statuts = lister_statuts_proposes($desc); |
|
| 86 | + // tester si on a le droit de publier, si un statut publie existe |
|
| 87 | + if (isset($statuts['publie'])) { |
|
| 88 | + if (!autoriser('instituer', $objet, $id_objet, null, ['statut' => 'publie'])) { |
|
| 89 | + if ($v['statut'] == 'publie') { |
|
| 90 | + $editable = false; |
|
| 91 | + } else { |
|
| 92 | + $publiable = false; |
|
| 93 | + } |
|
| 94 | + } |
|
| 95 | + } |
|
| 96 | + $statuts = lister_statuts_proposes($desc, $editable ? $publiable : true); |
|
| 97 | + if (count($statuts) == 1 and isset($statuts[$v['statut']])) { |
|
| 98 | + $editable = false; |
|
| 99 | + } |
|
| 100 | + |
|
| 101 | + $valeurs = [ |
|
| 102 | + 'editable' => $editable, |
|
| 103 | + 'statut' => $v['statut'], |
|
| 104 | + '_objet' => $objet, |
|
| 105 | + '_id_objet' => $id_objet, |
|
| 106 | + '_statuts' => $statuts, |
|
| 107 | + '_publiable' => $publiable, |
|
| 108 | + '_label' => $desc['texte_changer_statut'] ?? 'texte_article_statut', |
|
| 109 | + '_aide' => $desc['aide_changer_statut'] ?? '', |
|
| 110 | + '_hidden' => "<input type='hidden' name='statut_old' value='" . $v['statut'] . "' />", |
|
| 111 | + ]; |
|
| 112 | + |
|
| 113 | + #if (!count($valeurs['statuts'])) |
|
| 114 | + return $valeurs; |
|
| 115 | 115 | } |
| 116 | 116 | |
| 117 | 117 | /** |
@@ -131,35 +131,35 @@ discard block |
||
| 131 | 131 | * Tableau des erreurs |
| 132 | 132 | */ |
| 133 | 133 | function formulaires_instituer_objet_verifier_dist($objet, $id_objet, $retour = '', $editable = true) { |
| 134 | - $erreurs = []; |
|
| 135 | - // charger le contenu de l'objet |
|
| 136 | - // dont son champ statut |
|
| 137 | - $v = formulaires_editer_objet_charger($objet, $id_objet, 0, 0, '', ''); |
|
| 138 | - |
|
| 139 | - if ($v['statut'] !== _request('statut_old')) { |
|
| 140 | - $erreurs['statut'] = _T('instituer_erreur_statut_a_change'); |
|
| 141 | - } else { |
|
| 142 | - $table = table_objet_sql($objet); |
|
| 143 | - $desc = lister_tables_objets_sql($table); |
|
| 144 | - |
|
| 145 | - $publiable = true; |
|
| 146 | - if ( |
|
| 147 | - isset($v['id_rubrique']) |
|
| 148 | - and !autoriser('publierdans', 'rubrique', $v['id_rubrique']) |
|
| 149 | - ) { |
|
| 150 | - $publiable = false; |
|
| 151 | - } |
|
| 152 | - $l = lister_statuts_proposes($desc, $publiable); |
|
| 153 | - $statut = _request('statut'); |
|
| 154 | - if ( |
|
| 155 | - !isset($l[$statut]) |
|
| 156 | - or !autoriser('instituer', $objet, $id_objet, '', ['statut' => $statut]) |
|
| 157 | - ) { |
|
| 158 | - $erreurs['statut'] = _T('instituer_erreur_statut_non_autorise'); |
|
| 159 | - } |
|
| 160 | - } |
|
| 161 | - |
|
| 162 | - return $erreurs; |
|
| 134 | + $erreurs = []; |
|
| 135 | + // charger le contenu de l'objet |
|
| 136 | + // dont son champ statut |
|
| 137 | + $v = formulaires_editer_objet_charger($objet, $id_objet, 0, 0, '', ''); |
|
| 138 | + |
|
| 139 | + if ($v['statut'] !== _request('statut_old')) { |
|
| 140 | + $erreurs['statut'] = _T('instituer_erreur_statut_a_change'); |
|
| 141 | + } else { |
|
| 142 | + $table = table_objet_sql($objet); |
|
| 143 | + $desc = lister_tables_objets_sql($table); |
|
| 144 | + |
|
| 145 | + $publiable = true; |
|
| 146 | + if ( |
|
| 147 | + isset($v['id_rubrique']) |
|
| 148 | + and !autoriser('publierdans', 'rubrique', $v['id_rubrique']) |
|
| 149 | + ) { |
|
| 150 | + $publiable = false; |
|
| 151 | + } |
|
| 152 | + $l = lister_statuts_proposes($desc, $publiable); |
|
| 153 | + $statut = _request('statut'); |
|
| 154 | + if ( |
|
| 155 | + !isset($l[$statut]) |
|
| 156 | + or !autoriser('instituer', $objet, $id_objet, '', ['statut' => $statut]) |
|
| 157 | + ) { |
|
| 158 | + $erreurs['statut'] = _T('instituer_erreur_statut_non_autorise'); |
|
| 159 | + } |
|
| 160 | + } |
|
| 161 | + |
|
| 162 | + return $erreurs; |
|
| 163 | 163 | } |
| 164 | 164 | |
| 165 | 165 | /** |
@@ -178,25 +178,25 @@ discard block |
||
| 178 | 178 | */ |
| 179 | 179 | function formulaires_instituer_objet_traiter_dist($objet, $id_objet, $retour = '', $editable = true) { |
| 180 | 180 | |
| 181 | - $c = ['statut' => _request('statut')]; |
|
| 182 | - // si on a envoye une 'date_posterieure', l'enregistrer |
|
| 183 | - // todo dans le HTML |
|
| 184 | - if ($d = _request('date_posterieure')) { |
|
| 185 | - $c['date'] = $d; |
|
| 186 | - } |
|
| 187 | - |
|
| 188 | - |
|
| 189 | - include_spip('action/editer_objet'); |
|
| 190 | - if ($err = objet_instituer($objet, $id_objet, $c)) { |
|
| 191 | - $res = ['message_erreur' => $err]; |
|
| 192 | - } else { |
|
| 193 | - $res = ['message_ok' => _T('info_modification_enregistree')]; |
|
| 194 | - if ($retour) { |
|
| 195 | - $res['redirect'] = $retour; |
|
| 196 | - } |
|
| 197 | - set_request('statut'); |
|
| 198 | - set_request('date_posterieure'); |
|
| 199 | - } |
|
| 200 | - |
|
| 201 | - return $res; |
|
| 181 | + $c = ['statut' => _request('statut')]; |
|
| 182 | + // si on a envoye une 'date_posterieure', l'enregistrer |
|
| 183 | + // todo dans le HTML |
|
| 184 | + if ($d = _request('date_posterieure')) { |
|
| 185 | + $c['date'] = $d; |
|
| 186 | + } |
|
| 187 | + |
|
| 188 | + |
|
| 189 | + include_spip('action/editer_objet'); |
|
| 190 | + if ($err = objet_instituer($objet, $id_objet, $c)) { |
|
| 191 | + $res = ['message_erreur' => $err]; |
|
| 192 | + } else { |
|
| 193 | + $res = ['message_ok' => _T('info_modification_enregistree')]; |
|
| 194 | + if ($retour) { |
|
| 195 | + $res['redirect'] = $retour; |
|
| 196 | + } |
|
| 197 | + set_request('statut'); |
|
| 198 | + set_request('date_posterieure'); |
|
| 199 | + } |
|
| 200 | + |
|
| 201 | + return $res; |
|
| 202 | 202 | } |
@@ -107,7 +107,7 @@ |
||
| 107 | 107 | '_publiable' => $publiable, |
| 108 | 108 | '_label' => $desc['texte_changer_statut'] ?? 'texte_article_statut', |
| 109 | 109 | '_aide' => $desc['aide_changer_statut'] ?? '', |
| 110 | - '_hidden' => "<input type='hidden' name='statut_old' value='" . $v['statut'] . "' />", |
|
| 110 | + '_hidden' => "<input type='hidden' name='statut_old' value='".$v['statut']."' />", |
|
| 111 | 111 | ]; |
| 112 | 112 | |
| 113 | 113 | #if (!count($valeurs['statuts'])) |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | **/ |
| 18 | 18 | |
| 19 | 19 | if (!defined('_ECRIRE_INC_VERSION')) { |
| 20 | - return; |
|
| 20 | + return; |
|
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | |
@@ -45,136 +45,136 @@ discard block |
||
| 45 | 45 | **/ |
| 46 | 46 | function formulaires_dater_charger_dist($objet, $id_objet, $retour = '', $options = []) { |
| 47 | 47 | |
| 48 | - $jour = null; |
|
| 49 | - $mois = null; |
|
| 50 | - $annee = null; |
|
| 51 | - $heure = null; |
|
| 52 | - $minute = null; |
|
| 53 | - $objet = objet_type($objet); |
|
| 54 | - if (!$objet or !intval($id_objet)) { |
|
| 55 | - return false; |
|
| 56 | - } |
|
| 57 | - |
|
| 58 | - if (!is_array($options)) { |
|
| 59 | - $options = unserialize($options); |
|
| 60 | - } |
|
| 61 | - |
|
| 62 | - $_id_objet = id_table_objet($objet); |
|
| 63 | - $table = table_objet($objet); |
|
| 64 | - $trouver_table = charger_fonction('trouver_table', 'base'); |
|
| 65 | - $desc = $trouver_table($table); |
|
| 66 | - |
|
| 67 | - if (!$desc) { |
|
| 68 | - return false; |
|
| 69 | - } |
|
| 70 | - |
|
| 71 | - $champ_date = $desc['date'] ?: 'date'; |
|
| 72 | - if (isset($options['champ_date']) and $options['champ_date']) { |
|
| 73 | - $champ_date = $options['champ_date']; |
|
| 74 | - } |
|
| 75 | - if (!isset($desc['field'][$champ_date])) { |
|
| 76 | - return false; |
|
| 77 | - } |
|
| 78 | - |
|
| 79 | - $valeurs = [ |
|
| 80 | - 'objet' => $objet, |
|
| 81 | - 'id_objet' => $id_objet, |
|
| 82 | - 'id' => $id_objet, |
|
| 83 | - ]; |
|
| 84 | - |
|
| 85 | - |
|
| 86 | - $select = "$champ_date as date"; |
|
| 87 | - $champ_date_redac = 'date_redac'; |
|
| 88 | - if (isset($options['champ_date_redac']) and $options['champ_date_redac']) { |
|
| 89 | - $champ_date_redac = $options['champ_date_redac']; |
|
| 90 | - } |
|
| 91 | - if (isset($desc['field'][$champ_date_redac])) { |
|
| 92 | - $select .= ",$champ_date_redac as date_redac"; |
|
| 93 | - } |
|
| 94 | - if (isset($desc['field']['statut'])) { |
|
| 95 | - $select .= ',statut'; |
|
| 96 | - } |
|
| 97 | - |
|
| 98 | - |
|
| 99 | - $row = sql_fetsel($select, $desc['table'], "$_id_objet=" . intval($id_objet)); |
|
| 100 | - $statut = $row['statut'] ?? 'publie'; // pas de statut => publie |
|
| 101 | - |
|
| 102 | - $valeurs['editable'] = autoriser('dater', $objet, $id_objet, null, ['statut' => $statut]); |
|
| 103 | - |
|
| 104 | - $possedeDateRedac = false; |
|
| 105 | - |
|
| 106 | - if ( |
|
| 107 | - isset($row['date_redac']) and |
|
| 108 | - $regs = recup_date($row['date_redac'], false) |
|
| 109 | - ) { |
|
| 110 | - $annee_redac = $regs[0]; |
|
| 111 | - $mois_redac = $regs[1]; |
|
| 112 | - $jour_redac = $regs[2]; |
|
| 113 | - $heure_redac = $regs[3]; |
|
| 114 | - $minute_redac = $regs[4]; |
|
| 115 | - $possedeDateRedac = true; |
|
| 116 | - // attention : les vrai dates de l'annee 1 sont stockee avec +9000 => 9001 |
|
| 117 | - // mais reviennent ici en annee 1 par recup_date |
|
| 118 | - // on verifie donc que le intval($row['date_redac']) qui ressort l'annee |
|
| 119 | - // est bien lui aussi <=1 : dans ce cas c'est une date sql 'nulle' ou presque, selon |
|
| 120 | - // le gestionnnaire sql utilise (0001-01-01 pour PG par exemple) |
|
| 121 | - if (intval($row['date_redac']) <= 1 and ($annee_redac <= 1) and ($mois_redac <= 1) and ($jour_redac <= 1)) { |
|
| 122 | - $possedeDateRedac = false; |
|
| 123 | - } |
|
| 124 | - } else { |
|
| 125 | - $annee_redac = $mois_redac = $jour_redac = $heure_redac = $minute_redac = 0; |
|
| 126 | - } |
|
| 127 | - |
|
| 128 | - if ($regs = recup_date($row['date'], false)) { |
|
| 129 | - $annee = $regs[0]; |
|
| 130 | - $mois = $regs[1]; |
|
| 131 | - $jour = $regs[2]; |
|
| 132 | - $heure = $regs[3]; |
|
| 133 | - $minute = $regs[4]; |
|
| 134 | - } |
|
| 135 | - |
|
| 136 | - // attention, si la variable s'appelle date ou date_redac, le compilo va |
|
| 137 | - // la normaliser, ce qu'on ne veut pas ici. |
|
| 138 | - $valeurs['afficher_date_redac'] = ($possedeDateRedac ? $row['date_redac'] : ''); |
|
| 139 | - $valeurs['date_redac_jour'] = dater_formater_saisie_jour($jour_redac, $mois_redac, $annee_redac); |
|
| 140 | - $valeurs['date_redac_heure'] = "$heure_redac:$minute_redac"; |
|
| 141 | - |
|
| 142 | - $valeurs['afficher_date'] = $row['date']; |
|
| 143 | - $valeurs['date_jour'] = dater_formater_saisie_jour($jour, $mois, $annee); |
|
| 144 | - $valeurs['date_heure'] = "$heure:$minute"; |
|
| 145 | - |
|
| 146 | - $valeurs['sans_redac'] = !$possedeDateRedac; |
|
| 147 | - |
|
| 148 | - if (isset($options['date_redac'])) { |
|
| 149 | - $valeurs['_editer_date_anterieure'] = $options['date_redac']; |
|
| 150 | - } else { |
|
| 151 | - $valeurs['_editer_date_anterieure'] = ($objet == 'article' and ($GLOBALS['meta']['articles_redac'] != 'non' or $possedeDateRedac)); |
|
| 152 | - } |
|
| 153 | - $valeurs['_label_date'] = (($statut == 'publie') ? |
|
| 154 | - _T('texte_date_publication_objet') : _T('texte_date_creation_objet')); |
|
| 155 | - if (isset($options['label_date']) and $options['label_date']) { |
|
| 156 | - $valeurs['_label_date'] = $options['label_date']; |
|
| 157 | - } |
|
| 158 | - if (isset($options['label_date_redac']) and $options['label_date_redac']) { |
|
| 159 | - $valeurs['_label_date_redac'] = $options['label_date_redac']; |
|
| 160 | - } |
|
| 161 | - if (isset($options['texte_sans_date_redac']) and $options['texte_sans_date_redac']) { |
|
| 162 | - $valeurs['_texte_sans_date_redac'] = $options['texte_sans_date_redac']; |
|
| 163 | - } |
|
| 164 | - if (isset($options['class']) and $options['class']) { |
|
| 165 | - $valeurs['_class'] = $options['class']; |
|
| 166 | - } |
|
| 167 | - |
|
| 168 | - $valeurs['_saisie_en_cours'] = (_request('_saisie_en_cours') !== null or _request('date_jour') !== null); |
|
| 169 | - |
|
| 170 | - // cas ou l'on ne peut pas dater mais on peut modifier la date de redac anterieure |
|
| 171 | - // https://core.spip.net/issues/3494 |
|
| 172 | - $valeurs['_editer_date'] = $valeurs['editable']; |
|
| 173 | - if ($valeurs['_editer_date_anterieure'] and !$valeurs['editable']) { |
|
| 174 | - $valeurs['editable'] = autoriser('modifier', $objet, $id_objet); |
|
| 175 | - } |
|
| 176 | - |
|
| 177 | - return $valeurs; |
|
| 48 | + $jour = null; |
|
| 49 | + $mois = null; |
|
| 50 | + $annee = null; |
|
| 51 | + $heure = null; |
|
| 52 | + $minute = null; |
|
| 53 | + $objet = objet_type($objet); |
|
| 54 | + if (!$objet or !intval($id_objet)) { |
|
| 55 | + return false; |
|
| 56 | + } |
|
| 57 | + |
|
| 58 | + if (!is_array($options)) { |
|
| 59 | + $options = unserialize($options); |
|
| 60 | + } |
|
| 61 | + |
|
| 62 | + $_id_objet = id_table_objet($objet); |
|
| 63 | + $table = table_objet($objet); |
|
| 64 | + $trouver_table = charger_fonction('trouver_table', 'base'); |
|
| 65 | + $desc = $trouver_table($table); |
|
| 66 | + |
|
| 67 | + if (!$desc) { |
|
| 68 | + return false; |
|
| 69 | + } |
|
| 70 | + |
|
| 71 | + $champ_date = $desc['date'] ?: 'date'; |
|
| 72 | + if (isset($options['champ_date']) and $options['champ_date']) { |
|
| 73 | + $champ_date = $options['champ_date']; |
|
| 74 | + } |
|
| 75 | + if (!isset($desc['field'][$champ_date])) { |
|
| 76 | + return false; |
|
| 77 | + } |
|
| 78 | + |
|
| 79 | + $valeurs = [ |
|
| 80 | + 'objet' => $objet, |
|
| 81 | + 'id_objet' => $id_objet, |
|
| 82 | + 'id' => $id_objet, |
|
| 83 | + ]; |
|
| 84 | + |
|
| 85 | + |
|
| 86 | + $select = "$champ_date as date"; |
|
| 87 | + $champ_date_redac = 'date_redac'; |
|
| 88 | + if (isset($options['champ_date_redac']) and $options['champ_date_redac']) { |
|
| 89 | + $champ_date_redac = $options['champ_date_redac']; |
|
| 90 | + } |
|
| 91 | + if (isset($desc['field'][$champ_date_redac])) { |
|
| 92 | + $select .= ",$champ_date_redac as date_redac"; |
|
| 93 | + } |
|
| 94 | + if (isset($desc['field']['statut'])) { |
|
| 95 | + $select .= ',statut'; |
|
| 96 | + } |
|
| 97 | + |
|
| 98 | + |
|
| 99 | + $row = sql_fetsel($select, $desc['table'], "$_id_objet=" . intval($id_objet)); |
|
| 100 | + $statut = $row['statut'] ?? 'publie'; // pas de statut => publie |
|
| 101 | + |
|
| 102 | + $valeurs['editable'] = autoriser('dater', $objet, $id_objet, null, ['statut' => $statut]); |
|
| 103 | + |
|
| 104 | + $possedeDateRedac = false; |
|
| 105 | + |
|
| 106 | + if ( |
|
| 107 | + isset($row['date_redac']) and |
|
| 108 | + $regs = recup_date($row['date_redac'], false) |
|
| 109 | + ) { |
|
| 110 | + $annee_redac = $regs[0]; |
|
| 111 | + $mois_redac = $regs[1]; |
|
| 112 | + $jour_redac = $regs[2]; |
|
| 113 | + $heure_redac = $regs[3]; |
|
| 114 | + $minute_redac = $regs[4]; |
|
| 115 | + $possedeDateRedac = true; |
|
| 116 | + // attention : les vrai dates de l'annee 1 sont stockee avec +9000 => 9001 |
|
| 117 | + // mais reviennent ici en annee 1 par recup_date |
|
| 118 | + // on verifie donc que le intval($row['date_redac']) qui ressort l'annee |
|
| 119 | + // est bien lui aussi <=1 : dans ce cas c'est une date sql 'nulle' ou presque, selon |
|
| 120 | + // le gestionnnaire sql utilise (0001-01-01 pour PG par exemple) |
|
| 121 | + if (intval($row['date_redac']) <= 1 and ($annee_redac <= 1) and ($mois_redac <= 1) and ($jour_redac <= 1)) { |
|
| 122 | + $possedeDateRedac = false; |
|
| 123 | + } |
|
| 124 | + } else { |
|
| 125 | + $annee_redac = $mois_redac = $jour_redac = $heure_redac = $minute_redac = 0; |
|
| 126 | + } |
|
| 127 | + |
|
| 128 | + if ($regs = recup_date($row['date'], false)) { |
|
| 129 | + $annee = $regs[0]; |
|
| 130 | + $mois = $regs[1]; |
|
| 131 | + $jour = $regs[2]; |
|
| 132 | + $heure = $regs[3]; |
|
| 133 | + $minute = $regs[4]; |
|
| 134 | + } |
|
| 135 | + |
|
| 136 | + // attention, si la variable s'appelle date ou date_redac, le compilo va |
|
| 137 | + // la normaliser, ce qu'on ne veut pas ici. |
|
| 138 | + $valeurs['afficher_date_redac'] = ($possedeDateRedac ? $row['date_redac'] : ''); |
|
| 139 | + $valeurs['date_redac_jour'] = dater_formater_saisie_jour($jour_redac, $mois_redac, $annee_redac); |
|
| 140 | + $valeurs['date_redac_heure'] = "$heure_redac:$minute_redac"; |
|
| 141 | + |
|
| 142 | + $valeurs['afficher_date'] = $row['date']; |
|
| 143 | + $valeurs['date_jour'] = dater_formater_saisie_jour($jour, $mois, $annee); |
|
| 144 | + $valeurs['date_heure'] = "$heure:$minute"; |
|
| 145 | + |
|
| 146 | + $valeurs['sans_redac'] = !$possedeDateRedac; |
|
| 147 | + |
|
| 148 | + if (isset($options['date_redac'])) { |
|
| 149 | + $valeurs['_editer_date_anterieure'] = $options['date_redac']; |
|
| 150 | + } else { |
|
| 151 | + $valeurs['_editer_date_anterieure'] = ($objet == 'article' and ($GLOBALS['meta']['articles_redac'] != 'non' or $possedeDateRedac)); |
|
| 152 | + } |
|
| 153 | + $valeurs['_label_date'] = (($statut == 'publie') ? |
|
| 154 | + _T('texte_date_publication_objet') : _T('texte_date_creation_objet')); |
|
| 155 | + if (isset($options['label_date']) and $options['label_date']) { |
|
| 156 | + $valeurs['_label_date'] = $options['label_date']; |
|
| 157 | + } |
|
| 158 | + if (isset($options['label_date_redac']) and $options['label_date_redac']) { |
|
| 159 | + $valeurs['_label_date_redac'] = $options['label_date_redac']; |
|
| 160 | + } |
|
| 161 | + if (isset($options['texte_sans_date_redac']) and $options['texte_sans_date_redac']) { |
|
| 162 | + $valeurs['_texte_sans_date_redac'] = $options['texte_sans_date_redac']; |
|
| 163 | + } |
|
| 164 | + if (isset($options['class']) and $options['class']) { |
|
| 165 | + $valeurs['_class'] = $options['class']; |
|
| 166 | + } |
|
| 167 | + |
|
| 168 | + $valeurs['_saisie_en_cours'] = (_request('_saisie_en_cours') !== null or _request('date_jour') !== null); |
|
| 169 | + |
|
| 170 | + // cas ou l'on ne peut pas dater mais on peut modifier la date de redac anterieure |
|
| 171 | + // https://core.spip.net/issues/3494 |
|
| 172 | + $valeurs['_editer_date'] = $valeurs['editable']; |
|
| 173 | + if ($valeurs['_editer_date_anterieure'] and !$valeurs['editable']) { |
|
| 174 | + $valeurs['editable'] = autoriser('modifier', $objet, $id_objet); |
|
| 175 | + } |
|
| 176 | + |
|
| 177 | + return $valeurs; |
|
| 178 | 178 | } |
| 179 | 179 | |
| 180 | 180 | /** |
@@ -192,20 +192,20 @@ discard block |
||
| 192 | 192 | * Date formatée tel que `02/10/2012` |
| 193 | 193 | **/ |
| 194 | 194 | function dater_formater_saisie_jour($jour, $mois, $annee, $sep = '/') { |
| 195 | - $annee = str_pad($annee, 4, '0', STR_PAD_LEFT); |
|
| 196 | - if (intval($jour)) { |
|
| 197 | - $jour = str_pad($jour, 2, '0', STR_PAD_LEFT); |
|
| 198 | - $mois = str_pad($mois, 2, '0', STR_PAD_LEFT); |
|
| 195 | + $annee = str_pad($annee, 4, '0', STR_PAD_LEFT); |
|
| 196 | + if (intval($jour)) { |
|
| 197 | + $jour = str_pad($jour, 2, '0', STR_PAD_LEFT); |
|
| 198 | + $mois = str_pad($mois, 2, '0', STR_PAD_LEFT); |
|
| 199 | 199 | |
| 200 | - return "$jour$sep$mois$sep$annee"; |
|
| 201 | - } |
|
| 202 | - if (intval($mois)) { |
|
| 203 | - $mois = str_pad($mois, 2, '0', STR_PAD_LEFT); |
|
| 200 | + return "$jour$sep$mois$sep$annee"; |
|
| 201 | + } |
|
| 202 | + if (intval($mois)) { |
|
| 203 | + $mois = str_pad($mois, 2, '0', STR_PAD_LEFT); |
|
| 204 | 204 | |
| 205 | - return "$mois$sep$annee"; |
|
| 206 | - } |
|
| 205 | + return "$mois$sep$annee"; |
|
| 206 | + } |
|
| 207 | 207 | |
| 208 | - return $annee; |
|
| 208 | + return $annee; |
|
| 209 | 209 | } |
| 210 | 210 | |
| 211 | 211 | /** |
@@ -224,7 +224,7 @@ discard block |
||
| 224 | 224 | * Hash du formulaire |
| 225 | 225 | **/ |
| 226 | 226 | function formulaires_dater_identifier_dist($objet, $id_objet, $retour = '', $options = []) { |
| 227 | - return serialize([$objet, $id_objet]); |
|
| 227 | + return serialize([$objet, $id_objet]); |
|
| 228 | 228 | } |
| 229 | 229 | |
| 230 | 230 | /** |
@@ -242,30 +242,30 @@ discard block |
||
| 242 | 242 | * Tableau des erreurs |
| 243 | 243 | */ |
| 244 | 244 | function formulaires_dater_verifier_dist($objet, $id_objet, $retour = '', $options = []) { |
| 245 | - $erreurs = []; |
|
| 246 | - |
|
| 247 | - // ouvrir le formulaire en edition ? |
|
| 248 | - if (_request('_saisie_en_cours')) { |
|
| 249 | - $erreurs['message_erreur'] = ''; |
|
| 250 | - |
|
| 251 | - return $erreurs; |
|
| 252 | - } |
|
| 253 | - |
|
| 254 | - if (_request('changer')) { |
|
| 255 | - foreach (['date', 'date_redac'] as $k) { |
|
| 256 | - if ($v = _request($k . '_jour') and !dater_recuperer_date_saisie($v, $k)) { |
|
| 257 | - $erreurs[$k] = _T('format_date_incorrecte'); |
|
| 258 | - } elseif ($v = _request($k . '_heure') and !dater_recuperer_heure_saisie($v)) { |
|
| 259 | - $erreurs[$k] = _T('format_heure_incorrecte'); |
|
| 260 | - } |
|
| 261 | - } |
|
| 262 | - |
|
| 263 | - if (!_request('date_jour')) { |
|
| 264 | - $erreurs['date'] = _T('info_obligatoire'); |
|
| 265 | - } |
|
| 266 | - } |
|
| 267 | - |
|
| 268 | - return $erreurs; |
|
| 245 | + $erreurs = []; |
|
| 246 | + |
|
| 247 | + // ouvrir le formulaire en edition ? |
|
| 248 | + if (_request('_saisie_en_cours')) { |
|
| 249 | + $erreurs['message_erreur'] = ''; |
|
| 250 | + |
|
| 251 | + return $erreurs; |
|
| 252 | + } |
|
| 253 | + |
|
| 254 | + if (_request('changer')) { |
|
| 255 | + foreach (['date', 'date_redac'] as $k) { |
|
| 256 | + if ($v = _request($k . '_jour') and !dater_recuperer_date_saisie($v, $k)) { |
|
| 257 | + $erreurs[$k] = _T('format_date_incorrecte'); |
|
| 258 | + } elseif ($v = _request($k . '_heure') and !dater_recuperer_heure_saisie($v)) { |
|
| 259 | + $erreurs[$k] = _T('format_heure_incorrecte'); |
|
| 260 | + } |
|
| 261 | + } |
|
| 262 | + |
|
| 263 | + if (!_request('date_jour')) { |
|
| 264 | + $erreurs['date'] = _T('info_obligatoire'); |
|
| 265 | + } |
|
| 266 | + } |
|
| 267 | + |
|
| 268 | + return $erreurs; |
|
| 269 | 269 | } |
| 270 | 270 | |
| 271 | 271 | /** |
@@ -283,79 +283,79 @@ discard block |
||
| 283 | 283 | * Retours des traitements |
| 284 | 284 | */ |
| 285 | 285 | function formulaires_dater_traiter_dist($objet, $id_objet, $retour = '', $options = []) { |
| 286 | - $res = ['editable' => ' ']; |
|
| 287 | - |
|
| 288 | - if (_request('changer')) { |
|
| 289 | - $table = table_objet($objet); |
|
| 290 | - $trouver_table = charger_fonction('trouver_table', 'base'); |
|
| 291 | - $desc = $trouver_table($table); |
|
| 292 | - |
|
| 293 | - if (!$desc) { |
|
| 294 | - return ['message_erreur' => _L('erreur')]; |
|
| 295 | - } #impossible en principe |
|
| 296 | - |
|
| 297 | - $champ_date = $desc['date'] ?: 'date'; |
|
| 298 | - if (isset($options['champ_date']) and $options['champ_date']) { |
|
| 299 | - $champ_date = $options['champ_date']; |
|
| 300 | - } |
|
| 301 | - |
|
| 302 | - $set = []; |
|
| 303 | - |
|
| 304 | - $charger = charger_fonction('charger', 'formulaires/dater/'); |
|
| 305 | - $v = $charger($objet, $id_objet, $retour, $options); |
|
| 306 | - |
|
| 307 | - if ($v['_editer_date']) { |
|
| 308 | - if (!$d = dater_recuperer_date_saisie(_request('date_jour'))) { |
|
| 309 | - $d = [date('Y'), date('m'), date('d')]; |
|
| 310 | - } |
|
| 311 | - if (!$h = dater_recuperer_heure_saisie(_request('date_heure'))) { |
|
| 312 | - $h = [0, 0]; |
|
| 313 | - } |
|
| 314 | - |
|
| 315 | - $set[$champ_date] = sql_format_date($d[0], $d[1], $d[2], $h[0], $h[1]); |
|
| 316 | - } |
|
| 317 | - |
|
| 318 | - $champ_date_redac = 'date_redac'; |
|
| 319 | - if (isset($options['champ_date_redac']) and $options['champ_date_redac']) { |
|
| 320 | - $champ_date_redac = $options['champ_date_redac']; |
|
| 321 | - } |
|
| 322 | - if (isset($desc['field'][$champ_date_redac]) and $v['_editer_date_anterieure']) { |
|
| 323 | - if (!_request('date_redac_jour') or _request('sans_redac')) { |
|
| 324 | - $set[$champ_date_redac] = sql_format_date(0, 0, 0, 0, 0, 0); |
|
| 325 | - } else { |
|
| 326 | - if (!$d = dater_recuperer_date_saisie(_request('date_redac_jour'), 'date_redac')) { |
|
| 327 | - $d = [date('Y'), date('m'), date('d')]; |
|
| 328 | - } |
|
| 329 | - if (!$h = dater_recuperer_heure_saisie(_request('date_redac_heure'))) { |
|
| 330 | - $h = [0, 0]; |
|
| 331 | - } |
|
| 332 | - $set[$champ_date_redac] = sql_format_date($d[0], $d[1], $d[2], $h[0], $h[1]); |
|
| 333 | - } |
|
| 334 | - } |
|
| 335 | - |
|
| 336 | - if (count($set)) { |
|
| 337 | - $publie_avant = objet_test_si_publie($objet, $id_objet); |
|
| 338 | - include_spip('action/editer_objet'); |
|
| 339 | - objet_modifier($objet, $id_objet, $set); |
|
| 340 | - $publie_apres = objet_test_si_publie($objet, $id_objet); |
|
| 341 | - if ($publie_avant !== $publie_apres) { |
|
| 342 | - // on refuse ajax pour forcer le rechargement de la page ici |
|
| 343 | - // on refera traiter une 2eme fois, mais c'est sans consequence |
|
| 344 | - refuser_traiter_formulaire_ajax(); |
|
| 345 | - } |
|
| 346 | - } |
|
| 347 | - } |
|
| 348 | - |
|
| 349 | - if ($retour) { |
|
| 350 | - $res['redirect'] = $retour; |
|
| 351 | - } |
|
| 352 | - |
|
| 353 | - set_request('date_jour'); |
|
| 354 | - set_request('date_redac_jour'); |
|
| 355 | - set_request('date_heure'); |
|
| 356 | - set_request('date_redac_heure'); |
|
| 357 | - |
|
| 358 | - return $res; |
|
| 286 | + $res = ['editable' => ' ']; |
|
| 287 | + |
|
| 288 | + if (_request('changer')) { |
|
| 289 | + $table = table_objet($objet); |
|
| 290 | + $trouver_table = charger_fonction('trouver_table', 'base'); |
|
| 291 | + $desc = $trouver_table($table); |
|
| 292 | + |
|
| 293 | + if (!$desc) { |
|
| 294 | + return ['message_erreur' => _L('erreur')]; |
|
| 295 | + } #impossible en principe |
|
| 296 | + |
|
| 297 | + $champ_date = $desc['date'] ?: 'date'; |
|
| 298 | + if (isset($options['champ_date']) and $options['champ_date']) { |
|
| 299 | + $champ_date = $options['champ_date']; |
|
| 300 | + } |
|
| 301 | + |
|
| 302 | + $set = []; |
|
| 303 | + |
|
| 304 | + $charger = charger_fonction('charger', 'formulaires/dater/'); |
|
| 305 | + $v = $charger($objet, $id_objet, $retour, $options); |
|
| 306 | + |
|
| 307 | + if ($v['_editer_date']) { |
|
| 308 | + if (!$d = dater_recuperer_date_saisie(_request('date_jour'))) { |
|
| 309 | + $d = [date('Y'), date('m'), date('d')]; |
|
| 310 | + } |
|
| 311 | + if (!$h = dater_recuperer_heure_saisie(_request('date_heure'))) { |
|
| 312 | + $h = [0, 0]; |
|
| 313 | + } |
|
| 314 | + |
|
| 315 | + $set[$champ_date] = sql_format_date($d[0], $d[1], $d[2], $h[0], $h[1]); |
|
| 316 | + } |
|
| 317 | + |
|
| 318 | + $champ_date_redac = 'date_redac'; |
|
| 319 | + if (isset($options['champ_date_redac']) and $options['champ_date_redac']) { |
|
| 320 | + $champ_date_redac = $options['champ_date_redac']; |
|
| 321 | + } |
|
| 322 | + if (isset($desc['field'][$champ_date_redac]) and $v['_editer_date_anterieure']) { |
|
| 323 | + if (!_request('date_redac_jour') or _request('sans_redac')) { |
|
| 324 | + $set[$champ_date_redac] = sql_format_date(0, 0, 0, 0, 0, 0); |
|
| 325 | + } else { |
|
| 326 | + if (!$d = dater_recuperer_date_saisie(_request('date_redac_jour'), 'date_redac')) { |
|
| 327 | + $d = [date('Y'), date('m'), date('d')]; |
|
| 328 | + } |
|
| 329 | + if (!$h = dater_recuperer_heure_saisie(_request('date_redac_heure'))) { |
|
| 330 | + $h = [0, 0]; |
|
| 331 | + } |
|
| 332 | + $set[$champ_date_redac] = sql_format_date($d[0], $d[1], $d[2], $h[0], $h[1]); |
|
| 333 | + } |
|
| 334 | + } |
|
| 335 | + |
|
| 336 | + if (count($set)) { |
|
| 337 | + $publie_avant = objet_test_si_publie($objet, $id_objet); |
|
| 338 | + include_spip('action/editer_objet'); |
|
| 339 | + objet_modifier($objet, $id_objet, $set); |
|
| 340 | + $publie_apres = objet_test_si_publie($objet, $id_objet); |
|
| 341 | + if ($publie_avant !== $publie_apres) { |
|
| 342 | + // on refuse ajax pour forcer le rechargement de la page ici |
|
| 343 | + // on refera traiter une 2eme fois, mais c'est sans consequence |
|
| 344 | + refuser_traiter_formulaire_ajax(); |
|
| 345 | + } |
|
| 346 | + } |
|
| 347 | + } |
|
| 348 | + |
|
| 349 | + if ($retour) { |
|
| 350 | + $res['redirect'] = $retour; |
|
| 351 | + } |
|
| 352 | + |
|
| 353 | + set_request('date_jour'); |
|
| 354 | + set_request('date_redac_jour'); |
|
| 355 | + set_request('date_heure'); |
|
| 356 | + set_request('date_redac_heure'); |
|
| 357 | + |
|
| 358 | + return $res; |
|
| 359 | 359 | } |
| 360 | 360 | |
| 361 | 361 | /** |
@@ -366,24 +366,24 @@ discard block |
||
| 366 | 366 | * @return array|string Chaîne vide si date invalide, tableau (année, mois, jour) sinon. |
| 367 | 367 | */ |
| 368 | 368 | function dater_recuperer_date_saisie($post, $quoi = 'date') { |
| 369 | - if (!preg_match('#^(?:(?:([0-9]{1,2})[/-])?([0-9]{1,2})[/-])?([0-9]{4}|[0-9]{1,2})#', $post, $regs)) { |
|
| 370 | - return ''; |
|
| 371 | - } |
|
| 372 | - if ($quoi == 'date_redac') { |
|
| 373 | - if ($regs[3] <> '' and $regs[3] < 1001) { |
|
| 374 | - $regs[3] += 9000; |
|
| 375 | - } |
|
| 376 | - |
|
| 377 | - return [$regs[3], $regs[2], $regs[1]]; |
|
| 378 | - } else { |
|
| 379 | - if ( |
|
| 380 | - checkdate(intval($regs[2]), intval($regs[1]), intval($regs[3])) |
|
| 381 | - and $t = mktime(0, 0, 0, $regs[2], $regs[1], $regs[3]) |
|
| 382 | - ) { |
|
| 383 | - return [date('Y', $t), date('m', $t), date('d', $t)]; |
|
| 384 | - } |
|
| 385 | - return ''; |
|
| 386 | - } |
|
| 369 | + if (!preg_match('#^(?:(?:([0-9]{1,2})[/-])?([0-9]{1,2})[/-])?([0-9]{4}|[0-9]{1,2})#', $post, $regs)) { |
|
| 370 | + return ''; |
|
| 371 | + } |
|
| 372 | + if ($quoi == 'date_redac') { |
|
| 373 | + if ($regs[3] <> '' and $regs[3] < 1001) { |
|
| 374 | + $regs[3] += 9000; |
|
| 375 | + } |
|
| 376 | + |
|
| 377 | + return [$regs[3], $regs[2], $regs[1]]; |
|
| 378 | + } else { |
|
| 379 | + if ( |
|
| 380 | + checkdate(intval($regs[2]), intval($regs[1]), intval($regs[3])) |
|
| 381 | + and $t = mktime(0, 0, 0, $regs[2], $regs[1], $regs[3]) |
|
| 382 | + ) { |
|
| 383 | + return [date('Y', $t), date('m', $t), date('d', $t)]; |
|
| 384 | + } |
|
| 385 | + return ''; |
|
| 386 | + } |
|
| 387 | 387 | } |
| 388 | 388 | |
| 389 | 389 | /** |
@@ -393,12 +393,12 @@ discard block |
||
| 393 | 393 | * @return array |
| 394 | 394 | */ |
| 395 | 395 | function dater_recuperer_heure_saisie($post) { |
| 396 | - if (!preg_match('#([0-9]{1,2})(?:[h:](?:([0-9]{1,2}))?)?#', $post, $regs)) { |
|
| 397 | - return ''; |
|
| 398 | - } |
|
| 399 | - if ($regs[1] > 23 or $regs[2] > 59) { |
|
| 400 | - return ''; |
|
| 401 | - } |
|
| 402 | - |
|
| 403 | - return [$regs[1], $regs[2]]; |
|
| 396 | + if (!preg_match('#([0-9]{1,2})(?:[h:](?:([0-9]{1,2}))?)?#', $post, $regs)) { |
|
| 397 | + return ''; |
|
| 398 | + } |
|
| 399 | + if ($regs[1] > 23 or $regs[2] > 59) { |
|
| 400 | + return ''; |
|
| 401 | + } |
|
| 402 | + |
|
| 403 | + return [$regs[1], $regs[2]]; |
|
| 404 | 404 | } |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | } |
| 97 | 97 | |
| 98 | 98 | |
| 99 | - $row = sql_fetsel($select, $desc['table'], "$_id_objet=" . intval($id_objet)); |
|
| 99 | + $row = sql_fetsel($select, $desc['table'], "$_id_objet=".intval($id_objet)); |
|
| 100 | 100 | $statut = $row['statut'] ?? 'publie'; // pas de statut => publie |
| 101 | 101 | |
| 102 | 102 | $valeurs['editable'] = autoriser('dater', $objet, $id_objet, null, ['statut' => $statut]); |
@@ -253,9 +253,9 @@ discard block |
||
| 253 | 253 | |
| 254 | 254 | if (_request('changer')) { |
| 255 | 255 | foreach (['date', 'date_redac'] as $k) { |
| 256 | - if ($v = _request($k . '_jour') and !dater_recuperer_date_saisie($v, $k)) { |
|
| 256 | + if ($v = _request($k.'_jour') and !dater_recuperer_date_saisie($v, $k)) { |
|
| 257 | 257 | $erreurs[$k] = _T('format_date_incorrecte'); |
| 258 | - } elseif ($v = _request($k . '_heure') and !dater_recuperer_heure_saisie($v)) { |
|
| 258 | + } elseif ($v = _request($k.'_heure') and !dater_recuperer_heure_saisie($v)) { |
|
| 259 | 259 | $erreurs[$k] = _T('format_heure_incorrecte'); |
| 260 | 260 | } |
| 261 | 261 | } |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | |
| 159 | 159 | // si id numerique et un seul objet possible, pas d'ambiguite |
| 160 | 160 | if (is_numeric($ref) and count($objets) === 1) { |
| 161 | - $ref = reset($objets) . $ref; |
|
| 161 | + $ref = reset($objets).$ref; |
|
| 162 | 162 | } |
| 163 | 163 | |
| 164 | 164 | // Si la référence ne correspond à rien, c'est fini |
@@ -166,7 +166,7 @@ discard block |
||
| 166 | 166 | return json_export(false); |
| 167 | 167 | } |
| 168 | 168 | // Sinon on récupère les infos utiles |
| 169 | - [$type, , $id, , , , ] = array_pad($match, 7, null); |
|
| 169 | + [$type,, $id,,,,] = array_pad($match, 7, null); |
|
| 170 | 170 | |
| 171 | 171 | // On regarde si le type trouvé fait partie des objets sélectionnables |
| 172 | 172 | if (!in_array(table_objet($type), $objets)) { |
@@ -211,8 +211,8 @@ discard block |
||
| 211 | 211 | $types = (is_array($types) ? array_filter($types) : []); |
| 212 | 212 | |
| 213 | 213 | // recuperer tous les freres et soeurs de la rubrique visee |
| 214 | - $id_parent = sql_getfetsel('id_parent', 'spip_rubriques', 'id_rubrique=' . intval($id_rubrique)); |
|
| 215 | - $fratrie = sql_allfetsel('id_rubrique', 'spip_rubriques', 'id_parent=' . intval($id_parent)); |
|
| 214 | + $id_parent = sql_getfetsel('id_parent', 'spip_rubriques', 'id_rubrique='.intval($id_rubrique)); |
|
| 215 | + $fratrie = sql_allfetsel('id_rubrique', 'spip_rubriques', 'id_parent='.intval($id_parent)); |
|
| 216 | 216 | $fratrie = array_column($fratrie, 'id_rubrique'); |
| 217 | 217 | $has = sql_allfetsel('DISTINCT id_parent', 'spip_rubriques', sql_in('id_parent', $fratrie)); |
| 218 | 218 | $has = array_column($has, 'id_parent'); |
@@ -7,7 +7,7 @@ discard block |
||
| 7 | 7 | **/ |
| 8 | 8 | |
| 9 | 9 | if (!defined('_ECRIRE_INC_VERSION')) { |
| 10 | - return; |
|
| 10 | + return; |
|
| 11 | 11 | } |
| 12 | 12 | |
| 13 | 13 | /** |
@@ -28,51 +28,51 @@ discard block |
||
| 28 | 28 | * - afficher : tableau des objets à afficher (mais pas forcément sélectionnables) |
| 29 | 29 | */ |
| 30 | 30 | function selecteur_lister_objets($includelist = [], $excludelist = []) { |
| 31 | - static $liste_selecteurs, $liste_parents; |
|
| 32 | - |
|
| 33 | - if (!$liste_selecteurs) { |
|
| 34 | - $liste_selecteurs = find_all_in_path('formulaires/selecteur/', 'hierarchie-[\w]+[.]html$'); |
|
| 35 | - } |
|
| 36 | - $objets_selectionner = []; |
|
| 37 | - foreach ($liste_selecteurs as $fichier => $chemin) { |
|
| 38 | - $objets_selectionner[] = preg_replace('/^hierarchie-([\w]+)[.]html$/', '$1', $fichier); |
|
| 39 | - } |
|
| 40 | - |
|
| 41 | - // S'il y a une whitelist on ne garde que ce qui est dedans |
|
| 42 | - if (!empty($includelist)) { |
|
| 43 | - $includelist = array_map('table_objet', $includelist); |
|
| 44 | - $objets_selectionner = array_intersect($objets_selectionner, $includelist); |
|
| 45 | - } |
|
| 46 | - // On supprime ce qui est dans la liste d’exclusion |
|
| 47 | - $excludelist = array_map('table_objet', $excludelist); |
|
| 48 | - // On enlève toujours la racine |
|
| 49 | - $excludelist[] = 'racine'; |
|
| 50 | - $objets_selectionner = array_diff($objets_selectionner, $excludelist); |
|
| 51 | - |
|
| 52 | - // Ensuite on cherche ce qu'on doit afficher : au moins ceux qu'on peut sélectionner |
|
| 53 | - $objets_afficher = $objets_selectionner; |
|
| 54 | - |
|
| 55 | - // Il faut alors chercher d'éventuels parents obligatoires en plus : |
|
| 56 | - // lister-trucs-bidules.html => on doit afficher des "trucs" pour trouver des "bidules" |
|
| 57 | - if (!$liste_parents) { |
|
| 58 | - $liste_parents = find_all_in_path('formulaires/selecteur/', 'lister-[\w]+-[\w]+[.]html$'); |
|
| 59 | - } |
|
| 60 | - foreach ($liste_parents as $fichier => $chemin) { |
|
| 61 | - preg_match('/^lister-([\w]+)-([\w]+)[.]html$/', $fichier, $captures); |
|
| 62 | - $parent = $captures[1]; |
|
| 63 | - $type = $captures[2]; |
|
| 64 | - // Si le type fait partie de ce qu'on doit afficher alors on ajoute aussi le parent à l'affichage |
|
| 65 | - if (in_array($type, $objets_afficher)) { |
|
| 66 | - $objets_afficher[] = $parent; |
|
| 67 | - } |
|
| 68 | - } |
|
| 69 | - |
|
| 70 | - $objets = [ |
|
| 71 | - 'selectionner' => array_unique($objets_selectionner), |
|
| 72 | - 'afficher' => array_unique($objets_afficher), |
|
| 73 | - ]; |
|
| 74 | - |
|
| 75 | - return $objets; |
|
| 31 | + static $liste_selecteurs, $liste_parents; |
|
| 32 | + |
|
| 33 | + if (!$liste_selecteurs) { |
|
| 34 | + $liste_selecteurs = find_all_in_path('formulaires/selecteur/', 'hierarchie-[\w]+[.]html$'); |
|
| 35 | + } |
|
| 36 | + $objets_selectionner = []; |
|
| 37 | + foreach ($liste_selecteurs as $fichier => $chemin) { |
|
| 38 | + $objets_selectionner[] = preg_replace('/^hierarchie-([\w]+)[.]html$/', '$1', $fichier); |
|
| 39 | + } |
|
| 40 | + |
|
| 41 | + // S'il y a une whitelist on ne garde que ce qui est dedans |
|
| 42 | + if (!empty($includelist)) { |
|
| 43 | + $includelist = array_map('table_objet', $includelist); |
|
| 44 | + $objets_selectionner = array_intersect($objets_selectionner, $includelist); |
|
| 45 | + } |
|
| 46 | + // On supprime ce qui est dans la liste d’exclusion |
|
| 47 | + $excludelist = array_map('table_objet', $excludelist); |
|
| 48 | + // On enlève toujours la racine |
|
| 49 | + $excludelist[] = 'racine'; |
|
| 50 | + $objets_selectionner = array_diff($objets_selectionner, $excludelist); |
|
| 51 | + |
|
| 52 | + // Ensuite on cherche ce qu'on doit afficher : au moins ceux qu'on peut sélectionner |
|
| 53 | + $objets_afficher = $objets_selectionner; |
|
| 54 | + |
|
| 55 | + // Il faut alors chercher d'éventuels parents obligatoires en plus : |
|
| 56 | + // lister-trucs-bidules.html => on doit afficher des "trucs" pour trouver des "bidules" |
|
| 57 | + if (!$liste_parents) { |
|
| 58 | + $liste_parents = find_all_in_path('formulaires/selecteur/', 'lister-[\w]+-[\w]+[.]html$'); |
|
| 59 | + } |
|
| 60 | + foreach ($liste_parents as $fichier => $chemin) { |
|
| 61 | + preg_match('/^lister-([\w]+)-([\w]+)[.]html$/', $fichier, $captures); |
|
| 62 | + $parent = $captures[1]; |
|
| 63 | + $type = $captures[2]; |
|
| 64 | + // Si le type fait partie de ce qu'on doit afficher alors on ajoute aussi le parent à l'affichage |
|
| 65 | + if (in_array($type, $objets_afficher)) { |
|
| 66 | + $objets_afficher[] = $parent; |
|
| 67 | + } |
|
| 68 | + } |
|
| 69 | + |
|
| 70 | + $objets = [ |
|
| 71 | + 'selectionner' => array_unique($objets_selectionner), |
|
| 72 | + 'afficher' => array_unique($objets_afficher), |
|
| 73 | + ]; |
|
| 74 | + |
|
| 75 | + return $objets; |
|
| 76 | 76 | } |
| 77 | 77 | |
| 78 | 78 | /** |
@@ -99,31 +99,31 @@ discard block |
||
| 99 | 99 | * liste des couples (objets => id_objet) ou liste des identifiants d'un type d'objet. |
| 100 | 100 | **/ |
| 101 | 101 | function picker_selected($selected, $type = '') { |
| 102 | - $select = []; |
|
| 103 | - $type = preg_replace(',\W,', '', $type); |
|
| 104 | - |
|
| 105 | - if ($selected and !is_array($selected)) { |
|
| 106 | - $selected = explode(',', $selected); |
|
| 107 | - } |
|
| 108 | - |
|
| 109 | - if (is_array($selected)) { |
|
| 110 | - foreach ($selected as $value) { |
|
| 111 | - // Si c'est le bon format déjà |
|
| 112 | - if (preg_match('/^([\w]+)[|]([0-9]+)$/', $value, $captures)) { |
|
| 113 | - $objet = $captures[1]; |
|
| 114 | - $id_objet = intval($captures[2]); |
|
| 115 | - |
|
| 116 | - // Si on cherche un type et que c'est le bon, on renvoit un tableau que d'identifiants |
|
| 117 | - if (is_string($type) and $type == $objet and ($id_objet or in_array($objet, ['racine', 'rubrique']))) { |
|
| 118 | - $select[] = $id_objet; |
|
| 119 | - } elseif (!$type and ($id_objet or in_array($objet, ['racine', 'rubrique']))) { |
|
| 120 | - $select[] = ['objet' => $objet, 'id_objet' => $id_objet]; |
|
| 121 | - } |
|
| 122 | - } |
|
| 123 | - } |
|
| 124 | - } |
|
| 125 | - |
|
| 126 | - return $select; |
|
| 102 | + $select = []; |
|
| 103 | + $type = preg_replace(',\W,', '', $type); |
|
| 104 | + |
|
| 105 | + if ($selected and !is_array($selected)) { |
|
| 106 | + $selected = explode(',', $selected); |
|
| 107 | + } |
|
| 108 | + |
|
| 109 | + if (is_array($selected)) { |
|
| 110 | + foreach ($selected as $value) { |
|
| 111 | + // Si c'est le bon format déjà |
|
| 112 | + if (preg_match('/^([\w]+)[|]([0-9]+)$/', $value, $captures)) { |
|
| 113 | + $objet = $captures[1]; |
|
| 114 | + $id_objet = intval($captures[2]); |
|
| 115 | + |
|
| 116 | + // Si on cherche un type et que c'est le bon, on renvoit un tableau que d'identifiants |
|
| 117 | + if (is_string($type) and $type == $objet and ($id_objet or in_array($objet, ['racine', 'rubrique']))) { |
|
| 118 | + $select[] = $id_objet; |
|
| 119 | + } elseif (!$type and ($id_objet or in_array($objet, ['racine', 'rubrique']))) { |
|
| 120 | + $select[] = ['objet' => $objet, 'id_objet' => $id_objet]; |
|
| 121 | + } |
|
| 122 | + } |
|
| 123 | + } |
|
| 124 | + } |
|
| 125 | + |
|
| 126 | + return $select; |
|
| 127 | 127 | } |
| 128 | 128 | |
| 129 | 129 | /** |
@@ -140,49 +140,49 @@ discard block |
||
| 140 | 140 | * Booléen indiquant si les articles sont sélectionnables |
| 141 | 141 | */ |
| 142 | 142 | function picker_identifie_id_rapide($ref, $rubriques_ou_objets = false, $articles = false) { |
| 143 | - include_spip('inc/json'); |
|
| 144 | - include_spip('inc/lien'); |
|
| 145 | - |
|
| 146 | - // On construit un tableau des objets sélectionnables suivant les paramètres |
|
| 147 | - $objets = []; |
|
| 148 | - if ($rubriques_ou_objets and is_array($rubriques_ou_objets)) { |
|
| 149 | - $objets = $rubriques_ou_objets; |
|
| 150 | - } else { |
|
| 151 | - if ($rubriques_ou_objets) { |
|
| 152 | - $objets[] = 'rubriques'; |
|
| 153 | - } |
|
| 154 | - if ($articles) { |
|
| 155 | - $objets[] = 'articles'; |
|
| 156 | - } |
|
| 157 | - } |
|
| 158 | - |
|
| 159 | - // si id numerique et un seul objet possible, pas d'ambiguite |
|
| 160 | - if (is_numeric($ref) and count($objets) === 1) { |
|
| 161 | - $ref = reset($objets) . $ref; |
|
| 162 | - } |
|
| 163 | - |
|
| 164 | - // Si la référence ne correspond à rien, c'est fini |
|
| 165 | - if (!($match = typer_raccourci($ref))) { |
|
| 166 | - return json_export(false); |
|
| 167 | - } |
|
| 168 | - // Sinon on récupère les infos utiles |
|
| 169 | - [$type, , $id, , , , ] = array_pad($match, 7, null); |
|
| 170 | - |
|
| 171 | - // On regarde si le type trouvé fait partie des objets sélectionnables |
|
| 172 | - if (!in_array(table_objet($type), $objets)) { |
|
| 173 | - return json_export(false); |
|
| 174 | - } |
|
| 175 | - |
|
| 176 | - // Maintenant que tout est bon, on cherche les informations sur cet objet |
|
| 177 | - include_spip('inc/filtres'); |
|
| 178 | - if (!$titre = generer_objet_info($id, $type, 'titre')) { |
|
| 179 | - return json_export(false); |
|
| 180 | - } |
|
| 181 | - |
|
| 182 | - // On simplifie le texte |
|
| 183 | - $titre = attribut_html($titre); |
|
| 184 | - |
|
| 185 | - return json_export(['type' => $type, 'id' => "$type|$id", 'titre' => $titre]); |
|
| 143 | + include_spip('inc/json'); |
|
| 144 | + include_spip('inc/lien'); |
|
| 145 | + |
|
| 146 | + // On construit un tableau des objets sélectionnables suivant les paramètres |
|
| 147 | + $objets = []; |
|
| 148 | + if ($rubriques_ou_objets and is_array($rubriques_ou_objets)) { |
|
| 149 | + $objets = $rubriques_ou_objets; |
|
| 150 | + } else { |
|
| 151 | + if ($rubriques_ou_objets) { |
|
| 152 | + $objets[] = 'rubriques'; |
|
| 153 | + } |
|
| 154 | + if ($articles) { |
|
| 155 | + $objets[] = 'articles'; |
|
| 156 | + } |
|
| 157 | + } |
|
| 158 | + |
|
| 159 | + // si id numerique et un seul objet possible, pas d'ambiguite |
|
| 160 | + if (is_numeric($ref) and count($objets) === 1) { |
|
| 161 | + $ref = reset($objets) . $ref; |
|
| 162 | + } |
|
| 163 | + |
|
| 164 | + // Si la référence ne correspond à rien, c'est fini |
|
| 165 | + if (!($match = typer_raccourci($ref))) { |
|
| 166 | + return json_export(false); |
|
| 167 | + } |
|
| 168 | + // Sinon on récupère les infos utiles |
|
| 169 | + [$type, , $id, , , , ] = array_pad($match, 7, null); |
|
| 170 | + |
|
| 171 | + // On regarde si le type trouvé fait partie des objets sélectionnables |
|
| 172 | + if (!in_array(table_objet($type), $objets)) { |
|
| 173 | + return json_export(false); |
|
| 174 | + } |
|
| 175 | + |
|
| 176 | + // Maintenant que tout est bon, on cherche les informations sur cet objet |
|
| 177 | + include_spip('inc/filtres'); |
|
| 178 | + if (!$titre = generer_objet_info($id, $type, 'titre')) { |
|
| 179 | + return json_export(false); |
|
| 180 | + } |
|
| 181 | + |
|
| 182 | + // On simplifie le texte |
|
| 183 | + $titre = attribut_html($titre); |
|
| 184 | + |
|
| 185 | + return json_export(['type' => $type, 'id' => "$type|$id", 'titre' => $titre]); |
|
| 186 | 186 | } |
| 187 | 187 | |
| 188 | 188 | /** |
@@ -205,34 +205,34 @@ discard block |
||
| 205 | 205 | * Comme le filtre `oui` : espace (` `) si rubrique à afficher, chaîne vide sinon. |
| 206 | 206 | */ |
| 207 | 207 | function test_enfants_rubrique($id_rubrique, $types = []) { |
| 208 | - static $has_child = []; |
|
| 209 | - |
|
| 210 | - if (!isset($has_child[$id_rubrique])) { |
|
| 211 | - $types = (is_array($types) ? array_filter($types) : []); |
|
| 212 | - |
|
| 213 | - // recuperer tous les freres et soeurs de la rubrique visee |
|
| 214 | - $id_parent = sql_getfetsel('id_parent', 'spip_rubriques', 'id_rubrique=' . intval($id_rubrique)); |
|
| 215 | - $fratrie = sql_allfetsel('id_rubrique', 'spip_rubriques', 'id_parent=' . intval($id_parent)); |
|
| 216 | - $fratrie = array_column($fratrie, 'id_rubrique'); |
|
| 217 | - $has = sql_allfetsel('DISTINCT id_parent', 'spip_rubriques', sql_in('id_parent', $fratrie)); |
|
| 218 | - $has = array_column($has, 'id_parent'); |
|
| 219 | - $fratrie = array_diff($fratrie, $has); |
|
| 220 | - |
|
| 221 | - while (count($fratrie) and is_array($types) and count($types)) { |
|
| 222 | - $type = array_shift($types); |
|
| 223 | - $h = sql_allfetsel('DISTINCT id_rubrique', table_objet_sql($type), sql_in('id_rubrique', $fratrie)); |
|
| 224 | - $h = array_column($h, 'id_rubrique'); |
|
| 225 | - $has = array_merge($has, $h); |
|
| 226 | - $fratrie = array_diff($fratrie, $h); |
|
| 227 | - } |
|
| 228 | - |
|
| 229 | - if (count($has)) { |
|
| 230 | - $has_child = $has_child + array_combine($has, array_pad([], count($has), true)); |
|
| 231 | - } |
|
| 232 | - if (count($fratrie)) { |
|
| 233 | - $has_child = $has_child + array_combine($fratrie, array_pad([], count($fratrie), false)); |
|
| 234 | - } |
|
| 235 | - } |
|
| 236 | - |
|
| 237 | - return $has_child[$id_rubrique] ? ' ' : ''; |
|
| 208 | + static $has_child = []; |
|
| 209 | + |
|
| 210 | + if (!isset($has_child[$id_rubrique])) { |
|
| 211 | + $types = (is_array($types) ? array_filter($types) : []); |
|
| 212 | + |
|
| 213 | + // recuperer tous les freres et soeurs de la rubrique visee |
|
| 214 | + $id_parent = sql_getfetsel('id_parent', 'spip_rubriques', 'id_rubrique=' . intval($id_rubrique)); |
|
| 215 | + $fratrie = sql_allfetsel('id_rubrique', 'spip_rubriques', 'id_parent=' . intval($id_parent)); |
|
| 216 | + $fratrie = array_column($fratrie, 'id_rubrique'); |
|
| 217 | + $has = sql_allfetsel('DISTINCT id_parent', 'spip_rubriques', sql_in('id_parent', $fratrie)); |
|
| 218 | + $has = array_column($has, 'id_parent'); |
|
| 219 | + $fratrie = array_diff($fratrie, $has); |
|
| 220 | + |
|
| 221 | + while (count($fratrie) and is_array($types) and count($types)) { |
|
| 222 | + $type = array_shift($types); |
|
| 223 | + $h = sql_allfetsel('DISTINCT id_rubrique', table_objet_sql($type), sql_in('id_rubrique', $fratrie)); |
|
| 224 | + $h = array_column($h, 'id_rubrique'); |
|
| 225 | + $has = array_merge($has, $h); |
|
| 226 | + $fratrie = array_diff($fratrie, $h); |
|
| 227 | + } |
|
| 228 | + |
|
| 229 | + if (count($has)) { |
|
| 230 | + $has_child = $has_child + array_combine($has, array_pad([], count($has), true)); |
|
| 231 | + } |
|
| 232 | + if (count($fratrie)) { |
|
| 233 | + $has_child = $has_child + array_combine($fratrie, array_pad([], count($fratrie), false)); |
|
| 234 | + } |
|
| 235 | + } |
|
| 236 | + |
|
| 237 | + return $has_child[$id_rubrique] ? ' ' : ''; |
|
| 238 | 238 | } |
@@ -11,53 +11,53 @@ |
||
| 11 | 11 | \***************************************************************************/ |
| 12 | 12 | |
| 13 | 13 | if (!defined('_ECRIRE_INC_VERSION')) { |
| 14 | - return; |
|
| 14 | + return; |
|
| 15 | 15 | } |
| 16 | 16 | |
| 17 | 17 | // Fonction appelee par divers pipelines |
| 18 | 18 | function notifications_instituerarticle_dist($quoi, $id_article, $options) { |
| 19 | 19 | |
| 20 | - // ne devrait jamais se produire |
|
| 21 | - if ($options['statut'] == $options['statut_ancien']) { |
|
| 22 | - spip_log('statut inchange', 'notifications'); |
|
| 23 | - |
|
| 24 | - return; |
|
| 25 | - } |
|
| 26 | - |
|
| 27 | - include_spip('inc/texte'); |
|
| 28 | - |
|
| 29 | - $modele = ''; |
|
| 30 | - if ($options['statut'] == 'publie') { |
|
| 31 | - if ( |
|
| 32 | - $GLOBALS['meta']['post_dates'] == 'non' |
|
| 33 | - and strtotime($options['date']) > time() |
|
| 34 | - ) { |
|
| 35 | - $modele = 'notifications/article_valide'; |
|
| 36 | - } else { |
|
| 37 | - $modele = 'notifications/article_publie'; |
|
| 38 | - } |
|
| 39 | - } |
|
| 40 | - |
|
| 41 | - if ($options['statut'] == 'prop' and $options['statut_ancien'] != 'publie') { |
|
| 42 | - $modele = 'notifications/article_propose'; |
|
| 43 | - } |
|
| 44 | - |
|
| 45 | - if ($modele) { |
|
| 46 | - $destinataires = []; |
|
| 47 | - if ($GLOBALS['meta']['suivi_edito'] == 'oui') { |
|
| 48 | - $destinataires = explode(',', $GLOBALS['meta']['adresse_suivi']); |
|
| 49 | - } |
|
| 50 | - |
|
| 51 | - |
|
| 52 | - $destinataires = pipeline( |
|
| 53 | - 'notifications_destinataires', |
|
| 54 | - [ |
|
| 55 | - 'args' => ['quoi' => $quoi, 'id' => $id_article, 'options' => $options], |
|
| 56 | - 'data' => $destinataires |
|
| 57 | - ] |
|
| 58 | - ); |
|
| 59 | - |
|
| 60 | - $texte = email_notification_article($id_article, $modele); |
|
| 61 | - notifications_envoyer_mails($destinataires, $texte); |
|
| 62 | - } |
|
| 20 | + // ne devrait jamais se produire |
|
| 21 | + if ($options['statut'] == $options['statut_ancien']) { |
|
| 22 | + spip_log('statut inchange', 'notifications'); |
|
| 23 | + |
|
| 24 | + return; |
|
| 25 | + } |
|
| 26 | + |
|
| 27 | + include_spip('inc/texte'); |
|
| 28 | + |
|
| 29 | + $modele = ''; |
|
| 30 | + if ($options['statut'] == 'publie') { |
|
| 31 | + if ( |
|
| 32 | + $GLOBALS['meta']['post_dates'] == 'non' |
|
| 33 | + and strtotime($options['date']) > time() |
|
| 34 | + ) { |
|
| 35 | + $modele = 'notifications/article_valide'; |
|
| 36 | + } else { |
|
| 37 | + $modele = 'notifications/article_publie'; |
|
| 38 | + } |
|
| 39 | + } |
|
| 40 | + |
|
| 41 | + if ($options['statut'] == 'prop' and $options['statut_ancien'] != 'publie') { |
|
| 42 | + $modele = 'notifications/article_propose'; |
|
| 43 | + } |
|
| 44 | + |
|
| 45 | + if ($modele) { |
|
| 46 | + $destinataires = []; |
|
| 47 | + if ($GLOBALS['meta']['suivi_edito'] == 'oui') { |
|
| 48 | + $destinataires = explode(',', $GLOBALS['meta']['adresse_suivi']); |
|
| 49 | + } |
|
| 50 | + |
|
| 51 | + |
|
| 52 | + $destinataires = pipeline( |
|
| 53 | + 'notifications_destinataires', |
|
| 54 | + [ |
|
| 55 | + 'args' => ['quoi' => $quoi, 'id' => $id_article, 'options' => $options], |
|
| 56 | + 'data' => $destinataires |
|
| 57 | + ] |
|
| 58 | + ); |
|
| 59 | + |
|
| 60 | + $texte = email_notification_article($id_article, $modele); |
|
| 61 | + notifications_envoyer_mails($destinataires, $texte); |
|
| 62 | + } |
|
| 63 | 63 | } |
@@ -11,7 +11,7 @@ discard block |
||
| 11 | 11 | \***************************************************************************/ |
| 12 | 12 | |
| 13 | 13 | if (!defined('_ECRIRE_INC_VERSION')) { |
| 14 | - return; |
|
| 14 | + return; |
|
| 15 | 15 | } |
| 16 | 16 | |
| 17 | 17 | |
@@ -21,18 +21,18 @@ discard block |
||
| 21 | 21 | |
| 22 | 22 | |
| 23 | 23 | function req_sqlite3_dist($addr, $port, $login, $pass, $db = '', $prefixe = '') { |
| 24 | - return req_sqlite_dist($addr, $port, $login, $pass, $db, $prefixe, $sqlite_version = 3); |
|
| 24 | + return req_sqlite_dist($addr, $port, $login, $pass, $db, $prefixe, $sqlite_version = 3); |
|
| 25 | 25 | } |
| 26 | 26 | |
| 27 | 27 | |
| 28 | 28 | function spip_sqlite3_constantes() { |
| 29 | - if (!defined('SPIP_SQLITE3_ASSOC')) { |
|
| 30 | - define('SPIP_SQLITE3_ASSOC', PDO::FETCH_ASSOC); |
|
| 31 | - define('SPIP_SQLITE3_NUM', PDO::FETCH_NUM); |
|
| 32 | - define('SPIP_SQLITE3_BOTH', PDO::FETCH_BOTH); |
|
| 33 | - } |
|
| 29 | + if (!defined('SPIP_SQLITE3_ASSOC')) { |
|
| 30 | + define('SPIP_SQLITE3_ASSOC', PDO::FETCH_ASSOC); |
|
| 31 | + define('SPIP_SQLITE3_NUM', PDO::FETCH_NUM); |
|
| 32 | + define('SPIP_SQLITE3_BOTH', PDO::FETCH_BOTH); |
|
| 33 | + } |
|
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | function spip_versions_sqlite3() { |
| 37 | - return _sqlite_charger_version(3) ? 3 : false; |
|
| 37 | + return _sqlite_charger_version(3) ? 3 : false; |
|
| 38 | 38 | } |
