Commit Graph

632 Commits

Author SHA1 Message Date
markjcrane 27b8116368 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2015-08-27 13:27:40 -06:00
markjcrane db488b5917 Change require("mime") to require("mime.core"). 2015-08-27 13:27:24 -06:00
Alexey Melnichuk 9ad23e65b5 Fix. Delete number-alias from cache when set DND/Follome/Forward. 2015-08-26 13:44:34 +04:00
markjcrane a49bd861ca Change directory hostname to switchname which is a little more flexible. 2015-08-22 23:25:27 -06:00
Alexey Melnichuk d7bc826c30 Fx. Comment 2015-08-21 17:20:55 +04:00
Alexey Melnichuk 148d2b42f2 Add. Flag to switch mode for building dial-string.
You can configure ether you register with UserID=number-alias or UserID=Extension
In both cases to dial user you should use `user/<number-alias>@domain` or `user_data <number-alias>@domain`

Need test setting of presence_id for case when UserID=Extension.
2015-08-21 16:57:13 +04:00
Alexey Melnichuk fdfa8f715f Change. Store data in cache based on UserID.
Change. Support register with AuthID==UserID==Extension for extension with number-alias.

1. We need only one record in memcache.
  When we get SIP request we can find record by userid.
  When we want check AuthID we do `user_data userid@domain attr id`
  which also search record by userid.
2. We do not need check AuthID if we get record from DB. There already has check.

So we can reduce number of request to
* if there no record in memcached
 - one memcache get (returns not found)
 - database auth
 - one memcache set
* if record in memcache
 - one memcache get to retrieve XML
 - one memcache get to check Extension==AuthID
2015-08-21 16:18:52 +04:00
FusionPBX 9066f19b72 Merge pull request #1116 from moteus/verify_number_alias
Fix. Verify number-alias and user id.
2015-08-20 18:45:45 -06:00
Alexey Melnichuk 897b32be80 Fix. Verify number-alias and user id.
This replaces `inbound-reg-force-matching-username` profile option.
So if your extension has number-alias you can use
UserID=number-alias
AuthID=Extension

It also supports such check on INVITE not only on REGISTER.
2015-08-20 12:27:27 +04:00
Alexey Melnichuk 72cb20f6c4 Revert. Both legs can control of call. 2015-08-19 10:06:22 +04:00
Alexey Melnichuk 42a15cab44 Fix. Concatenate record extension 2015-08-18 15:49:56 +04:00
Alexey Melnichuk 8442ea979e Change. Use bind_bind_digit instead of bind_meta_app.
Change. Allow transfer and turn on recordings only for authorized users.
Fix. Use record_ext in recording in ring_group.

This allow configure other dtmf sequence like `*#` and `##`
2015-08-18 15:38:41 +04:00
markjcrane 2e6f90fb80 Fax keep local updates. 2015-08-16 02:01:37 -06:00
markjcrane 772474faae Update ring group rollover so that it works like standard roll over. If busy it moves to the next line. If not busy and timeout it moves to the timeout action. 2015-08-14 15:27:48 -06:00
markjcrane 1e6d8bfa26 IVR Menu allow one of the options to override direct dial to an extension. 2015-08-14 11:26:11 -06:00
markjcrane fe904dfc1c Remove an extra line and change the console message. 2015-08-14 09:47:00 -06:00
FusionPBX fe45b3c036 Merge pull request #1098 from moteus/toll_allow_forward
Set Toll Allow for call forward/follow me
2015-08-14 08:34:17 -06:00
FusionPBX 65f0ddd438 Merge pull request #1097 from moteus/toll_allow
Change. toll_allow use ordered template-list.
2015-08-14 08:33:19 -06:00
Alexey Melnichuk 46bbc28220 Change. Use toll_allow of extension who set call forward. 2015-08-14 13:27:47 +04:00
Alexey Melnichuk a85e7eb70a Fix. Off debug output 2015-08-14 12:26:34 +04:00
Alexey Melnichuk 0b11ab57de Change. toll_allow use ordered template-list.
Add. Russian toll_allow templates.

