From f53ea1ce3659445360ad20890c11bd59c25d0d82 Mon Sep 17 00:00:00 2001 From: Deepak Srivastava Date: Mon, 22 Apr 2013 17:44:49 +0530 Subject: [PATCH] Fix for CRM-12391 --- CRM/Activity/BAO/Activity.php | 4 +++- CRM/Contact/Form/Task/SMSCommon.php | 19 +++++++++--------- CRM/SMS/Provider.php | 2 +- .../extensions/org.civicrm.sms.clickatell.zip | Bin 7430 -> 7471 bytes .../org_civicrm_sms_clickatell.php | 4 ++-- tools/extensions/org.civicrm.sms.twilio.zip | Bin 5900 -> 5934 bytes .../org_civicrm_sms_twilio.php | 2 +- 7 files changed, 17 insertions(+), 14 deletions(-) diff --git a/CRM/Activity/BAO/Activity.php b/CRM/Activity/BAO/Activity.php index 996379dbbe..941e55c19e 100644 --- a/CRM/Activity/BAO/Activity.php +++ b/CRM/Activity/BAO/Activity.php @@ -1498,6 +1498,7 @@ LEFT JOIN civicrm_case_activity ON ( civicrm_case_activity.activity_id = tbl.a ); } + $success = 0; $escapeSmarty = $sent = FALSE; foreach ($contactDetails as $values) { $contactId = $values['contact_id']; @@ -1533,10 +1534,11 @@ LEFT JOIN civicrm_case_activity ON ( civicrm_case_activity.activity_id = tbl.a )) { // even a single successful delivery should set this falg to true $sent = TRUE; + $success++; } } - return array($sent, $activity->id); + return array($sent, $activity->id, $success); } /** diff --git a/CRM/Contact/Form/Task/SMSCommon.php b/CRM/Contact/Form/Task/SMSCommon.php index d21c14495f..79cbfd1aea 100644 --- a/CRM/Contact/Form/Task/SMSCommon.php +++ b/CRM/Contact/Form/Task/SMSCommon.php @@ -170,7 +170,7 @@ class CRM_Contact_Form_Task_SMSCommon { } } - if (is_array($form->_contactIds) && $toSetDefault) { + if (is_array($form->_contactIds) && !empty($form->_contactIds) && $toSetDefault) { $returnProperties = array( 'sort_name' => 1, 'phone' => 1, @@ -393,26 +393,27 @@ class CRM_Contact_Form_Task_SMSCommon { $smsParams = $thisValues; unset($smsParams['text_message']); $smsParams['provider_id'] = $fromSmsProviderId; + $contactIds = array_keys($form->_contactDetails); + $allContactIds = array_keys($form->_allContactDetails); - list($sent, $activityId) = CRM_Activity_BAO_Activity::sendSMS($formattedContactDetails, + list($sent, $activityId, $countSuccess) = CRM_Activity_BAO_Activity::sendSMS($formattedContactDetails, $thisValues, $smsParams, - array_keys($form->_contactDetails) + $contactIds ); if ($sent) { - $count_success = count($form->_contactDetails); - CRM_Core_Session::setStatus(ts('One message was sent successfully.', array('plural' => '%count messages were sent successfully.', 'count' => $count_success)), ts('Message Sent', array('plural' => 'Messages Sent', 'count' => $count_success)), 'success'); + CRM_Core_Session::setStatus(ts('One message was sent successfully.', array('plural' => '%count messages were sent successfully.', 'count' => $countSuccess)), ts('Message Sent', array('plural' => 'Messages Sent', 'count' => $countSuccess)), 'success'); } //Display the name and number of contacts for those sms is not sent. - $smsNotSent = array_diff_assoc($form->_allContactDetails, $form->_contactDetails); + $smsNotSent = array_diff_assoc($allContactIds, $contactIds); if (!empty($smsNotSent)) { $not_sent = array(); - foreach ($smsNotSent as $contactId => $values) { - $displayName = $values['display_name']; - $phone = $values['phone']; + foreach ($smsNotSent as $index => $contactId) { + $displayName = $form->_allContactDetails[$contactId]['display_name']; + $phone = $form->_allContactDetails[$contactId]['phone']; $contactViewUrl = CRM_Utils_System::url('civicrm/contact/view', "reset=1&cid=$contactId"); $not_sent[] = "$displayName"; } diff --git a/CRM/SMS/Provider.php b/CRM/SMS/Provider.php index ae9cbeaee6..3bcf023234 100644 --- a/CRM/SMS/Provider.php +++ b/CRM/SMS/Provider.php @@ -159,7 +159,7 @@ INNER JOIN civicrm_mailing_job mj ON mj.mailing_id = m.id AND mj.id = %1"; return $value; } - function inbound($from, $body, $to = NULL, $trackID = NULL) { + function processInbound($from, $body, $to = NULL, $trackID = NULL) { $formatFrom = $this->formatPhone($this->stripPhone($from), $like, "like"); $escapedFrom = CRM_Utils_Type::escape($formatFrom, 'String'); $fromContactID = CRM_Core_DAO::singleValueQuery('SELECT contact_id FROM civicrm_phone WHERE phone LIKE "' . $escapedFrom . '"'); diff --git a/tools/extensions/org.civicrm.sms.clickatell.zip b/tools/extensions/org.civicrm.sms.clickatell.zip index 6d8308ce37692a18aaa3ded976c3c6b90dd911bf..9730f743290abc4e3d58b287c5368068331877c7 100644 GIT binary patch delta 4557 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'from', 'String'); $fromPhone = $this->formatPhone($this->stripPhone($fromPhone), $like, "like"); - return parent::inbound($fromPhone, $this->retrieve('text', 'String'), NULL, $this->retrieve('moMsgId', 'String')); + return parent::processInbound($fromPhone, $this->retrieve('text', 'String'), NULL, $this->retrieve('moMsgId', 'String')); } /** diff --git a/tools/extensions/org.civicrm.sms.twilio.zip b/tools/extensions/org.civicrm.sms.twilio.zip index eba3894bb3d79a511a64034292bc8fc781e79927..7c581aec36fb50207f2af6ad0cb13b7fe8f6dcc5 100644 GIT binary patch delta 1355 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 diff --git a/tools/extensions/org.civicrm.sms.twilio/org_civicrm_sms_twilio.php b/tools/extensions/org.civicrm.sms.twilio/org_civicrm_sms_twilio.php index 783ea757e3..a4eedc97db 100644 --- a/tools/extensions/org.civicrm.sms.twilio/org_civicrm_sms_twilio.php +++ b/tools/extensions/org.civicrm.sms.twilio/org_civicrm_sms_twilio.php @@ -183,7 +183,7 @@ class org_civicrm_sms_twilio extends CRM_SMS_Provider { function inbound() { $like = ""; $fromPhone = $this->retrieve('From', 'String'); - return parent::inbound($fromPhone, $this->retrieve('Body', 'String'), NULL, $this->retrieve('SmsSid', 'String')); + return parent::processInbound($fromPhone, $this->retrieve('Body', 'String'), NULL, $this->retrieve('SmsSid', 'String')); } /** -- 2.25.1