@@ -118,11 +118,9 @@ |
||
| 118 | 118 | |
| 119 | 119 | if ($statut and test_espace_prive()) { |
| 120 | 120 | $footer = bouton_action(_T('public:accueil_site'), generer_url_ecrire('accueil')); |
| 121 | - } |
|
| 122 | - elseif (!empty($_COOKIE['spip_admin'])) { |
|
| 121 | + } elseif (!empty($_COOKIE['spip_admin'])) { |
|
| 123 | 122 | $footer = bouton_action(_T('public:lien_connecter'), generer_url_public('login')); |
| 124 | - } |
|
| 125 | - else { |
|
| 123 | + } else { |
|
| 126 | 124 | $footer = bouton_action(_T('public:accueil_site'), $GLOBALS['meta']['adresse_site']); |
| 127 | 125 | } |
| 128 | 126 | |
@@ -68,13 +68,11 @@ discard block |
||
| 68 | 68 | $f = find_in_path("$serveur.php", 'connect/'); |
| 69 | 69 | } |
| 70 | 70 | } |
| 71 | - } |
|
| 72 | - else { |
|
| 71 | + } else { |
|
| 73 | 72 | if (defined('_FILE_CONNECT') and _FILE_CONNECT) { |
| 74 | 73 | // init du serveur principal |
| 75 | 74 | $f = _FILE_CONNECT; |
| 76 | - } |
|
| 77 | - elseif ($install and defined('_FILE_CONNECT_TMP')) { |
|
| 75 | + } elseif ($install and defined('_FILE_CONNECT_TMP')) { |
|
| 78 | 76 | // installation en cours |
| 79 | 77 | $f = _FILE_CONNECT_TMP; |
| 80 | 78 | } |
@@ -87,8 +85,7 @@ discard block |
||
| 87 | 85 | if (!isset($GLOBALS['db_ok'])) { |
| 88 | 86 | spip_log("spip_connect: fichier de connexion '$f' OK mais echec connexion au serveur", _LOG_HS); |
| 89 | 87 | } |
| 90 | - } |
|
| 91 | - else { |
|
| 88 | + } else { |
|
| 92 | 89 | spip_log("spip_connect: fichier de connexion '$f' non trouve, pas de connexion serveur", _LOG_HS); |
| 93 | 90 | } |
| 94 | 91 | if (!isset($GLOBALS['db_ok'])) { |
@@ -456,8 +453,7 @@ discard block |
||
| 456 | 453 | and strpos($query_echappees, $part . $next, $currentpos) === $nextpos |
| 457 | 454 | ) { |
| 458 | 455 | $part .= array_shift($textes); |
| 459 | - } |
|
| 460 | - else { |
|
| 456 | + } else { |
|
| 461 | 457 | break; |
| 462 | 458 | } |
| 463 | 459 | } |