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

Fix: Regression with firefox

Browse Source
This commit is contained in:
Laurent Destailleur 2014-03-05 11:52:51 +01:00
parent 6c536d43e5
commit a3fcb5ac5a
2 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
htdocs/opensurvey/public/studs.php
View File

@ -61,7 +61,7 @@ $listofvoters=explode(',',$_SESSION["savevoter"]);
if (GETPOST('ajoutcomment')) if (GETPOST('ajoutcomment'))
{ {
if (!$canbemodified) accessforbidden(); if (!$canbemodified) accessforbidden();
$error=0; $error=0;
if (! GETPOST('comment')) if (! GETPOST('comment'))
@ -81,16 +81,16 @@ if (GETPOST('ajoutcomment'))
$comment_user = GETPOST('commentuser'); $comment_user = GETPOST('commentuser');
$resql = $object->addComment($comment, $comment_user); $resql = $object->addComment($comment, $comment_user);
if (! $resql) dol_print_error($db); if (! $resql) dol_print_error($db);
} }
} }
// Add vote // Add vote
if (isset($_POST["boutonp"])) if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x")) // boutonp for chrom, boutonp_x for firefox
{ {
if (!$canbemodified) accessforbidden(); if (!$canbemodified) accessforbidden();
//Si le nom est bien entré //Si le nom est bien entré
if (GETPOST('nom')) if (GETPOST('nom'))
{ {
@ -110,7 +110,7 @@ if (isset($_POST["boutonp"]))
} }
} }
$nom=substr($_POST["nom"],0,64); $nom=substr(GETPOST("nom"),0,64);
// Check if vote already exists // Check if vote already exists
$sql = 'SELECT id_users, nom FROM '.MAIN_DB_PREFIX."opensurvey_user_studs WHERE id_sondage='".$db->escape($numsondage)."' AND nom = '".$db->escape($nom)."' ORDER BY id_users"; $sql = 'SELECT id_users, nom FROM '.MAIN_DB_PREFIX."opensurvey_user_studs WHERE id_sondage='".$db->escape($numsondage)."' AND nom = '".$db->escape($nom)."' ORDER BY id_users";
@ -138,18 +138,18 @@ if (isset($_POST["boutonp"]))
if ($object->fk_user_creat) { if ($object->fk_user_creat) {
$userstatic = new User($db); $userstatic = new User($db);
$userstatic->fetch($object->fk_user_creat); $userstatic->fetch($object->fk_user_creat);
$email = $userstatic->email; $email = $userstatic->email;
} else { } else {
$email = $object->mail_admin; $email = $object->mail_admin;
} }
//Linked user may not have an email set //Linked user may not have an email set
if ($email) { if ($email) {
include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'; include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
$body = $langs->trans('EmailSomeoneVoted', $nom, getUrlSondage($numsondage, true)); $body = $langs->trans('EmailSomeoneVoted', $nom, getUrlSondage($numsondage, true));
$cmailfile=new CMailFile("[".MAIN_APPLICATION_TITLE."] ".$langs->trans("Poll").': '.$object->titre, $email, $conf->global->MAIN_MAIL_EMAIL_FROM, $body); $cmailfile=new CMailFile("[".MAIN_APPLICATION_TITLE."] ".$langs->trans("Poll").': '.$object->titre, $email, $conf->global->MAIN_MAIL_EMAIL_FROM, $body);
$result=$cmailfile->sendfile(); $result=$cmailfile->sendfile();
} }
@ -204,7 +204,7 @@ if ($testmodifier)
$nouveauchoix.="0"; $nouveauchoix.="0";
} }
} }
if (!$canbemodified) accessforbidden(); if (!$canbemodified) accessforbidden();
$idtomodify=$_POST["idtomodify".$modifier]; $idtomodify=$_POST["idtomodify".$modifier];
@ -222,7 +222,7 @@ $idcomment=GETPOST('deletecomment','int');
if ($idcomment) if ($idcomment)
{ {
if (!$canbemodified) accessforbidden(); if (!$canbemodified) accessforbidden();
$resql = $object->deleteComment($idcomment); $resql = $object->deleteComment($idcomment);
} }
@ -271,7 +271,7 @@ print '</div>'."\n";
//The survey has expired, users can't vote or do any action //The survey has expired, users can't vote or do any action
if (!$canbemodified) { if (!$canbemodified) {
print '<div style="text-align: center"><p>'.$langs->trans('SurveyExpiredInfo').'</p></div>'; print '<div style="text-align: center"><p>'.$langs->trans('SurveyExpiredInfo').'</p></div>';
llxFooterSurvey(); llxFooterSurvey();
@ -714,7 +714,7 @@ $comments = $object->getComments();
if ($comments) if ($comments)
{ {
print "<br><b>" . $langs->trans("CommentsOfVoters") . ":</b><br>\n"; print "<br><b>" . $langs->trans("CommentsOfVoters") . ":</b><br>\n";
foreach ($comments as $obj) { foreach ($comments as $obj) {
print '<div class="comment"><span class="usercomment">'; print '<div class="comment"><span class="usercomment">';
if (in_array($obj->usercomment, $listofvoters)) print '<a href="'.$_SERVER["PHP_SELF"].'?deletecomment='.$obj->id_comment.'&sondage='.$numsondage.'"> '.img_picto('', 'delete.png').'</a> '; if (in_array($obj->usercomment, $listofvoters)) print '<a href="'.$_SERVER["PHP_SELF"].'?deletecomment='.$obj->id_comment.'&sondage='.$numsondage.'"> '.img_picto('', 'delete.png').'</a> ';

32
htdocs/opensurvey/results.php
View File

@ -52,13 +52,13 @@ $nblignes=count($object->fetch_lines());
//Return to the results //Return to the results
if (GETPOST('retoursondage')) { if (GETPOST('retoursondage')) {
header('Location: results.php?id='.$_GET['id']); header('Location: results.php?id='.$_GET['id']);
die; exit;
} }
$nbcolonnes = substr_count($object->sujet, ',') + 1; $nbcolonnes = substr_count($object->sujet, ',') + 1;
// Add vote // Add vote
if (isset($_POST["boutonp"])) if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x")) // boutonp for chrom, boutonp.x for firefox
{ {
if (GETPOST('nom')) if (GETPOST('nom'))
{ {
@ -128,7 +128,7 @@ if ($testmodifier)
// Security check // Security check
if (!$user->rights->opensurvey->write) accessforbidden(); if (!$user->rights->opensurvey->write) accessforbidden();
$nouveauchoix = ''; $nouveauchoix = '';
for ($i = 0; $i < $nbcolonnes; $i++) for ($i = 0; $i < $nbcolonnes; $i++)
{ {
@ -161,7 +161,7 @@ if (GETPOST("ajoutercolonne") && GETPOST('nouvellecolonne') && ($object->format
{ {
// Security check // Security check
if (!$user->rights->opensurvey->write) accessforbidden(); if (!$user->rights->opensurvey->write) accessforbidden();
$nouveauxsujets=$object->sujet; $nouveauxsujets=$object->sujet;
//on rajoute la valeur a la fin de tous les sujets deja entrés //on rajoute la valeur a la fin de tous les sujets deja entrés
@ -185,7 +185,7 @@ if (isset($_POST["ajoutercolonne"]) && ($object->format == "D"))
{ {
// Security check // Security check
if (!$user->rights->opensurvey->write) accessforbidden(); if (!$user->rights->opensurvey->write) accessforbidden();
$nouveauxsujets=$object->sujet; $nouveauxsujets=$object->sujet;
if (isset($_POST["nouveaujour"]) && $_POST["nouveaujour"] != "vide" && if (isset($_POST["nouveaujour"]) && $_POST["nouveaujour"] != "vide" &&
@ -280,7 +280,7 @@ for ($i = 0; $i < $nblignes; $i++)
{ {
// Security check // Security check
if (!$user->rights->opensurvey->write) accessforbidden(); if (!$user->rights->opensurvey->write) accessforbidden();
$compteur=0; $compteur=0;
// Loop on each answer // Loop on each answer
@ -315,7 +315,7 @@ for ($i = 0; $i < $nbcolonnes; $i++)
{ {
// Security check // Security check
if (!$user->rights->opensurvey->write) accessforbidden(); if (!$user->rights->opensurvey->write) accessforbidden();
$db->begin(); $db->begin();
$toutsujet = explode(",",$object->sujet); $toutsujet = explode(",",$object->sujet);
@ -473,7 +473,7 @@ if (GETPOST('ajoutsujet'))
{ {
// Security check // Security check
if (!$user->rights->opensurvey->write) accessforbidden(); if (!$user->rights->opensurvey->write) accessforbidden();
//on recupere les données et les sujets du sondage //on recupere les données et les sujets du sondage
print '<form name="formulaire" action="" method="POST">'."\n"; print '<form name="formulaire" action="" method="POST">'."\n";
print '<input type="hidden" name="backtourl" value="'.GETPOST('backtourl').'">'; print '<input type="hidden" name="backtourl" value="'.GETPOST('backtourl').'">';
@ -496,7 +496,7 @@ if (GETPOST('ajoutsujet'))
else else
{ {
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
$formother=new FormOther($db); $formother=new FormOther($db);
//ajout d'une date avec creneau horaire //ajout d'une date avec creneau horaire
print $langs->trans("AddADate") .':<br><br>'."\n"; print $langs->trans("AddADate") .':<br><br>'."\n";
@ -508,9 +508,9 @@ if (GETPOST('ajoutsujet'))
print '</SELECT>'."\n"; print '</SELECT>'."\n";
print $formother->select_month('', 'nouveaumois', 1); print $formother->select_month('', 'nouveaumois', 1);
print '&nbsp;'; print '&nbsp;';
print $formother->select_year('', 'nouvelleannee', 1, 0, 5, 0, 1); print $formother->select_year('', 'nouvelleannee', 1, 0, 5, 0, 1);
print '<br><br>'. $langs->trans("AddStartHour") .': <br><br>'."\n"; print '<br><br>'. $langs->trans("AddStartHour") .': <br><br>'."\n";
@ -624,7 +624,7 @@ if ($object->format=="D")
print '<td class="annee">'; print '<td class="annee">';
print '<a href="'.$_SERVER["PHP_SELF"].'?ajoutsujet=1&id='.$object->id_sondage.'">'.$langs->trans("Add").'</a></td>'."\n"; print '<a href="'.$_SERVER["PHP_SELF"].'?ajoutsujet=1&id='.$object->id_sondage.'">'.$langs->trans("Add").'</a></td>'."\n";
} }
print '</tr>'."\n"; print '</tr>'."\n";
print '<tr>'."\n"; print '<tr>'."\n";
print '<td></td>'."\n"; print '<td></td>'."\n";
@ -653,7 +653,7 @@ if ($object->format=="D")
if ($user->rights->opensurvey->write) { if ($user->rights->opensurvey->write) {
print '<td class="mois"><a href="'.$_SERVER["PHP_SELF"].'?ajoutsujet=1&id='.$object->id_sondage.'">'.$langs->trans("Add").'</a></td>'."\n"; print '<td class="mois"><a href="'.$_SERVER["PHP_SELF"].'?ajoutsujet=1&id='.$object->id_sondage.'">'.$langs->trans("Add").'</a></td>'."\n";
} }
print '</tr>'."\n"; print '</tr>'."\n";
print '<tr>'."\n"; print '<tr>'."\n";
print '<td></td>'."\n"; print '<td></td>'."\n";
@ -700,7 +700,7 @@ if ($object->format=="D")
if ($user->rights->opensurvey->write) { if ($user->rights->opensurvey->write) {
print '<td class="heure"><a href="'.$_SERVER["PHP_SELF"].'?ajoutsujet=1&id='.$object->id_sondage.'">'.$langs->trans("Add").'</a></td>'."\n"; print '<td class="heure"><a href="'.$_SERVER["PHP_SELF"].'?ajoutsujet=1&id='.$object->id_sondage.'">'.$langs->trans("Add").'</a></td>'."\n";
} }
print '</tr>'."\n"; print '</tr>'."\n";
} }
} }
@ -744,11 +744,11 @@ while ($compteur < $num)
$ensemblereponses = $obj->reponses; $ensemblereponses = $obj->reponses;
print '<tr><td>'."\n"; print '<tr><td>'."\n";
if ($user->rights->opensurvey->write) { if ($user->rights->opensurvey->write) {
print '<input type="image" name="effaceligne'.$compteur.'" src="'.dol_buildpath('/opensurvey/img/cancel.png',1).'">'."\n"; print '<input type="image" name="effaceligne'.$compteur.'" src="'.dol_buildpath('/opensurvey/img/cancel.png',1).'">'."\n";
} }
// Name // Name
print '</td><td class="nom">'.dol_htmlentities($obj->nom).'</td>'."\n"; print '</td><td class="nom">'.dol_htmlentities($obj->nom).'</td>'."\n";