Merge branch 'develop' into feature/638

pull/642/head
Tim 2018-09-08 14:02:16 +02:00 committed by GitHub
commit 347c5365eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 3 deletions

View File

@ -6,6 +6,7 @@ Not yet released
---------------- ----------------
* #642: Added post field as addition to #631. * #642: Added post field as addition to #631.
* #644: Fixed urlencoding in Nexmo message
* #639: Added combined notifications. * #639: Added combined notifications.
* #626: Added redirect check. * #626: Added redirect check.
* #627: Latest server output, error and output during a failure will be saved and are shown on the server page. * #627: Latest server output, error and output during a failure will be saved and are shown on the server page.

View File

@ -54,8 +54,6 @@ class Nexmo extends Core {
$success = 1; $success = 1;
$error = ""; $error = "";
$message = rawurlencode($message);
foreach ($this->recipients as $recipient) { foreach ($this->recipients as $recipient) {
$curl = curl_init(); $curl = curl_init();

View File

@ -94,8 +94,31 @@ $().ready(function() {
$('#type').change(function () { $('#type').change(function () {
changeTypeSwitch($('#type').val()); 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) { function changeTypeSwitch(typeInput) {
switch (typeInput) { switch (typeInput) {
case 'service': case 'service':