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

Keep removing direct references to LIME (email needs more work)

Browse Source
This commit is contained in:
Adam Zammit
2017-02-03 11:22:29 +11:00
parent 87391f25a6
commit 1a4b41fd04
3 changed files with 23 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
admin/supervisor.php
View File

@@ -491,10 +491,11 @@ if ($case_id != false)
//Modify the case in Limesurvey
$sid = get_lime_sid($case_id);
$id = get_lime_id($case_id);
$id = get_lime_id($case_id);
$url = get_lime_url($case_id);
print "<div class='panel-body'>";
if ($id)
print "<h4><a href='" . LIME_URL . "admin/admin.php?action=dataentry&amp;sid=$sid&amp;subaction=edit&amp;id=$id' class='btn btn-default btn-lime'><i class='fa fa-lemon-o fa-lg'></i>&emsp;" . T_("Modify responses for this case") . "</a></h4>";
print "<h4><a href='" . $url . "admin/dataentry?sa=editdata&amp;subaction=edit&amp;surveyid=$sid&amp;id=$id' class='btn btn-default btn-lime'><i class='fa fa-lemon-o fa-lg'></i>&emsp;" . T_("Modify responses for this case") . "</a></h4>";
else
print "<div class='alert text-danger' role='alert'>" . T_("Case not yet started in Limesurvey") . "</div>";
print "</div></div>";

172
email.php
View File

