Add from_extension back to the user_record dialplan and fix the record_session condition

This commit is contained in:
Mark Crane
2014-08-03 17:16:00 +00:00
parent 62626d2a7c
commit 9ce9be52a6

View File

@@ -4,53 +4,51 @@
<action application="set" data="user_record=${user_data ${destination_number}@${domain_name} var user_record}" inline="true"/> <action application="set" data="user_record=${user_data ${destination_number}@${domain_name} var user_record}" inline="true"/>
<action application="set" data="from_user_exists=${user_exists id ${sip_from_user} ${sip_from_host}}" inline="true"/> <action application="set" data="from_user_exists=${user_exists id ${sip_from_user} ${sip_from_host}}" inline="true"/>
</condition> </condition>
<condition field="${user_exists}" expression="^true$"/> <condition field="${user_exists}" expression="^true$" break="never"/>
<condition field="${user_record}" expression="^all$" break="never"> <condition field="${user_record}" expression="^all$" break="never">
<action application="set" data="record_session=true" inline="true"/> <action application="set" data="record_session=true" inline="true"/>
</condition> </condition>
<condition field="${user_exists}" expression="^true$"/> <condition field="${user_exists}" expression="^true$" break="never"/>
<condition field="${call_direction}" expression="^inbound$" break="never"/> <condition field="${call_direction}" expression="^inbound$" break="never"/>
<condition field="${user_record}" expression="^inbound$" break="never"> <condition field="${user_record}" expression="^inbound$" break="never">
<action application="set" data="record_session=true" inline="true"/> <action application="set" data="record_session=true" inline="true"/>
</condition> </condition>
<condition field="${user_exists}" expression="^true$"/> <condition field="${user_exists}" expression="^true$" break="never"/>
<condition field="${call_direction}" expression="^outbound$" break="never"/> <condition field="${call_direction}" expression="^outbound$" break="never"/>
<condition field="${user_record}" expression="^outbound$" break="never"> <condition field="${user_record}" expression="^outbound$" break="never">
<action application="set" data="record_session=true" inline="true"/> <action application="set" data="record_session=true" inline="true"/>
</condition> </condition>
<condition field="${user_exists}" expression="^true$"/> <condition field="${user_exists}" expression="^true$" break="never"/>
<condition field="${call_direction}" expression="^local$" break="never"/> <condition field="${call_direction}" expression="^local$" break="never"/>
<condition field="${user_record}" expression="^local$" break="never"> <condition field="${user_record}" expression="^local$" break="never">
<action application="set" data="record_session=true" inline="true"/> <action application="set" data="record_session=true" inline="true"/>
</condition> </condition>
<!-- <condition field="${from_user_exists}" expression="^true$" break="never">
<condition field="${from_user_exists}" expression="^true$">
<action application="set" data="from_user_record=${user_data ${sip_from_user}@${sip_from_host} var user_record}" inline="true"/> <action application="set" data="from_user_record=${user_data ${sip_from_user}@${sip_from_host} var user_record}" inline="true"/>
</condition> </condition>
<condition field="${from_user_exists}" expression="^true$"/> <condition field="${from_user_exists}" expression="^true$" break="never"/>
<condition field="${from_user_record}" expression="^all$"> <condition field="${from_user_record}" expression="^all$" break="never">
<action application="set" data="record_session=true" inline="true"/> <action application="set" data="record_session=true" inline="true"/>
</condition> </condition>
<condition field="${from_user_exists}" expression="^true$"/> <condition field="${from_user_exists}" expression="^true$" break="never"/>
<condition field="${call_direction}" expression="^inbound$"/> <condition field="${call_direction}" expression="^inbound$" break="never"/>
<condition field="${from_user_record}" expression="^inbound$"> <condition field="${from_user_record}" expression="^inbound$" break="never">
<action application="set" data="record_session=true" inline="true"/> <action application="set" data="record_session=true" inline="true"/>
</condition> </condition>
<condition field="${from_user_exists}" expression="^true$"/> <condition field="${from_user_exists}" expression="^true$" break="never"/>
<condition field="${call_direction}" expression="^outbound$"/> <condition field="${call_direction}" expression="^outbound$" break="never"/>
<condition field="${from_user_record}" expression="^outbound$"> <condition field="${from_user_record}" expression="^outbound$" break="never">
<action application="set" data="record_session=true" inline="true"/> <action application="set" data="record_session=true" inline="true"/>
</condition> </condition>
<condition field="${from_user_exists}" expression="^true$"/> <condition field="${from_user_exists}" expression="^true$" break="never"/>
<condition field="${call_direction}" expression="^local$"/> <condition field="${call_direction}" expression="^local$" break="never"/>
<condition field="${from_user_record}" expression="^local$"> <condition field="${from_user_record}" expression="^local$" break="never">
<action application="set" data="record_session=true" inline="true"/> <action application="set" data="record_session=true" inline="true"/>
</condition> </condition>
-->
<condition field="${file_exists ${recordings_dir}/${domain_name}/archive/${strftime(%Y)}/${strftime(%b)}/${strftime(%d)}}" expression="^false$" break="never"> <condition field="${file_exists ${recordings_dir}/${domain_name}/archive/${strftime(%Y)}/${strftime(%b)}/${strftime(%d)}}" expression="^false$" break="never">
<action application="system" data="mkdir -p ${recordings_dir}/${domain_name}/archive/${strftime(%Y)}/${strftime(%b)}/${strftime(%d)}"/> <action application="system" data="mkdir -p ${recordings_dir}/${domain_name}/archive/${strftime(%Y)}/${strftime(%b)}/${strftime(%d)}"/>
</condition> </condition>
<condition field="record_session" expression="^true$"> <condition field="${record_session}" expression="^true$">
<action application="set" data="api_on_answer=${uuid_record ${uuid} start ${recordings_dir}/${domain_name}/archive/${strftime(%Y)}/${strftime(%b)}/${strftime(%d)}/${uuid}.${record_ext}}"/> <action application="set" data="api_on_answer=${uuid_record ${uuid} start ${recordings_dir}/${domain_name}/archive/${strftime(%Y)}/${strftime(%b)}/${strftime(%d)}/${uuid}.${record_ext}}"/>
</condition> </condition>
</extension> </extension>