From cd67df870669498d7e65d2b000cf79f2d5e408db Mon Sep 17 00:00:00 2001 From: Mark Crane Date: Mon, 16 Dec 2013 21:56:19 +0000 Subject: [PATCH] Default Extension enabled to true for those that don't have the new extension_enabled permission. --- app/extensions/extension_edit.php | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/app/extensions/extension_edit.php b/app/extensions/extension_edit.php index 4dd60d7cbd..2f9fcc5a25 100644 --- a/app/extensions/extension_edit.php +++ b/app/extensions/extension_edit.php @@ -274,7 +274,9 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { //if (strlen($cidr) == 0) { $msg .= $text['message-required']."CIDR
\n"; } //if (strlen($sip_force_contact) == 0) { $msg .= $text['message-required']."SIP Force Contact
\n"; } //if (strlen($dial_string) == 0) { $msg .= $text['message-required']."Dial String
\n"; } - if (strlen($enabled) == 0) { $msg .= $text['message-required'].$text['label-enabled']."
\n"; } + if (permission_exists('extension_enabled')) { + if (strlen($enabled) == 0) { $msg .= $text['message-required'].$text['label-enabled']."
\n"; } + } //if (strlen($description) == 0) { $msg .= $text['message-required']."Description
\n"; } if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) { require_once "resources/header.php"; @@ -377,9 +379,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { } $sql .= "sip_bypass_media, "; $sql .= "dial_string, "; - if (permission_exists('extension_enabled')) { - $sql .= "enabled, "; - } + $sql .= "enabled, "; $sql .= "description "; $sql .= ")"; $sql .= "values "; @@ -439,6 +439,9 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { if (permission_exists('extension_enabled')) { $sql .= "'$enabled', "; } + else { + $sql .= "'true', "; + } $sql .= "'$description' "; $sql .= ")"; $db->exec(check_sql($sql)); @@ -538,7 +541,9 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $sql .= "mwi_account = '$mwi_account', "; $sql .= "sip_bypass_media = '$sip_bypass_media', "; $sql .= "dial_string = '$dial_string', "; - $sql .= "enabled = '$enabled', "; + if (permission_exists('extension_enabled')) { + $sql .= "enabled = '$enabled', "; + } $sql .= "description = '$description' "; $sql .= "where domain_uuid = '$domain_uuid' "; $sql .= "and extension_uuid = '$extension_uuid'";