diff --git a/create_classic_poll.php b/create_classic_poll.php index 9a15a83..6e8ffbd 100644 --- a/create_classic_poll.php +++ b/create_classic_poll.php @@ -64,7 +64,7 @@ if (empty($_SESSION['form']->title) || empty($_SESSION['form']->admin_name) || ( } // Step 4 : Data prepare before insert in DB - if (isset($_POST['confirmecreation'])) { + if (isset($_POST['confirmation'])) { // Define expiration date $enddate = filter_input(INPUT_POST, 'enddate', FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => '#^[0-9]{2}/[0-9]{2}/[0-9]{4}$#']]); @@ -124,9 +124,6 @@ if (empty($_SESSION['form']->title) || empty($_SESSION['form']->admin_name) || ( } // Step 3/4 : Confirm poll creation and choose a removal date else if (isset($_POST['fin_sondage_autre'])) { - Utils::print_header(__('Step 3', 'Removal date and confirmation (3 on 3)')); - bandeau_titre(__('Step 3', 'Removal date and confirmation (3 on 3)')); - // Store choices in $_SESSION if (isset($_POST['choices'])) { @@ -178,45 +175,13 @@ if (empty($_SESSION['form']->title) || empty($_SESSION['form']->admin_name) || ( $end_date_str = utf8_encode(strftime($date_format['txt_date'], $max_expiry_time)); //textual date - echo ' -
' . "\n"; + $smarty->assign('title', __('Step 3', 'Removal date and confirmation (3 on 3)')); + $smarty->assign('summary', $summary); + $smarty->assign('end_date_str', $end_date_str); + $smarty->assign('default_poll_duration', $config['default_poll_duration']); + $smarty->assign('use_smtp', $config['use_smtp']); - bandeau_pied(); + $smarty->display('create_classic_poll_step3.tpl'); // Step 2/4 : Select choices of the poll } else { diff --git a/create_date_poll.php b/create_date_poll.php index 71ab2d4..6f8be7c 100644 --- a/create_date_poll.php +++ b/create_date_poll.php @@ -165,11 +165,6 @@ if (!isset($_SESSION['form']->title) || !isset($_SESSION['form']->admin_name) || // Step 3/4 : Confirm poll creation if (!empty($_POST['choixheures']) && !isset($_SESSION['form']->totalchoixjour)) { - Utils::print_header ( __('Step 3', 'Removal date and confirmation (3 on 3)') ); - bandeau_titre(__('Step 3', 'Removal date and confirmation (3 on 3)')); - - $end_date_str = utf8_encode(strftime($date_format['txt_date'], $max_expiry_time)); // textual date - // Summary $summary = '