Don't display installer if not necessary

Fix already defined constants
Remove unused translation

diff --git a/galette/config/behavior.inc.php.dist b/galette/config/behavior.inc.php.dist
index f05ea19385094f336c10a276a8e5411c6494ff6b..2c59ae4791a5db47ff0d412f12299883e1e04ced 100644 (file)
--- a/galette/config/behavior.inc.php.dist
+++ b/galette/config/behavior.inc.php.dist
@@ -7,9 +7,9 @@
  *
  * PHP version 5
  *
- * Copyright © 2017 The Galette Team
+ * Copyright © 2017-2021 The Galette Team
  *
- * This file is part of Galette (http://galette.eu).
+ * This file is part of Galette (https://galette.eu).
  *
  * Galette is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,9 +28,10 @@
  * @package   Galette
  *
  * @author    Johan Cwiklinski <johan@x-tnd.be>
- * @copyright 2017 The Galette Team
+
+ * @copyright 2017-2021 The Galette Team
  * @license   http://www.gnu.org/licenses/gpl-3.0.html GPL License 3.0 or (at your option) any later version
- * @link      http://galette.eu
+ * @link      https://galette.eu
  */
 
 //change this *ONLY* for debug purposes!
@@ -52,3 +53,9 @@
  *  a single reverse proxy
  */
 //define('GALETTE_X_FORWARDED_FOR_INDEX', 1);
+
+/*
+ * Uncomment to enable the installer page even if galette is already installed and up to date
+ * @see https://bugs.galette.eu/issues/1574
+ */
+//define('FORCE_INSTALLER', true);

diff --git a/galette/includes/galette.inc.php b/galette/includes/galette.inc.php
index bbea374fb8dc94b2319612e43732d54073422792..ae55a2086184bafc0dddc1e1a126ac78ae23affe 100644 (file)
--- a/galette/includes/galette.inc.php
+++ b/galette/includes/galette.inc.php
@@ -68,6 +68,8 @@ $installed = file_exists(GALETTE_CONFIG_PATH . 'config.inc.php');
 if (!$installed && !$installer) {
     header('location: ./installer.php');
     die();
+} else if ($installed) {
+    include_once GALETTE_CONFIG_PATH . 'config.inc.php';
 }
 
 if (
@@ -77,11 +79,6 @@ if (
     include_once GALETTE_CONFIG_PATH . 'behavior.inc.php';
 }
 
-if (isset($installer) && $installer !== true) {
-    //If we're not working from installer
-    include_once GALETTE_CONFIG_PATH . 'config.inc.php';
-}
-
 use Analog\Analog;
 use Analog\Handler;
 use Analog\Handler\LevelName;
@@ -184,9 +181,8 @@ Analog::handler($galette_run_log);
 
 require_once GALETTE_ROOT . 'includes/functions.inc.php';
 
-if (!$installer and !defined('GALETTE_TESTS')) {
-    //If we're not working from installer nor from tests
-    include_once GALETTE_CONFIG_PATH . 'config.inc.php';
+//If we're not working from tests
+if ($installed && !defined('GALETTE_TESTS')) {
 
     /**
      * Database instantiation

diff --git a/galette/install/steps/end.php b/galette/install/steps/end.php
index 125edd688245dbec851d3d6202aa4da07641c301..11515bc1debaa48309683d25e4bf3b521dd11714 100644 (file)
--- a/galette/install/steps/end.php
+++ b/galette/install/steps/end.php
@@ -48,7 +48,6 @@ if ($install->isUpgrade()) {
     echo _T("Galette has been successfully updated!");
 }
 ?></p>
-                <div id="errorbox"><?php echo _T("To secure the system, please delete the install directory"); ?></div>
                 <form action="<?php echo GALETTE_BASE_PATH; ?>" method="get">
                     <p id="btn_box">
                         <button type="submit"><?php echo _T("Homepage"); ?> <i class="fas fa-home"></i></button>

diff --git a/galette/install/steps/galette.php b/galette/install/steps/galette.php
index 8b5c22d42f48e9760ad774d336447a189f47f5b9..e1060a99f0a61ae41f4ad435b6c458aa1fb190a5 100644 (file)
--- a/galette/install/steps/galette.php
+++ b/galette/install/steps/galette.php
@@ -44,6 +44,8 @@ $errs = array();
 $install->reinitReport();
 
 $config_file_ok = $install->writeConfFile();
+include_once GALETTE_CONFIG_PATH . 'config.inc.php';
+
 $objects_ok = $install->initObjects($i18n, $zdb, new Login($zdb, $i18n));
 ?>
                 <h2><?php echo $install->getStepTitle(); ?></h2>

diff --git a/galette/lang/galette.pot b/galette/lang/galette.pot
index c2d879541506068fb709d5941f90643d37f28a39..3b828067a31119f053e926fd3338f869378d4d62 100644 (file)
--- a/galette/lang/galette.pot
+++ b/galette/lang/galette.pot
@@ -3423,10 +3423,6 @@ msgstr ""
 msgid "Galette has been successfully updated!"
 msgstr ""
 
-#: ../install/steps/end.php:51
-msgid "To secure the system, please delete the install directory"
-msgstr ""
-
 #: ../install/steps/end.php:54
 msgid "Homepage"
 msgstr ""

diff --git a/galette/lang/galette_ar.utf8.po b/galette/lang/galette_ar.utf8.po
index 9a77b248f7cb7c1f5b4b14aaefc7ab2f6b84c7b5..4fc47a9ddc3de59b2bae4d16afaf614a90aad9a1 100644 (file)
--- a/galette/lang/galette_ar.utf8.po
+++ b/galette/lang/galette_ar.utf8.po
@@ -3444,10 +3444,6 @@ msgstr ""
 msgid "Galette has been successfully updated!"
 msgstr ""
 
-#: ../install/steps/end.php:51
-msgid "To secure the system, please delete the install directory"
-msgstr ""
-
 #: ../install/steps/end.php:54
 msgid "Homepage"
 msgstr "الصفحة الرئيسية"

diff --git a/galette/lang/galette_br.utf8.po b/galette/lang/galette_br.utf8.po
index f672ebe2370d1d05d870f42fd032bc2137be2b44..3aa5dd5f3a693295f620fb79ed6f28b4605ea165 100644 (file)
--- a/galette/lang/galette_br.utf8.po
+++ b/galette/lang/galette_br.utf8.po
@@ -3428,10 +3428,6 @@ msgstr ""
 msgid "Galette has been successfully updated!"
 msgstr ""
 
-#: ../install/steps/end.php:51
-msgid "To secure the system, please delete the install directory"
-msgstr ""
-
 #: ../install/steps/end.php:54
 msgid "Homepage"
 msgstr ""

diff --git a/galette/lang/galette_ca.utf8.po b/galette/lang/galette_ca.utf8.po
index 0f8f73cf204adcc4cd72395d8eaa87760a011290..3f1da6fa724cac3443a6e87f8d32f729d62facad 100644 (file)
--- a/galette/lang/galette_ca.utf8.po
+++ b/galette/lang/galette_ca.utf8.po
@@ -4143,12 +4143,6 @@ msgstr "La Galette s'ha instal·lat correctament!"
 msgid "Galette has been successfully updated!"
 msgstr "La Galette s'ha actualitzat correctament!"
 
-#: ../install/steps/end.php:51
-#, fuzzy
-msgid "To secure the system, please delete the install directory"
-msgstr ""
-"Per assegurar el sistema si us plau esborra el directori d'instal·lació"
-
 #: ../install/steps/end.php:54
 #, fuzzy
 msgid "Homepage"

diff --git a/galette/lang/galette_de_DE.utf8.po b/galette/lang/galette_de_DE.utf8.po
index 813a9b2ca22c66f7fc6ab2efd57ca7a551c77a1c..eaa444503a6e195927ec1fe6a1e432fa49abfcc7 100644 (file)
--- a/galette/lang/galette_de_DE.utf8.po
+++ b/galette/lang/galette_de_DE.utf8.po
@@ -3587,10 +3587,6 @@ msgstr "Galette wurde erfolgreich installiert!"
 msgid "Galette has been successfully updated!"
 msgstr "Galette wurde erfolgreich aktualisiert!"
 
-#: ../install/steps/end.php:51
-msgid "To secure the system, please delete the install directory"
-msgstr "Um das System zu schützen, löschen Sie bitte das install Verzeichnis"
-
 #: ../install/steps/end.php:54
 msgid "Homepage"
 msgstr "Homepage"

diff --git a/galette/lang/galette_en_US.po b/galette/lang/galette_en_US.po
index e8262905d1bda3c7a55e1937de747d9941e5ba82..074eeae65432515e4969c4bfc3203fbe38906771 100644 (file)
--- a/galette/lang/galette_en_US.po
+++ b/galette/lang/galette_en_US.po
@@ -3508,10 +3508,6 @@ msgstr "Galette has been successfully installed!"
 msgid "Galette has been successfully updated!"
 msgstr "Galette has been successfully updated!"
 
-#: ../install/steps/end.php:51
-msgid "To secure the system, please delete the install directory"
-msgstr "To secure the system, please delete the install directory"
-
 #: ../install/steps/end.php:54
 msgid "Homepage"
 msgstr "Homepage"

diff --git a/galette/lang/galette_es.utf8.po b/galette/lang/galette_es.utf8.po
index 65ae3b0d09793a5b67d8565c299b8744e236cbff..619d725a0af743a1a3fa5274f98d5662e977c415 100644 (file)
--- a/galette/lang/galette_es.utf8.po
+++ b/galette/lang/galette_es.utf8.po
@@ -3534,10 +3534,6 @@ msgstr ""
 msgid "Galette has been successfully updated!"
 msgstr ""
 
-#: ../install/steps/end.php:51
-msgid "To secure the system, please delete the install directory"
-msgstr ""
-
 #: ../install/steps/end.php:54
 msgid "Homepage"
 msgstr ""

diff --git a/galette/lang/galette_fr_FR.utf8.po b/galette/lang/galette_fr_FR.utf8.po
index c688d71c6a5bf4cf9ebff06a68904deba4e906e3..1434febf178b29bfdaf46b2d7944e8ca53c1ffc7 100644 (file)
--- a/galette/lang/galette_fr_FR.utf8.po
+++ b/galette/lang/galette_fr_FR.utf8.po
@@ -3592,10 +3592,6 @@ msgstr "Galette a été installé avec succès !"
 msgid "Galette has been successfully updated!"
 msgstr "Galette a été mis à jour avec succès !"
 
-#: ../install/steps/end.php:51
-msgid "To secure the system, please delete the install directory"
-msgstr "Pour sécuriser le système, veuillez supprimer le dossier « install »"
-
 #: ../install/steps/end.php:54
 msgid "Homepage"
 msgstr "Page d’accueil"

diff --git a/galette/lang/galette_it_IT.utf8.po b/galette/lang/galette_it_IT.utf8.po
index b477489cc151c405a9af9e4807edd2e8ff0e24a8..0788f7d192670d9b2c487da553822c336353c767 100644 (file)
--- a/galette/lang/galette_it_IT.utf8.po
+++ b/galette/lang/galette_it_IT.utf8.po
@@ -3491,10 +3491,6 @@ msgstr ""
 msgid "Galette has been successfully updated!"
 msgstr ""
 
-#: ../install/steps/end.php:51
-msgid "To secure the system, please delete the install directory"
-msgstr ""
-
 #: ../install/steps/end.php:54
 msgid "Homepage"
 msgstr ""

diff --git a/galette/lang/galette_nb_NO.utf8.po b/galette/lang/galette_nb_NO.utf8.po
index 2a5e721d9749f93fa216d4a14e449c31e0f80d48..8e9ac92f3816ffdfdc892a90730544fc982452ac 100644 (file)
--- a/galette/lang/galette_nb_NO.utf8.po
+++ b/galette/lang/galette_nb_NO.utf8.po
@@ -3429,10 +3429,6 @@ msgstr ""
 msgid "Galette has been successfully updated!"
 msgstr ""
 
-#: ../install/steps/end.php:51
-msgid "To secure the system, please delete the install directory"
-msgstr ""
-
 #: ../install/steps/end.php:54
 msgid "Homepage"
 msgstr ""

diff --git a/galette/lang/galette_oc.utf8.po b/galette/lang/galette_oc.utf8.po
index 74866fa6886f8ec1573994fa38292782c5903c80..1645fee68f210bea13a8e0cf972c377e742f0bee 100644 (file)
--- a/galette/lang/galette_oc.utf8.po
+++ b/galette/lang/galette_oc.utf8.po
@@ -3434,10 +3434,6 @@ msgstr ""
 msgid "Galette has been successfully updated!"
 msgstr ""
 
-#: ../install/steps/end.php:51
-msgid "To secure the system, please delete the install directory"
-msgstr ""
-
 #: ../install/steps/end.php:54
 msgid "Homepage"
 msgstr "Pagina d'acuèlh"

diff --git a/galette/lang/galette_ota.utf8.po b/galette/lang/galette_ota.utf8.po
index ddd05eb2e6e253ab9458be6e555579d25bd0c105..7eb8b142c55c78d880ae6268890a7dd0c9b0c891 100644 (file)
--- a/galette/lang/galette_ota.utf8.po
+++ b/galette/lang/galette_ota.utf8.po
@@ -3421,10 +3421,6 @@ msgstr ""
 msgid "Galette has been successfully updated!"
 msgstr ""
 
-#: ../install/steps/end.php:51
-msgid "To secure the system, please delete the install directory"
-msgstr ""
-
 #: ../install/steps/end.php:54
 msgid "Homepage"
 msgstr ""

diff --git a/galette/lang/galette_si.utf8.po b/galette/lang/galette_si.utf8.po
index a117de42cd361774d09cb453063938118087274b..7c4a68ad561ba65a5e98594f4e0fdca221cc11bc 100644 (file)
--- a/galette/lang/galette_si.utf8.po
+++ b/galette/lang/galette_si.utf8.po
@@ -3426,10 +3426,6 @@ msgstr ""
 msgid "Galette has been successfully updated!"
 msgstr ""
 
-#: ../install/steps/end.php:51
-msgid "To secure the system, please delete the install directory"
-msgstr ""
-
 #: ../install/steps/end.php:54
 msgid "Homepage"
 msgstr ""

diff --git a/galette/lang/galette_tr.utf8.po b/galette/lang/galette_tr.utf8.po
index a07ea6cbc9951f16cfb2fd68bebb3e5839433a80..f39aeabf8a905c3fbed9442602ab33953eb0841d 100644 (file)
--- a/galette/lang/galette_tr.utf8.po
+++ b/galette/lang/galette_tr.utf8.po
@@ -3440,10 +3440,6 @@ msgstr ""
 msgid "Galette has been successfully updated!"
 msgstr ""
 
-#: ../install/steps/end.php:51
-msgid "To secure the system, please delete the install directory"
-msgstr ""
-
 #: ../install/steps/end.php:54
 msgid "Homepage"
 msgstr ""

diff --git a/galette/lang/galette_uk.utf8.po b/galette/lang/galette_uk.utf8.po
index c4a5290ebe636be7167ea79fedd627e66e441f66..7ee062c5b56e905238d2b7f9bdd07a05f0a7e9dd 100644 (file)
--- a/galette/lang/galette_uk.utf8.po
+++ b/galette/lang/galette_uk.utf8.po
@@ -3536,10 +3536,6 @@ msgstr "Galette успішно встановлено!"
 msgid "Galette has been successfully updated!"
 msgstr "Galette успішно оновлено!"
 
-#: ../install/steps/end.php:51
-msgid "To secure the system, please delete the install directory"
-msgstr "Щоб захистити систему, видаліть каталог установлення"
-
 #: ../install/steps/end.php:54
 msgid "Homepage"
 msgstr "Домівка"

diff --git a/galette/webroot/installer.php b/galette/webroot/installer.php
index fa7138afca0b477540c7155fee135b135e9585c9..a91aa37afa2d5b6f9f55b00e04f8bfe3f42e1702 100644 (file)
--- a/galette/webroot/installer.php
+++ b/galette/webroot/installer.php
@@ -60,12 +60,21 @@ $logfile = 'galette_install';
 define('GALETTE_BASE_PATH', '../');
 define('GALETTE_THEME_DIR', './themes/default/');
 
+$needs_update = false;
 require_once '../includes/galette.inc.php';
 
 session_start();
 $session_name = 'galette_install_' . str_replace('.', '_', GALETTE_VERSION);
 $session = &$_SESSION['galette'][$session_name];
 
+// don't display installer if not necessary
+$install_in_progress = isset($session[md5(GALETTE_ROOT)]);
+$force_installer = defined('FORCE_INSTALLER') && FORCE_INSTALLER;
+if (!$install_in_progress && !$force_installer && $installed && !$needs_update) {
+    http_response_code(404);
+    die();
+}
+
 $app =  new \Galette\Core\SlimApp();
 require_once '../includes/dependencies.php';
 
@@ -85,24 +94,6 @@ if (isset($session[md5(GALETTE_ROOT)]) && !isset($_GET['raz'])) {
 
 $error_detected = array();
 
-/**
- * Initialize database constants to connect
- *
- * @param Install $install Installer
- *
- * @return void
- */
-function initDbConstants($install)
-{
-    define('TYPE_DB', $install->getDbType());
-    define('PREFIX_DB', $install->getTablesPrefix());
-    define('USER_DB', $install->getDbUser());
-    define('PWD_DB', $install->getDbPass());
-    define('HOST_DB', $install->getDbHost());
-    define('PORT_DB', $install->getDbPort());
-    define('NAME_DB', $install->getDbName());
-}
-
 if ($install->isStepPassed(GaletteInstall::STEP_TYPE)) {
     define('GALETTE_LOGGER_CHECKED', true);
 
@@ -198,13 +189,15 @@ if (isset($_POST['stepback_btn'])) {
 if (!$install->isEndStep()
     && ($install->postCheckDb() || $install->isDbCheckStep())
 ) {
-    //if we have passed database configuration, define required constants
-    initDbConstants($install);
-
-    if ($install->postCheckDb()) {
-        //while before check db, connection is not checked
-        $zdb = new GaletteDb();
-    }
+    //while before check db, connection is not checked
+    $zdb = new GaletteDb(array(
+        'TYPE_DB' => $install->getDbType(),
+        'HOST_DB' => $install->getDbHost(),
+        'PORT_DB' => $install->getDbPort(),
+        'USER_DB' => $install->getDbUser(),
+        'PWD_DB' => $install->getDbPass(),
+        'NAME_DB' => $install->getDbName()
+    ));
 }
 
 header('Content-Type: text/html; charset=UTF-8');