Talenttic_survey/CATI_Tool
2
0
Fork 0
mirror of https://github.com/ACSPRI/queXS synced 2024-04-02 12:12:16 +00:00
Code Issues Releases Activity

Updated to Limesurvey 1.91+ Revision 11132

Browse Source
This commit is contained in:
azammitdcarf
2011-10-10 01:32:52 +00:00
parent 859396b9d0
commit 4e93b2e0ca
18 changed files with 290 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/limesurvey/admin/admin_functions.php
View File

@@ -335,7 +335,8 @@ function getAdminHeader($meta=false)
{
$strAdminHeader.=$meta;
}
$strAdminHeader.="<meta http-equiv=\"content-type\" content=\"text/html; charset=UTF-8\" />\n"
$strAdminHeader.="<meta http-equiv=\"content-type\" content=\"text/html; charset=UTF-8\" />\n";
$strAdminHeader.= "<script type=\"text/javascript\" src=\"{$homeurl}/scripts/tabpane/js/tabpane.js\"></script>\n"
. "<script type=\"text/javascript\" src=\"{$rooturl}/scripts/jquery/jquery.js\"></script>\n"
. "<script type=\"text/javascript\" src=\"{$rooturl}/scripts/jquery/jquery-ui.js\"></script>\n"
. "<script type=\"text/javascript\" src=\"{$rooturl}/scripts/jquery/jquery.qtip.js\"></script>\n"

15
include/limesurvey/admin/import_functions.php
View File

