afup#1416 rollback

stakovicz · Jan 8, 2024 · 0797992 · 0797992
1 parent d15c6b4
commit 0797992
Show file tree

Hide file tree

Showing 8 changed files with 96 additions and 45 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -39,6 +39,12 @@ jobs:
       - name: Composer install
         run: composer install --no-scripts
 
+      - name: Config file
+        run: make configs/application/config.php
+
+      - name: Parameters file
+        run: make app/config/parameters.yml
+
       - name: Tests - Unit
         run: ./bin/atoum
 
@@ -66,10 +72,10 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-composer-
 
-      - name: CS fixer prerequisites config
+      - name: Config file
         run: make configs/application/config.php
 
-      - name: CS fixer prerequisites parameters
+      - name: Parameters file
         run: make app/config/parameters.yml
 
       - name: Composer install
@@ -103,9 +109,12 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-composer-
 
-      - name: Prerequisites
+      - name: Config file
         run: make configs/application/config.php
 
+      - name: Parameters file
+        run: make app/config/parameters.yml
+
       - name: Composer install
         run: composer install --no-scripts --ignore-platform-req=php
 

diff --git a/Makefile b/Makefile
@@ -74,8 +74,8 @@ test:
 test-functional: data config htdocs/uploads
 	CURRENT_UID=$(CURRENT_UID) $(DOCKER_COMPOSE_BIN) stop dbtest apachephptest planetetest mailcatcher
 	CURRENT_UID=$(CURRENT_UID) $(DOCKER_COMPOSE_BIN) up -d dbtest apachephptest planetetest mailcatcher
-	CURRENT_UID=$(CURRENT_UID) $(DOCKER_COMPOSE_BIN) run --no-deps --rm cliphp ./bin/behat
-	CURRENT_UID=$(CURRENT_UID) $(DOCKER_COMPOSE_BIN) run --no-deps --rm cliphp ./bin/behat -c behat-planete.yml
+	CURRENT_UID=$(CURRENT_UID) $(DOCKER_COMPOSE_BIN) run --no-deps --rm apachephptest ./bin/behat
+	CURRENT_UID=$(CURRENT_UID) $(DOCKER_COMPOSE_BIN) run --no-deps --rm planetetest ./bin/behat -c behat-planete.yml
 	CURRENT_UID=$(CURRENT_UID) $(DOCKER_COMPOSE_BIN) stop dbtest apachephptest planetetest mailcatcher
 
 data:

diff --git a/htdocs/includes/prepend.inc.php b/htdocs/includes/prepend.inc.php
@@ -0,0 +1,57 @@
+<?php
+
+// Initialisation
+ob_start();
+
+session_start();
+
+// Inclusion de l'autoload de composer
+require_once dirname(__FILE__) . '/../../vendor/autoload.php';
+
+require_once dirname(__FILE__).'/../../sources/Afup/fonctions.php';
+
+// Configuration
+$conf = new \Afup\Site\Utils\Configuration(dirname(__FILE__).'/../../configs/application/config.php');
+$GLOBALS['AFUP_CONF'] = $conf;
+error_reporting($conf->obtenir('divers|niveau_erreur'));
+ini_set('display_errors', $conf->obtenir('divers|afficher_erreurs'));
+ini_set('include_path', ini_get('include_path') . PATH_SEPARATOR . dirname(__FILE__).'/../../dependencies/PEAR/' . PATH_SEPARATOR . dirname(__FILE__).'/../../dependencies/');
+header('Content-type: text/html; charset=UTF-8');
+
+// On détermine sur quel sous-site on est
+$serveur   = "";
+$url = $_SERVER['REQUEST_URI'];
+if (strrpos($url, '?') !== false) {
+    $position = strrpos($url, '?');
+    $url      = substr($url, 0, $position);
+}
+$position  = strrpos($url, '/');
+$url       = substr($_SERVER['REQUEST_URI'], 0, $position);
+$parties   = explode('/', $url);
+$sous_site = array_pop($parties);
+if (empty($sous_site) and strpos($_SERVER['HTTP_HOST'], "planete") !== false) {
+    $sous_site = "planete";
+    $serveur = "https://afup.org";
+}
+
+// Initialisation de Smarty
+$smarty = new Smarty;
+$smarty->template_dir  = array(dirname(__FILE__).'/../../htdocs/templates/' . $sous_site . '/',
+    dirname(__FILE__).'/../../htdocs/templates/commun/');
+$smarty->compile_dir   = dirname(__FILE__).'/../../htdocs/cache/templates';
+$smarty->compile_id    = $sous_site;
+$smarty->use_sub_dirs  = true;
+$smarty->compile_check = true;
+$smarty->php_handling  = SMARTY_PHP_ALLOW;
+$smarty->assign('url_base', 'http://' . $_SERVER['HTTP_HOST'] . '/');
+$smarty->assign('chemin_template', $serveur.$conf->obtenir('web|path').'templates/' . $sous_site . '/');
+$smarty->assign('chemin_javascript', $serveur.$conf->obtenir('web|path').'javascript/');
+
+// Initialisation de la couche d'abstraction de la base de données
+$bdd = new \Afup\Site\Utils\Base_De_Donnees($conf->obtenir('bdd|hote'),
+    $conf->obtenir('bdd|base'),
+    $conf->obtenir('bdd|utilisateur'),
+    $conf->obtenir('bdd|mot_de_passe'));
+$bdd->executer("SET NAMES 'utf8'");
+
+require_once(dirname(__FILE__) . '/../../sources/Afup/Bootstrap/commonStart.php');
diff --git a/htdocs/pages/administration/configuration.php b/htdocs/pages/administration/configuration.php
@@ -14,21 +14,6 @@
 
 $formulaire->setDefaults($defaults);
 
