diff --git a/resources/install/scripts/app/ring_groups/index.lua b/resources/install/scripts/app/ring_groups/index.lua index fed00574a0..0cbc8832f5 100644 --- a/resources/install/scripts/app/ring_groups/index.lua +++ b/resources/install/scripts/app/ring_groups/index.lua @@ -75,11 +75,10 @@ end --set the recording path - recording_archive = recordings_dir - if (domain_count > 1) then - recording_archive = recording_archive.."/"..domain_name; - end - recording_archive = recording_archive.."/archive/"..(os.date("%Y")).."/"..(os.date("%b")).."/"..(os.date("%d")); + recording_archive = recordings_dir .. "/" .. domain_name .. "/archive/" .. os.date("%Y/%b/%d"); + +--set the recording file + record_file = recording_archive:gsub("\\", "/") .. "/" .. uuid .. "." .. record_ext --prepare the api object api = freeswitch.API(); @@ -346,6 +345,7 @@ cmd = "user_data ".. destination_number .."@"..domain_name.." var user_record"; user_record = trim(api:executeString(cmd)); --set the record_session variable + record_session = false; if (user_record == "all") then record_session = true; end @@ -361,9 +361,11 @@ --record the session if (record_session) then - cmd = "uuid_record "..uuid.." start "..recording_archive.."/"..uuid.."."..record_ext; - response = api:executeString(cmd); + record_session = ",api_on_answer='uuid_record "..uuid.." start ".. record_file .. "'"; + else + record_session = "" end + row.record_session = record_session --process according to user_exists, sip_uri, external number if (user_exists == "true") then @@ -371,26 +373,27 @@ cmd = "user_data ".. destination_number .."@"..domain_name.." var extension_uuid"; extension_uuid = trim(api:executeString(cmd)); --send to user + local dial_string_to_user = "[sip_invite_domain="..domain_name..","..group_confirm.."leg_timeout="..destination_timeout..","..delay_name.."="..destination_delay..",dialed_extension=" .. row.destination_number .. ",extension_uuid="..extension_uuid .. row.record_session .. "]user/" .. row.destination_number .. "@" .. domain_name; if (ring_group_skip_active ~= nil) then if (ring_group_skip_active == "true") then cmd = "show channels like "..destination_number; reply = trim(api:executeString(cmd)); --freeswitch.consoleLog("notice", "[ring group] reply "..cmd.." " .. reply .. "\n"); if (reply == "0 total.") then - dial_string = "[sip_invite_domain="..domain_name..","..group_confirm.."leg_timeout="..destination_timeout..","..delay_name.."="..destination_delay..",dialed_extension=" .. row.destination_number .. ",extension_uuid="..extension_uuid.."]user/" .. row.destination_number .. "@" .. domain_name; + dial_string = dial_string_to_user else if (string.find(reply, domain_name)) then --active call else - dial_string = "[sip_invite_domain="..domain_name..","..group_confirm.."leg_timeout="..destination_timeout..","..delay_name.."="..destination_delay..",dialed_extension=" .. row.destination_number .. ",extension_uuid="..extension_uuid.."]user/" .. row.destination_number .. "@" .. domain_name; + dial_string = dial_string_to_user; end end else --look inside the reply to check for the correct domain_name - dial_string = "[sip_invite_domain="..domain_name..","..group_confirm.."leg_timeout="..destination_timeout..","..delay_name.."="..destination_delay..",dialed_extension=" .. row.destination_number .. ",extension_uuid="..extension_uuid.."]user/" .. row.destination_number .. "@" .. domain_name; + dial_string = dial_string_to_user; end else - dial_string = "[sip_invite_domain="..domain_name..","..group_confirm.."leg_timeout="..destination_timeout..","..delay_name.."="..destination_delay..",dialed_extension=" .. row.destination_number .. ",extension_uuid="..extension_uuid.."]user/" .. row.destination_number .. "@" .. domain_name; + dial_string = dial_string_to_user; end elseif (tonumber(destination_number) == nil) then --sip uri @@ -496,7 +499,6 @@ -- end --set bind digit action - local record_file = recordings_dir.."/archive/"..os.date("%Y").."/"..os.date("%m").."/"..os.date("%d").."}/"..uuid.."."..record_ext local bindings = { "local,*1,exec:execute_extension,dx XML " .. context, "local,*2,exec:record_session," .. record_file, @@ -537,7 +539,7 @@ --send the call to the destination if (user_exists == "true") then - dial_string = "["..group_confirm.."sip_invite_domain="..domain_name..",dialed_extension=" .. destination_number .. ",extension_uuid="..extension_uuid..",domain_name="..domain_name..",domain_uuid="..domain_uuid.."]user/" .. destination_number .. "@" .. domain_name; + dial_string = "["..group_confirm.."sip_invite_domain="..domain_name..",dialed_extension=" .. destination_number .. ",extension_uuid="..extension_uuid..",domain_name="..domain_name..",domain_uuid="..domain_uuid..row.record_session.."]user/" .. destination_number .. "@" .. domain_name; session:execute("bridge", dial_string); elseif (tonumber(destination_number) == nil) then --sip uri diff --git a/resources/install/scripts/app/voicemail/app_languages.lua b/resources/install/scripts/app/voicemail/app_languages.lua index e7be24c3e9..0c2daed73b 100644 --- a/resources/install/scripts/app/voicemail/app_languages.lua +++ b/resources/install/scripts/app/voicemail/app_languages.lua @@ -5,15 +5,22 @@ text['label-download']['en-us'] = "Download"; text['label-download']['es-cl'] = "Descargar"; text['label-download']['pt-pt'] = "Baixar"; text['label-download']['fr-fr'] = "Télécharger"; +text['label-download']['de-de'] = "Download"; +text['label-download']['de-at'] = "Download"; text['label-listen'] = {}; text['label-listen']['en-us'] = "Listen"; text['label-listen']['es-cl'] = "Escuchar"; text['label-listen']['pt-pt'] = "Ouvir"; text['label-listen']['fr-fr'] = "Écouter"; +text['label-listen']['de-de'] = "Anhören"; +text['label-listen']['de-at'] = "Anhören"; text['label-attached'] = {}; text['label-attached']['en-us'] = "Attached"; text['label-attached']['es-cl'] = "Adjunto"; text['label-attached']['pt-pt'] = "Ligado"; -text['label-attached']['fr-fr'] = "Attaché"; \ No newline at end of file +text['label-attached']['fr-fr'] = "Attaché"; +text['label-attached']['de-de'] = "im Anhang"; +text['label-attached']['de-at'] = "im Anhang"; + diff --git a/resources/install/scripts/app/voicemail/resources/templates/de/at/email_body.tpl b/resources/install/scripts/app/voicemail/resources/templates/de/at/email_body.tpl new file mode 100644 index 0000000000..3d459931aa --- /dev/null +++ b/resources/install/scripts/app/voicemail/resources/templates/de/at/email_body.tpl @@ -0,0 +1,61 @@ + + + + + + + + +
+Neue Sprachnachricht +
+ + + + + + + + + + + + + + + + + + +
+Nebenstelle + +${account}@${domain_name} +
+Anrufer + +${caller_id_number} +
+Nachricht + +${message} +
+Länge + +${message_duration} +
+
+ diff --git a/resources/install/scripts/app/voicemail/resources/templates/de/at/email_subject.tpl b/resources/install/scripts/app/voicemail/resources/templates/de/at/email_subject.tpl new file mode 100644 index 0000000000..a410ff3338 --- /dev/null +++ b/resources/install/scripts/app/voicemail/resources/templates/de/at/email_subject.tpl @@ -0,0 +1 @@ +Sprachnachricht von ${caller_id_name} <${caller_id_number}> ${message_duration} diff --git a/resources/install/scripts/app/voicemail/resources/templates/de/de/email_body.tpl b/resources/install/scripts/app/voicemail/resources/templates/de/de/email_body.tpl new file mode 100644 index 0000000000..3d459931aa --- /dev/null +++ b/resources/install/scripts/app/voicemail/resources/templates/de/de/email_body.tpl @@ -0,0 +1,61 @@ + + + + + + + + +
+Neue Sprachnachricht +
+ + + + + + + + + + + + + + + + + + +
+Nebenstelle + +${account}@${domain_name} +
+Anrufer + +${caller_id_number} +
+Nachricht + +${message} +
+Länge + +${message_duration} +
+
+ diff --git a/resources/install/scripts/app/voicemail/resources/templates/de/de/email_subject.tpl b/resources/install/scripts/app/voicemail/resources/templates/de/de/email_subject.tpl new file mode 100644 index 0000000000..a410ff3338 --- /dev/null +++ b/resources/install/scripts/app/voicemail/resources/templates/de/de/email_subject.tpl @@ -0,0 +1 @@ +Sprachnachricht von ${caller_id_name} <${caller_id_number}> ${message_duration} diff --git a/resources/templates/provision/snom/7xx/{$mac}.xml b/resources/templates/provision/snom/7xx/{$mac}.xml index 4bf3c626b6..08dafb4a42 100644 --- a/resources/templates/provision/snom/7xx/{$mac}.xml +++ b/resources/templates/provision/snom/7xx/{$mac}.xml @@ -36,35 +36,40 @@ {$display_name_1} {$user_id_1} {$user_password_1} -{$server_address_1} +{$server_address_1}:{$sip_port_1};transport={$sip_transport_1} +{$register_expires_1} Default off *97 {$display_name_2} {$user_id_2} {$user_password_2} -{$server_address_2} +{$server_address_2}:{$sip_port_2};transport={$sip_transport_2} +{$register_expires_2} Default off *97 {$display_name_3} {$user_id_3} {$user_password_3} -{$server_address_3} +{$server_address_3}:{$sip_port_3};transport={$sip_transport_3} +{$register_expires_3} Default off *97 {$display_name_4} {$user_id_4} {$user_password_4} -{$server_address_4} +{$server_address_4}:{$sip_port_4};transport={$sip_transport_4} +{$register_expires_4} Default off *97 {$display_name_5} {$user_id_5} {$user_password_5} -{$server_address_5} +{$server_address_5}:{$sip_port_5};transport={$sip_transport_5} +{$register_expires_5} Default off *97