@@ -21,22 +21,22 @@ discard block |
||
| 21 | 21 | return; |
| 22 | 22 | } |
| 23 | 23 | |
| 24 | -require_once __DIR__ . '/bootstrap/config/initial.php'; |
|
| 24 | +require_once __DIR__.'/bootstrap/config/initial.php'; |
|
| 25 | 25 | |
| 26 | 26 | // inclure l'ecran de securite si il n'a pas été inclus en prepend php |
| 27 | 27 | if ( |
| 28 | 28 | !defined('_ECRAN_SECURITE') |
| 29 | - && @file_exists($f = _ROOT_RACINE . _NOM_PERMANENTS_INACCESSIBLES . 'ecran_securite.php') |
|
| 29 | + && @file_exists($f = _ROOT_RACINE._NOM_PERMANENTS_INACCESSIBLES.'ecran_securite.php') |
|
| 30 | 30 | ) { |
| 31 | 31 | include $f; |
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | // et on peut lancer l'autoloader |
| 35 | -require_once dirname(__DIR__) . '/vendor/autoload.php'; |
|
| 35 | +require_once dirname(__DIR__).'/vendor/autoload.php'; |
|
| 36 | 36 | |
| 37 | -require_once __DIR__ . '/bootstrap/config/globals.php'; |
|
| 38 | -require_once __DIR__ . '/bootstrap/proxy.php'; |
|
| 39 | -require_once __DIR__ . '/bootstrap/mitigation.php'; |
|
| 37 | +require_once __DIR__.'/bootstrap/config/globals.php'; |
|
| 38 | +require_once __DIR__.'/bootstrap/proxy.php'; |
|
| 39 | +require_once __DIR__.'/bootstrap/mitigation.php'; |
|
| 40 | 40 | |
| 41 | 41 | // numero de branche, utilise par les plugins |
| 42 | 42 | // pour specifier les versions de SPIP necessaires |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | // |
| 71 | 71 | // Charger les fonctions liees aux serveurs Http et Sql. |
| 72 | 72 | // |
| 73 | -require_once __DIR__ . '/bootstrap/functions.php'; |
|
| 73 | +require_once __DIR__.'/bootstrap/functions.php'; |
|
| 74 | 74 | |
| 75 | 75 | // Definition personnelles eventuelles |
| 76 | 76 | |
@@ -94,10 +94,10 @@ discard block |
||
| 94 | 94 | // ===> on execute en neutralisant les messages d'erreur |
| 95 | 95 | |
| 96 | 96 | spip_initialisation_core( |
| 97 | - (_DIR_RACINE . _NOM_PERMANENTS_INACCESSIBLES), |
|
| 98 | - (_DIR_RACINE . _NOM_PERMANENTS_ACCESSIBLES), |
|
| 99 | - (_DIR_RACINE . _NOM_TEMPORAIRES_INACCESSIBLES), |
|
| 100 | - (_DIR_RACINE . _NOM_TEMPORAIRES_ACCESSIBLES) |
|
| 97 | + (_DIR_RACINE._NOM_PERMANENTS_INACCESSIBLES), |
|
| 98 | + (_DIR_RACINE._NOM_PERMANENTS_ACCESSIBLES), |
|
| 99 | + (_DIR_RACINE._NOM_TEMPORAIRES_INACCESSIBLES), |
|
| 100 | + (_DIR_RACINE._NOM_TEMPORAIRES_ACCESSIBLES) |
|
| 101 | 101 | ); |
| 102 | 102 | |
| 103 | 103 | // chargement des plugins : doit arriver en dernier |
@@ -153,7 +153,7 @@ discard block |
||
| 153 | 153 | include_spip('inc/lang'); |
| 154 | 154 | utiliser_langue_visiteur(); |
| 155 | 155 | include_spip('inc/minipres'); |
| 156 | - echo minipres(_T('info_travaux_titre'), "<p style='text-align: center;'>" . _T('info_travaux_texte') . '</p>', ['status' => 503]); |
|
| 156 | + echo minipres(_T('info_travaux_titre'), "<p style='text-align: center;'>"._T('info_travaux_texte').'</p>', ['status' => 503]); |
|
| 157 | 157 | exit; |
| 158 | 158 | } |
| 159 | 159 | // autrement c'est une install ad hoc (spikini...), on sait pas faire |
@@ -192,12 +192,12 @@ discard block |
||
| 192 | 192 | } |
| 193 | 193 | if (!isset($GLOBALS['spip_header_silencieux']) || !$GLOBALS['spip_header_silencieux']) { |
| 194 | 194 | include_spip('inc/filtres_mini'); |
| 195 | - header(_HEADER_COMPOSED_BY . " $spip_version_affichee @ www.spip.net + " . url_absolue(_DIR_VAR . 'config.txt')); |
|
| 195 | + header(_HEADER_COMPOSED_BY." $spip_version_affichee @ www.spip.net + ".url_absolue(_DIR_VAR.'config.txt')); |
|
| 196 | 196 | } else { |
| 197 | 197 | // header minimal |
| 198 | - header(_HEADER_COMPOSED_BY . ' @ www.spip.net'); |
|
| 198 | + header(_HEADER_COMPOSED_BY.' @ www.spip.net'); |
|
| 199 | 199 | } |
| 200 | 200 | } |
| 201 | 201 | |
| 202 | 202 | $methode = ($_SERVER['REQUEST_METHOD'] ?? ((php_sapi_name() == 'cli') ? 'cli' : '')); |
| 203 | -spip_log($methode . ' ' . self() . ' - ' . _FILE_CONNECT, _LOG_DEBUG); |
|
| 203 | +spip_log($methode.' '.self().' - '._FILE_CONNECT, _LOG_DEBUG); |
|
@@ -6,19 +6,19 @@ |
||
| 6 | 6 | * Ces fichiers ne peuvent pas être surchargés dans des plugins |
| 7 | 7 | */ |
| 8 | 8 | |
| 9 | -include_once __DIR__ . '/inc/auth.php'; |
|
| 10 | -include_once __DIR__ . '/inc/form.php'; |
|
| 11 | -include_once __DIR__ . '/inc/initialization.php'; |
|
| 12 | -include_once __DIR__ . '/inc/i18n.php'; |
|
| 13 | -include_once __DIR__ . '/inc/jobs.php'; |
|
| 14 | -include_once __DIR__ . '/inc/loading.php'; |
|
| 15 | -include_once __DIR__ . '/inc/logging.php'; |
|
| 16 | -include_once __DIR__ . '/inc/path.php'; |
|
| 17 | -include_once __DIR__ . '/inc/pipeline.php'; |
|
| 18 | -include_once __DIR__ . '/inc/request.php'; |
|
| 19 | -include_once __DIR__ . '/inc/sanitize.php'; |
|
| 20 | -include_once __DIR__ . '/inc/templating.php'; |
|
| 21 | -include_once __DIR__ . '/inc/utils.php'; |
|
| 22 | -include_once __DIR__ . '/inc/urls.php'; |
|
| 23 | -require_once dirname(__DIR__) . '/base/connect_sql.php'; |
|
| 9 | +include_once __DIR__.'/inc/auth.php'; |
|
| 10 | +include_once __DIR__.'/inc/form.php'; |
|
| 11 | +include_once __DIR__.'/inc/initialization.php'; |
|
| 12 | +include_once __DIR__.'/inc/i18n.php'; |
|
| 13 | +include_once __DIR__.'/inc/jobs.php'; |
|
| 14 | +include_once __DIR__.'/inc/loading.php'; |
|
| 15 | +include_once __DIR__.'/inc/logging.php'; |
|
| 16 | +include_once __DIR__.'/inc/path.php'; |
|
| 17 | +include_once __DIR__.'/inc/pipeline.php'; |
|
| 18 | +include_once __DIR__.'/inc/request.php'; |
|
| 19 | +include_once __DIR__.'/inc/sanitize.php'; |
|
| 20 | +include_once __DIR__.'/inc/templating.php'; |
|
| 21 | +include_once __DIR__.'/inc/utils.php'; |
|
| 22 | +include_once __DIR__.'/inc/urls.php'; |
|
| 23 | +require_once dirname(__DIR__).'/base/connect_sql.php'; |
|
| 24 | 24 | |
@@ -15,7 +15,7 @@ |
||
| 15 | 15 | // UA plus cibles |
| 16 | 16 | . '80legs|accoona|AltaVista|ASPSeek|Baidu|Charlotte|EC2LinkFinder|eStyle|facebook|flipboard|hootsuite|FunWebProducts|Google|Genieo|INA dlweb|InfegyAtlas|Java VM|LiteFinder|Lycos|MetaURI|Moreover|Rambler|Scooter|ScrubbyBloglines|Yahoo|Yeti' |
| 17 | 17 | . ',i', |
| 18 | - (string)$_SERVER['HTTP_USER_AGENT'] |
|
| 18 | + (string) $_SERVER['HTTP_USER_AGENT'] |
|
| 19 | 19 | ) |
| 20 | 20 | ); |
| 21 | 21 | } |
@@ -129,7 +129,7 @@ discard block |
||
| 129 | 129 | $value = interdire_scripts($value, -1); |
| 130 | 130 | } |
| 131 | 131 | if (!empty($options['class'])) { |
| 132 | - $value = "<span class='" . $options['class'] . "'>$value</span>"; |
|
| 132 | + $value = "<span class='".$options['class']."'>$value</span>"; |
|
| 133 | 133 | } |
| 134 | 134 | $text = str_replace("@$name@", (string) $value, (string) $text); |
| 135 | 135 | unset($args[$name]); |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | // Si des variables n'ont pas ete inserees, le signaler |
| 139 | 139 | // (chaines de langues pas a jour) |
| 140 | 140 | if ($args) { |
| 141 | - spip_log("$f: variables inutilisees " . join(', ', array_keys($args)), _LOG_DEBUG); |
|
| 141 | + spip_log("$f: variables inutilisees ".join(', ', array_keys($args)), _LOG_DEBUG); |
|
| 142 | 142 | } |
| 143 | 143 | } |
| 144 | 144 | |
@@ -99,11 +99,11 @@ |
||
| 99 | 99 | $GLOBALS['_INC_PUBLIC']++; |
| 100 | 100 | |
| 101 | 101 | // fix #4235 |
| 102 | - $cache_utilise_session_appelant = ($GLOBALS['cache_utilise_session'] ?? null); |
|
| 102 | + $cache_utilise_session_appelant = ($GLOBALS['cache_utilise_session'] ?? null); |
|
| 103 | 103 | |
| 104 | 104 | |
| 105 | 105 | foreach (is_array($fond) ? $fond : [$fond] as $f) { |
| 106 | - unset($GLOBALS['cache_utilise_session']); // fix #4235 |
|
| 106 | + unset($GLOBALS['cache_utilise_session']); // fix #4235 |
|
| 107 | 107 | |
| 108 | 108 | $page = evaluer_fond($f, $contexte, $connect); |
| 109 | 109 | if ($page === '') { |
@@ -32,12 +32,12 @@ discard block |
||
| 32 | 32 | if (strlen($dossier) && !str_ends_with($dossier, '/')) { |
| 33 | 33 | $dossier .= '/'; |
| 34 | 34 | } |
| 35 | - $f = str_replace('/', '_', $dossier) . $nom; |
|
| 35 | + $f = str_replace('/', '_', $dossier).$nom; |
|
| 36 | 36 | |
| 37 | 37 | if (function_exists($f)) { |
| 38 | 38 | return $f; |
| 39 | 39 | } |
| 40 | - if (function_exists($g = $f . '_dist')) { |
|
| 40 | + if (function_exists($g = $f.'_dist')) { |
|
| 41 | 41 | return $g; |
| 42 | 42 | } |
| 43 | 43 | |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | // passer en minuscules (cf les balises de formulaires) |
| 59 | 59 | // et inclure le fichier |
| 60 | 60 | if ( |
| 61 | - !($inc = include_spip($dossier . ($d = strtolower($nom)))) |
|
| 61 | + !($inc = include_spip($dossier.($d = strtolower($nom)))) |
|
| 62 | 62 | && strlen(dirname($dossier)) |
| 63 | 63 | && dirname($dossier) != '.' |
| 64 | 64 | ) { |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | } |
| 77 | 77 | |
| 78 | 78 | // Echec : message d'erreur |
| 79 | - spip_log("fonction $nom ($f ou $g) indisponible" . |
|
| 79 | + spip_log("fonction $nom ($f ou $g) indisponible". |
|
| 80 | 80 | ($inc ? '' : " (fichier $d absent de $dossier)")); |
| 81 | 81 | |
| 82 | 82 | include_spip('inc/minipres'); |
@@ -84,12 +84,12 @@ discard block |
||
| 84 | 84 | echo minipres( |
| 85 | 85 | _T('forum_titre_erreur'), |
| 86 | 86 | $inc ? |
| 87 | - _T('fonction_introuvable', ['fonction' => '<code>' . spip_htmlentities($f) . '</code>']) |
|
| 87 | + _T('fonction_introuvable', ['fonction' => '<code>'.spip_htmlentities($f).'</code>']) |
|
| 88 | 88 | . '<br />' |
| 89 | - . _T('fonction_introuvable', ['fonction' => '<code>' . spip_htmlentities($g) . '</code>']) |
|
| 89 | + . _T('fonction_introuvable', ['fonction' => '<code>'.spip_htmlentities($g).'</code>']) |
|
| 90 | 90 | : |
| 91 | - _T('fichier_introuvable', ['fichier' => '<code>' . spip_htmlentities($d) . '</code>']), |
|
| 92 | - ['all_inline' => true,'status' => 404] |
|
| 91 | + _T('fichier_introuvable', ['fichier' => '<code>'.spip_htmlentities($d).'</code>']), |
|
| 92 | + ['all_inline' => true, 'status' => 404] |
|
| 93 | 93 | ); |
| 94 | 94 | exit; |
| 95 | 95 | } |
@@ -135,7 +135,7 @@ discard block |
||
| 135 | 135 | * - string : chemin du fichier trouvé |
| 136 | 136 | **/ |
| 137 | 137 | function include_spip($f, $include = true) { |
| 138 | - return find_in_path($f . '.php', '', $include); |
|
| 138 | + return find_in_path($f.'.php', '', $include); |
|
| 139 | 139 | } |
| 140 | 140 | |
| 141 | 141 | /** |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | * - string : chemin du fichier trouvé |
| 156 | 156 | **/ |
| 157 | 157 | function require_spip($f) { |
| 158 | - return find_in_path($f . '.php', '', 'required'); |
|
| 158 | + return find_in_path($f.'.php', '', 'required'); |
|
| 159 | 159 | } |
| 160 | 160 | |
| 161 | 161 | |
@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | // donc il faut l'inclure "en globals" |
| 174 | 174 | if ($f = find_in_path('mes_fonctions.php')) { |
| 175 | 175 | global $dossier_squelettes; |
| 176 | - include_once(_ROOT_CWD . $f); |
|
| 176 | + include_once(_ROOT_CWD.$f); |
|
| 177 | 177 | } |
| 178 | 178 | |
| 179 | 179 | if (@is_readable(_CACHE_PLUGINS_FCT)) { |
@@ -201,8 +201,8 @@ discard block |
||
| 201 | 201 | if ($type === 'defaut') { |
| 202 | 202 | $objet = objet_type($quoi); |
| 203 | 203 | if ( |
| 204 | - ($f = charger_fonction('generer_' . $objet . '_url', 'urls', true)) |
|
| 205 | - || ($f = charger_fonction('generer_url_' . $objet, 'urls', true)) // deprecated |
|
| 204 | + ($f = charger_fonction('generer_'.$objet.'_url', 'urls', true)) |
|
| 205 | + || ($f = charger_fonction('generer_url_'.$objet, 'urls', true)) // deprecated |
|
| 206 | 206 | ) { |
| 207 | 207 | return $f; |
| 208 | 208 | } |
@@ -215,7 +215,7 @@ discard block |
||
| 215 | 215 | } |
| 216 | 216 | |
| 217 | 217 | // inclure le module d'url |
| 218 | - include_spip('urls/' . $url_type); |
|
| 218 | + include_spip('urls/'.$url_type); |
|
| 219 | 219 | |
| 220 | 220 | switch ($quoi) { |
| 221 | 221 | case 'page': |
@@ -277,7 +277,7 @@ discard block |
||
| 277 | 277 | * @return array|string |
| 278 | 278 | */ |
| 279 | 279 | function trouver_fond($nom, $dir = '', $pathinfo = false) { |
| 280 | - $f = find_in_path($nom . '.' . _EXTENSION_SQUELETTES, $dir ? rtrim($dir, '/') . '/' : ''); |
|
| 280 | + $f = find_in_path($nom.'.'._EXTENSION_SQUELETTES, $dir ? rtrim($dir, '/').'/' : ''); |
|
| 281 | 281 | if (!$pathinfo) { |
| 282 | 282 | return $f; |
| 283 | 283 | } |
@@ -39,22 +39,22 @@ discard block |
||
| 39 | 39 | |
| 40 | 40 | // le nom du repertoire plugins/ activables/desactivables |
| 41 | 41 | if (!defined('_DIR_PLUGINS')) { |
| 42 | - define('_DIR_PLUGINS', _DIR_RACINE . 'plugins/'); |
|
| 42 | + define('_DIR_PLUGINS', _DIR_RACINE.'plugins/'); |
|
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | // le nom du repertoire des extensions/ permanentes du core, toujours actives |
| 46 | 46 | if (!defined('_DIR_PLUGINS_DIST')) { |
| 47 | - define('_DIR_PLUGINS_DIST', _DIR_RACINE . 'plugins-dist/'); |
|
| 47 | + define('_DIR_PLUGINS_DIST', _DIR_RACINE.'plugins-dist/'); |
|
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | // le nom du repertoire des librairies |
| 51 | 51 | if (!defined('_DIR_LIB')) { |
| 52 | - define('_DIR_LIB', _DIR_RACINE . 'lib/'); |
|
| 52 | + define('_DIR_LIB', _DIR_RACINE.'lib/'); |
|
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | // répertoire des libs via Composer |
| 56 | 56 | if (!defined('_DIR_VENDOR')) { |
| 57 | - define('_DIR_VENDOR', _DIR_RACINE . 'vendor/'); |
|
| 57 | + define('_DIR_VENDOR', _DIR_RACINE.'vendor/'); |
|
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | if (!defined('_DIR_IMG')) { |
@@ -64,29 +64,29 @@ discard block |
||
| 64 | 64 | define('_DIR_LOGOS', $pa); |
| 65 | 65 | } |
| 66 | 66 | if (!defined('_DIR_IMG_ICONES')) { |
| 67 | - define('_DIR_IMG_ICONES', _DIR_LOGOS . 'icones/'); |
|
| 67 | + define('_DIR_IMG_ICONES', _DIR_LOGOS.'icones/'); |
|
| 68 | 68 | } |
| 69 | 69 | |
| 70 | 70 | if (!defined('_DIR_DUMP')) { |
| 71 | - define('_DIR_DUMP', $ti . 'dump/'); |
|
| 71 | + define('_DIR_DUMP', $ti.'dump/'); |
|
| 72 | 72 | } |
| 73 | 73 | if (!defined('_DIR_SESSIONS')) { |
| 74 | - define('_DIR_SESSIONS', $ti . 'sessions/'); |
|
| 74 | + define('_DIR_SESSIONS', $ti.'sessions/'); |
|
| 75 | 75 | } |
| 76 | 76 | if (!defined('_DIR_TRANSFERT')) { |
| 77 | - define('_DIR_TRANSFERT', $ti . 'upload/'); |
|
| 77 | + define('_DIR_TRANSFERT', $ti.'upload/'); |
|
| 78 | 78 | } |
| 79 | 79 | if (!defined('_DIR_CACHE')) { |
| 80 | - define('_DIR_CACHE', $ti . 'cache/'); |
|
| 80 | + define('_DIR_CACHE', $ti.'cache/'); |
|
| 81 | 81 | } |
| 82 | 82 | if (!defined('_DIR_CACHE_XML')) { |
| 83 | - define('_DIR_CACHE_XML', _DIR_CACHE . 'xml/'); |
|
| 83 | + define('_DIR_CACHE_XML', _DIR_CACHE.'xml/'); |
|
| 84 | 84 | } |
| 85 | 85 | if (!defined('_DIR_SKELS')) { |
| 86 | - define('_DIR_SKELS', _DIR_CACHE . 'skel/'); |
|
| 86 | + define('_DIR_SKELS', _DIR_CACHE.'skel/'); |
|
| 87 | 87 | } |
| 88 | 88 | if (!defined('_DIR_AIDE')) { |
| 89 | - define('_DIR_AIDE', _DIR_CACHE . 'aide/'); |
|
| 89 | + define('_DIR_AIDE', _DIR_CACHE.'aide/'); |
|
| 90 | 90 | } |
| 91 | 91 | if (!defined('_DIR_TMP')) { |
| 92 | 92 | define('_DIR_TMP', $ti); |
@@ -115,27 +115,27 @@ discard block |
||
| 115 | 115 | // Declaration des fichiers |
| 116 | 116 | |
| 117 | 117 | if (!defined('_CACHE_PLUGINS_PATH')) { |
| 118 | - define('_CACHE_PLUGINS_PATH', _DIR_CACHE . 'charger_plugins_chemins.php'); |
|
| 118 | + define('_CACHE_PLUGINS_PATH', _DIR_CACHE.'charger_plugins_chemins.php'); |
|
| 119 | 119 | } |
| 120 | 120 | if (!defined('_CACHE_PLUGINS_OPT')) { |
| 121 | - define('_CACHE_PLUGINS_OPT', _DIR_CACHE . 'charger_plugins_options.php'); |
|
| 121 | + define('_CACHE_PLUGINS_OPT', _DIR_CACHE.'charger_plugins_options.php'); |
|
| 122 | 122 | } |
| 123 | 123 | if (!defined('_CACHE_PLUGINS_FCT')) { |
| 124 | - define('_CACHE_PLUGINS_FCT', _DIR_CACHE . 'charger_plugins_fonctions.php'); |
|
| 124 | + define('_CACHE_PLUGINS_FCT', _DIR_CACHE.'charger_plugins_fonctions.php'); |
|
| 125 | 125 | } |
| 126 | 126 | if (!defined('_CACHE_PIPELINES')) { |
| 127 | - define('_CACHE_PIPELINES', _DIR_CACHE . 'charger_pipelines.php'); |
|
| 127 | + define('_CACHE_PIPELINES', _DIR_CACHE.'charger_pipelines.php'); |
|
| 128 | 128 | } |
| 129 | 129 | if (!defined('_CACHE_CHEMIN')) { |
| 130 | - define('_CACHE_CHEMIN', _DIR_CACHE . 'chemin.txt'); |
|
| 130 | + define('_CACHE_CHEMIN', _DIR_CACHE.'chemin.txt'); |
|
| 131 | 131 | } |
| 132 | 132 | |
| 133 | 133 | # attention .php obligatoire pour ecrire_fichier_securise |
| 134 | 134 | if (!defined('_FILE_META')) { |
| 135 | - define('_FILE_META', $ti . 'meta_cache.php'); |
|
| 135 | + define('_FILE_META', $ti.'meta_cache.php'); |
|
| 136 | 136 | } |
| 137 | 137 | if (!defined('_DIR_LOG')) { |
| 138 | - define('_DIR_LOG', _DIR_TMP . 'log/'); |
|
| 138 | + define('_DIR_LOG', _DIR_TMP.'log/'); |
|
| 139 | 139 | } |
| 140 | 140 | if (!defined('_FILE_LOG')) { |
| 141 | 141 | define('_FILE_LOG', 'spip'); |
@@ -151,7 +151,7 @@ discard block |
||
| 151 | 151 | if (!defined('_FILE_CONNECT')) { |
| 152 | 152 | define( |
| 153 | 153 | '_FILE_CONNECT', |
| 154 | - @is_readable($f = _DIR_CONNECT . _FILE_CONNECT_INS . '.php') ? $f : false |
|
| 154 | + @is_readable($f = _DIR_CONNECT._FILE_CONNECT_INS.'.php') ? $f : false |
|
| 155 | 155 | ); |
| 156 | 156 | } |
| 157 | 157 | |
@@ -162,7 +162,7 @@ discard block |
||
| 162 | 162 | if (!defined('_FILE_CHMOD')) { |
| 163 | 163 | define( |
| 164 | 164 | '_FILE_CHMOD', |
| 165 | - @is_readable($f = _DIR_CHMOD . _FILE_CHMOD_INS . '.php') ? $f : false |
|
| 165 | + @is_readable($f = _DIR_CHMOD._FILE_CHMOD_INS.'.php') ? $f : false |
|
| 166 | 166 | ); |
| 167 | 167 | } |
| 168 | 168 | |
@@ -174,10 +174,10 @@ discard block |
||
| 174 | 174 | define('_FILE_TMP_SUFFIX', '.tmp.php'); |
| 175 | 175 | } |
| 176 | 176 | if (!defined('_FILE_CONNECT_TMP')) { |
| 177 | - define('_FILE_CONNECT_TMP', _DIR_CONNECT . _FILE_CONNECT_INS . _FILE_TMP_SUFFIX); |
|
| 177 | + define('_FILE_CONNECT_TMP', _DIR_CONNECT._FILE_CONNECT_INS._FILE_TMP_SUFFIX); |
|
| 178 | 178 | } |
| 179 | 179 | if (!defined('_FILE_CHMOD_TMP')) { |
| 180 | - define('_FILE_CHMOD_TMP', _DIR_CHMOD . _FILE_CHMOD_INS . _FILE_TMP_SUFFIX); |
|
| 180 | + define('_FILE_CHMOD_TMP', _DIR_CHMOD._FILE_CHMOD_INS._FILE_TMP_SUFFIX); |
|
| 181 | 181 | } |
| 182 | 182 | |
| 183 | 183 | // Definition des droits d'acces en ecriture |
@@ -195,13 +195,13 @@ discard block |
||
| 195 | 195 | define('_DEFAULT_CHARSET', 'utf-8'); |
| 196 | 196 | } |
| 197 | 197 | if (!defined('_ROOT_PLUGINS')) { |
| 198 | - define('_ROOT_PLUGINS', _ROOT_RACINE . 'plugins/'); |
|
| 198 | + define('_ROOT_PLUGINS', _ROOT_RACINE.'plugins/'); |
|
| 199 | 199 | } |
| 200 | 200 | if (!defined('_ROOT_PLUGINS_DIST')) { |
| 201 | - define('_ROOT_PLUGINS_DIST', _ROOT_RACINE . 'plugins-dist/'); |
|
| 201 | + define('_ROOT_PLUGINS_DIST', _ROOT_RACINE.'plugins-dist/'); |
|
| 202 | 202 | } |
| 203 | 203 | if (!defined('_ROOT_PLUGINS_SUPPL') && defined('_DIR_PLUGINS_SUPPL') && _DIR_PLUGINS_SUPPL) { |
| 204 | - define('_ROOT_PLUGINS_SUPPL', _ROOT_RACINE . str_replace(_DIR_RACINE, '', _DIR_PLUGINS_SUPPL)); |
|
| 204 | + define('_ROOT_PLUGINS_SUPPL', _ROOT_RACINE.str_replace(_DIR_RACINE, '', _DIR_PLUGINS_SUPPL)); |
|
| 205 | 205 | } |
| 206 | 206 | |
| 207 | 207 | // La taille des Log |
@@ -238,7 +238,7 @@ discard block |
||
| 238 | 238 | // (non surchargeable en l'etat ; attention si on utilise include_spip() |
| 239 | 239 | // pour le rendre surchargeable, on va provoquer un reecriture |
| 240 | 240 | // systematique du noyau ou une baisse de perfs => a etudier) |
| 241 | - include_once _ROOT_RESTREINT . 'inc/flock.php'; |
|
| 241 | + include_once _ROOT_RESTREINT.'inc/flock.php'; |
|
| 242 | 242 | |
| 243 | 243 | // charger tout de suite le path et son cache |
| 244 | 244 | load_path_cache(); |
@@ -274,7 +274,7 @@ discard block |
||
| 274 | 274 | !empty($_SERVER['QUERY_STRING']) |
| 275 | 275 | && !strpos($_SERVER['REQUEST_URI'], '?') |
| 276 | 276 | ) { |
| 277 | - $GLOBALS['REQUEST_URI'] .= '?' . $_SERVER['QUERY_STRING']; |
|
| 277 | + $GLOBALS['REQUEST_URI'] .= '?'.$_SERVER['QUERY_STRING']; |
|
| 278 | 278 | } |
| 279 | 279 | } |
| 280 | 280 | |
@@ -310,7 +310,7 @@ discard block |
||
| 310 | 310 | ) { |
| 311 | 311 | if (isset($GLOBALS['meta']['adresse_site'])) { |
| 312 | 312 | $uri_ref = parse_url($GLOBALS['meta']['adresse_site']); |
| 313 | - $uri_ref = ($uri_ref['path'] ?? '') . '/'; |
|
| 313 | + $uri_ref = ($uri_ref['path'] ?? '').'/'; |
|
| 314 | 314 | } else { |
| 315 | 315 | $uri_ref = ''; |
| 316 | 316 | } |
@@ -404,7 +404,7 @@ discard block |
||
| 404 | 404 | } |
| 405 | 405 | if (!defined('_CACHE_RUBRIQUES')) { |
| 406 | 406 | /** Fichier cache pour le navigateur de rubrique du bandeau */ |
| 407 | - define('_CACHE_RUBRIQUES', _DIR_TMP . 'menu-rubriques-cache.txt'); |
|
| 407 | + define('_CACHE_RUBRIQUES', _DIR_TMP.'menu-rubriques-cache.txt'); |
|
| 408 | 408 | } |
| 409 | 409 | if (!defined('_CACHE_RUBRIQUES_MAX')) { |
| 410 | 410 | /** Nombre maxi de rubriques enfants affichées pour chaque rubrique du navigateur de rubrique du bandeau */ |
@@ -627,7 +627,7 @@ discard block |
||
| 627 | 627 | } |
| 628 | 628 | if (isset($GLOBALS['visiteur_session']['nom'])) { |
| 629 | 629 | spip_log($GLOBALS['visiteur_session']['nom'] |
| 630 | - . ' ' . _VAR_MODE); |
|
| 630 | + . ' '._VAR_MODE); |
|
| 631 | 631 | } |
| 632 | 632 | } // pas autorise ? |
| 633 | 633 | else { |
@@ -642,7 +642,7 @@ discard block |
||
| 642 | 642 | if (!str_contains($self, 'page=login')) { |
| 643 | 643 | include_spip('inc/headers'); |
| 644 | 644 | $redirect = parametre_url(self('&', true), 'var_mode', $_GET['var_mode'], '&'); |
| 645 | - redirige_par_entete(generer_url_public('login', 'url=' . rawurlencode($redirect), true)); |
|
| 645 | + redirige_par_entete(generer_url_public('login', 'url='.rawurlencode($redirect), true)); |
|
| 646 | 646 | } |
| 647 | 647 | } |
| 648 | 648 | // sinon tant pis |
@@ -32,8 +32,7 @@ discard block |
||
| 32 | 32 | . "><div>\n" |
| 33 | 33 | . "<input type='hidden' name='exec' value='$script1' />" |
| 34 | 34 | . $corps |
| 35 | - . (!$submit ? '' : |
|
| 36 | - ("<div style='text-align: " . $GLOBALS['spip_lang_right'] . "'><input class='fondo submit btn' type='submit' value=\"" . entites_html($submit) . '" /></div>')) |
|
| 35 | + . (!$submit ? '' : ("<div style='text-align: ".$GLOBALS['spip_lang_right']."'><input class='fondo submit btn' type='submit' value=\"".entites_html($submit).'" /></div>')) |
|
| 37 | 36 | . "</div></form>\n"; |
| 38 | 37 | } |
| 39 | 38 | |
@@ -58,13 +57,13 @@ discard block |
||
| 58 | 57 | ? generer_url_ecrire(_request('exec')) |
| 59 | 58 | : generer_url_public(); |
| 60 | 59 | |
| 61 | - return "\n<form action='" . |
|
| 62 | - $h . |
|
| 63 | - "'" . |
|
| 64 | - $atts . |
|
| 65 | - ">\n" . |
|
| 66 | - '<div>' . |
|
| 67 | - "\n<input type='hidden' name='action' value='$script' />" . |
|
| 68 | - $corps . |
|
| 60 | + return "\n<form action='". |
|
| 61 | + $h. |
|
| 62 | + "'". |
|
| 63 | + $atts. |
|
| 64 | + ">\n". |
|
| 65 | + '<div>'. |
|
| 66 | + "\n<input type='hidden' name='action' value='$script' />". |
|
| 67 | + $corps. |
|
| 69 | 68 | '</div></form>'; |
| 70 | 69 | } |
@@ -91,7 +91,7 @@ |
||
| 91 | 91 | } |
| 92 | 92 | |
| 93 | 93 | // appliquer notre fonction si elle existe |
| 94 | - $fonc = 'execute_pipeline_' . strtolower($action); |
|
| 94 | + $fonc = 'execute_pipeline_'.strtolower($action); |
|
| 95 | 95 | if (function_exists($fonc)) { |
| 96 | 96 | $val = $fonc($val); |
| 97 | 97 | } // plantage ? |