don't disable conference if conference-set-profile is disallowed and set expand-vars permission to match code

This commit is contained in:
Raymond Chandler 2013-01-04 20:53:00 -05:00
parent b2714cbc30
commit 5462ea69ac
2 changed files with 3 additions and 2 deletions

View File

@ -55,7 +55,7 @@
<application name="hangup"/>
</application-list>
</permission>
<permission name="expand-vars-in-tag-body" value="false">
<permission name="expand-vars" value="false">
<!-- default to "deny" or "allow" -->
<!-- type attr can be "deny" or "allow" nothing defaults to opposite of the list default so allow in this case -->
<!--

View File

@ -24,6 +24,7 @@
* Contributor(s):
*
* Anthony Minessale II <anthm@freeswitch.org>
* Raymond Chandler <intralanman@freeswitch.org>
*
* mod_httapi.c -- HT-TAPI Hypertext Telephony API
*
@ -1987,7 +1988,7 @@ static switch_status_t do_config(void)
} else if (!strcasecmp(var, "conference")) {
profile->perms.conference.enabled = switch_true(val);
} else if (!strcasecmp(var, "conference-set-profile")) {
profile->perms.conference.enabled = switch_true(val);
if (switch_true(val)) profile->perms.conference.enabled = SWITCH_TRUE;
profile->perms.conference.set_profile = switch_true(val);
}