Skip to content

Commit

Permalink
Fixed issue: Entering invalid float in multiple numeric question is c…
Browse files Browse the repository at this point in the history
…ausing the survey to exit

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey@8450 b72ed6b6-b9f8-46b5-92b4-906544132732
  • Loading branch information
c-schmitz committed Mar 2, 2010
1 parent bd4c9b2 commit ac0bc13
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
2 changes: 2 additions & 0 deletions admin/importsurvey.php
Expand Up @@ -587,6 +587,7 @@
unset($surveyrowdata['usestartdate']);
unset($surveyrowdata['useexpiry']);
unset($surveyrowdata['url']);
unset($surveyrowdata['lastpage']);
if (isset($surveyrowdata['startdate'])) {unset($surveyrowdata['startdate']);}
$surveyrowdata['bounce_email']=$surveyrowdata['adminemail'];
if (!isset($surveyrowdata['datecreated']) || $surveyrowdata['datecreated']=='' || $surveyrowdata['datecreated']=='null') {$surveyrowdata['datecreated']=$connect->BindTimeStamp(date_shift(date("Y-m-d H:i:s"), "Y-m-d", $timeadjust));}
Expand Down Expand Up @@ -619,6 +620,7 @@
$surveylsrowdata['surveyls_email_remind']=translink('survey', $surveyid, $newsid, $surveylsrowdata['surveyls_email_remind']);
$surveylsrowdata['surveyls_email_register']=translink('survey', $surveyid, $newsid, $surveylsrowdata['surveyls_email_register']);
$surveylsrowdata['surveyls_email_confirm']=translink('survey', $surveyid, $newsid, $surveylsrowdata['surveyls_email_confirm']);
unset($surveylsrowdata['lastpage']);

$surveylsrowdata['surveyls_survey_id']=$newsid;
$newvalues=array_values($surveylsrowdata);
Expand Down
4 changes: 4 additions & 0 deletions common.php
Expand Up @@ -6512,6 +6512,10 @@ function getQuotaInformation($surveyid,$quotaid='all')
{
global $clang, $clienttoken;
$baselang = GetBaseLanguageFromSurveyID($surveyid);
if (!isset($_SESSION['s_lang']))
{
return array();
}
$query = "SELECT * FROM ".db_table_name('quota').", ".db_table_name('quota_languagesettings')."
WHERE ".db_table_name('quota').".id = ".db_table_name('quota_languagesettings').".quotals_quota_id
AND sid='{$surveyid}'
Expand Down
4 changes: 2 additions & 2 deletions qanda.php
Expand Up @@ -3933,14 +3933,14 @@ function do_multiplenumeric($ia)
$qidattributes=getQuestionAttributes($ia[0],'K');
$answer='';
//Must turn on the "numbers only javascript"
$numbersonly = 'onkeypress="return goodchars(event,\'0123456789.\')"';
$numbersonly = 'onkeypress="inputField = event.srcElement ? event.srcElement : event.target || event.currentTarget; if (inputField.value.indexOf(\'.\')>0 && String.fromCharCode(getkey(event))==\'.\') return false; return goodchars(event,\'0123456789.\')"';
if (trim($qidattributes['maximum_chars'])!='')
{
$maxsize=$qidattributes['maximum_chars'];
}
else
{
$maxsize = 255;
$maxsize = 25;
}

//EQUALS VALUE
Expand Down

0 comments on commit ac0bc13

Please sign in to comment.