-$formulaire->addElement('header'  , ''                                      , 'Mails');
-$formulaire->addElement('text'    , 'mails|email_expediteur'                , 'Email expediteur'                , array('size' => 30));
-$formulaire->addElement('text'    , 'mails|nom_expediteur'                  , 'Nom expediteur'                  , array('size' => 30));
-$formulaire->addElement('textarea', 'mails|texte_adhesion_personne_physique', 'Texte adhesion personne physique', array('cols' => 42, 'rows' => 7));
-$formulaire->addElement('text'    , 'mails|force_destinataire'              , 'Force le destinaire du mail pour test'                  , array('size' => 30));
-$formulaire->addElement('text'    , 'mails|bcc'                             , 'Ajout un email en bcc à tout les emailss'                  , array('size' => 30));
-
-
-$formulaire->addElement('header'  , ''                                      , 'Config SMTP');
-$formulaire->addElement('text'    , 'mails|serveur_smtp'                    , 'Serveur SMTP'                , array('size' => 30));
-$formulaire->addElement('advcheckbox', 'mails|tls'                          , 'Use TLS'                     , null, null, array(0, 1));
-$formulaire->addElement('text'    , 'mails|port'                            , 'Port'                        , array('size' => 30));
-$formulaire->addElement('text'    , 'mails|username'                        , 'Username'                    , array('size' => 30));
-$formulaire->addElement('text'    , 'mails|password'                        , 'Password'                    , array('size' => 30));
-
 $formulaire->addElement('header'  , ''                   , 'AFUP');
 $formulaire->addElement('text'    , 'afup|raison_sociale', 'Raison Sociale', array('size' => 30));
 $formulaire->addElement('textarea', 'afup|adresse'       , 'Adresse'       , array('cols' => 42, 'rows' => 7));

diff --git a/sources/Afup/Bootstrap/Http.php b/sources/Afup/Bootstrap/Http.php
@@ -31,12 +31,12 @@
 }
 
 // mise à jour des paramétrages PHP en fonction de la configuration