This needs because we need
89%d is mobile except 8940%d which one is international.
2015-08-14 12:07:38 +04:00
markjcrane 09c4dd79d0 Remove hostname on the acl memcache variable name. 2015-08-13 19:49:09 -06:00
markjcrane 3f9bef47ee Abbreviation for variables are discouraged because they aren't intuitive especially for those from other languages. Replace 'ep' variable no idea what it represented to 'user' which is what freeswitch calls ans extension that you register to. 2015-08-13 11:34:48 -06:00
FusionPBX c4374178a4 Merge pull request #1093 from moteus/dnd_number_alias
Fix. Use number alias to forward call to VM when DND is on.
2015-08-13 11:25:08 -06:00
Alexey Melnichuk 5f67be647d Fix. Use number alias to forward call to VM when DND is on (Lua part) 2015-08-13 13:14:46 +04:00
markjcrane d5592672f0 base_dir is not dependable as its irrelevant for freeswitch package installs replace it with settings['switch']['voicemail']['dir']. 2015-08-12 23:45:27 -06:00
markjcrane 27a72bfa59 Remove outbound restriction for intercept. 2015-08-12 23:38:46 -06:00
FusionPBX 72d489ec65 Merge pull request #1091 from moteus/intercept_outbound
Fix. Allow intercept only outbound calls.
2015-08-12 23:34:43 -06:00
markjcrane 47c8fb090d Add expire["acl.conf"] = "3600"; 2015-08-12 23:31:21 -06:00
markjcrane b44cacd07a Add acl.conf.lua to the xml handler. 2015-08-12 23:21:10 -06:00
Alexey Melnichuk ce9e2cc4d1 Fix. Allow intercept only outbound calls.
Now it is possible intercept call from local extension to the world.

Fix. intercept channels also in EARLY state.

