projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into master-civimail-abtest
[civicrm-core.git]
/
CRM
/
Activity
/
BAO
/
Activity.php
diff --git
a/CRM/Activity/BAO/Activity.php
b/CRM/Activity/BAO/Activity.php
index ae1629f98bca67cc8a3c49dcd8108105ac8057b5..efb8f57d1e37de28458c5c98b7d895c8a91c8a8c 100644
(file)
--- a/
CRM/Activity/BAO/Activity.php
+++ b/
CRM/Activity/BAO/Activity.php
@@
-1375,16
+1375,12
@@
LEFT JOIN civicrm_activity_contact src ON (src.activity_id = ac.activity_id AND
$userID = $session->get('userID');
}
$userID = $session->get('userID');
}
- $text = &$activityParams['text_message'];
- $html = &$activityParams['html_message'];
+ $text = &$activityParams['sms_text_message'];
// CRM-4575
// token replacement of addressee/email/postal greetings
// get the tokens added in subject and message
$messageToken = CRM_Utils_Token::getTokens($text);
// CRM-4575
// token replacement of addressee/email/postal greetings
// get the tokens added in subject and message
$messageToken = CRM_Utils_Token::getTokens($text);
- $messageToken = array_merge($messageToken,
- CRM_Utils_Token::getTokens($html)
- );
//create the meta level record first ( sms activity )
$activityTypeID = CRM_Core_OptionGroup::getValue('activity_type',
//create the meta level record first ( sms activity )
$activityTypeID = CRM_Core_OptionGroup::getValue('activity_type',
@@
-1392,13
+1388,7
@@
LEFT JOIN civicrm_activity_contact src ON (src.activity_id = ac.activity_id AND
'name'
);
'name'
);
- // CRM-6265: save both text and HTML parts in details (if present)
- if ($html and $text) {
- $details = "-ALTERNATIVE ITEM 0-\n$html\n-ALTERNATIVE ITEM 1-\n$text\n-ALTERNATIVE END-\n";
- }
- else {
- $details = $html ? $html : $text;
- }
+ $details = $text;
$activitySubject = $activityParams['activity_subject'];
$activityParams = array(
$activitySubject = $activityParams['activity_subject'];
$activityParams = array(
@@
-1454,9
+1444,6
@@
LEFT JOIN civicrm_activity_contact src ON (src.activity_id = ac.activity_id AND
$tokenText = CRM_Utils_Token::replaceContactTokens($text, $values, FALSE, $messageToken, FALSE, $escapeSmarty);
$tokenText = CRM_Utils_Token::replaceHookTokens($tokenText, $values, $categories, FALSE, $escapeSmarty);
$tokenText = CRM_Utils_Token::replaceContactTokens($text, $values, FALSE, $messageToken, FALSE, $escapeSmarty);
$tokenText = CRM_Utils_Token::replaceHookTokens($tokenText, $values, $categories, FALSE, $escapeSmarty);
- $tokenHtml = CRM_Utils_Token::replaceContactTokens($html, $values, TRUE, $messageToken, FALSE, $escapeSmarty);
- $tokenHtml = CRM_Utils_Token::replaceHookTokens($tokenHtml, $values, $categories, TRUE, $escapeSmarty);
-
// Only send if the phone is of type mobile
$phoneTypes = CRM_Core_OptionGroup::values('phone_type', TRUE, FALSE, FALSE, NULL, 'name');
if ($values['phone_type_id'] == CRM_Utils_Array::value('Mobile', $phoneTypes)) {
// Only send if the phone is of type mobile
$phoneTypes = CRM_Core_OptionGroup::values('phone_type', TRUE, FALSE, FALSE, NULL, 'name');
if ($values['phone_type_id'] == CRM_Utils_Array::value('Mobile', $phoneTypes)) {
@@
-1469,7
+1456,6
@@
LEFT JOIN civicrm_activity_contact src ON (src.activity_id = ac.activity_id AND
$sendResult = self::sendSMSMessage(
$contactId,
$tokenText,
$sendResult = self::sendSMSMessage(
$contactId,
$tokenText,
- $tokenHtml,
$smsParams,
$activityID,
$userID
$smsParams,
$activityID,
$userID
@@
-1513,7
+1499,6
@@
LEFT JOIN civicrm_activity_contact src ON (src.activity_id = ac.activity_id AND
*/
static function sendSMSMessage($toID,
&$tokenText,
*/
static function sendSMSMessage($toID,
&$tokenText,
- &$tokenHtml,
$smsParams = array(),
$activityID,
$userID = null
$smsParams = array(),
$activityID,
$userID = null
@@
-1546,13
+1531,12
@@
LEFT JOIN civicrm_activity_contact src ON (src.activity_id = ac.activity_id AND
);
}
);
}
- $message = $tokenHtml ? $tokenHtml : $tokenText;
$recipient = $smsParams['To'];
$smsParams['contact_id'] = $toID;
$smsParams['parent_activity_id'] = $activityID;
$providerObj = CRM_SMS_Provider::singleton(array('provider_id' => $smsParams['provider_id']));
$recipient = $smsParams['To'];
$smsParams['contact_id'] = $toID;
$smsParams['parent_activity_id'] = $activityID;
$providerObj = CRM_SMS_Provider::singleton(array('provider_id' => $smsParams['provider_id']));
- $sendResult = $providerObj->send($recipient, $smsParams, $
message
, NULL, $userID);
+ $sendResult = $providerObj->send($recipient, $smsParams, $
tokenText
, NULL, $userID);
if (PEAR::isError($sendResult)) {
return $sendResult;
}
if (PEAR::isError($sendResult)) {
return $sendResult;
}