Merge branch 'feature/message-on-poll-creation' into 'develop'
ajout du message "Le sondage est bien créé." See merge request framasoft/framadate!286
This commit is contained in:
commit
a092777657
|
@ -29,6 +29,7 @@ use Framadate\Services\LogService;
|
||||||
use Framadate\Services\MailService;
|
use Framadate\Services\MailService;
|
||||||
use Framadate\Services\NotificationService;
|
use Framadate\Services\NotificationService;
|
||||||
use Framadate\Services\PollService;
|
use Framadate\Services\PollService;
|
||||||
|
use Framadate\Services\SessionService;
|
||||||
use Framadate\Utils;
|
use Framadate\Utils;
|
||||||
|
|
||||||
include_once __DIR__ . '/app/inc/init.php';
|
include_once __DIR__ . '/app/inc/init.php';
|
||||||
|
@ -51,6 +52,7 @@ $adminPollService = new AdminPollService($connect, $pollService, $logService);
|
||||||
$inputService = new InputService();
|
$inputService = new InputService();
|
||||||
$mailService = new MailService($config['use_smtp'], $config['smtp_options']);
|
$mailService = new MailService($config['use_smtp'], $config['smtp_options']);
|
||||||
$notificationService = new NotificationService($mailService);
|
$notificationService = new NotificationService($mailService);
|
||||||
|
$sessionService = new SessionService();
|
||||||
|
|
||||||
/* PAGE */
|
/* PAGE */
|
||||||
/* ---- */
|
/* ---- */
|
||||||
|
@ -70,6 +72,18 @@ if ($poll) {
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// -------------------------------
|
||||||
|
// creation message
|
||||||
|
// -------------------------------
|
||||||
|
|
||||||
|
$messagePollCreated = $sessionService->get("Framadate", "messagePollCreated", FALSE);
|
||||||
|
|
||||||
|
if ($messagePollCreated) {
|
||||||
|
$sessionService->remove("Framadate", "messagePollCreated");
|
||||||
|
|
||||||
|
$message = new Message('success', __('adminstuds', 'The poll is created.'));
|
||||||
|
}
|
||||||
|
|
||||||
// -------------------------------
|
// -------------------------------
|
||||||
// Update poll info
|
// Update poll info
|
||||||
// -------------------------------
|
// -------------------------------
|
||||||
|
|
|
@ -21,6 +21,7 @@ use Framadate\Services\LogService;
|
||||||
use Framadate\Services\MailService;
|
use Framadate\Services\MailService;
|
||||||
use Framadate\Services\PollService;
|
use Framadate\Services\PollService;
|
||||||
use Framadate\Services\PurgeService;
|
use Framadate\Services\PurgeService;
|
||||||
|
use Framadate\Services\SessionService;
|
||||||
use Framadate\Utils;
|
use Framadate\Utils;
|
||||||
|
|
||||||
include_once __DIR__ . '/app/inc/init.php';
|
include_once __DIR__ . '/app/inc/init.php';
|
||||||
|
@ -31,6 +32,7 @@ $logService = new LogService();
|
||||||
$pollService = new PollService($connect, $logService);
|
$pollService = new PollService($connect, $logService);
|
||||||
$mailService = new MailService($config['use_smtp'], $config['smtp_options']);
|
$mailService = new MailService($config['use_smtp'], $config['smtp_options']);
|
||||||
$purgeService = new PurgeService($connect, $logService);
|
$purgeService = new PurgeService($connect, $logService);
|
||||||
|
$sessionService = new SessionService();
|
||||||
|
|
||||||
if (is_file('bandeaux_local.php')) {
|
if (is_file('bandeaux_local.php')) {
|
||||||
include_once('bandeaux_local.php');
|
include_once('bandeaux_local.php');
|
||||||
|
@ -108,6 +110,9 @@ if (empty($_SESSION['form']->title) || empty($_SESSION['form']->admin_name) || (
|
||||||
// Delete old polls
|
// Delete old polls
|
||||||
$purgeService->purgeOldPolls();
|
$purgeService->purgeOldPolls();
|
||||||
|
|
||||||
|
// creation message
|
||||||
|
$sessionService->set("Framadate", "messagePollCreated", TRUE);
|
||||||
|
|
||||||
// Redirect to poll administration
|
// Redirect to poll administration
|
||||||
header('Location:' . Utils::getUrlSondage($admin_poll_id, true));
|
header('Location:' . Utils::getUrlSondage($admin_poll_id, true));
|
||||||
exit;
|
exit;
|
||||||
|
|
|
@ -22,6 +22,7 @@ use Framadate\Services\LogService;
|
||||||
use Framadate\Services\MailService;
|
use Framadate\Services\MailService;
|
||||||
use Framadate\Services\PollService;
|
use Framadate\Services\PollService;
|
||||||
use Framadate\Services\PurgeService;
|
use Framadate\Services\PurgeService;
|
||||||
|
use Framadate\Services\SessionService;
|
||||||
use Framadate\Utils;
|
use Framadate\Utils;
|
||||||
|
|
||||||
include_once __DIR__ . '/app/inc/init.php';
|
include_once __DIR__ . '/app/inc/init.php';
|
||||||
|
@ -33,6 +34,7 @@ $pollService = new PollService($connect, $logService);
|
||||||
$mailService = new MailService($config['use_smtp'], $config['smtp_options']);
|
$mailService = new MailService($config['use_smtp'], $config['smtp_options']);
|
||||||
$purgeService = new PurgeService($connect, $logService);
|
$purgeService = new PurgeService($connect, $logService);
|
||||||
$inputService = new InputService();
|
$inputService = new InputService();
|
||||||
|
$sessionService = new SessionService();
|
||||||
|
|
||||||
if (is_readable('bandeaux_local.php')) {
|
if (is_readable('bandeaux_local.php')) {
|
||||||
include_once('bandeaux_local.php');
|
include_once('bandeaux_local.php');
|
||||||
|
@ -232,6 +234,9 @@ switch ($step) {
|
||||||
// Delete old polls
|
// Delete old polls
|
||||||
$purgeService->purgeOldPolls();
|
$purgeService->purgeOldPolls();
|
||||||
|
|
||||||
|
// creation message
|
||||||
|
$sessionService->set("Framadate", "messagePollCreated", TRUE);
|
||||||
|
|
||||||
// Redirect to poll administration
|
// Redirect to poll administration
|
||||||
header('Location:' . Utils::getUrlSondage($admin_poll_id, true));
|
header('Location:' . Utils::getUrlSondage($admin_poll_id, true));
|
||||||
exit;
|
exit;
|
||||||
|
|
|
@ -437,6 +437,7 @@
|
||||||
"Vote updated": "تم تحديث التصويت",
|
"Vote updated": "تم تحديث التصويت",
|
||||||
"You can add a new scheduling date to your poll.": "You can add a new scheduling date to your poll.",
|
"You can add a new scheduling date to your poll.": "You can add a new scheduling date to your poll.",
|
||||||
"Your poll has been removed!": "Your poll has been removed!",
|
"Your poll has been removed!": "Your poll has been removed!",
|
||||||
|
"The poll is created." : "The poll is created.",
|
||||||
"and add a new column with": "and add a new column with",
|
"and add a new column with": "and add a new column with",
|
||||||
"remove a column or a line with": "remove a column or a line with"
|
"remove a column or a line with": "remove a column or a line with"
|
||||||
},
|
},
|
||||||
|
|
|
@ -437,6 +437,7 @@
|
||||||
"Vote updated": "Hizivaet eo bet ar vouezh",
|
"Vote updated": "Hizivaet eo bet ar vouezh",
|
||||||
"You can add a new scheduling date to your poll.": "Gallout a rit ouzhpennañ un deiziad d'ho sontadeg.",
|
"You can add a new scheduling date to your poll.": "Gallout a rit ouzhpennañ un deiziad d'ho sontadeg.",
|
||||||
"Your poll has been removed!": "Dilamet eo bet ar sontadeg!",
|
"Your poll has been removed!": "Dilamet eo bet ar sontadeg!",
|
||||||
|
"The poll is created." : "The poll is created.",
|
||||||
"and add a new column with": "ha m'ho peus disoñjet un dibab e c'hallit ouzhpennañ ur bann en ur glikañ war",
|
"and add a new column with": "ha m'ho peus disoñjet un dibab e c'hallit ouzhpennañ ur bann en ur glikañ war",
|
||||||
"remove a column or a line with": "dilemel ur bann pe ul linenn gant"
|
"remove a column or a line with": "dilemel ur bann pe ul linenn gant"
|
||||||
},
|
},
|
||||||
|
|
|
@ -437,6 +437,7 @@
|
||||||
"Vote updated": "Stimme aktualisiert",
|
"Vote updated": "Stimme aktualisiert",
|
||||||
"You can add a new scheduling date to your poll.": "Sie können Ihrer Umfrage ein neues Datum hinzufügen.",
|
"You can add a new scheduling date to your poll.": "Sie können Ihrer Umfrage ein neues Datum hinzufügen.",
|
||||||
"Your poll has been removed!": "Ihre Umfrage wurde gelöscht!",
|
"Your poll has been removed!": "Ihre Umfrage wurde gelöscht!",
|
||||||
|
"The poll is created." : "The poll is created.",
|
||||||
"and add a new column with": "und neue Spalte hinzufügen mit",
|
"and add a new column with": "und neue Spalte hinzufügen mit",
|
||||||
"remove a column or a line with": "Zeile oder Spalte entfernen mit"
|
"remove a column or a line with": "Zeile oder Spalte entfernen mit"
|
||||||
},
|
},
|
||||||
|
|
|
@ -438,6 +438,7 @@
|
||||||
"Vote updated": "Vote updated",
|
"Vote updated": "Vote updated",
|
||||||
"You can add a new scheduling date to your poll.": "You can add a new scheduling date to your poll.",
|
"You can add a new scheduling date to your poll.": "You can add a new scheduling date to your poll.",
|
||||||
"Your poll has been removed!": "Your poll has been removed!",
|
"Your poll has been removed!": "Your poll has been removed!",
|
||||||
|
"The poll is created." : "The poll is created.",
|
||||||
"and add a new column with": "and add a new column with",
|
"and add a new column with": "and add a new column with",
|
||||||
"remove a column or a line with": "remove a column or a line with"
|
"remove a column or a line with": "remove a column or a line with"
|
||||||
},
|
},
|
||||||
|
|
|
@ -437,6 +437,7 @@
|
||||||
"Vote updated": "Voto actualizado",
|
"Vote updated": "Voto actualizado",
|
||||||
"You can add a new scheduling date to your poll.": "Puede añadir una nueva fecha de encuentro a su encuesta.",
|
"You can add a new scheduling date to your poll.": "Puede añadir una nueva fecha de encuentro a su encuesta.",
|
||||||
"Your poll has been removed!": "Su encuesta ha sido borrada",
|
"Your poll has been removed!": "Su encuesta ha sido borrada",
|
||||||
|
"The poll is created." : "The poll is created.",
|
||||||
"and add a new column with": "y se puede añadir una columna con",
|
"and add a new column with": "y se puede añadir una columna con",
|
||||||
"remove a column or a line with": "borrar una columna o una fila con"
|
"remove a column or a line with": "borrar una columna o una fila con"
|
||||||
},
|
},
|
||||||
|
|
|
@ -438,6 +438,7 @@
|
||||||
"Vote updated": "Vote mis à jour",
|
"Vote updated": "Vote mis à jour",
|
||||||
"You can add a new scheduling date to your poll.": "Vous pouvez ajouter une date à votre sondage.",
|
"You can add a new scheduling date to your poll.": "Vous pouvez ajouter une date à votre sondage.",
|
||||||
"Your poll has been removed!": "Votre sondage a été supprimé !",
|
"Your poll has been removed!": "Votre sondage a été supprimé !",
|
||||||
|
"The poll is created." : "Le sondage est bien créé.",
|
||||||
"and add a new column with": "et si vous avez oublié de saisir un choix, vous pouvez rajouter une colonne en cliquant sur",
|
"and add a new column with": "et si vous avez oublié de saisir un choix, vous pouvez rajouter une colonne en cliquant sur",
|
||||||
"remove a column or a line with": "effacer une colonne ou une ligne avec"
|
"remove a column or a line with": "effacer une colonne ou une ligne avec"
|
||||||
},
|
},
|
||||||
|
|
|
@ -437,6 +437,7 @@
|
||||||
"Vote updated": "Voto aggiornato",
|
"Vote updated": "Voto aggiornato",
|
||||||
"You can add a new scheduling date to your poll.": "Potete aggiungere una data al vostro sondaggio.",
|
"You can add a new scheduling date to your poll.": "Potete aggiungere una data al vostro sondaggio.",
|
||||||
"Your poll has been removed!": "Il vostro sondaggio è stato eliminato !",
|
"Your poll has been removed!": "Il vostro sondaggio è stato eliminato !",
|
||||||
|
"The poll is created." : "The poll is created.",
|
||||||
"and add a new column with": "e se vi foste dimenticati di inserire una scelta, potreste aggiungere una colonna cliccando su",
|
"and add a new column with": "e se vi foste dimenticati di inserire una scelta, potreste aggiungere una colonna cliccando su",
|
||||||
"remove a column or a line with": " cancellare una colonna o una riga con "
|
"remove a column or a line with": " cancellare una colonna o una riga con "
|
||||||
},
|
},
|
||||||
|
|
|
@ -437,6 +437,7 @@
|
||||||
"Vote updated": "Stem aangepast",
|
"Vote updated": "Stem aangepast",
|
||||||
"You can add a new scheduling date to your poll.": "Je kan een nieuwe datum toevoegen aan je poll.",
|
"You can add a new scheduling date to your poll.": "Je kan een nieuwe datum toevoegen aan je poll.",
|
||||||
"Your poll has been removed!": "Je poll is verwijderd!",
|
"Your poll has been removed!": "Je poll is verwijderd!",
|
||||||
|
"The poll is created." : "The poll is created.",
|
||||||
"and add a new column with": "en voeg een nieuwe kokom toe met",
|
"and add a new column with": "en voeg een nieuwe kokom toe met",
|
||||||
"remove a column or a line with": "verwijder een kolom of regel met"
|
"remove a column or a line with": "verwijder een kolom of regel met"
|
||||||
},
|
},
|
||||||
|
|
|
@ -437,6 +437,7 @@
|
||||||
"Vote updated": "Vòte mes a jorn",
|
"Vote updated": "Vòte mes a jorn",
|
||||||
"You can add a new scheduling date to your poll.": "Podètz apondre una data a vòstre sondatge.",
|
"You can add a new scheduling date to your poll.": "Podètz apondre una data a vòstre sondatge.",
|
||||||
"Your poll has been removed!": "Vòstre sondatge es estat suprimit !",
|
"Your poll has been removed!": "Vòstre sondatge es estat suprimit !",
|
||||||
|
"The poll is created." : "The poll is created.",
|
||||||
"and add a new column with": "E se avètz oblidat de picar una causida, podètz tornar apondre una colomna en clicant sus",
|
"and add a new column with": "E se avètz oblidat de picar una causida, podètz tornar apondre una colomna en clicant sus",
|
||||||
"remove a column or a line with": "escafar una colomna o una linha amb"
|
"remove a column or a line with": "escafar una colomna o una linha amb"
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue