Merge branch 'release/13.0' into release/14.0

FreePBX · Jun 5, 2018 · 4f70b67 · 4f70b67
2 parents 6142719 + f32d9ce
commit 4f70b67
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/assets/js/did/did.js b/assets/js/did/did.js
@@ -9,6 +9,9 @@ $("[name='privacyman']").change(function(){
 	}
 });
 $('.fpbx-submit').submit(function() {
+	if (!validateDestinations($(this)[0], 1, true)){
+		return false;
+	}
 	if(!($('#extension').val().match(/^\+?[0-9a-dA-D#\*]+$/)) && ($('#extension').val().trim() != '') && ($('#extension').val().indexOf('_') !== 0)){
 		return warnInvalid($('#extension'), _("DID can only be numbers, A-D, * and #. DID may also start with a +. Patterns must begin with an _"));
 	}

diff --git a/functions.inc.php b/functions.inc.php
@@ -1475,7 +1475,7 @@ function core_do_get_config($engine) {
 			$catchall_context='ext-did-catchall';
 			foreach($didlist as $item) {
 				if (trim($item['destination']) == '') {
-					continue;
+					throw new \Exception("Inbound Route {$item['extension']}/{$item['cidnum']} does not have a valid destination");
 				}
 				$exten = trim($item['extension']);
 				$cidnum = trim($item['cidnum']);