Mirrors/framadate
1
0
Fork 0
mirror of https://framagit.org/framasoft/framadate/framadate synced 2026-01-23 02:14:06 +00:00
Code Issues Projects Releases Wiki Activity

Use Services factory everywhere to initialize variables

Browse source
This commit is contained in:
Liquidsoul 2019-04-19 11:46:30 +02:00 • committed by Thomas Citharel
parent 1a66bd8bbe
commit aa61f40d51
No known key found for this signature in database
GPG key ID: A061B9DDE0CA0773
13 changed files with 35 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

15
action/add_comment.php
View file

@ -17,12 +17,7 @@
* Auteurs de Framadate/OpenSondage : Framasoft (https://github.com/framasoft)
*/
use Framadate\Message;
use Framadate\Services\InputService;
use Framadate\Services\LogService;
use Framadate\Services\MailService;
use Framadate\Services\NotificationService;
use Framadate\Services\PollService;
use Framadate\Services\SecurityService;
include_once __DIR__ . '/../app/inc/init.php';
@ -39,12 +34,10 @@ $is_admin = false;
/* Services */
/*----------*/
$logService = new LogService();
$inputService = new InputService();
$mailService = new MailService($config['use_smtp'], $config['smtp_options'], $config['use_sendmail']);
$notificationService = new NotificationService($mailService, $smarty);
$pollService = new PollService($connect, $logService, $notificationService);
$securityService = new SecurityService();
$inputService = Services::input();
$notificationService = Services::notification();
$pollService = Services::poll();
$securityService = Services::security();
/* PAGE */
/* ---- */

14
action/send_edit_link_by_email_action.php
View file

@ -18,20 +18,14 @@
*/
use Framadate\Message;
use Framadate\Services\LogService;
use Framadate\Services\MailService;
use Framadate\Services\NotificationService;
use Framadate\Services\PollService;
use Framadate\Services\SessionService;
use Framadate\Utils;
include_once __DIR__ . '/../app/inc/init.php';
$logService = new LogService();
$sessionService = new SessionService();
$mailService = new MailService($config['use_smtp'], $config['smtp_options'], $config['use_sendmail']);
$notificationService = new NotificationService($mailService, $smarty);
$pollService = new PollService($connect, $logService, $notificationService);
$mailService = Services::mail();
$notificationService = Services::notification();
$pollService = Services::poll();
$sessionService = Services::session();
$result = false;
$message = null;

9
admin/cleanDemo.php
View file

@ -17,13 +17,6 @@
* Auteurs de Framadate/OpenSondage : Framasoft (https://github.com/framasoft)
*/
use Framadate\Services\LogService;
use Framadate\Services\PurgeService;
include_once __DIR__ . '/../app/inc/init.php';
$logService = new LogService();
$purgeService = new PurgeService($connect, $logService);
$purgeService->cleanDemoPoll();
Services::purge()->cleanDemoPoll();

14
admin/polls.php
View file

@ -17,11 +17,6 @@
* Auteurs de Framadate/OpenSondage : Framasoft (https://github.com/framasoft)
*/
use Framadate\Services\AdminPollService;
use Framadate\Services\LogService;
use Framadate\Services\MailService;
use Framadate\Services\PollService;
use Framadate\Services\SecurityService;
use Framadate\Services\SuperAdminService;
include_once __DIR__ . '/../app/inc/init.php';
@ -50,13 +45,10 @@ $poll_to_delete = null;
/* Services */
/*----------*/
$logService = new LogService();
$mailService = new MailService($config['use_smtp'], $config['smtp_options'], $config['use_sendmail']);
$notificationService = new NotificationService($mailService, $smarty);
$pollService = new PollService($connect, $logService, $notificationService);
$adminPollService = new AdminPollService($connect, $pollService, $logService);
$adminPollService = Services::adminPoll();
$pollService = Services::poll();
$securityService = Services::security();
$superAdminService = new SuperAdminService();
$securityService = new SecurityService();
/* GET */
/*-----*/

14
admin/purge.php
View file

@ -17,11 +17,6 @@
* Auteurs de Framadate/OpenSondage : Framasoft (https://github.com/framasoft)
*/
use Framadate\Services\InputService;
use Framadate\Services\LogService;
use Framadate\Services\PurgeService;
use Framadate\Services\SecurityService;
include_once __DIR__ . '/../app/inc/init.php';
include_once __DIR__ . '/../bandeaux.php';
@ -33,10 +28,9 @@ $message = null;
/* Services */
/*----------*/
$logService = new LogService();
$purgeService = new PurgeService($connect, $logService);
$securityService = new SecurityService();
$inputService = new InputService();
$inputService = Services::input();
$purgeService = Services::purge();
$securityService = Services::security();
/* POST */
/*-----*/
@ -57,4 +51,4 @@ $smarty->assign('crsf', $securityService->getToken('admin'));
$smarty->assign('title', __('Admin', 'Purge'));
$smarty->display('admin/purge.tpl');
$smarty->display('admin/purge.tpl');

18
adminstuds.php
View file

@ -26,13 +26,7 @@ use Framadate\Exception\MomentAlreadyExistsException;
use Framadate\Exception\SlotAlreadyExistsException;
use Framadate\Message;
use Framadate\Security\PasswordHasher;
use Framadate\Services\AdminPollService;
use Framadate\Services\InputService;
use Framadate\Services\LogService;
use Framadate\Services\MailService;
use Framadate\Services\NotificationService;
use Framadate\Services\PollService;
use Framadate\Services\SessionService;
use Framadate\Utils;
include_once __DIR__ . '/app/inc/init.php';
@ -49,13 +43,11 @@ $editingVoteId = 0;
/* Services */
/*----------*/
$logService = new LogService();
$mailService = new MailService($config['use_smtp'], $config['smtp_options'], $config['use_sendmail']);
$notificationService = new NotificationService($mailService, $smarty);
$pollService = new PollService($connect, $logService, $notificationService);
$adminPollService = new AdminPollService($connect, $pollService, $logService);
$inputService = new InputService();
$sessionService = new SessionService();
$adminPollService = Services::adminPoll();
$inputService = Services::input();
$notificationService = Services::notification();
$pollService = Services::poll();
$sessionService = Services::session();
/* PAGE */
/* ---- */

16
create_classic_poll.php
View file

@ -18,25 +18,11 @@
*/
use Framadate\Choice;
use Framadate\Form;
use Framadate\Services\InputService;
use Framadate\Services\LogService;
use Framadate\Services\MailService;
use Framadate\Services\NotificationService;
use Framadate\Services\PollService;
use Framadate\Services\PurgeService;
use Framadate\Services\SessionService;
use Framadate\Utils;
include_once __DIR__ . '/app/inc/init.php';
/* Service */
/*---------*/
$logService = new LogService();
$mailService = new MailService($config['use_smtp'], $config['smtp_options'], $config['use_sendmail']);
$notificationService = new NotificationService($mailService, $smarty);
$pollService = new PollService($connect, $logService, $notificationService);
$purgeService = new PurgeService($connect, $logService);
$sessionService = new SessionService();
$pollService = Services::poll();
if (is_file('bandeaux_local.php')) {
include_once('bandeaux_local.php');

18
create_date_poll.php
View file

@ -18,26 +18,12 @@
*/
use Framadate\Choice;
use Framadate\Form;
use Framadate\Services\InputService;
use Framadate\Services\LogService;
use Framadate\Services\MailService;
use Framadate\Services\NotificationService;
use Framadate\Services\PollService;
use Framadate\Services\PurgeService;
use Framadate\Services\SessionService;
use Framadate\Utils;
include_once __DIR__ . '/app/inc/init.php';
/* Service */
/*---------*/
$logService = new LogService();
$mailService = new MailService($config['use_smtp'], $config['smtp_options'], $config['use_sendmail']);
$notificationService = new NotificationService($mailService, $smarty);
$purgeService = new PurgeService($connect, $logService);
$inputService = new InputService();
$sessionService = new SessionService();
$pollService = new PollService($connect, $logService, $notificationService);
$inputService = Services::input();
$pollService = Services::poll();
if (is_readable('bandeaux_local.php')) {
include_once('bandeaux_local.php');

3
create_poll.php
View file

@ -20,7 +20,6 @@
use Framadate\Form;
use Framadate\Repositories\RepositoryFactory;
use Framadate\Security\PasswordHasher;
use Framadate\Services\InputService;
use Framadate\Utils;
include_once __DIR__ . '/app/inc/init.php';
@ -30,7 +29,7 @@ const GO_TO_STEP_2 = 'gotostep2';
/* Services */
/*----------*/
$inputService = new InputService();
$inputService = Services::input();
$pollRepository = RepositoryFactory::pollRepository();
/* PAGE */

10
exportcsv.php
View file

@ -16,9 +16,6 @@
* Auteurs de STUdS (projet initial) : Guilhem BORGHESI (borghesi@unistra.fr) et Raphaël DROZ
* Auteurs de Framadate/OpenSondage : Framasoft (https://github.com/framasoft)
*/
use Framadate\Services\LogService;
use Framadate\Services\PollService;
use Framadate\Services\SecurityService;
use Framadate\Utils;
include_once __DIR__ . '/app/inc/init.php';
@ -34,11 +31,8 @@ $poll = null;
/* Services */
/*----------*/
$logService = new LogService();
$mailService = new MailService($config['use_smtp'], $config['smtp_options'], $config['use_sendmail']);
$notificationService = new NotificationService($mailService, $smarty);
$pollService = new PollService($connect, $logService, $notificationService);
$securityService = new SecurityService();
$pollService = Services::poll();
$securityService = Services::security();
/* PAGE */
/* ---- */

11
find_polls.php
View file

@ -18,19 +18,14 @@
*/
use Framadate\Message;
use Framadate\Services\LogService;
use Framadate\Services\MailService;
use Framadate\Services\NotificationService;
use Framadate\Services\PollService;
include_once __DIR__ . '/app/inc/init.php';
/* SERVICES */
/* -------- */
$logService = new LogService();
$mailService = new MailService($config['use_smtp'], $config['smtp_options'], $config['use_sendmail']);
$notificationService = new NotificationService($mailService, $smarty);
$pollService = new PollService($connect, $logService, $notificationService);
$notificationService = Services::notification();
$pollService = Services::poll();
/* PAGE */
/* ---- */

11
index.php
View file

@ -17,10 +17,6 @@
* Auteurs de Framadate/OpenSondage : Framasoft (https://github.com/framasoft)
*/
use Framadate\Services\LogService;
use Framadate\Services\MailService;
use Framadate\Services\NotificationService;
use Framadate\Services\PollService;
use Framadate\Utils;
include_once __DIR__ . '/app/inc/init.php';
@ -30,13 +26,6 @@ if (!is_file(CONF_FILENAME)) {
exit;
}
/* SERVICES */
/* -------- */
$logService = new LogService();
$mailService = new MailService($config['use_smtp'], $config['smtp_options'], $config['use_sendmail']);
$notificationService = new NotificationService($mailService, $smarty);
$pollService = new PollService($connect, $logService, $notificationService);
/* PAGE */
/* ---- */

17
studs.php
View file

@ -22,12 +22,7 @@ use Framadate\Exception\ConcurrentEditionException;
use Framadate\Exception\ConcurrentVoteException;
use Framadate\Message;
use Framadate\Security\Token;
use Framadate\Services\InputService;
use Framadate\Services\LogService;
use Framadate\Services\MailService;
use Framadate\Services\NotificationService;
use Framadate\Services\PollService;
use Framadate\Services\SecurityService;
use Framadate\Services\SessionService;
use Framadate\Utils;
@ -55,13 +50,11 @@ $selectedNewVotes = [];
/* Services */
/*----------*/
$logService = new LogService();
$inputService = new InputService();
$mailService = new MailService($config['use_smtp'], $config['smtp_options'], $config['use_sendmail']);
$notificationService = new NotificationService($mailService, $smarty);
$pollService = new PollService($connect, $logService, $notifierService);
$securityService = new SecurityService();
$sessionService = new SessionService();
$inputService = Services::input();
$notificationService = Services::notification();
$pollService = Services::poll();
$securityService = Services::security();
$sessionService = Services::session();
/* PAGE */
/* ---- */