One of my softphones return 180 Ringing with SDP (no 183 Progress).
And FreeSWITCH shows such channel as `EARLY` not as `RINGING`)
2015-08-12 10:09:56 +04:00
FusionPBX 81003e35d8 Merge pull request #1018 from moteus/number_alias_as_vm_id
Change. Use number_alias as voicemail_id.
2015-08-11 20:43:20 -06:00
markjcrane 42d9548fac XML Handler - directory.lua change ext to username. 2015-08-11 20:36:01 -06:00
FusionPBX c117b071e6 Merge pull request #1080 from moteus/dial_number_alias
Fix. Use number_alias in dial-string.
2015-08-11 20:31:42 -06:00
FusionPBX 9087c09182 Merge pull request #1081 from moteus/number_alias_as_caller_id
Fix. Use number-alias as caller_id_number variable.
2015-08-11 20:30:19 -06:00
markjcrane 601c532013 Change '//' to '/'. This fixes a problem where its calling require when it should call dofile. 2015-08-11 20:25:34 -06:00
FusionPBX 9f4287a9b4 Merge pull request #1087 from moteus/revert-1086-revert-1053-require_config
Change. Use `require` function to load Lua libraries
2015-08-11 20:05:48 -06:00
FusionPBX 978bec7cbd Merge pull request #1088 from moteus/number_alis_group_intercept
Fix. Group intercept extension with number alias
2015-08-11 20:05:04 -06:00
markjcrane 558c82d386 Add a break to prevent call the failover bridge statement at the same time the primary bridge statement is called. 2015-08-11 13:42:46 -06:00
Alexey Melnichuk 4639001ca3 Fix. Include config file. 2015-08-11 14:40:02 +04:00
Alexey Melnichuk c19b6cc7ee Fix. Group intercept extension with number alias 2015-08-11 14:18:25 +04:00
Alexey Melnichuk 3e16e69adb Revert "Revert "Change. Use `require "resources.functions.config"` to load co…" 2015-08-11 05:06:33 +03:00
FusionPBX 2a2dd209df Revert "Change. Use `require "resources.functions.config"` to load config file." 2015-08-10 11:50:29 -06:00
FusionPBX 559aa61fbd Merge pull request #1053 from moteus/require_config
Change. Use `require "resources.functions.config"` to load config file.
2015-08-10 11:31:35 -06:00
markjcrane 1d6c6463e7 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2015-08-10 11:22:11 -06:00
markjcrane bec13ef258 Ring group external destinations use the | as the delimiter for fail-over. 2015-08-10 11:21:48 -06:00
FusionPBX cd21e26893 Merge pull request #1079 from moteus/temp_dir
Fix. Use `temp_dir` variable instead of hard coded `/tmp`
2015-08-10 10:25:22 -06:00
FusionPBX 983365ad41 Merge pull request #1084 from moteus/page_active_conf
Fix. Allow monitoring page conferences via `Active Conferences` app.
2015-08-10 10:23:03 -06:00
Alexey Melnichuk d8b2ec5271 Fix. add functions/count.lua to preview commit. 2015-08-10 13:01:49 +04:00
Alexey Melnichuk 703b61636a Change. Use only `require` to load function.
Fix. Remove multiple definition of same function.
2015-08-10 12:43:06 +04:00
Alexey Melnichuk b5cacea373 Fix. Allow monitoring page conferences via `Active Conferences` app. 2015-08-10 11:43:32 +04:00
Luis Daniel Lucio Quiroz f1e082bc03 Use os.time instead of mysql native function
Odd, but on some deployments LUA wont accept unixtime stamp functions (regardless it works on CLI). So, to workaround this, lets use os.time() which it returns the same value expected.
2015-08-09 21:56:28 -06:00
Alexey Melnichuk b97ae86283 Fix. Use number-alias as caller_id_number variable. 2015-08-07 16:17:25 +04:00
Alexey Melnichuk bfa72cc78a Fix. Use number_alias in dial-string. 2015-08-07 15:18:52 +04:00
Alexey Melnichuk 630d9e020c Fix. Always use `/` separator on FS command.
Fix. Override `temp_dir` from `config.lua` file.
2015-08-07 12:11:27 +04:00
Alexey Melnichuk 785136eca9 Fix. Use `temp_dir` variable instead of hard coded `/tmp` 2015-08-07 11:52:18 +04:00
markjcrane a1fdd5c220 Fix a problem with custom public context and XMl handler. 2015-07-31 21:03:22 -06:00
markjcrane 173e9ca691 Fix fax_retry.lua for domain_name and domain_uuid. Add [FAX] to the logging to the console. 2015-07-30 19:32:18 -06:00
Alexey Melnichuk 565395c44f Fix. Correct path when user on `group_confirm_file` 2015-07-28 15:59:04 +04:00
markjcrane d8c9c3910f Remove trailing tabs. 2015-07-23 17:50:16 -06:00
markjcrane 32b782d3f0 Prevent nil errors in settings.lua. 2015-07-22 09:42:35 -06:00
Alexey Melnichuk 3da348fff0 Change. Use `require "resources.functions.config"` to load config file.
Change. Move `script_dir` definition into config file.
2015-07-22 13:20:51 +04:00
Alexey Melnichuk 57808740ef Merge branch 'master' into number_alias_as_vm_id
Conflicts:
	app/hot_desking/extension_edit.php
