lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/product_code_syntax' into product_code_syntax

Browse Source
This commit is contained in:
Frédéric FRANCE 2021-02-26 16:12:57 +01:00
commit 7ac8fcbca1
No known key found for this signature in database
GPG Key ID: 06809324E4B2ABC1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/opensurvey/results.php
View File

@ -264,7 +264,7 @@ if (isset($_POST["ajoutercolonne"]) && $object->format == "D") {
// Delete line // Delete line
for ($i = 0; $i < $nblines; $i++) { for ($i = 0; $i < $nblines; $i++) {
if (GETPOST("effaceligne".$i) || GETPOST("effaceligne".$i."_x") || GETPOST("effaceligne".$i.".x")) { // effacelignei for chrome, effacelignei_x for firefox if (GETPOST("effaceligne".$i) || GETPOST("effaceligne".$i."_x") || GETPOST("effaceligne".$i.".x")) { // effacelignei for chrome, effacelignei_x for firefox
// Security check // Security check
if (!$user->rights->opensurvey->write) { if (!$user->rights->opensurvey->write) {
accessforbidden(); accessforbidden();
} }
@ -299,7 +299,7 @@ for ($i = 0; $i < $nblines; $i++) {
for ($i = 0; $i < $nbcolonnes; $i++) { for ($i = 0; $i < $nbcolonnes; $i++) {
if ((GETPOST("effacecolonne".$i) || GETPOST("effacecolonne".$i."_x") || GETPOST("effacecolonne".$i.".x")) if ((GETPOST("effacecolonne".$i) || GETPOST("effacecolonne".$i."_x") || GETPOST("effacecolonne".$i.".x"))
&& $nbcolonnes > 1) { // effacecolonnei for chrome, effacecolonnei_x for firefox && $nbcolonnes > 1) { // effacecolonnei for chrome, effacecolonnei_x for firefox
// Security check // Security check
if (!$user->rights->opensurvey->write) { if (!$user->rights->opensurvey->write) {
accessforbidden(); accessforbidden();
} }

2
htdocs/opensurvey/wizard/create_survey.php
View File

@ -82,7 +82,7 @@ if (!empty($creation_sondage_date) || !empty($creation_sondage_autre)) {
$champdatefin = dol_mktime(0, 0, 0, GETPOST('champdatefinmonth'), GETPOST('champdatefinday'), GETPOST('champdatefinyear')); $champdatefin = dol_mktime(0, 0, 0, GETPOST('champdatefinmonth'), GETPOST('champdatefinday'), GETPOST('champdatefinyear'));
if ($champdatefin && ($champdatefin > 0)) { // A date was provided if ($champdatefin && ($champdatefin > 0)) { // A date was provided
// Expire date is not before today // Expire date is not before today
if ($champdatefin >= dol_now()) { if ($champdatefin >= dol_now()) {
$testdate = true; $testdate = true;
$_SESSION['champdatefin'] = dol_print_date($champdatefin, 'dayrfc'); $_SESSION['champdatefin'] = dol_print_date($champdatefin, 'dayrfc');