@@ -85,162 +85,19 @@ if (isset($_POST['email']) && ((isset($_POST['firstname']) && !empty($_POST['fir
$firstname = $db->qstr($_POST['firstname']);
$lastname = $db->qstr($_POST['lastname']);
//update the limesurvey database email details
$sql = "UPDATE " . LIME_PREFIX ."tokens_{$lime_sid}
SET email = $email, firstname = $firstname, lastname = $lastname, emailstatus = 'OK'
WHERE token = '$token'";
//set in Limesurvey
//set_participant_properties($sSessionKey, $lime_sid, array['token' => $token], array['email' => $email, 'firstname' => $firstname, 'lastname' => $lastname, 'emailstatus' => 'OK']);
$db->Execute($sql);
//Send email
include_once("include/limesurvey/classes/phpmailer/class.phpmailer.php");
$fieldsarray = array();
$fieldsarray["{EMAIL}"]=$_POST['email'];
$fieldsarray["{FIRSTNAME}"]=$_POST['firstname'];
$fieldsarray["{LASTNAME}"]=$_POST['lastname'];
$fieldsarray["{TOKEN}"]=$token;
$fieldsarray["{LANGUAGE}"]=DEFAULT_LOCALE;
$fieldsarray["{SID}"]=$fieldsarray["{SURVEYID}"]=$lime_sid;
//$fieldsarray["{SURVEYNAME}"]=$thissurvey["surveyls_title"];
$sql = "SELECT sivr.var,sv.val
FROM `sample_var` as sv, `sample_import_var_restrict` as sivr, `case` as c
WHERE c.case_id = $case_id
AND sv.sample_id = c.sample_id
AND sivr.var_id = sv.var_id";
$attributes = $db->GetAssoc($sql);
//Assign sample variables
foreach ($attributes as $attributefield=>$val)
if (0) //if mail sent - disable temporarily
{
$fieldsarray['{SAMPLE:'.strtoupper($attributefield).'}']=$val;
}
$fieldsarray["{OPTOUTURL}"]=LIME_URL . "optout.php?lang=".trim(DEFAULT_LOCALE)."&sid=$lime_sid&token={$token}";
$fieldsarray["{SURVEYURL}"]=LIME_URL . "index.php?lang=".trim(DEFAULT_LOCALE)."&sid=$lime_sid&token={$token}";
$barebone_link=$fieldsarray["{SURVEYURL}"];
$customheaders = array( '1' => "X-surveyid: ".$lime_sid, '2' => "X-tokenid: ".$fieldsarray["{TOKEN}"]);
$sql = "SELECT surveyls_email_invite_subj, surveyls_email_invite
FROM `lime_surveys_languagesettings`
WHERE `surveyls_survey_id` = $lime_sid
order by surveyls_language LIKE '" . DEFAULT_LOCALE . "' DESC";
$econtent = $db->GetRow($sql);
$modsubject = $econtent['surveyls_email_invite_subj'];
$modmessage = $econtent['surveyls_email_invite'];
foreach ( $fieldsarray as $key => $value )
{
$modsubject=str_replace($key, $value, $modsubject);
}
foreach ( $fieldsarray as $key => $value )
{
$modmessage=str_replace($key, $value, $modmessage);
}
$modsubject = str_replace("@@SURVEYURL@@", $barebone_link, $modsubject);
$modmessage = str_replace("@@SURVEYURL@@", $barebone_link, $modmessage);
$mail = new PHPMailer;
$mail->CharSet = 'UTF-8';
$sql = "SELECT stg_value
FROM " . LIME_PREFIX . "settings_global
WHERE stg_name = 'emailsmtpssl'";
$emailsmtpssl = $db->GetOne($sql);
if (isset($emailsmtpssl) && trim($emailsmtpssl)!=='' && $emailsmtpssl!==0)
{
if ($emailsmtpssl===1)
{
$mail->SMTPSecure = "ssl";
}
else
{
$mail->SMTPSecure = $emailsmtpssl;
}
}
$sql = "SELECT stg_value
FROM " . LIME_PREFIX . "settings_global
WHERE stg_name = 'emailmethod'";
$emailmethod = $db->GetOne($sql);
switch ($emailmethod) {
case "qmail":
$mail->IsQmail();
break;
case "smtp":
$mail->IsSMTP();
$sql = "SELECT stg_name,stg_value
FROM " . LIME_PREFIX . "settings_global";
$ec =$db->GetAssoc($sql);
if (strpos($ec['emailsmtphost'],':')>0)
{
$mail->Host = substr($ec['emailsmtphost'],0,strpos($ec['emailsmtphost'],':'));
$mail->Port = substr($ec['emailsmtphost'],strpos($ec['emailsmtphost'],':')+1);
}
else {
$mail->Host = $ec['emailsmtphost'];
}
$mail->Username =$ec['emailsmtpuser'];
$mail->Password =$ec['emailsmtppassword'];
if (trim($ec['emailsmtpuser'])!="")
{
$mail->SMTPAuth = true;
}
break;
case "sendmail":
$mail->IsSendmail();
break;
default:
//Set to the default value to rule out incorrect settings.
$emailmethod="mail";
$mail->IsMail();
}
$sql = "SELECT admin,adminemail
FROM " . LIME_PREFIX . "surveys
WHERE sid = $lime_sid";
$from = $db->GetRow($sql);
$mail->SetFrom($from['adminemail'],$from['admin']);
$mail->Sender = $from['adminemail'];
$mail->AddAddress($_POST['email']);
foreach ($customheaders as $key=>$val)
{
$mail->AddCustomHeader($val);
}
$mail->AddCustomHeader("X-Surveymailer: queXS Emailer (quexs.sourceforge.net)");
$mail->IsHTML(true);
$mail->Body = $modmessage;
$mail->AltBody = trim(strip_tags(html_entity_decode($modmessage,ENT_QUOTES,'UTF-8')));
$mail->Subject = $modsubject;
if ($mail->Send())
{
// Put call attempt id in to sent
// Put call attempt id in to sent in Limesurvey
$sql = "UPDATE ". LIME_PREFIX . "tokens_{$lime_sid}
SET sent='$ca'
WHERE token='$token'";
$db->Execute($sql);
//$db->Execute($sql);
//Add a note that sent
@@ -249,23 +106,6 @@ if (isset($_POST['email']) && ((isset($_POST['firstname']) && !empty($_POST['fir
$db->Execute($sql);
//set to start frm the first page if the format for the respondent is not question by question
$sql = "SELECT q.lime_mode
FROM questionnaire as q, `case` as c
WHERE c.case_id = $case_id
AND q.questionnaire_id = c.questionnaire_id";
$lmode = $db->GetOne($sql);
if ($lmode != "question")
{
$sql = "UPDATE " . LIME_PREFIX ."survey_{$lime_sid}
SET lastpage = 0
WHERE token = '$token'";
$db->Execute($sql);
}
if (isset($_POST['submith']))
{
end_call($operator_id,41); //end with outcome sent

14
functions/functions.limesurvey.php
View File

@@ -676,6 +676,20 @@ function create_limesurvey_questionnaire($title,$exittoend = true)
}
function get_lime_url($case_id)
{
global $db;
$sql = "SELECT r.entry_url
FROM remote as r, `case` as c, questionnaire as q
WHERE c.case_id = $case_id
AND c.questionnaire_id = q.questionnaire_id
AND q.remote_id = r.id";
return $db->GetOne($sql);
}
/**
* Return the limesurvey id given the case_id
*