2015-07-21 11:19:13 +04:00
FusionPBX a214b57f81 Merge pull request #1047 from moteus/page_concat_conf_name
Fix. Concat conf name in page.lua
2015-07-20 16:52:23 -06:00
markjcrane 6f9eb6ab29 After call forward has been set with feature code *72 or *74 play back the number that call forward is set to. 2015-07-20 12:59:45 -06:00
markjcrane 4fc2bbaa9f Voicemail to email send the email in the send_email.lua rather than with email.lua. So that the delete doesn't occur until after email is sent. 2015-07-20 11:40:31 -06:00
Alexey Melnichuk 4b30e652b4 Fix. Concat conf name in page.lua 2015-07-20 12:44:05 +04:00
FusionPBX 861e545541 Merge pull request #1037 from moteus/copy_voice_mail
Fix. Use OS specific copy function.
2015-07-18 12:55:05 -07:00
FusionPBX 59e4f6b91f Merge pull request #1023 from moteus/ext-dial-string
Fix. Use extension to generate dial-string in xml_handler
2015-07-18 12:54:24 -07:00
FusionPBX 064f73aa70 Merge pull request #1045 from moteus/page_domain
Page domain
2015-07-18 12:47:55 -07:00
FusionPBX 8e989c7fb6 Merge pull request #1040 from moteus/vm-phrase
Change. Use predefined phrases in vm menu.
2015-07-18 12:45:34 -07:00
Alexey Melnichuk 61f5e77cfb Fix. Use `temp_dir` to debug dialplan xml file 2015-07-16 12:56:13 +04:00
Alexey Melnichuk 78541b67ce Fix. Use correct conf name on originate 2015-07-16 12:11:57 +04:00
Alexey Melnichuk 8fbbbda5a4 Fix. Make page extension domain specific. 2015-07-16 11:50:07 +04:00
Alexey Melnichuk 3a805e1870 Change. Use predefined phrases in vm menu.
Current implementation produces not correct phrases e.g. on Russian language.
2015-07-14 13:42:05 +04:00
Alexey Melnichuk acec54be57 Fix. Use OS specific copy function. 2015-07-13 10:44:47 +04:00
markjcrane 63c6031da6 Change 'is null' to 'is not null'. 2015-07-10 08:00:08 -03:00
markjcrane ec532e8d12 Play voicemail messages with the newest messages first. 2015-07-08 15:46:34 -03:00
markjcrane c0a6c121f2 Prevent nil from causing problems with functions/settings.lua. 2015-07-08 15:36:33 -03:00
Alexey Melnichuk fec3b0f14c Fix. xml_handler/directory generate vm params based on number_alias 2015-07-07 18:16:21 +04:00
Alexey Melnichuk 1d5bb75f2d Fix. Use extension to generate dial-string in xml_handler
When uses number_alias contact should be searched by extension name.
2015-07-07 17:47:50 +04:00
FusionPBX 410cb1a268 Update confirm.lua
Add a domain_name nil check.
2015-07-04 04:16:44 -06:00
markjcrane 8b3c4ca914 Use originate_delay_start to fix the enterprise ring group delay. 2015-07-03 09:51:02 -06:00
Mark Crane cafc371c88 Fix a problem where the inbound context has public in the name with public@ as a prefix and .public as a suffix. 2015-06-30 18:42:52 +00:00
Mark Crane f994329edb FAX sure domain_uuid is set at the right time. 2015-06-30 18:01:30 +00:00
Mark Crane 88ef7714b5 Minor adjustments for confirm.lua and ring groups ensure domain_name and domain_uuid are set. 2015-06-24 19:31:53 +00:00
Mark Crane f2bbf183fa Add the call screen recording to work with call forward and follow me. 2015-06-23 23:41:15 +00:00
Mark Crane ad34763c8d Set call_screen_enabled as a variable in directory.lua. 2015-06-23 20:33:22 +00:00
Mark Crane 1510c1c631 Add extension_call_screen permission, and add call_screen_enabled to extensions/extension_edit.php. 2015-06-23 20:06:44 +00:00
Mark Crane 2f9dd5f1e0 A few more adjustments to get the ring group missed call working. 2015-06-20 04:06:20 +00:00
Mark Crane 140af2ffa2 Add missed call option to ring groups. 2015-06-20 03:43:38 +00:00
Mark Crane 6252e5bfb0 Fix call center xml handler domain. 2015-06-18 20:08:54 +00:00
Mark Crane 7cec657e76 Add a missing quote fixes a problem with call center using xml handler and fix the indentation. 2015-06-18 19:25:42 +00:00
Mark Crane 0bcea327b9 Add a missing quote fixes a problem with call center using xml handler. 2015-06-18 19:20:51 +00:00
Mark Crane cbb81d43f4 When dialing *74 clear the call forward destination which will allow it to set a new one with *73. 2015-06-18 06:55:46 +00:00
Mark Crane c296880fff Add variable for Ring Group Distinctive Ring ${domain_name} and ${local_ip_v4} 2015-06-15 23:26:02 +00:00
Mark Crane 83daf1ed73 When leaving a voicemail use the message_waiting function. 2015-06-11 06:31:10 +00:00
Mark Crane f80bc84639 Use the mwi_account under accounts -> extensions to allow sending MWI to multiple extensions. 2015-06-11 06:30:21 +00:00
luis daniel lucio quiroz 5a168e3779 load balancing fixed 2015-06-11 01:43:30 +00:00
Mark Crane c33995d84b Add ring_group_distinctive_ring to the destinations array. 2015-06-07 16:26:53 +00:00
Mark Crane 8d71798eeb Add a prefix of Alert-Info= 2015-06-07 04:10:41 +00:00
Mark Crane 7cdddbf5d0 Add ring group distinctive ring option to the lua. 2015-06-07 04:06:39 +00:00
Mark Crane 2b69ac00d7 Synchronize the translations. 2015-06-06 02:37:26 +00:00
Mark Crane 3de401da03 Fix hold music when used with Conference Center and XML Handler. 2015-06-04 22:43:46 +00:00
luis daniel lucio quiroz 7b5b36ffa0 mod_verto xml handler support 2015-05-30 22:14:01 +00:00
Mark Crane d060fd8b70 Sync the changes to fix conference recording from the dev branch. Add a few comments and make the indentation consistent. 2015-05-30 20:32:01 +00:00
Mark Crane c65187284a Improve the indentation. 2015-05-30 20:19:36 +00:00
Mark Crane e969555a46 A little more polish for this feature. 2015-05-30 04:50:19 +00:00
Mark Crane 0bd5391e34 Add the api object to the failur handler. 2015-05-29 05:53:02 +00:00
Mark Crane 4c45d7d457 Update failure handler with the necessary changes for missed calls. 2015-05-29 05:46:21 +00:00
Mark Crane dd3f6bc784 Add trim include to the failure_handler. 2015-05-29 05:36:50 +00:00
Mark Crane c380e29913 Add a hangup hook to dialplan local_extension and remove originator cancel from the failure_handler. 2015-05-29 05:16:34 +00:00
Mark Crane 47f37420c8 Add app/hangup to support originator cancel for missed calls. 2015-05-29 05:12:41 +00:00
Mark Crane d14507fdf8 Add missed call email notification. 2015-05-29 03:56:49 +00:00
Mark Crane 9b9d174d8c Change the file from ANSI to UTF-8 no BOM. 2015-05-29 02:55:25 +00:00
luis daniel lucio quiroz 49ea23507c conference_session_uuid issue fixed, the recording path is now fixed with/without multitenant 2015-05-28 18:41:43 +00:00
Mark Crane 4a937c83f1 Change how the previous alternate device is handled. 2015-05-25 16:31:08 +00:00
Mark Crane 196a99b70a Handle Do Not Disturb set on the extension for ring groups. 2015-05-16 23:38:07 +00:00
Mark Crane 7aacf2578c Remove the code that is attempts and succeeds to prevent DND extension from affecting the Ring Groups because it also prevents calling external numbers and using bridge statements in the ring group. Will commit a fix soon that does an alternative way of removing extensions that are set to DND in FusionPBX's GUI. 2015-05-15 19:14:18 +00:00
Mark Crane f2403e5efa Remove session:sleep from scripts/confirm.lua. 2015-05-15 01:38:09 +00:00
Mark Crane 28c4f7ea50 Page conference settings need page caller controls. For non modertor 0 mute and press again to unmute. 2015-05-14 01:56:11 +00:00
Mark Crane a9107f4edf Remove ;; from the XML Handler. 2015-05-13 16:43:30 +00:00
Mark Crane a438c8134b Fix a nil error for fax_remote_station_id and make the caller id name and number work for inbound FAX. 2015-05-13 06:46:36 +00:00
Nate Jones 7860fe106d Ring Groups: DND extensions not included when retrieving Ring Group destinations (real fix for Issue 927, re: r8338). 2015-05-12 05:59:33 +00:00
Nate Jones a3b256b4d9 Fax: Fix fax-to-email, better conversion to PDF. 2015-05-11 23:41:11 +00:00
Nate Jones 9b200a70d3 Fax: Prevent fax_destination field from being populated on received faxes. 2015-05-09 06:21:53 +00:00
Nate Jones 95e965b108 Fax: Upgrade script to generate and store meta-data from existing fax files, fix Lua script to insert correct fax file path into db, JavaScript prompt corrections, adjust redirect after send to use new interface, fix delete so files on file system are removed (using path from db), fix paging and sorting on Inbox and Sent, fix TIF to PDF conversion for viewing sent/received faxes (if PDF version not present). 2015-05-09 05:22:29 +00:00
Mark Crane b48f216946 Fix call forward no answer by changing originate_disposition from "ALLOTTED_TIMEOUT" to "NO_ANSWER". 2015-05-08 14:48:48 +00:00
Mark Crane a04f13c89e Update the comments on provision/index.lua 2015-05-06 04:39:26 +00:00
Mark Crane 1fbd2a332b Put the message date back in the email template but comment it out. It's removed by default because it doesn't respect the timezone per domain. 2015-05-05 17:23:25 +00:00
Mark Crane ffa7603990 Remove the message_date from the voicemail to email template. 2015-05-05 16:25:51 +00:00
Mark Crane b1a33cf477 Change leg_timeout for call_timeout in the xml handler directory. 2015-05-05 07:34:19 +00:00
Mark Crane da8bd3f010 Change the copyright year on the ring groups lua script. 2015-05-05 07:12:44 +00:00
Mark Crane c889363820 Add domain_uuid to the ring group SQL query. 2015-05-05 07:11:31 +00:00
Mark Crane 8cda7312cd Remove the DND check on the ring groups as it caused the query to return duplicate destination numbers. 2015-05-05 06:35:43 +00:00
Mark Crane b701652c78 Fix the sip profile enabled by changing the alias from 's' to a 'p'. 2015-05-05 05:34:00 +00:00
Mark Crane 96d4e0cea1 Change scripts directory from user_status to agent_status. 2015-05-04 18:40:54 +00:00
Mark Crane cbd41428c8 Lua script app/user_status updated to use agent_id and agent_password. 2015-05-04 18:34:43 +00:00
Mark Crane f79c9925f0 Add support for the new sip profiles enabled field. 2015-05-02 05:08:41 +00:00
Mark Crane e972d383d1 Add domain_uuid to the provision SQL queries and add debug SQL option. 2015-05-01 13:37:04 +00:00
Mark Crane 9b2cac9d34 Add additional auhtorized checks and comment out debugging code. 2015-05-01 12:57:06 +00:00
Mark Crane 144ac08ca9 Change device_model to device_uuid_alternate. 2015-04-30 10:21:23 +00:00
Nate Jones b38be32c9c Paging: Ability to grant caller moderator status/controls, auto-generate random pin.
Conference: Add missing caller-controls and moderator-controls parameters in autoload_config.
2015-04-30 09:45:41 +00:00
Mark Crane 1f3c104435 Get the login details from devices table. 2015-04-30 09:33:19 +00:00
Nate Jones cad0b090b6 XML Handler: Include missing language macros. 2015-04-30 06:59:24 +00:00
Mark Crane ffa08fda46 Add lua script app/provision. 2015-04-30 05:42:30 +00:00
Mark Crane f7db70d77c Remove two trailing tabs from the end of the lines. 2015-04-29 21:48:08 +00:00
Nate Jones ab4d1840b4 SIP: Return "NO_ANSWER" instead of "NORMAL_CLEARING" if an extension is called with voicemail disabled. Implements patch suggested in Issue 920. Thanks. 2015-04-29 21:21:00 +00:00
Nate Jones 7ec16e4dda Recordings: Add sleep (1s) before ID prompt. 2015-04-29 21:05:19 +00:00
Nate Jones 1429f978f0 Ring Group: Fixes Issue 927 - Assigned extensions set to DND (via the GUI) will not be included when the Ring Group executes. 2015-04-29 00:29:20 +00:00