Skip to content

Commit

Permalink
Fixed issue: Quotas from older survey structure formats were not corr…
Browse files Browse the repository at this point in the history 
…ectly imported

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey@9122 b72ed6b6-b9f8-46b5-92b4-906544132732
  • Loading branch information
@c-schmitz
c-schmitz committed Sep 10, 2010
1 parent 6bc764a commit d0f4919
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 37 deletions.
22 changes: 6 additions & 16 deletions admin/importsurvey.php
View file
Expand Up @@ -1101,21 +1101,11 @@ function CSVImportSurvey($sFullFilepath)

$asrowdata=array_combine($fieldorders,$fieldcontents);

$oldsid=$asrowdata["sid"];
$newqid="";
$newquotaid="";
$oldqid=$asrowdata['qid'];
$oldquotaid=$asrowdata['quota_id'];

foreach ($substitutions as $subs) {
if ($oldsid==$subs[0]) {$newsid=$subs[3];}
if ($oldqid==$subs[2]) {$newqid=$subs[5];}
}

$newquotaid=$aQuotaReplacements[$oldquotaid];
$newquotaid=$aQuotaReplacements[$asrowdata['quota_id']];

$asrowdata["sid"]=$newsid;
$asrowdata["qid"]=$newqid;
$asrowdata["qid"]=$aQIDReplacements[$asrowdata['qid']];

$asrowdata["quota_id"]=$newquotaid;
unset($asrowdata["id"]);

Expand Down Expand Up @@ -1155,18 +1145,18 @@ function CSVImportSurvey($sFullFilepath)
if ($importresults['quota'] > 0 && (!isset($importresults['quotals']) || $importresults['quotals'] == 0)) {
$i=0;
$defaultsurveylanguage=isset($defaultsurveylanguage) ? $defaultsurveylanguage : "en";
$tablename=$dbprefix.'quota_languagesettings';
foreach($aQuotaReplacements as $oldquotaid=>$newquotaid) {
$asrowdata=array("quotals_quota_id" => $newquotaid,
"quotals_language" => $defaultsurveylanguage,
"quotals_name" => $quotadata[$i]["name"],
"quotals_message" => $clang->gT("Sorry your responses have exceeded a quota on this survey."),
"quotals_url" => "",
"quotals_urldescrip" => "");
$asinsert = $connect->getInsertSQL($tablename,$asrowdata);
$result=$connect->Execute($asinsert) or safe_die ("Couldn't insert quota<br />$asinsert<br />".$connect->ErrorMsg());
$i++;
}
$tablename=$dbprefix.'quota_languagesettings';
$asinsert = $connect->getInsertSQL($tablename,$asrowdata);
$result=$connect->Execute($asinsert) or safe_die ("Couldn't insert quota<br />$asinsert<br />".$connect->ErrorMsg());
$countquotals=$i;
}

Expand Down
42 changes: 21 additions & 21 deletions admin/quota.php
View file
Expand Up @@ -101,7 +101,7 @@ function getQuotaAnswers($qid,$surveyid,$quota_id)
$query = "SELECT * FROM ".db_table_name('quota_members')." WHERE sid='{$surveyid}' and qid='{$qid}' and quota_id='{$quota_id}'";
$result = db_execute_assoc($query) or safe_die($connect->ErrorMsg());

$query = "SELECT code,answer FROM ".db_table_name('answers')." WHERE qid='{$qid}'";
$query = "SELECT title,question FROM ".db_table_name('questions')." WHERE parent_qid='{$qid}'";
$ansresult = db_execute_assoc($query) or safe_die($connect->ErrorMsg());

$answerlist = array();
Expand All @@ -110,8 +110,8 @@ function getQuotaAnswers($qid,$surveyid,$quota_id)
{
for ($x=1; $x<6; $x++)
{
$tmparrayans = array('Title' => $qtype['title'], 'Display' => substr($dbanslist['answer'],0,40).' ['.$x.']', 'code' => $dbanslist['code']);
$answerlist[$dbanslist['code']."-".$x] = $tmparrayans;
$tmparrayans = array('Title' => $qtype['title'], 'Display' => substr($dbanslist['question'],0,40).' ['.$x.']', 'code' => $dbanslist['title']);
$answerlist[$dbanslist['title']."-".$x] = $tmparrayans;
}
}

Expand Down Expand Up @@ -627,24 +627,24 @@ function getQuotaAnswers($qid,$surveyid,$quota_id)
{
$question_answers = getQuotaAnswers($quota_questions['qid'],$surveyid,$quotalisting['id']);
$quotasoutput .='
<tr class="evenrow">
<td align="center">&nbsp;</td>
<td align="center">'.$question_answers[$quota_questions['code']]['Title'].'</td>
<td align="center">'.$question_answers[$quota_questions['code']]['Display'].'</td>
<td align="center">&nbsp;</td>
<td align="center">&nbsp;</td>
<td style="padding: 3px;" align="center">
<form action="'.$scriptname.'" method="post">
<input name="submit" type="submit" class="submit" value="'.$clang->gT("Remove").'" />
<input type="hidden" name="sid" value="'.$surveyid.'" />
<input type="hidden" name="action" value="quotas" />
<input type="hidden" name="quota_member_id" value="'.$quota_questions['id'].'" />
<input type="hidden" name="quota_qid" value="'.$quota_questions['qid'].'" />
<input type="hidden" name="quota_anscode" value="'.$quota_questions['code'].'" />
<input type="hidden" name="subaction" value="quota_delans" />
</form>
</td>
</tr>';
<tr class="evenrow">
<td align="center">&nbsp;</td>
<td align="center">'.$question_answers[$quota_questions['code']]['Title'].'</td>
<td align="center">'.$question_answers[$quota_questions['code']]['Display'].'</td>
<td align="center">&nbsp;</td>
<td align="center">&nbsp;</td>
<td style="padding: 3px;" align="center">
<form action="'.$scriptname.'" method="post">
<input name="submit" type="submit" class="submit" value="'.$clang->gT("Remove").'" />
<input type="hidden" name="sid" value="'.$surveyid.'" />
<input type="hidden" name="action" value="quotas" />
<input type="hidden" name="quota_member_id" value="'.$quota_questions['id'].'" />
<input type="hidden" name="quota_qid" value="'.$quota_questions['qid'].'" />
<input type="hidden" name="quota_anscode" value="'.$quota_questions['code'].'" />
<input type="hidden" name="subaction" value="quota_delans" />
</form>
</td>
</tr>';
}
}

Expand Down

0 comments on commit d0f4919

Please sign in to comment.