From 617ffb5739cadc232a42225dca76e1d9b6b74e5c Mon Sep 17 00:00:00 2001 From: TimZ99 Date: Sat, 8 Sep 2018 13:51:37 +0200 Subject: [PATCH 1/2] Added advanced switch (removed during merge #627) --- static/js/scripts.js | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/static/js/scripts.js b/static/js/scripts.js index bcebcabd..3a743d49 100755 --- a/static/js/scripts.js +++ b/static/js/scripts.js @@ -93,8 +93,31 @@ $().ready(function() { $('#type').change(function () { changeTypeSwitch($('#type').val()); }); + + // advanced information + $(".advanced").hide(); + var advanced = 0; + $("#advanced").click( + function() { + advancedSwitch((advanced += 1) % 2); + }); }); +function advancedSwitch(statusInput) { + switch (statusInput) { + case 0: + $(".advanced").slideUp(); + break; + + case 1: + $(".advanced").slideDown(); + break; + + default: + $(".advanced").hide(); + } +} + function changeTypeSwitch(typeInput) { switch (typeInput) { case 'service': From b59afd9d338f97989330997def092a36d4ea4ec2 Mon Sep 17 00:00:00 2001 From: Tim Date: Sat, 8 Sep 2018 13:54:09 +0200 Subject: [PATCH 2/2] Removed url encoding from Nexmo message (#644) --- CHANGELOG.rst | 1 + src/psm/Txtmsg/Nexmo.php | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 22f5c1c2..4ac4c4e5 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,6 +5,7 @@ Changelog Not yet released ---------------- +* #644: Fixed urlencoding in Nexmo message * #639: Added combined notifications. * #626: Added redirect check. * #627: Latest server output, error and output during a failure will be saved and are shown on the server page. diff --git a/src/psm/Txtmsg/Nexmo.php b/src/psm/Txtmsg/Nexmo.php index f7cb7ee7..a4bf51ff 100644 --- a/src/psm/Txtmsg/Nexmo.php +++ b/src/psm/Txtmsg/Nexmo.php @@ -53,9 +53,7 @@ class Nexmo extends Core { public function sendSMS($message) { $success = 1; $error = ""; - - $message = rawurlencode($message); - + foreach ($this->recipients as $recipient) { $curl = curl_init();