'."\n";
- echo _("Generate the convocation letter (.PDF), choose the place to meet and validate") .' ';
+ echo _("Generate the convocation letter (.PDF), choose the place to meet and validate") .' ';
echo '';
echo '';
echo '';
- echo '
';
+ echo '
';
echo '
'."\n";
- // ''. _("Enter a meeting place!") .'
'."\n";
+ // ''. _("Enter a meeting place!") .'
'."\n";
}
// TODO
if (isset($_POST["exportpdf_x"]) && !issetAndNoEmpty('lieureunion')) {
- echo ''. _("Enter a meeting place!") .'
'."\n";
-}
+ echo ''. _("Enter a meeting place!") .'
'."\n";
+} */
echo ''."\n";
-echo '
'."\n";
+echo '
'."\n";
//fin de la partie GESTION et beandeau de pied
//echo ''."\n";
-echo '
'. _("Your poll aim is to make a choice between different subjects. Enter the subjects to vote for:") .'
'."\n";
+ echo '
'. _("Your poll aim is to make a choice between different subjects.") . ' ' . _("Enter the subjects to vote for:") .'
'."\n";
echo '
'."\n";
//affichage des cases texte de formulaire
@@ -212,11 +191,11 @@ if (!isset($_POST["fin_sondage_autre_x"])) {
if ((isset($_POST["fin_sondage_autre"]) || isset($_POST["fin_sondage_autre_x"])) && !$erreur && !$erreur_injection) {
//demande de la date de fin du sondage
echo '
'."\n";
- echo '
'. _("Your poll will be automatically removed after 6 months. You can fix another removal date for it.") .'
'."\n";
+ echo '
'. _("Your poll will be automatically removed after 6 months."). ' ' . _("You can fix another removal date for it.") .'
" . _("You haven't filled the first section of the poll creation.") . " !
"."\n";
+ print "
" . _("You haven't filled the first section of the poll creation.") . " !
"."\n";
print _("Back to the homepage of ") . ' ' . '' . NOMAPPLICATION . '.' . "\n";
- echo '
'."\n";
echo ''."\n";
//bandeau de pied
//sur_bandeau_pied();
@@ -237,21 +214,25 @@ if (!issetAndNoEmpty('nom', $_SESSION) && !issetAndNoEmpty('adresse', $_SESSION)
echo '
';
//affichage de l'aide pour les jours
- echo '
'."\n";
- echo _("Select your dates amoung the free days (green). The selected days are in blue. You can unselect a day previously selected by clicking again on it.") ."\n";
+ echo '
'."\n";
+ echo '
'._("Select your dates amoung the free days (green). The selected days are in blue.").' '. _("You can unselect a day previously selected by clicking again on it.") .'
'."\n";
echo '
'."\n";
//debut du tableau qui affiche le calendrier
echo '
'."\n";
//affichage de tous les jours choisis
if (issetAndNoEmpty('totalchoixjour', $_SESSION) && (!issetAndNoEmpty('choixheures_x') || $erreur)) {
//affichage des jours
- echo ' '."\n";
- echo '
'. _("Selected days") .' :
'."\n";
+ echo ' '."\n";
+ echo '
'. _("Selected days") .' :
'."\n";
//affichage de l'aide pour les jours
- //echo _("For each selected day, you can choose, or not, meeting hours in the following format : - empty, - \"8h\", \"8H\" or \"8:00\" to give a meeting's start hour, - \"8-11\", \"8h-11h\", \"8H-11H\" ou \"8:00-11:00\" to give a meeting's start and end hour, - \"8h15-11h15\", \"8H15-11H15\" ou \"8:15-11:15\" for the same thing but with minutes.") .'
'."\n";
- echo _("For each selected day, you can choose, or not, meeting hours (e.g.: \"8h\", \"8:30\", \"8\", \"evening\", etc.)") .'
'."\n";
+ echo '
'._("For each selected day, you can choose, or not, meeting hours (e.g.: \"8h\", \"8:30\", \"8h-10h\", \"evening\", etc.)") .'
'. _("Your poll will expire automatically 2 days after the last date of your poll.") .'
'. _("Removal date") .' : '.$date_fin.'
'."\n";
+ echo '
'. _("Your poll will expire automatically 2 days after the last date of your poll.") .'
'. _("Removal date") .' : '.$date_fin.'
'."\n";
echo '
'."\n";
echo '
'."\n";
- echo ''. _("Once you have confirmed the creation of your poll, you will be automatically redirected on the page of your poll.
Then, you will receive quickly an email contening the link to your poll for sending it to the voters.") .''."\n";
+ echo '
'. _("Once you have confirmed the creation of your poll, you will be automatically redirected on the page of your poll."). '
' . _("Then, you will receive quickly an email contening the link to your poll for sending it to the voters.") .'
'."\n";
echo'
'."\n";
// echo'
'."\n";
// echo 'Pour finir la création du sondage, cliquez sur le bouton ci-dessous'."\n";
@@ -594,13 +574,13 @@ if (!issetAndNoEmpty('nom', $_SESSION) && !issetAndNoEmpty('adresse', $_SESSION)
echo '
';
}
echo '';
diff --git a/creation_sondage.php b/creation_sondage.php
index 3e34294..db0bfee 100644
--- a/creation_sondage.php
+++ b/creation_sondage.php
@@ -1,41 +1,20 @@
Execute("SELECT * FROM user_studs WHERE id_sondage=" . $_GET['numsondage'] . " ORDER BY id_users");
+$sql = 'SELECT * FROM user_studs WHERE id_sondage='.$connect->Param('numsondage').' ORDER BY id_users';
+$sql = $connect->Prepare($sql);
+$user_studs = $connect->Execute($sql, array($_GET['numsondage']));
$dsondage = get_sondage_from_id($_GET['numsondage']);
$nbcolonnes=substr_count($dsondage->sujet,',')+1;
@@ -52,22 +33,26 @@ $toutsujet=explode(",",$dsondage->sujet);
#$toutsujet=str_replace("°","'",$toutsujet);
//affichage des sujets du sondage
-$input.=";";
-for ($i=0;$toutsujet[$i];$i++) {
+$input =";";
+foreach ($toutsujet as $value) {
if ($dsondage->format=="D"||$dsondage->format=="D+") {
- $input.=''.date("j/n/Y",$toutsujet[$i]).';';
+ if (strpos($dsondage->sujet,'@') !== false) {
+ $days=explode("@",$value);
+ $input.= date("j/n/Y",$days[0]).';';
+ } else {
+ $input.= date("j/n/Y",$values).';';
+ }
} else {
- $input.=''.$toutsujet[$i].';';
+ $input.= $value.';';
}
}
-
$input.="\r\n";
if (strpos($dsondage->sujet,'@') !== false) {
$input.=";";
- for ($i=0;$toutsujet[$i];$i++) {
- $heures=explode("@",$toutsujet[$i]);
- $input.=''.$heures[1].';';
+ foreach ($toutsujet as $value) {
+ $heures=explode("@",$value);
+ $input.= $heures[1].';';
}
$input.="\r\n";
@@ -100,4 +85,4 @@ header( 'Content-Length: '.$filesize );
header( 'Content-Disposition: attachment; filename="'.$filename.'"' );
header( 'Cache-Control: max-age=10' );
echo $input;
-die();
\ No newline at end of file
+die();
diff --git a/exportics.php b/exportics.php
index 3703e08..da6eb59 100644
--- a/exportics.php
+++ b/exportics.php
@@ -1,42 +1,20 @@
setComponent ( $vevent ); // add event to calendar
$v->setConfig( "language", "fr" );
$v->setConfig( "directory", "export" );
$v->setConfig( "filename", $_SESSION["numsondage"].".ics" ); // set file name
-$v->returnCalendar();
\ No newline at end of file
+$v->returnCalendar();
diff --git a/exportpdf.php b/exportpdf.php
index 2f37f7e..c9feb18 100644
--- a/exportpdf.php
+++ b/exportpdf.php
@@ -1,42 +1,20 @@
diff --git a/i18n.php b/i18n.php
index 34c20c7..7623301 100644
--- a/i18n.php
+++ b/i18n.php
@@ -1,8 +1,8 @@
'."\n";
-#echo '
'.NOMAPPLICATION.' '. _("What is it about?") .'
';
-#echo '
'. _("Making polls to schedule meetings or events, quickly and easily. You can also run polls to determine what will be your next meeting place, the meeting topic or anything like the country you would like to visit during your next holidays.") .'
'."\n".' '."\n";
+#echo '
'.NOMAPPLICATION.' '. _("What is it about?") .'
';
+#echo '
'. _("Making polls to schedule meetings or events, quickly and easily. You can also run polls to determine what will be your next meeting place, the meeting topic or anything like the country you would like to visit during your next holidays.") .'
'."\n"; + $commentaires = $dsondage->commentaires; + $commentaires=nl2br(str_replace("\\","",$commentaires)); + echo ''. $commentaires .''; + echo '