@@ -1399,6 +1399,7 @@ function XMLImportSurvey($sFullFilepath,$sXMLdata=NULL,$sNewSurveyName=NULL,$iDe
}
}
$aOldNewFieldmap=aReverseTranslateFieldnames($oldsid,$newsid,$aGIDReplacements,$aQIDReplacements);
// Import conditions --------------------------------------------------------------
if(isset($xml->conditions))
{
@@ -1457,6 +1458,19 @@ function XMLImportSurvey($sFullFilepath,$sXMLdata=NULL,$sNewSurveyName=NULL,$iDe
$insertdata["method"]='==';
}
// Now process the value and replace @sgqa@ codes TIBO
if (preg_match("/^@(.*)@$/",$insertdata["value"],$cfieldnameInCondValue))
{
if (isset($aOldNewFieldmap[$cfieldnameInCondValue[1]]))
{
$newvalue = '@'.$aOldNewFieldmap[$cfieldnameInCondValue[1]].'@';
$insertdata["value"] = $newvalue;
}
}
// now translate any links
$query=$connect->GetInsertSQL($tablename,$insertdata);
$result=$connect->Execute($query) or safe_die ($clang->gT("Error").": Failed to insert data<br />{$query}<br />\n".$connect->ErrorMsg());
@@ -1561,7 +1575,6 @@ function XMLImportSurvey($sFullFilepath,$sXMLdata=NULL,$sNewSurveyName=NULL,$iDe
GiveAllSurveyPermissions($_SESSION['loginID'],$newsid);
if ($bTranslateInsertansTags)
{
$aOldNewFieldmap=aReverseTranslateFieldnames($oldsid,$newsid,$aGIDReplacements,$aQIDReplacements);
TranslateInsertansTags($newsid,$oldsid,$aOldNewFieldmap);
}

79
include/limesurvey/admin/integritycheck.php
View File

@@ -28,27 +28,30 @@ if($_SESSION['USER_RIGHT_CONFIGURATOR'] == 1)
. "<div class='header ui-widget-header'>".$clang->gT("Data Consistency Check")."<br />\n"
. "<span style='font-size:7pt;'>".$clang->gT("If errors are showing up you might have to execute this script repeatedly.")."</span></div>\n"
. "<ul>\n";
/****** Plainly delete survey permissions if the survey or user does not exist ***/
$connect->query("delete FROM {$dbprefix}survey_permissions where sid not in (select sid from {$dbprefix}surveys)");
$connect->query("delete FROM {$dbprefix}survey_permissions where uid not in (select uid from {$dbprefix}users)");
// Silently fix subquestions
fixSubquestions();
/***** Check for activate survey tables with missing survey entry **/
$sQuery = db_select_tables_like("{$dbprefix}survey\_%");
$aResult = db_execute_num($sQuery) or safe_die("Couldn't get list of conditions from database<br />$query<br />".$connect->ErrorMsg());
while ($aRow=$aResult->FetchRow())
{
$tablename=substr($aRow[0],strlen($dbprefix));
$tablename=substr($aRow[0],strlen($dbprefix));
if ($tablename=='survey_permissions') continue;
$iSurveyID=substr($tablename,strpos($tablename,'_')+1);
$iSurveyID=substr($tablename,strpos($tablename,'_')+1);
$qquery="SELECT sid FROM {$dbprefix}surveys WHERE sid='{$iSurveyID}'";
$qresult=$connect->Execute($qquery) or safe_die ("Couldn't check questions table for qids<br />$qquery<br />".$connect->ErrorMsg());
$qcount=$qresult->RecordCount();
if ($qcount==0)
{
$date = date('YmdHis').rand(1,1000);
$date = date('YmdHis').rand(1,1000);
$sOldTable = "survey_{$iSurveyID}";
$sNewTable = "old_survey_{$iSurveyID}_$date";
@@ -63,24 +66,24 @@ if($_SESSION['USER_RIGHT_CONFIGURATOR'] == 1)
$setsequence="ALTER TABLE $sNewTable ALTER COLUMN id SET DEFAULT nextval('{$sNewTable}_id_seq'::regclass);";
$deactivateresult = $connect->Execute($setsequence) or die ("Couldn't make backup of the survey table. Please try again. The database reported the following error:<br />".htmlspecialchars($connect->ErrorMsg())."<br /><br />Survey was not deactivated either.<br /><br /><a href='$scriptname?sid={$postsid}'>".$clang->gT("Main Admin Screen")."</a>");
}
}
}
/***** Check for activate token tables with missing survey entry **/
$sQuery = db_select_tables_like("{$dbprefix}tokens\_%");
$aResult = db_execute_num($sQuery) or safe_die("Couldn't get list of token tables from database<br />$query<br />".$connect->ErrorMsg());
while ($aRow=$aResult->FetchRow())
{
$tablename=substr($aRow[0],strlen($dbprefix));
$iSurveyID=substr($tablename,strpos($tablename,'_')+1);
$tablename=substr($aRow[0],strlen($dbprefix));
$iSurveyID=substr($tablename,strpos($tablename,'_')+1);
$qquery="SELECT sid FROM {$dbprefix}surveys WHERE sid='{$iSurveyID}'";
$qresult=$connect->Execute($qquery) or safe_die ("Couldn't check survey table for sid<br />$qquery<br />".$connect->ErrorMsg());
$qcount=$qresult->RecordCount();
if ($qcount==0)
{
$date = date('YmdHis').rand(1,1000);
$date = date('YmdHis').rand(1,1000);
$sOldTable = "tokens_{$iSurveyID}";
$sNewTable = "old_tokens_{$iSurveyID}_$date";
$deactivatequery = db_rename_table( db_table_name_nq($sOldTable), db_table_name_nq($sNewTable));
@@ -98,11 +101,11 @@ if($_SESSION['USER_RIGHT_CONFIGURATOR'] == 1)
} else {
$deactivateresult = $connect->Execute($deactivatequery) or die ("Couldn't deactivate because:<br />\n".htmlspecialchars($connect->ErrorMsg())." - Query: ".htmlspecialchars($deactivatequery)." <br /><br />\n<a href='$scriptname?sid=$surveyid'>Admin</a>\n");
}
}
}
/**********************************************************************/
/* CHECK CONDITIONS */
/**********************************************************************/
@@ -179,7 +182,7 @@ if($_SESSION['USER_RIGHT_CONFIGURATOR'] == 1)
/**********************************************************************/
$sQuery = "SELECT * FROM {$dbprefix}defaultvalues where qid not in (select qid from {$dbprefix}questions)";
$result = db_execute_assoc($sQuery) or safe_die($connect->ErrorMsg());
$iCountDefaultValues=$result->RecordCount();
$iCountDefaultValues=$result->RecordCount();
if ($iCountDefaultValues>0) {
$integritycheck .= "<li>".sprintf($clang->gT("There are %s orphaned default value entries which can be deleted."),$iCountDefaultValues)."</li>";
@@ -187,14 +190,14 @@ if($_SESSION['USER_RIGHT_CONFIGURATOR'] == 1)
else
{
$integritycheck .= "<li>".$clang->gT("All default values meet consistency standards")."</li>\n";
}
}
/**********************************************************************/
/* Check quotas */
/**********************************************************************/
$sQuery = "SELECT * FROM {$dbprefix}quota where sid not in (select sid from {$dbprefix}surveys)";
$result = db_execute_assoc($sQuery) or safe_die($connect->ErrorMsg());
$iCountQuotas=$result->RecordCount();
$iCountQuotas=$result->RecordCount();
if ($iCountQuotas>0) {
$integritycheck .= "<li>".sprintf($clang->gT("There are %s orphaned quota entries which can be deleted."),$iCountQuotas)."</li>";
@@ -202,15 +205,15 @@ if($_SESSION['USER_RIGHT_CONFIGURATOR'] == 1)
else
{
$integritycheck .= "<li>".$clang->gT("All quotas meet consistency standards")."</li>\n";
}
}
/**********************************************************************/
/* Check quota languagesettings */
/**********************************************************************/
$sQuery = "SELECT * FROM {$dbprefix}quota_languagesettings where quotals_quota_id not in (select id from {$dbprefix}quota)";
$result = db_execute_assoc($sQuery) or safe_die($connect->ErrorMsg());
$iCountQuotaLanguageSettings=$result->RecordCount();
$iCountQuotaLanguageSettings=$result->RecordCount();
if ($iCountQuotaLanguageSettings>0) {
$integritycheck .= "<li>".sprintf($clang->gT("There are %s orphaned quota language settings which can be deleted."),$iCountQuotaLanguageSettings)."</li>";
@@ -218,26 +221,26 @@ if($_SESSION['USER_RIGHT_CONFIGURATOR'] == 1)
else
{
$integritycheck .= "<li>".$clang->gT("All quota language settings meet consistency standards")."</li>\n";
}
}
/**********************************************************************/
/* Check quota members */
/**********************************************************************/
$sQuery = "SELECT * FROM {$dbprefix}quota_members where quota_id not in (select id from {$dbprefix}quota) or qid not in (select qid from {$dbprefix}questions) or sid not in (select sid from {$dbprefix}surveys)";
$result = db_execute_assoc($sQuery) or safe_die($connect->ErrorMsg());
$iCountQuotaMembers=$result->RecordCount();
$iCountQuotaMembers=$result->RecordCount();
if ($iCountQuotaMembers>0) {
$integritycheck .= "<li>".sprintf($clang->gT("There are %s orphaned quota members which can be deleted."),$iCountQuotaMembers)."</li>";
}
else
{
$integritycheck .= "<li>".$clang->gT("All quota members meet consistency standards")."</li>\n";
}
}
/**********************************************************************/
/* CHECK ASSESSMENTS */
/**********************************************************************/
@@ -357,8 +360,8 @@ if($_SESSION['USER_RIGHT_CONFIGURATOR'] == 1)
{
$integritycheck .= "<li>".$clang->gT("All survey language settings meet consistency standards")."</li>\n";
}
/**********************************************************************/
/* CHECK QUESTIONS */
/**********************************************************************/
@@ -563,7 +566,7 @@ if($_SESSION['USER_RIGHT_CONFIGURATOR'] == 1)
if (!isset($cdelete) && !isset($adelete) && !isset($qdelete) &&
!isset($gdelete) && !isset($asgdelete) && !isset($sdelete) &&
!isset($assdelete) && !isset($qadelete) && !isset($oldsdelete) &&
!isset($oldtdelete) && !isset($sldelete)&& $iCountDefaultValues==0 &&
!isset($oldtdelete) && !isset($sldelete)&& $iCountDefaultValues==0 &&
$iCountQuotas==0 && $iCountQuotaLanguageSettings==0 && $iCountQuotaMembers==0) {
$integritycheck .= "<br />".$clang->gT("No database action required");
} else {
@@ -579,17 +582,17 @@ if($_SESSION['USER_RIGHT_CONFIGURATOR'] == 1)
{
$integritycheck .= "<input type='hidden' name='quotalanguagesettings_delete' value='1' />\n";
}
if ($iCountQuotas>0)
{
$integritycheck .= "<input type='hidden' name='quota_delete' value='1' />\n";
}
if ($iCountDefaultValues>0)
{
$integritycheck .= "<input type='hidden' name='defaultvalue_delete' value='1' />\n";
}
if (isset($oldsdelete)) {
foreach($oldsdelete as $olds) {
$integritycheck .= "<input type='hidden' name='oldsdelete[]' value='{$olds}' />\n";
@@ -752,15 +755,15 @@ if($_SESSION['USER_RIGHT_CONFIGURATOR'] == 1)
$sSQL = "delete FROM {$dbprefix}quota where sid not in (select sid from {$dbprefix}surveys)";
$result = $connect->Execute($sSQL) or safe_die ("Couldn't delete quotas ($sSQL)<br />".$connect->ErrorMsg());
}
if (isset($bQuotaLanguageSettingsDelete) && $bQuotaLanguageSettingsDelete==1)
{
$integritycheck .= $clang->gT("Deleting orphaned language settings.")."<br />\n";
$sSQL = "delete FROM {$dbprefix}quota_languagesettings where quotals_quota_id not in (select id from {$dbprefix}quota)";
$result = $connect->Execute($sSQL) or safe_die ("Couldn't delete quotas ($sSQL)<br />".$connect->ErrorMsg());
}
if (isset($oldsdelete)) {
$integritycheck .= $clang->gT("Deleting old survey result tables").":<br /><span style='font-size: 7pt;'>\n";
foreach ($oldsdelete as $olds) {
@@ -790,7 +793,7 @@ if($_SESSION['USER_RIGHT_CONFIGURATOR'] == 1)
}
$integritycheck .= "</span><br />\n";
}
if (isset($sldelete)) {
$integritycheck .= $clang->gT("Deleting survey language settings").":<br /><spanstyle='font-size:7pt;'>\n";
foreach ($sldelete as $sld) {
@@ -924,7 +927,7 @@ if($_SESSION['USER_RIGHT_CONFIGURATOR'] == 1)
$integritycheck .= $clang->gT("Check database again?")."<br />\n"
."<a href='{$scriptname}?action=checkintegrity'>".$clang->gT("Check Again")."</a><br />\n"
."</div><br />\n";
}
$surveyid=false;

71
include/limesurvey/admin/printablesurvey.php
View File

@@ -136,7 +136,7 @@ if(isset($showsgqacode) && $showsgqacode == true)
}
else
{
$surveyname = $surveyname;
$surveyname = "";
}
$survey_output = array(
@@ -493,7 +493,7 @@ while ($degrow = $degresult->FetchRow())
{
$explanation .= $clang->gT("Answer was")." ";
}
$explanation .= " `".$distinctrow['value']."`";
$explanation .= " ".$distinctrow['value'];
}
if(!$distinctrow['cqid']) { // cqid == 0 ==> token attribute match
$tokenData = GetTokenFieldsAndNames($surveyid);
@@ -531,7 +531,7 @@ while ($degrow = $degresult->FetchRow())
{
$explanation .= $clang->gT("is")." ";
}
$explanation .= " `".$distinctrow['value']."`";
$answer_section = $distinctrow['value'];
}
$conquery="SELECT cid, cqid, q.title,\n"
@@ -838,7 +838,7 @@ while ($degrow = $degresult->FetchRow())
{
$pdfoutput .=" o ".$i." ";
// $printablesurveyoutput .="\t\t\t<input type='checkbox' name='$fieldname' value='$i' readonly='readonly' />$i \n";
$question['ANSWER'] .="\t\t<li>\n\t\t\t".input_type_image('radio',$i)."\n\t\t\t$i\n\t\t</li>\n";
$question['ANSWER'] .="\t\t<li>\n\t\t\t".input_type_image('radio',$i)."\n\t\t\t$i ".addsgqacode("($i)")."\n\t\t</li>\n";
}
if(isset($_POST['printableexport'])){$pdf->intopdf($pdfoutput);}
$question['ANSWER'] .="\t</ul>\n";
@@ -858,8 +858,8 @@ while ($degrow = $degresult->FetchRow())
$question['QUESTION_TYPE_HELP'] = $clang->gT("Please choose *only one* of the following:");
$question['ANSWER'] .= "\n\t<ul>\n";
$question['ANSWER'] .= "\t\t<li>\n\t\t\t".input_type_image('radio',$clang->gT("Female"))."\n\t\t\t".$clang->gT("Female")."\n\t\t</li>\n";
$question['ANSWER'] .= "\t\t<li>\n\t\t\t".input_type_image('radio',$clang->gT("Male"))."\n\t\t\t".$clang->gT("Male")."\n\t\t</li>\n";
$question['ANSWER'] .= "\t\t<li>\n\t\t\t".input_type_image('radio',$clang->gT("Female"))."\n\t\t\t".$clang->gT("Female")." ".addsgqacode("(F)")."\n\t\t</li>\n";
$question['ANSWER'] .= "\t\t<li>\n\t\t\t".input_type_image('radio',$clang->gT("Male"))."\n\t\t\t".$clang->gT("Male")." ".addsgqacode("(M)")."\n\t\t</li>\n";
$question['ANSWER'] .= "\t</ul>\n";
if(isset($_POST['printableexport'])){$pdf->intopdf($clang->gT("Please choose *only one* of the following:"));}
@@ -911,15 +911,19 @@ while ($degrow = $degresult->FetchRow())
list ($category, $answer) = explode($optCategorySeparator,$dearow['answer']);
if ($category != '')
{
$dearow['answer'] = "($category) $answer";
$dearow['answer'] = "($category) $answer ".addsgqacode("(".$dearow['code'].")");
}
else
{
$dearow['answer'] = $answer;
$dearow['answer'] = $answer.addsgqacode(" (".$dearow['code'].")");
}
$question['ANSWER'] .= "\t".$wrapper['item-start']."\t\t".input_type_image('radio' , $dearow['answer'])."\n\t\t\t".$dearow['answer']."\n".$wrapper['item-end'];
}
else
{
$question['ANSWER'] .= "\t".$wrapper['item-start']."\t\t".input_type_image('radio' , $dearow['answer'])."\n\t\t\t".$dearow['answer'].addsgqacode(" (".$dearow['code'].")")."\n".$wrapper['item-end'];
}
$question['ANSWER'] .= "\t".$wrapper['item-start']."\t\t".input_type_image('radio' , $dearow['answer'])."\n\t\t\t".$dearow['answer']."\n".$wrapper['item-end'];
if(isset($_POST['printableexport'])){$pdf->intopdf(" o ".$dearow['answer']);}
++$rowcounter;
@@ -942,7 +946,7 @@ while ($degrow = $degresult->FetchRow())
if(trim($qidattributes["other_replace_text"])=='')
{$qidattributes["other_replace_text"]="Other";}
// $printablesurveyoutput .="\t".$wrapper['item-start']."\t\t".input_type_image('radio' , $clang->gT("Other"))."\n\t\t\t".$clang->gT("Other")."\n\t\t\t<input type='text' size='30' readonly='readonly' />\n".$wrapper['item-end'];
$question['ANSWER'] .= $wrapper['item-start-other'].input_type_image('radio',$clang->gT($qidattributes["other_replace_text"])).' '.$clang->gT($qidattributes["other_replace_text"])."\n\t\t\t".input_type_image('other')."\n".$wrapper['item-end'];
$question['ANSWER'] .= $wrapper['item-start-other'].input_type_image('radio',$clang->gT($qidattributes["other_replace_text"])).' '.$clang->gT($qidattributes["other_replace_text"]).addsgqacode(" (-oth-)")."\n\t\t\t".input_type_image('other').addsgqacode(" (".$deqrow['sid']."X".$deqrow['gid']."X".$deqrow['qid']."other)")."\n".$wrapper['item-end'];
if(isset($_POST['printableexport'])){$pdf->intopdf(" o ".$clang->gT($qidattributes["other_replace_text"]).": ________");}
}
$question['ANSWER'] .= $wrapper['whole-end'];
@@ -958,14 +962,14 @@ while ($degrow = $degresult->FetchRow())
$question['ANSWER'] = "\t<ul>\n";
while ($dearow = $dearesult->FetchRow())
{
$question['ANSWER'] .= "\t\t<li>\n\t\t\t".input_type_image('radio',$dearow['answer'])."\n\t\t\t".$dearow['answer']."\n\t\t</li>\n";
$question['ANSWER'] .= "\t\t<li>\n\t\t\t".input_type_image('radio',$dearow['answer'])."\n\t\t\t".$dearow['answer'].addsgqacode(" (".$dearow['code'].")")."\n\t\t</li>\n";
if(isset($_POST['printableexport'])){$pdf->intopdf($dearow['answer']);}
}
$question['ANSWER'] .= "\t</ul>\n";
$question['ANSWER'] .= "\t<p class=\"comment\">\n\t\t".$clang->gT("Make a comment on your choice here:")."\n";
if(isset($_POST['printableexport'])){$pdf->intopdf("Make a comment on your choice here:");}
$question['ANSWER'] .= "\t\t".input_type_image('textarea',$clang->gT("Make a comment on your choice here:"),50,8)."\n\t</p>\n";
$question['ANSWER'] .= "\t\t".input_type_image('textarea',$clang->gT("Make a comment on your choice here:"),50,8).addsgqacode(" (".$deqrow['sid']."X".$deqrow['gid']."X".$deqrow['qid']."comment)")."\n\t</p>\n";
for($i=0;$i<9;$i++)
{
@@ -1078,7 +1082,7 @@ while ($degrow = $degresult->FetchRow())
while ($mearow = $mearesult->FetchRow())
{
$longest_string = longest_string($mearow['question'] , $longest_string );
$question['ANSWER'] .= "\t<li><span>\n\t\t".input_type_image('checkbox',$mearow['question']).$mearow['question']."</span>\n\t\t".input_type_image('text','comment box',60).addsgqacode(" (".$fieldname.$mearow['title'].") ")."\n\t</li>\n";
$question['ANSWER'] .= "\t<li><span>\n\t\t".input_type_image('checkbox',$mearow['question']).$mearow['question'].addsgqacode(" (".$fieldname.$mearow['title'].") ")."</span>\n\t\t".input_type_image('text','comment box',60).addsgqacode(" (".$fieldname.$mearow['title']."comment) ")."\n\t</li>\n";
$pdfoutput[$j]=array(" o ".$mearow['title']," __________");
$j++;
}
@@ -1191,8 +1195,8 @@ while ($degrow = $degresult->FetchRow())
// ==================================================================
case "Y": //YES/NO
$question['QUESTION_TYPE_HELP'] = $clang->gT("Please choose *only one* of the following:");
$question['ANSWER'] = "\n<ul>\n\t<li>\n\t\t".input_type_image('radio',$clang->gT('Yes'))."\n\t\t".$clang->gT('Yes')."\n\t</li>\n";
$question['ANSWER'] .= "\n\t<li>\n\t\t".input_type_image('radio',$clang->gT('No'))."\n\t\t".$clang->gT('No')."\n\t</li>\n</ul>\n";
$question['ANSWER'] = "\n<ul>\n\t<li>\n\t\t".input_type_image('radio',$clang->gT('Yes'))."\n\t\t".$clang->gT('Yes').addsgqacode(" (Y)")."\n\t</li>\n";
$question['ANSWER'] .= "\n\t<li>\n\t\t".input_type_image('radio',$clang->gT('No'))."\n\t\t".$clang->gT('No').addsgqacode(" (N)")."\n\t</li>\n</ul>\n";
if(isset($_POST['printableexport'])){$pdf->intopdf($clang->gT("Please choose *only one* of the following:"),"U");}
if(isset($_POST['printableexport'])){$pdf->intopdf(" o ".$clang->gT("Yes"));}
@@ -1207,20 +1211,19 @@ while ($degrow = $degresult->FetchRow())
$question['QUESTION_TYPE_HELP'] = $clang->gT("Please choose the appropriate response for each item:");
$question['QUESTION_TYPE_HELP'] .= array_filter_help($qidattributes, $surveyprintlang, $surveyid);
$question['ANSWER'] = '
$question['ANSWER'] = "
<table>
<thead>
<tr>
<td>&nbsp;</td>
<th>1</th>
<th>2</th>
<th>3</th>
<th>4</th>
<th>5</th>
<th>1".addsgqacode(" (1)")."</th>
<th>2".addsgqacode(" (2)")."</th>
<th>3".addsgqacode(" (3)")."</th>
<th>4".addsgqacode(" (4)")."</th>
<th>5".addsgqacode(" (5)")."</th>
</tr>
</thead>
<tbody>
';
<tbody>";
if(isset($_POST['printableexport'])){$pdf->intopdf($clang->gT("Please choose the appropriate response for each item:"),"U");}
$pdfoutput = array();
@@ -1275,7 +1278,7 @@ while ($degrow = $degresult->FetchRow())
$question['ANSWER'] .= "\n<table>\n\t<thead>\n\t\t<tr>\n\t\t\t<td>&nbsp;</td>\n";
for ($i=1; $i<=10; $i++)
{
$question['ANSWER'] .= "\t\t\t<th>$i</th>\n";
$question['ANSWER'] .= "\t\t\t<th>$i".addsgqacode(" ($i)")."</th>\n";
}
$question['ANSWER'] .= "\t</thead>\n\n\t<tbody>\n";
if(isset($_POST['printableexport'])){$pdf->intopdf($clang->gT("Please choose the appropriate response for each item:"),"U");}
@@ -1313,9 +1316,9 @@ while ($degrow = $degresult->FetchRow())
<thead>
<tr>
<td>&nbsp;</td>
<th>'.$clang->gT("Yes").'</th>
<th>'.$clang->gT("Uncertain").'</th>
<th>'.$clang->gT("No").'</th>
<th>'.$clang->gT("Yes").addsgqacode(" (Y)").'</th>
<th>'.$clang->gT("Uncertain").addsgqacode(" (U)").'</th>
<th>'.$clang->gT("No").addsgqacode(" (N)").'</th>
</tr>
</thead>
<tbody>
@@ -1354,9 +1357,9 @@ while ($degrow = $degresult->FetchRow())
<thead>
<tr>
<td>&nbsp;</td>
<th>'.$clang->gT("Increase").'</th>
<th>'.$clang->gT("Same").'</th>
<th>'.$clang->gT("Decrease").'</th>
<th>'.$clang->gT("Increase").addsgqacode(" (I)").'</th>
<th>'.$clang->gT("Same").addsgqacode(" (S)").'</th>
<th>'.$clang->gT("Decrease").addsgqacode(" (D)").'</th>
</tr>
</thead>
<tbody>
@@ -1584,7 +1587,7 @@ while ($degrow = $degresult->FetchRow())
$column_headings = array();
while ($frow = $fresult->FetchRow())
{
$column_headings[] = $frow['answer'];
$column_headings[] = $frow['answer'].addsgqacode(" (".$frow['code'].")");
}
if (trim($qidattributes['answer_width'])!='')
{
@@ -1691,7 +1694,7 @@ while ($degrow = $degresult->FetchRow())
$pdfoutput[0][0]='';
while ($frow = $fresult->FetchRow())
{
$printablesurveyoutput2 .="\t\t\t<th>{$frow['answer']}</th>\n";
$printablesurveyoutput2 .="\t\t\t<th>{$frow['answer']}".addsgqacode(" (".$frow['code'].")")."</th>\n";
$myheader2 .= "<td></td>";
$pdfoutput[0][$l1+1]=$frow['answer'];
$l1++;
@@ -1708,7 +1711,7 @@ while ($degrow = $degresult->FetchRow())
$scale2array = array();
while ($frow1 = $fresult1->FetchRow())
{
$printablesurveyoutput2 .="\t\t\t<th>{$frow1['answer']}</th>\n";
$printablesurveyoutput2 .="\t\t\t<th>{$frow1['answer']}".addsgqacode(" (".$frow1['code'].")")."</th>\n";
$pdfoutput[1][$l2]=$frow['answer'];
//add current question code
@@ -1806,7 +1809,7 @@ while ($degrow = $degresult->FetchRow())
{
$question['ANSWER'] .= "\t\t<tr class=\"$rowclass\">\n";
$rowclass = alternation($rowclass,'row');
$question['ANSWER'] .= "\t\t\t<th class=\"answertext\">{$mearow['answer']}</th>\n";
$question['ANSWER'] .= "\t\t\t<th class=\"answertext\">{$mearow['answer']}".addsgqacode(" (".$mearow['code'].")")."</th>\n";
//$printablesurveyoutput .="\t\t\t\t\t<td>";
$pdfoutput[$a][0]=$mearow['answer'];
for ($i=1; $i<=$fcount; $i++)

2
include/limesurvey/admin/remotecontrol/lsrc.testclient.php
View File

@@ -20,6 +20,8 @@
//// errors are ok, but warnings have nothing to say (in this case, sometimes warnings are useful!)
//ini_set("error_reporting", "E_ALL & ~E_WARNING");
die('Test client is deactivated for security reasons. Open lsrc.testclient.php and comment this line to activate the test client.');
include_once("lsrc.client.php");
/**
* initiate the testclient object

1
include/limesurvey/admin/scripts/admin_core.js
View File

@@ -1,6 +1,7 @@
//$Id: admin_core.js 10855 2011-08-26 13:30:41Z mot3 $
$(document).ready(function(){
setupAllTabs();
if(typeof(userdateformat) !== 'undefined')
{
$(".popupdate").datepicker({ dateFormat: userdateformat,

12
include/limesurvey/admin/scripts/emailtemplates.js
View File

@@ -10,8 +10,8 @@ $(document).ready(function(){
/**
* This function loads each FCKeditor only when the tab is clicked and only if it is not already loaded
*/
function loadHTMLEditor(event, ui)
{
function loadHTMLEditor(event, ui)
{
if (typeof ui.panel.selector != 'undefined')
{
sSelector=ui.panel.selector;
@@ -22,18 +22,18 @@ function loadHTMLEditor(event, ui)
}
if ($(sSelector+' iframe').size()==0)
{
sCKEditorInstanceName='oFCKeditor_'+$(sSelector+' textarea').attr('id').replace(/-/i, "_");
sCKEditorInstanceName='oFCKeditor_'+$(sSelector+' textarea').attr('id').replace(/-/g, "_");
eval("if (typeof "+sCKEditorInstanceName+" != 'undefined')"+sCKEditorInstanceName+".ReplaceTextarea();");
}
}
function fillin(tofield, fromfield)
{
if (confirm(sReplaceTextConfirmation))
if (confirm(sReplaceTextConfirmation))
{
if (document.getElementById(tofield).readOnly == false)
{
$('#'+tofield).val($('#'+fromfield).val());
{
$('#'+tofield).val($('#'+fromfield).val());
}
updateCKeditor(tofield,$('#'+fromfield).val());

175
include/limesurvey/admin/statistics.php
View File

@@ -61,8 +61,7 @@ $maxchars = 50;
//don't call this script directly!
if (isset($_REQUEST['homedir'])) {die('You cannot start this script directly');}
include_once("login_check.php");
//some includes, the progressbar is used to show a progressbar while generating the graphs
//include_once("login_check.php");
@@ -409,7 +408,7 @@ foreach ($filters as $flt)
}
$statisticsoutput .= "\t\t<tr><td><div class='header ui-widget-header'>\n"
."<input type=\"checkbox\" id='btn_$flt[1]' onclick=\"selectCheckboxes('grp_$flt[1]', 'summary[]', 'btn_$flt[1]');\" />"
//use current groupname and groupid as heading
@@ -484,7 +483,7 @@ foreach ($filters as $flt)
// File Upload will need special filters in future, hence the special treatment
if ($flt[2] == "|") {$myfield = "|$myfield";}
//numerical input will get special treatment (arihtmetic mean, standard derivation, ...)
if ($flt[2] == "N") {$myfield = "N$myfield";}
$statisticsoutput .= "<input type='checkbox' id='filter$myfield' name='summary[]' value='$myfield'";
@@ -500,9 +499,9 @@ foreach ($filters as $flt)
*
* Auto-check the question types mentioned above
*/
if (isset($summary) && (array_search("{$surveyid}X{$flt[1]}X{$flt[0]}", $summary) !== FALSE
|| array_search("M{$surveyid}X{$flt[1]}X{$flt[0]}", $summary) !== FALSE
|| array_search("P{$surveyid}X{$flt[1]}X{$flt[0]}", $summary) !== FALSE
if (isset($summary) && (array_search("{$surveyid}X{$flt[1]}X{$flt[0]}", $summary) !== FALSE
|| array_search("M{$surveyid}X{$flt[1]}X{$flt[0]}", $summary) !== FALSE
|| array_search("P{$surveyid}X{$flt[1]}X{$flt[0]}", $summary) !== FALSE
|| array_search("N{$surveyid}X{$flt[1]}X{$flt[0]}", $summary) !== FALSE))
{$statisticsoutput .= " checked='checked'";}
@@ -554,18 +553,18 @@ foreach ($filters as $flt)
$myfield2="K{$myfield}".$row[0]."G";
$myfield3="K{$myfield}".$row[0]."L";
if ($counter2 == 4) {$statisticsoutput .= "\t\t\t\t</tr>\n\t\t\t\t<tr>\n"; $counter2=0;}
//start new TD
$statisticsoutput .= "\t\t\t\t<td align='center' valign='top'>";
//checkbox
$statisticsoutput .= "<input type='checkbox' name='summary[]' value='$myfield1'";
//check SGQA -> do we want to pre-check the checkbox?
if (isset($summary) && (array_search("K{$surveyid}X{$flt[1]}X{$flt[0]}{$row[0]}", $summary) !== FALSE))
{$statisticsoutput .= " checked='checked'";}
$statisticsoutput .= " />&nbsp;";
//show speaker
$statisticsoutput .= showSpeaker($flt[3]." - ".FlattenText($row[1]))."<br />\n";
@@ -580,10 +579,10 @@ foreach ($filters as $flt)
."\t\t\t\t\t<input type='text' name='$myfield3' value='";
if (isset($_POST[$myfield3])) {$statisticsoutput .= $_POST[$myfield3];}
$statisticsoutput .= "' onkeypress=\"return goodchars(event,'0123456789.,')\" /><br />\n";
//we added 1 form -> increase counter
$counter2++;
}
break;
@@ -603,16 +602,16 @@ foreach ($filters as $flt)
while ($row = $result->FetchRow())
{
//collecting data for output, for details see above (question type "N")
//we have one input field for each answer
$myfield2 = "Q".$myfield."$row[0]";
if ($counter2 == 4) {$statisticsoutput .= "\t\t\t\t</tr>\n\t\t\t\t<tr>\n"; $counter2=0;}
$statisticsoutput .= "\t\t\t\t<td align='center' valign='top'>";
$statisticsoutput .= "<input type='checkbox' name='summary[]' value='$myfield2'";
if (isset($summary) && (array_search("Q{$surveyid}X{$flt[1]}X{$flt[0]}{$row[0]}", $summary) !== FALSE))
{$statisticsoutput .= " checked='checked'";}
$statisticsoutput .= " />&nbsp;";
$statisticsoutput .= showSpeaker($flt[3]." - ".FlattenText($row[1]))
."<br />\n"
@@ -620,7 +619,7 @@ foreach ($filters as $flt)
."\t\t\t\t\t<input type='text' name='$myfield2' value='";
if (isset($_POST[$myfield2]))
{$statisticsoutput .= $_POST[$myfield2];}
$statisticsoutput .= "' />"
."\t\t\t\t</td>\n";
$counter2++;
@@ -759,7 +758,7 @@ foreach ($filters as $flt)
$statisticsoutput .= " /><strong>";
$statisticsoutput .= showSpeaker($niceqtext)
."<br />\n"
."\t\t\t\t\t<font size='1'>".$clang->gT("Date (YYYY-MM-DD) equals").":<br />\n"
."\t\t\t\t\t<input name='$myfield3' type='text' value='";
@@ -787,11 +786,11 @@ foreach ($filters as $flt)
for ($i=1; $i<=5; $i++)
{
$statisticsoutput .= "\t\t\t\t\t<option value='$i'";
//pre-select values which were marked before
if (isset($_POST[$myfield]) && is_array($_POST[$myfield]) && in_array($i, $_POST[$myfield]))
{$statisticsoutput .= " selected";}
$statisticsoutput .= ">$i</option>\n";
}
@@ -842,7 +841,7 @@ foreach ($filters as $flt)
foreach ($survlangs as $availlang)
{
$statisticsoutput .= "\t\t\t\t\t<option value='".$availlang."'";
//pre-select values which were marked before
if (isset($_POST[$myfield]) && is_array($_POST[$myfield]) && in_array($availlang, $_POST[$myfield]))
{$statisticsoutput .= " selected";}
@@ -869,24 +868,24 @@ foreach ($filters as $flt)
{
$myfield2 = $myfield.$row[0];
$statisticsoutput .= "<!-- $myfield2 - ";
if (isset($_POST[$myfield2])) {$statisticsoutput .= $_POST[$myfield2];}
$statisticsoutput .= " -->\n";
if ($counter2 == 4) {$statisticsoutput .= "\t\t\t\t</tr>\n\t\t\t\t<tr>\n"; $counter2=0;}
$statisticsoutput .= "\t\t\t\t<td align='center'>"
."<input type='checkbox' name='summary[]' value='$myfield2'";
//pre-check
if (isset($summary) && array_search($myfield2, $summary)!== FALSE) {$statisticsoutput .= " checked='checked'";}
$statisticsoutput .= " />&nbsp;"
.showSpeaker($niceqtext." ".str_replace("'", "`", $row[1])." - # ".$flt[3])
."<br />\n"
."\t\t\t\t<select name='{$surveyid}X{$flt[1]}X{$flt[0]}{$row[0]}[]' multiple='multiple'>\n";
//there are always exactly 5 values which have to be listed
for ($i=1; $i<=5; $i++)
{
@@ -898,10 +897,10 @@ foreach ($filters as $flt)
$statisticsoutput .= ">$i</option>\n";
}
$statisticsoutput .= "\t\t\t\t</select>\n\t\t\t\t</td>\n";
$counter2++;
//add this to all the other fields
}
@@ -921,23 +920,23 @@ foreach ($filters as $flt)
{
$myfield2 = $myfield . "$row[0]";
$statisticsoutput .= "<!-- $myfield2 - ";
if (isset($_POST[$myfield2])) {$statisticsoutput .= $_POST[$myfield2];}
$statisticsoutput .= " -->\n";
if ($counter2 == 4) {$statisticsoutput .= "\t\t\t\t</tr>\n\t\t\t\t<tr>\n"; $counter2=0;}
$statisticsoutput .= "\t\t\t\t<td align='center'>"; //heading
$statisticsoutput .= "<input type='checkbox' name='summary[]' value='$myfield2'";
if (isset($summary) && array_search($myfield2, $summary)!== FALSE) {$statisticsoutput .= " checked='checked'";}
$statisticsoutput .= " />&nbsp;"
.showSpeaker($niceqtext." ".str_replace("'", "`", $row[1])." - # ".$flt[3])
."<br />\n"
."\t\t\t\t<select name='{$surveyid}X{$flt[1]}X{$flt[0]}{$row[0]}[]' multiple='multiple'>\n";
//here wo loop through 10 entries to create a larger output form
for ($i=1; $i<=10; $i++)
{
@@ -946,7 +945,7 @@ foreach ($filters as $flt)
if (isset($_POST[$myfield2]) && $_POST[$myfield2] == $i) {$statisticsoutput .= " selected";}
$statisticsoutput .= ">$i</option>\n";
}
$statisticsoutput .= "\t\t\t\t</select>\n\t\t\t\t</td>\n";
$counter2++;
}
@@ -970,44 +969,44 @@ foreach ($filters as $flt)
{
$myfield2 = $myfield . "$row[0]";
$statisticsoutput .= "<!-- $myfield2 - ";
if (isset($_POST[$myfield2])) {$statisticsoutput .= $_POST[$myfield2];}
$statisticsoutput .= " -->\n";
if ($counter2 == 4) {$statisticsoutput .= "\t\t\t\t</tr>\n\t\t\t\t<tr>\n"; $counter2=0;}
$statisticsoutput .= "\t\t\t\t<td align='center'>"
."<input type='checkbox' name='summary[]' value='$myfield2'";
if (isset($summary) && array_search($myfield2, $summary)!== FALSE)
{$statisticsoutput .= " checked='checked'";}
$statisticsoutput .= " />&nbsp;<strong>"
.showSpeaker($niceqtext." ".str_replace("'", "`", $row[1])." - # ".$flt[3])
."</strong><br />\n"
."\t\t\t\t<select name='{$surveyid}X{$flt[1]}X{$flt[0]}{$row[0]}[]' multiple='multiple'>\n"
."\t\t\t\t\t<option value='Y'";
//pre-select "yes"
if (isset($_POST[$myfield2]) && is_array($_POST[$myfield2]) && in_array("Y", $_POST[$myfield2])) {$statisticsoutput .= " selected";}
$statisticsoutput .= ">".$clang->gT("Yes")."</option>\n"
."\t\t\t\t\t<option value='U'";
//pre-select "uncertain"
if (isset($_POST[$myfield2]) && is_array($_POST[$myfield2]) && in_array("U", $_POST[$myfield2])) {$statisticsoutput .= " selected";}
$statisticsoutput .= ">".$clang->gT("Uncertain")."</option>\n"
."\t\t\t\t\t<option value='N'";
//pre-select "no"
if (isset($_POST[$myfield2]) && is_array($_POST[$myfield2]) && in_array("N", $_POST[$myfield2])) {$statisticsoutput .= " selected";}
$statisticsoutput .= ">".$clang->gT("No")."</option>\n"
."\t\t\t\t</select>\n\t\t\t\t</td>\n";
$counter2++;
//add to array
}
@@ -1028,36 +1027,36 @@ foreach ($filters as $flt)
{
$myfield2 = $myfield . "$row[0]";
$statisticsoutput .= "<!-- $myfield2 - ";
if (isset($_POST[$myfield2])) {$statisticsoutput .= $_POST[$myfield2];}
$statisticsoutput .= " -->\n";
if ($counter2 == 4) {$statisticsoutput .= "\t\t\t\t</tr>\n\t\t\t\t<tr>\n"; $counter2=0;}
$statisticsoutput .= "\t\t\t\t<td align='center'>"
."<input type='checkbox' name='summary[]' value='$myfield2'";
if (isset($summary) && array_search($myfield2, $summary)!== FALSE) {$statisticsoutput .= " checked='checked'";}
$statisticsoutput .= " />&nbsp;<strong>"
.showSpeaker($niceqtext." ".str_replace("'", "`", $row[1])." - # ".$flt[3])
."</strong><br />\n"
."\t\t\t\t<select name='{$surveyid}X{$flt[1]}X{$flt[0]}{$row[0]}[]' multiple='multiple'>\n"
."\t\t\t\t\t<option value='I'";
if (isset($_POST[$myfield2]) && is_array($_POST[$myfield2]) && in_array("I", $_POST[$myfield2])) {$statisticsoutput .= " selected";}
$statisticsoutput .= ">".$clang->gT("Increase")."</option>\n"
."\t\t\t\t\t<option value='S'";
if (isset($_POST[$myfield]) && is_array($_POST[$myfield2]) && in_array("S", $_POST[$myfield2])) {$statisticsoutput .= " selected";}
$statisticsoutput .= ">".$clang->gT("Same")."</option>\n"
."\t\t\t\t\t<option value='D'";
if (isset($_POST[$myfield]) && is_array($_POST[$myfield2]) && in_array("D", $_POST[$myfield2])) {$statisticsoutput .= " selected";}
$statisticsoutput .= ">".$clang->gT("Decrease")."</option>\n"
."\t\t\t\t</select>\n\t\t\t\t</td>\n";
$counter2++;
@@ -1189,26 +1188,26 @@ foreach ($filters as $flt)
{
$myfield2 = $myfield . "$row[0]";
$statisticsoutput .= "<!-- $myfield2 - ";
if (isset($_POST[$myfield2])) {$statisticsoutput .= $_POST[$myfield2];}
$statisticsoutput .= " -->\n";
if ($counter2 == 4)
{
$statisticsoutput .= "\t\t\t\t</tr>\n\t\t\t\t<tr>\n";
$counter2=0;
}
$statisticsoutput .= "\t\t\t\t<td align='center'>"
."<input type='checkbox' name='summary[]' value='$myfield2'";
if (isset($summary) && array_search($myfield2, $summary)!== FALSE) {$statisticsoutput .= " checked='checked'";}
$statisticsoutput .= " />&nbsp;<strong>"
.showSpeaker($niceqtext." ".str_replace("'", "`", $row[1])." - # ".$flt[3])
."</strong><br />\n";
/*
* when hoovering the speaker symbol we show the whole question
*
@@ -1223,13 +1222,13 @@ foreach ($filters as $flt)
*/
$fquery = "SELECT * FROM ".db_table_name("answers")." WHERE qid={$flt[0]} AND language='{$language}' ORDER BY sortorder, code";
$fresult = db_execute_assoc($fquery);
//for debugging only:
//$statisticsoutput .= $fquery;
//creating form
$statisticsoutput .= "\t\t\t\t<select name='{$surveyid}X{$flt[1]}X{$flt[0]}{$row[0]}[]' multiple='multiple'>\n";
//loop through all possible answers
while ($frow = $fresult->FetchRow())
{
@@ -1240,10 +1239,10 @@ foreach ($filters as $flt)
$statisticsoutput .= ">({$frow['code']}) ".FlattenText($frow['answer'])."</option>\n";
}
$statisticsoutput .= "\t\t\t\t</select>\n\t\t\t\t</td>\n";
$counter2++;
//add fields to main array
}
@@ -1277,7 +1276,7 @@ foreach ($filters as $flt)
{
//adjust layout depending on counter
if ($counter2 == 4) {$statisticsoutput .= "\t\t\t\t</tr>\n\t\t\t\t<tr>\n"; $counter=0;}
//myfield is the SGQ identifier
//myfield2 is just used as comment in HTML like "R40X34X1721-1"
$myfield2 = "R" . $myfield . $i . "-" . strlen($i);
@@ -1285,19 +1284,19 @@ foreach ($filters as $flt)
$statisticsoutput .= "<!-- $myfield2 - ";
if (isset($_POST[$myfield2])) {$statisticsoutput .= $_POST[$myfield2];}
$statisticsoutput .= " -->\n"
."\t\t\t\t<td align='center'>"
."<input type='checkbox' name='summary[]' value='$myfield2'";
//pre-check
if (isset($summary) && array_search($myfield2, $summary) !== FALSE) {$statisticsoutput .= " checked='checked'";}
$statisticsoutput .= " />&nbsp;<strong>"
.showSpeaker($niceqtext." ".str_replace("'", "`", $row[1])." - # ".$flt[3])
."</strong><br />\n"
."\t\t\t\t<select name='{$surveyid}X{$flt[1]}X{$flt[0]}{$i}[]' multiple='multiple'>\n";
//output lists of ranking items
foreach ($answers as $ans)
{
@@ -1308,10 +1307,10 @@ foreach ($filters as $flt)
$statisticsoutput .= ">$ans[1]</option>\n";
}
$statisticsoutput .= "\t\t\t\t</select>\n\t\t\t\t</td>\n";
$counter2++;
//add averything to main array
}
@@ -1374,7 +1373,7 @@ foreach ($filters as $flt)
//check if there is a dualscale_headerA/B
$dshquery = "SELECT value FROM ".db_table_name("question_attributes")." WHERE qid={$flt[0]} AND attribute='dualscale_headerA'";
$dshresult = db_execute_num($dshquery) or safe_die ("Couldn't get dualscale header!<br />$dshquery<br />".$connect->ErrorMsg());
//get header
while($dshrow=$dshresult->FetchRow())
{
@@ -1393,7 +1392,7 @@ foreach ($filters as $flt)
$statisticsoutput .= " />&nbsp;<strong>"
.showSpeaker($niceqtext." [".str_replace("'", "`", $row[1])."] - ".$clang->gT("Label").": ".$labeltitle)
."</strong><br />\n";
/* get labels
* table "labels" contains
* - lid
@@ -1402,7 +1401,7 @@ foreach ($filters as $flt)
* - sortorder
* - language
*/
$fquery = "SELECT * FROM ".db_table_name("answers")." WHERE qid={$flt[0]} AND language='{$language}' and scale_id=0 ORDER BY sortorder, code";
$fresult = db_execute_assoc($fquery);
@@ -1430,7 +1429,7 @@ foreach ($filters as $flt)
//----------------- LABEL 2 ---------------------
//myfield2 = answer code
$myfield2 = $myfield . "$row[0]#1";
@@ -1460,7 +1459,7 @@ foreach ($filters as $flt)
//check if there is a dualsclae_headerA/B
$dshquery2 = "SELECT value FROM ".db_table_name("question_attributes")." WHERE qid={$flt[0]} AND attribute='dualscale_headerB'";
$dshresult2 = db_execute_num($dshquery2) or safe_die ("Couldn't get dualscale header!<br />$dshquery2<br />".$connect->ErrorMsg());
//get header
while($dshrow2=$dshresult2->FetchRow())
{
@@ -1481,7 +1480,7 @@ foreach ($filters as $flt)
$statisticsoutput .= " />&nbsp;<strong>"
.showSpeaker($niceqtext." [".str_replace("'", "`", $row[1])."] - ".$clang->gT("Label").": ".$labeltitle2)
."</strong><br />\n";
$fquery = "SELECT * FROM ".db_table_name("answers")." WHERE qid={$flt[0]} AND language='{$language}' and scale_id=1 ORDER BY sortorder, code";
$fresult = db_execute_assoc($fquery);
@@ -1552,10 +1551,10 @@ foreach ($filters as $flt)
while ($row=$result->FetchRow())
{
$statisticsoutput .= "\t\t\t\t\t\t<option value='{$row[0]}'";
//pre-check
if (isset($_POST[$myfield]) && is_array($_POST[$myfield]) && in_array($row[0], $_POST[$myfield])) {$statisticsoutput .= " selected";}
$statisticsoutput .= '>'.FlattenText($row[1])."</option>\n";
}

9
include/limesurvey/admin/surveylist.php
View File

@@ -253,14 +253,11 @@ elseif ($action == "ajaxowneredit"){
elseif ($action == "ajaxgetusers"){
header('Content-type: application/json');
$query = "SELECT users_name, uid FROM ".db_table_name('users').";";
$result = db_execute_assoc($query) or safe_die($connect->ErrorMsg());
$aSeenUsers = getuserlist();
$aUsers = array();
if($result->RecordCount() > 0) {
while($rows = $result->FetchRow())
$aUsers[] = array($rows['uid'], $rows['users_name']);
foreach ($aSeenUsers as $userline) {
$aUsers[] = array($userline['uid'], $userline['user']);
}
$ajaxoutput = json_encode($aUsers) . "\n";

38
include/limesurvey/common_functions.php
View File

@@ -2390,8 +2390,25 @@ function createFieldMap($surveyid, $style='short', $force_refresh=false, $questi
$usedinconditions = "Y";
}
else
{
$usedinconditions = "N";
{
// This question is not directly used in a condition, however we should
// check if its SGQA code is not used as a value in another condition
// as a @SGQA@ code
$atsgqaQuery = "SELECT count(1) as sgqausedincondition "
. "FROM ".db_table_name('questions')." as q, "
. db_table_name('conditions')." as c "
. "WHERE c.qid=q.qid AND q.sid=".$arow['sid']." AND "
. "c.value like '@".$arow['sid']."X".$arow['gid']."X".$arow['qid']."%'";
$atsgqaResult = db_execute_assoc($atsgqaQuery) or safe_die ("Couldn't get list @sgqa@ conditions in createFieldMap function.<br />$atsgqaQuery<br />".$connect->ErrorMsg()); //Checked
$atsgqaRow = $atsgqaResult->FetchRow();
if ($atsgqaRow['sgqausedincondition'] == 0 )
{
$usedinconditions = "N";
}
else
{
$usedinconditions = "Y";
}
}
// Field identifier
@@ -7816,4 +7833,21 @@ function sDefaultSubmitHandler()
EOS;
}
/**
* This function fixes the group ID and type on all subquestions
*
*/
function fixSubquestions()
{
$surveyidresult=db_execute_assoc("select sq.qid, sq.parent_qid, sq.gid as sqgid, q.gid, sq.type as sqtype, q.type
from ".db_table_name('questions')." sq JOIN ".db_table_name('questions')." q on sq.parent_qid=q.qid
where sq.parent_qid>0 and (sq.gid!=q.gid or sq.type!=q.type)");
foreach($surveyidresult->GetRows() as $sv)
{
db_execute_assoc('update '.db_table_name('questions')." set type='{$sv['type']}', gid={$sv['gid']} where qid={$sv['qid']}");
}
}
// Closing PHP tag intentionally omitted - yes, it is okay

18
include/limesurvey/docs/release_notes.txt
View File

@@ -78,6 +78,24 @@ HOW TO UPGRADE from a LimeSurvey 1.70(+) version to the latest 1.9x
Thank you to everyone who helped with this new release!
Changes from 1.91+ (build 11026) to 1.91+ (build 11110)
#Updated translation: Polish (elisa-ls)
-Fixed issue: Re-implemented commit 10985 ("groups of "or"ed conditions were displaying multiple times") (maziminke)
-Fied issue: Some single choice questions were missing answer codes for available answer options. Some questions using "other" text fields were missing correct IDs. (maziminke)
-Fixed issue #05476: File upload questions hidden by condition with min file upload set prevent survey submission (lemeur)
-Fixed issue #05477: Users with all rights unticked still see everyone in the system in the surveylist view (lemeur)
-Fixed issue #05483: Conditions using previous answers as rightoperand do not work when both questions are on the same page (lemeur)
-Fixed issue #05493: Conditions using previous answers (coded as @sgqa@) aren't translated when survey is imported. (lemeur)
-Fixed issue 05488: multi numeric - slider, inital value dont register (tpartner)
-Fixed issue: slider layout multinumeric can't be answered without javascript (shnoulle)
-Fixed issue: Path disclosure vulnerabilities (c_schmitz)
-Fixed issue: Templates not editable in Chinese (c_schmitz)
Changes from 1.91+ (build 11018) to 1.91+ (build 11026)
#Updated translation: Italian by Paride Buetti (c_schmitz)
-Fixed issue #5426: Language chooser (c_schmitz)
-Fixed issue: Tabs not properly displaying for subquestion/answer editing (c_schmitz)
Changes from 1.91+ (build 10951) to 1.91+ (build 11018)
#Updated translation : French (b00z00)
#Updated translation: German (c_schmitz)

16
include/limesurvey/group.php
View File

@@ -1361,14 +1361,14 @@ if (!$previewgrp){
}
echo '</div></div>';
echo "<script type=\"text/javascript\">\n"
. " $(\".outerframe\").addClass(\"withindex\");\n"
. " var idx = $(\"#index\");\n"
. " var row = $(\"#index .row.current\");\n"
. " idx.scrollTop(row.position().top - idx.height() / 2 - row.height() / 2);\n"
. "</script>\n";
echo "\n";
/* Can be replaced by php or in global js */
echo "<script type=\"text/javascript\">\n"
. " $(\".outerframe\").addClass(\"withindex\");\n"
. " var idx = $(\"#index\");\n"
. " var row = $(\"#index .row.current\");\n"
. " idx.scrollTop(row.position().top - idx.height() / 2 - row.height() / 2);\n"
. "</script>\n";
echo "\n";
}
echo "<!-- group2.php -->\n"; //This can go eventually - it's redundent for debugging

3
include/limesurvey/index.php
View File

@@ -1102,6 +1102,7 @@ function makelanguagechanger()
$lang = GetBaseLanguageFromSurveyID($surveyid);
$htmlcode ="<select name=\"select\" class='languagechanger' onchange=\"javascript:window.location=this.value\">\n";
$htmlcode .= "<option value=\"$relativeurl/index.php?sid=". $surveyid ."&amp;lang=". $lang ."$tokenparam\">".getLanguageNameFromCode($lang,false)."</option>\n";
$sAddToURL = "";
$sTargetURL = "$relativeurl/index.php";
if ($previewgrp){
@@ -1756,7 +1757,7 @@ function checkUploadedFileValidity($move, $backok=null)
else
$filecount = 0;
if ($filecount < $validation['min_num_of_files'])
if ($filecount < $validation['min_num_of_files'] && checkquestionfordisplay($fieldmap[$field]['qid']))
{
$filenotvalidated = array();
$filenotvalidated[$field] = $clang->gT("The minimum number of files has not been uploaded.");

16
include/limesurvey/qanda.php
View File

@@ -4529,12 +4529,9 @@ function do_multiplenumeric($ia)
. "<div id=\"slider-$myfname\" class=\"ui-slider-1\">\n"
. $slider_showmin
. "<div class=\"slider_callout\" id=\"slider-callout-$myfname\"></div>\n"
. "<div class=\"ui-slider-handle\" id=\"slider-handle-$myfname\"></div>\n"
. $slider_showmax
. "\t</div>"
. "</div>$sliderright\n"
. "<input class=\"text\" type=\"text\" name=\"$myfname\" id=\"answer$myfname\" style=\"display: none;\" value=\"";
if (isset($_SESSION[$myfname]))
. "<div class=\"ui-slider-handle\" id=\"slider-handle-$myfname\"></div>\n";
$answer_main .= "<input class=\"text\" type=\"text\" name=\"$myfname\" id=\"answer$myfname\" value=\"";
if (isset($_SESSION[$myfname]) && $_SESSION[$myfname] != '')
{
$answer_main .= $_SESSION[$myfname];
}
@@ -4542,8 +4539,11 @@ function do_multiplenumeric($ia)
{
$answer_main .= $slider_default;
}
$answer_main .= "\"/>\n"
. "\t</li>\n";
$answer_main .= "\"/>\n";
$answer_main .= $slider_showmax
. "\t</div>"
. "</div>$sliderright\n";
$answer_main .= "\t</li>\n";
}
// $answer .= "\t</tr>\n";

15
include/limesurvey/question.php
View File

@@ -675,14 +675,13 @@ if($thissurvey['allowjumps']=='Y' && !$bIsGroupDescrPage)
}
echo '</div></div>';
echo "<script type=\"text/javascript\">\n"
. " $(\".outerframe\").addClass(\"withindex\");\n"
. " var idx = $(\"#index\");\n"
. " var row = $(\"#index .row.current\");\n"
. " idx.scrollTop(row.position().top - idx.height() / 2 - row.height() / 2);\n"
. "</script>\n";
echo "\n";
echo "<script type=\"text/javascript\">\n"
. " $(\".outerframe\").addClass(\"withindex\");\n"
. " var idx = $(\"#index\");\n"
. " var row = $(\"#index .row.current\");\n"
. " idx.scrollTop(row.position().top - idx.height() / 2 - row.height() / 2);\n"
. "</script>\n";
echo "\n";
}
if (isset($conditions) && is_array($conditions) && count($conditions) != 0)

9
include/limesurvey/replacements.php
View File

@@ -64,6 +64,15 @@ function templatereplace($line, $replacements=array(), $anonymized=false)
{
$surveyformat = "";
}
/*if (isset($thissurvey['allowjumps']) && $thissurvey['allowjumps']=="Y" && $surveyformat!="allinone" && (isset($_SESSION['step']) && $_SESSION['step']>0)){
$surveyformat .= " withindex";
}*/
if (isset($thissurvey['showprogress']) && $thissurvey['showprogress']=="Y"){
$surveyformat .= " showprogress";
}
if (isset($thissurvey['showqnumcode'])){
$surveyformat .= " showqnumcode-".$thissurvey['showqnumcode'];
}
// real survey contact
if (isset($surveylist['contact']))
{

2
include/limesurvey/scripts/jquery/lime-slider.js vendored
View File

@@ -19,7 +19,7 @@ $(document).ready(function(){
// call the init slider routine for each element of the .multinum-slider class
$(".multinum-slider").each(function(i,e) {
var basename = e.id.substr(10);
$('#answer'+basename).hide();
$(this).prev('label').addClass('slider-label'); //3796 TP - add a class to the labels in slider questions to facilitate styling
//$("#slider-"+basename).addClass('ui-slider-2');

8
include/limesurvey/scripts/survey_runtime.js
View File

@@ -110,6 +110,14 @@ $(document).ready(function()
});
}
}
/*replacement for inline javascript for #index */
/*
$("#index").parents(".outerframe").addClass("withindex");
if ($("#index").size() && $("#index .row.current").size()){
var idx = $("#index");
var row = $("#index .row.current");
idx.scrollTop(row.position().top - idx.height() / 2 - row.height() / 2);
*/
});
gmaps = new Object;