-if ($_ENV['SYMFONY_ENV'] === 'dev') {
-    ini_set('error_reporting', E_ALL);
-    ini_set('display_errors', 1);
-} else {
+if (isset($_ENV['SYMFONY_ENV']) && $_ENV['SYMFONY_ENV'] === 'prod') {
     ini_set('error_reporting', E_ALL ^ E_WARNING);
     ini_set('display_errors', 0);
+} else {
+    ini_set('error_reporting', E_ALL);
+    ini_set('display_errors', 1);
 }
 ini_set('include_path', ini_get('include_path') . PATH_SEPARATOR . dirname(__FILE__).'/../../../dependencies/PEAR/');
 

diff --git a/sources/Afup/Forum/AppelConferencier.php b/sources/Afup/Forum/AppelConferencier.php
@@ -2,7 +2,12 @@
 
 namespace Afup\Site\Forum;
 
+use Afup\Site\Utils\Configuration;
+use Afup\Site\Utils\Mailing;
+use AppBundle\Email\Mailer\MailUser;
+use AppBundle\Email\Mailer\Message;
 use AppBundle\Event\Model\Talk;
+use Symfony\Component\Translation\Translator;
 
 class AppelConferencier
 {

diff --git a/sources/Afup/Utils/Configuration.php b/sources/Afup/Utils/Configuration.php
@@ -2,8 +2,6 @@
 
 namespace Afup\Site\Utils;
 
-use Symfony\Component\Yaml\Yaml;
-
 define('EURO', '€');
 
 /**
@@ -37,24 +35,21 @@ public function __construct($chemin_fichier)
         $this->_chemin_fichier = $chemin_fichier;
         $this->_valeurs = include($this->_chemin_fichier);
 
-        $parametersFile = dirname(__FILE__).'/../../../app/config/parameters.yml';
-        if (is_file($parametersFile)) {
-            $parameters = Yaml::parseFile($parametersFile)['parameters'];
-
-            $this->_valeurs['bdd']['hote'] = $parameters['database_host'];
-            $this->_valeurs['bdd']['base'] = $parameters['database_name'];
-            $this->_valeurs['bdd']['utilisateur'] = $parameters['database_user'];
-            $this->_valeurs['bdd']['mot_de_passe'] = $parameters['database_password'];
-
-            $this->_valeurs['mails']['serveur_smtp'] = $parameters['mails_serveur_smtp'];
-            $this->_valeurs['mails']['tls'] = $parameters['mails_tls'];
-            $this->_valeurs['mails']['username'] = $parameters['mails_username'];
-            $this->_valeurs['mails']['password'] = $parameters['mails_password'];
-            $this->_valeurs['mails']['port'] = $parameters['mails_port'];
-
-            $this->_valeurs['mails']['force_destinataire'] = $parameters['mails_force_destinataire'];
-            $this->_valeurs['mails']['bcc'] = $parameters['mails_bcc'];
-        }
+        $kernel = new SymfonyKernel();
+        $container = $kernel->getKernel()->getContainer();
+
+        $this->_valeurs['bdd']['hote'] = $container->getParameter('database_host');
+        $this->_valeurs['bdd']['base'] = $container->getParameter('database_name');
+        $this->_valeurs['bdd']['utilisateur'] = $container->getParameter('database_user');
+        $this->_valeurs['bdd']['mot_de_passe'] = $container->getParameter('database_password');
+
+        $this->_valeurs['mails']['serveur_smtp'] = $container->getParameter('mails_serveur_smtp');
+        $this->_valeurs['mails']['tls'] = $container->getParameter('mails_tls');
+        $this->_valeurs['mails']['username'] = $container->getParameter('mails_username');
+        $this->_valeurs['mails']['password'] = $container->getParameter('mails_password');
+        $this->_valeurs['mails']['port'] = $container->getParameter('mails_port');
+        $this->_valeurs['mails']['force_destinataire'] = $container->getParameter('mails_force_destinataire');
+        $this->_valeurs['mails']['bcc'] = $container->getParameter('mails_bcc');
     }
 
     /**

diff --git a/sources/Afup/Utils/SymfonyKernel.php b/sources/Afup/Utils/SymfonyKernel.php
@@ -21,7 +21,7 @@ public function __construct(Request $request = null)
         $env = 'prod';
         $debug = false;
 
-        if ($_ENV['SYMFONY_ENV'] === 'dev') {
+        if (isset($_ENV['SYMFONY_ENV']) && $_ENV['SYMFONY_ENV'] === 'dev') {
             Debug::enable(E_WARNING);
             $debug = true;
             $env = 'dev';