From b03ec148f2bb5e591bd606752c5a0d1ab716ed5d Mon Sep 17 00:00:00 2001 From: prasad <prasad@vtiger.com> Date: Mon, 26 Feb 2018 18:25:58 +0530 Subject: [PATCH] Fixes #88: HTML tag conversion for SMS message --- packages/vtiger/optional/SMSNotifier.zip | Bin 72625 -> 72671 bytes .../SMSNotifier/workflow/VTSMSTask.php | 6 +++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/vtiger/optional/SMSNotifier.zip b/packages/vtiger/optional/SMSNotifier.zip index f898e4f82fa52e31e237e0dfcf322d710f76ccb7..8b22be752a9e82e36f7ba347f73c58fec33f3ddf 100644 GIT binary patch delta 2448 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 IUrI#Gzu4;@EdT%j delta 2452 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 diff --git a/pkg/vtiger/modules/SMSNotifier/modules/SMSNotifier/workflow/VTSMSTask.php b/pkg/vtiger/modules/SMSNotifier/modules/SMSNotifier/workflow/VTSMSTask.php index a55622f60..59d508c61 100644 --- a/pkg/vtiger/modules/SMSNotifier/modules/SMSNotifier/workflow/VTSMSTask.php +++ b/pkg/vtiger/modules/SMSNotifier/modules/SMSNotifier/workflow/VTSMSTask.php @@ -59,6 +59,10 @@ class VTSMSTask extends VTTask { foreach($recepients as $tonumber) { if(!empty($tonumber)) $tonumbers[] = $tonumber; } + + //As content could be sent with HTML tags. + $content = strip_tags(br2nl($content)); + $this->smsNotifierId = SMSNotifier::sendsms($content, $tonumbers, $current_user->id, $relatedIdsArray); $util->revertUser(); } @@ -89,4 +93,4 @@ class VTSMSTask extends VTTask { return $result; } } -?> \ No newline at end of file +?> -- GitLab