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

Email from should be for this particular questionnaire

Browse Source 
Only autoadvance if an interviewer
This commit is contained in:
Adam Zammit
2013-04-08 10:45:00 +10:00
parent a12722cf76
commit cd4860622b
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
email.php
View File

@@ -202,19 +202,15 @@ if (isset($_POST['firstname']))
} }
$sql = "SELECT stg_value $sql = "SELECT admin,adminemail
FROM " . LIME_PREFIX . "settings_global FROM " . LIME_PREFIX . "surveys
WHERE stg_name LIKE 'siteadminemail'"; WHERE sid = $lime_sid";
$fromemail = $db->GetOne($sql); $from = $db->GetRow($sql);
$sql = "SELECT stg_value $mail->SetFrom($from['adminemail'],$from['admin']);
FROM " . LIME_PREFIX . "settings_global $mail->Sender = $from['adminemail'];
WHERE stg_name LIKE 'siteadminname'";
$fromname = $db->GetOne($sql);
$mail->SetFrom($fromemail,$fromname);
$mail->AddAddress($_POST['email']); $mail->AddAddress($_POST['email']);
foreach ($customheaders as $key=>$val) foreach ($customheaders as $key=>$val)
{ {

12
include/limesurvey/qanda.php
View File

@@ -64,7 +64,17 @@ function quexs_submit_on_click($do = true)
$r = "; $('.submit').css('display', ''); "; $r = "; $('.submit').css('display', ''); ";
if (LIME_AUTO_ADVANCE && $do) $interviewer=returnglobal('interviewer');
if (!empty($interviewer) || (isset($_SESSION['interviewer']) && $_SESSION['interviewer'] == true))
{
$interviewer = true;
}
else
{
$interviewer = false;
}
if (LIME_AUTO_ADVANCE && $do && $interviewer)
{ {
$r .= " document.limesurvey.move.value = '"; $r .= " document.limesurvey.move.value = '";
if (isset($_SESSION['step']) && $_SESSION['step'] && ($_SESSION['step'] == $_SESSION['totalsteps'])) if (isset($_SESSION['step']) && $_SESSION['step'] && ($_SESSION['step'] == $_SESSION['totalsteps']))