Skip to content

Fix/cpim handling from dryrun 1 #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
LawOfSynergy wants to merge 2 commits into from
Closed

Fix/cpim handling from dryrun 1 #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
626736b
Use rawurldecode() instead of urldecode()
LawOfSynergy May 2, 2026
4476707
Add cachebuster to webtexting.umd.js
LawOfSynergy May 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions outbound-hook.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,17 @@
// Web UI payload (Ian's webtexting)
$to = $event->to;
$contentType = $event->contentType;
$body = urldecode($event->body);
$dedupeID = urldecode($event->id);
$body = rawurldecode($event->body);
$dedupeID = rawurldecode($event->id);
$extensionUUID = $event->extensionUUID;
} else {
// FreeSWITCH event payload (from chatplan Lua via mod_curl)
// extension_uuid set by chatplan: ${user_data(${from_user}@${from_host} var extension_uuid)}
// Note: rawurldecode (RFC 3986) preserves literal `+` in CPIM Content-Type
// (e.g., application/vnd.gsma.rcs-ft-http+xml). urldecode would mangle to space.
$to = $event->to_user;
$contentType = isset($event->type) ? $event->type : 'text/plain';
$body = isset($event->_body) ? urldecode($event->_body) : '';
$body = isset($event->_body) ? rawurldecode($event->_body) : '';
$dedupeID = isset($event->{'sip_h_X-Message-ID'}) ? $event->{'sip_h_X-Message-ID'} : uuid();
$extensionUUID = $event->extension_uuid;
}
Expand Down
2 changes: 1 addition & 1 deletion threadlist.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ class='fas fa-check fa-fw'></span><span class='button-label never pad'>Start</sp

?>
<script src="https://cdn.jsdelivr.net/npm/popper.js@1.14.3/dist/umd/popper.min.js"></script>
<script src="js/webtexting.umd.js"></script>
<script src="js/webtexting.umd.js?v=<?php echo filemtime(__DIR__ . '/js/webtexting.umd.js'); ?>"></script>
<script type="text/javascript">
window.notification_data = <?php echo json_encode(array("extension_uuid" => $extension['extension_uuid'])); ?>;

Expand Down
Loading