diff --git a/htdocs/opensurvey/results.php b/htdocs/opensurvey/results.php index d8405c31027..7d68f54023b 100644 --- a/htdocs/opensurvey/results.php +++ b/htdocs/opensurvey/results.php @@ -37,7 +37,7 @@ if (empty($user->rights->opensurvey->read)) { // Init vars $action = GETPOST('action', 'aZ09'); -$numsondage = GETPOST("id"); +$numsondage = GETPOST("id", 'alphanohtml'); $object = new Opensurveysondage($db); $result = $object->fetch(0, $numsondage); @@ -53,8 +53,8 @@ $nblines = $object->fetch_lines(); */ // Return to the results -if (GETPOST('retoursondage')) { - header('Location: results.php?id='.(GETPOSTISSET('id_sondage') ? GETPOST('id_sondage', 'aZ09') : GETPOST('id', 'int'))); +if (GETPOST('cancel')) { + header('Location: results.php?id='.(GETPOSTISSET('id_sondage') ? GETPOST('id_sondage', 'aZ09') : GETPOST('id', 'alphanohtml'))); exit; } @@ -427,6 +427,7 @@ $title = $object->title." - ".$langs->trans('Card'); $helpurl = ''; $arrayofjs = array(); $arrayofcss = array('/opensurvey/css/style.css'); + llxHeader('', $title, $helpurl, 0, 0, 0, $arrayofjs, $arrayofcss); @@ -443,6 +444,7 @@ $toutsujet = str_replace("°", "'", $toutsujet); print '
'."\n"; print ''; +print ''; $head = opensurvey_prepare_head($object); @@ -508,7 +510,6 @@ print '
'; print ''; - // Expire date print ''."\n"; + print ''."\n"; $colspan = 1; } diff --git a/htdocs/public/opensurvey/studs.php b/htdocs/public/opensurvey/studs.php index 34f8ecd9400..b3459f7e36e 100644 --- a/htdocs/public/opensurvey/studs.php +++ b/htdocs/public/opensurvey/studs.php @@ -424,10 +424,10 @@ if ($object->format == "D") { } else { $next = intval($toutsujet[$i + 1]); } - if ($next && dol_print_date($cur, "%a %e") == dol_print_date($next, "%a %e") && dol_print_date($cur, "%B") == dol_print_date($next, "%B")) { + if ($next && dol_print_date($cur, "%a %d") == dol_print_date($next, "%a %d") && dol_print_date($cur, "%B") == dol_print_date($next, "%B")) { $colspan++; } else { - print ''."\n"; + print ''."\n"; $colspan = 1; } }
'.$langs->trans('ExpireDate').''; if ($action == 'edit') { @@ -575,9 +576,11 @@ if (GETPOST('ajoutsujet')) { accessforbidden(); } - print ''."\n"; + print ''."\n"; print ''; print ''; + print ''; + print ''; print '
'."\n"; print "

\n"; @@ -591,7 +594,7 @@ if (GETPOST('ajoutsujet')) { print ''; print ''; print '     '; - print ''; + print ''; print '

'."\n"; } else { require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; @@ -644,7 +647,7 @@ if (GETPOST('ajoutsujet')) { print '

'; print' '."\n"; print '   '; - print ''; + print ''; } print ''."\n"; @@ -757,10 +760,10 @@ if ($object->format == "D") { } else { $next = intval($toutsujet[$i + 1]); } - if ($next && dol_print_date($cur, "%a %e") == dol_print_date($next, "%a %e") && dol_print_date($cur, "%B") == dol_print_date($next, "%B")) { + if ($next && dol_print_date($cur, "%a %d") == dol_print_date($next, "%a %d") && dol_print_date($cur, "%B") == dol_print_date($next, "%B")) { $colspan++; } else { - print '
'.dol_print_date($cur, "%a %e").''.dol_print_date($cur, "%a %d").''.dol_print_date($cur, "%a %e").''.dol_print_date($cur, "%a %d").'