diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php
index 83e14232e8f..ca43feb70a2 100644
--- a/htdocs/opensurvey/card.php
+++ b/htdocs/opensurvey/card.php
@@ -196,7 +196,7 @@ print '';
print '';
// Type
-$type=($object->format=="A"||$object->format=="A+")?'classic':'date';
+$type=($object->format=="A")?'classic':'date';
print '
| '.$langs->trans("Type").' | ';
print img_picto('',dol_buildpath('/opensurvey/img/'.($type == 'classic'?'chart-32.png':'calendar-32.png'),1),'width="16"',1);
print ' '.$langs->trans($type=='classic'?"TypeClassic":"TypeDate").' |
';
diff --git a/htdocs/opensurvey/exportcsv.php b/htdocs/opensurvey/exportcsv.php
index 12e5fbb0489..ec48b65ce17 100644
--- a/htdocs/opensurvey/exportcsv.php
+++ b/htdocs/opensurvey/exportcsv.php
@@ -59,7 +59,7 @@ $toutsujet=explode(",",$object->sujet);
$input.=$langs->trans("Name").";";
for ($i=0;$toutsujet[$i];$i++)
{
- if ($object->format=="D"||$object->format=="D+")
+ if ($object->format=="D")
{
$input.=''.dol_print_date($toutsujet[$i],'dayhour').';';
} else {
diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php
index 26754dcebac..d5554315194 100644
--- a/htdocs/opensurvey/list.php
+++ b/htdocs/opensurvey/list.php
@@ -95,7 +95,7 @@ while ($i < min($num,$limit))
print '';
print ''.img_picto('','object_opensurvey').' '.$obj->id_sondage.'';
print ' | '.dol_htmlentities($obj->titre).' | ';
- $type=($obj->format=='A' || $obj->format=='A+')?'classic':'date';
+ $type=($obj->format=='A')?'classic':'date';
print img_picto('',dol_buildpath('/opensurvey/img/'.($type == 'classic'?'chart-32.png':'calendar-32.png'),1),'width="16"',1);
print ' '.$langs->trans($type=='classic'?"TypeClassic":"TypeDate");
print ' | '.dol_htmlentities($obj->nom_admin).' | ';
diff --git a/htdocs/opensurvey/public/studs.php b/htdocs/opensurvey/public/studs.php
index ec3d50b2026..a8274ddeb79 100644
--- a/htdocs/opensurvey/public/studs.php
+++ b/htdocs/opensurvey/public/studs.php
@@ -262,7 +262,7 @@ print '
'."\n";
print ''."\n";
// Show choice titles
-if ($object->format=="D"||$object->format=="D+")
+if ($object->format=="D")
{
//affichage des sujets du sondage
print ''."\n";
@@ -637,7 +637,7 @@ $meilleursujet = '';
for ($i = 0; $i < $nbcolonnes; $i++) {
if (isset($sumfor[$i]) && isset($meilleurecolonne) && $sumfor[$i] == $meilleurecolonne) {
$meilleursujet.=", ";
- if ($object->format=="D"||$object->format=="D+") {
+ if ($object->format=="D") {
$meilleursujetexport = $toutsujet[$i];
if (strpos($toutsujet[$i], '@') !== false) {
diff --git a/htdocs/opensurvey/results.php b/htdocs/opensurvey/results.php
index cf403949994..2d6796024af 100644
--- a/htdocs/opensurvey/results.php
+++ b/htdocs/opensurvey/results.php
@@ -157,7 +157,7 @@ if ($testmodifier)
}
// Add column (not for date)
-if (GETPOST("ajoutercolonne") && GETPOST('nouvellecolonne') && ($object->format == "A" || $object->format == "A+"))
+if (GETPOST("ajoutercolonne") && GETPOST('nouvellecolonne') && ($object->format == "A"))
{
// Security check
if (!$user->rights->opensurvey->write) accessforbidden();
@@ -178,7 +178,7 @@ if (GETPOST("ajoutercolonne") && GETPOST('nouvellecolonne') && ($object->format
}
// Add column (with format date)
-if (isset($_POST["ajoutercolonne"]) && ($object->format == "D" || $object->format == "D+"))
+if (isset($_POST["ajoutercolonne"]) && ($object->format == "D"))
{
// Security check
if (!$user->rights->opensurvey->write) accessforbidden();
@@ -443,7 +443,7 @@ print '';
print '
';
// Type
-$type=($object->format=="A"||$object->format=="A+")?'classic':'date';
+$type=($object->format=="A")?'classic':'date';
print '| '.$langs->trans("Type").' | ';
print img_picto('',dol_buildpath('/opensurvey/img/'.($type == 'classic'?'chart-32.png':'calendar-32.png'),1),'width="16"',1);
print ' '.$langs->trans($type=='classic'?"TypeClassic":"TypeDate").' |
';
@@ -487,7 +487,7 @@ if (GETPOST('ajoutsujet'))
print "
"."\n";
// Add new column
- if ($object->format=="A"||$object->format=="A+")
+ if ($object->format=="A")
{
print $langs->trans("AddNewColumn") .':
';
print $langs->trans("Title").'
';
@@ -593,7 +593,7 @@ print ''."\n";
// Show choice titles
-if ($object->format=="D"||$object->format=="D+")
+if ($object->format=="D")
{
//affichage des sujets du sondage
print ''."\n";
@@ -1009,7 +1009,7 @@ for ($i = 0; $i < $nbcolonnes; $i++) {
if (isset($sumfor[$i]) === true && isset($meilleurecolonne) === true && $sumfor[$i] == $meilleurecolonne) {
$meilleursujet.=", ";
- if ($object->format == "D" || $object->format == "D+") {
+ if ($object->format == "D") {
$meilleursujetexport = $toutsujet[$i];
if (strpos($toutsujet[$i], '@') !== false) {