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

Default to selected template if no token in queXS to determine template

Browse Source
This commit is contained in:
Adam Zammit
2016-12-23 14:44:04 +11:00
parent 2e7234aee9
commit e06cab9190
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/limesurvey/index.php
View File

@@ -505,8 +505,9 @@ else
} }
$qtmp = quexs_get_template($clienttoken);
if ($interviewer) if ($interviewer || $qtmp === false)
{ {
//SET THE TEMPLATE DIRECTORY //SET THE TEMPLATE DIRECTORY
if (!$thissurvey['templatedir']) if (!$thissurvey['templatedir'])
@@ -520,8 +521,8 @@ if ($interviewer)
} }
else else
{ {
$thissurvey['templatedir'] = quexs_get_template($clienttoken); $thissurvey['templatedir'] = $qtmp;
$thistpl=sGetTemplatePath(quexs_get_template($clienttoken)); $thistpl=sGetTemplatePath($qtmp);
} }

4
include/limesurvey/quexs.php
View File

@@ -70,7 +70,7 @@ else
*/ */
function quexs_get_template($clienttoken) function quexs_get_template($clienttoken)
{ {
if (empty($clienttoken)) return 'default'; if (empty($clienttoken)) return false;
$db = newADOConnection(DB_TYPE); $db = newADOConnection(DB_TYPE);
$db->Connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); $db->Connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
@@ -84,7 +84,7 @@ function quexs_get_template($clienttoken)
$tpl = $db->GetOne($sql); $tpl = $db->GetOne($sql);
if (empty($tpl)) if (empty($tpl))
return 'default'; return false;
else else
return $tpl; return $tpl;
} }