Commit Graph

1016 Commits

Author SHA1 Message Date
markjcrane fafe273c18 Fix a spelling mistake in xml handler ivr.conf.lua. 2016-03-20 00:49:21 -06:00
markjcrane 2a280afea9 Fix direct dial for IVR using the xml handler. 2016-03-19 18:13:49 -06:00
markjcrane 61987425af Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-03-11 14:21:28 -07:00
markjcrane c11459fae8 Get the domain_name from the array. 2016-03-11 14:21:08 -07:00
FusionPBX ee0df44e0d Merge pull request #1461 from mafoo/BugFix-ring_groups
corrected function definition
2016-03-11 13:25:20 -07:00
FusionPBX 260bf24100 Merge pull request #1479 from mafoo/WhitespaceClean-resources/install/scripts
WhitespaceClean-resources/install/scripts
2016-03-11 13:20:17 -07:00
markjcrane f5c2222f97 Prevent custom sip port from breaking provision.lua and add prevent nil concatenation errors. 2016-03-11 10:31:11 -07:00
mafoo 0eb7d5ddac WhitespaceClean-resources/install/scripts
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 13:21:52 +00:00
markjcrane 66ba2802bd The last two changes to xml handler dialplan.lua did not work well with global dialplans. Removed some of the changes to fix the regression. 2016-03-11 00:58:52 -07:00
markjcrane 7b5d8f08c5 Add missing call_direction for ring group destinations. 2016-03-10 18:10:49 -07:00
markjcrane 833860e067 Use a more efficient way to get the domain name for xml handler - dialplan. 2016-03-10 08:18:46 -07:00
markjcrane d14d4aeb8a Increase efficiency xml handler section dialplan. 2016-03-09 13:09:25 -07:00
mafoo 8ceec465ac corrected function definition
fixed bug introduced on 2/1/2016 in destination.lua
fixed bug introduced on 2/1/2016 in ring_member.lua
2016-03-09 17:54:44 +00:00
markjcrane 6804772e06 Fix the phrases_dir if statement. If the phrases_dir is not null then need to include xml from the file system. 2016-03-07 10:30:29 -07:00
markjcrane 90a9e55b77 Handle the phrases_dir nil in a more flexible way. 2016-03-04 15:51:10 -07:00
markjcrane 9ffcf3d872 Ensure the phrases_dir is not nil. 2016-03-04 15:08:58 -07:00
markjcrane ac0f620302 Prevent a nil error for xml handler languages. 2016-03-04 12:35:37 -07:00
markjcrane cb8aaac1f7 Add ring_member.lua to app/ring_groups/resources/scripts/ring_member.lua. 2016-02-29 18:52:04 -07:00
Alexey Melnichuk f2c43cb441 Fix. FreeSWITCH also breaks loop if return string value which contain number.
```Lua
dbh:query(sql, function()
  return "1" -- breaks loop
end)
2016-02-26 14:17:28 +03:00
Alexey Melnichuk bd4fa2a537 Fix. LuaSQL db backend breaks loop only on positive numbers. 2016-02-26 13:57:32 +03:00
Alexey Melnichuk b797775720 Fix. ODBC db backend should breaks loop only when callback returns number ~= 0
```Lua
dbh:query(sql, function(row)
  -- return 0     -- should not break loop
  -- return true  -- should not break loop
  return 1 -- should break loop
end)
```
2016-02-26 13:52:27 +03:00
FusionPBX bb13ec5063 Merge pull request #1443 from moteus/database_backend
Database backend
2016-02-25 08:39:07 -07:00
Luis Daniel Lucio Quiroz 56121737a9 Wrong variable in freeswitch.email
https://wiki.freeswitch.org/wiki/Mod_lua#freeswitch.email   

same as my other pull request
2016-02-24 19:59:54 -05:00
Alexey Melnichuk 7c225b404a Fix. Add `#` to caller ID name when call from IVR 2016-02-24 16:28:38 +03:00
Alexey Melnichuk 466f85a0be Move scripts to separate dirs. 2016-02-24 14:44:50 +03:00
markjcrane 33192164ad Fix a spelling mistake in the log message in dialplan.lua. 2016-02-22 13:17:04 -07:00
Alexey Melnichuk 4735d9f41c Fix. `unpack` moved to `table` in Lua 5.2 2016-02-20 15:22:28 +03:00
Alexey Melnichuk 6035d4033c Fix. `connected` method on LuaSQL backend. 2016-02-20 15:20:38 +03:00
Alexey Melnichuk 80746dbe3b Add. Support multiple database backends.
```Lua
local Database = require 'resources.functions.database'

-- Default backend configured via xml_handler.db_backend = 'native'
dbh = Database.new("system")

-- To use other backends you can use
dbh = Database.backend.luasql("system")
```
2016-02-19 17:03:45 +03:00
FusionPBX 7e8e1996f0 Merge pull request #1441 from moteus/page_caller_id_name
Fix. set caller id name in `page` application
2016-02-19 00:56:19 -07:00
markjcrane acda022e25 Company directory allow only setting the first or last name. 2016-02-16 13:05:25 -07:00
Alexey Melnichuk 270508bf95 Fix. set caller id name in `page` application 2016-02-16 13:36:14 +03:00
markjcrane 4e0f3e7918 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-02-10 13:49:46 -07:00
markjcrane e18a556643 Prevent nil from crashing the lua script. 2016-02-10 13:49:31 -07:00
Alexey Melnichuk b616736a29 Fix. Declare vars in correct scope. 2016-02-05 10:20:09 +03:00
Alexey Melnichuk b3764e21f9 Update log. 2016-02-04 20:00:12 +03:00
Alexey Melnichuk 9f818dfbbf Fix. Infinity loop. IVR ignores `max_failures`. 2016-02-04 19:42:42 +03:00
Alexey Melnichuk a9e4f5a3e6 Fix. Allow multiple actions in IVR 2016-02-04 19:05:24 +03:00
Alexey Melnichuk 1f9fbc6b7b Use logger class. 2016-02-04 16:05:35 +03:00
Alexey Melnichuk 2fe1337494 Simplify code 2016-02-04 13:20:30 +03:00
Alexey Melnichuk 834c0bce86 Merge remote-tracking branch 'upstream/master' into ivr_menu 2016-02-04 12:14:27 +03:00
FusionPBX 254ecafad3 Merge pull request #1420 from moteus/fix_partial_dialplan
Fix. Do not build context if there error.
2016-02-03 21:32:15 -07:00
markjcrane 58bbf9ae7b Remove trailing whitespaces. 2016-02-03 19:03:16 -07:00
markjcrane b7512ecc88 Include the mkdir function for the IVR Menu. 2016-02-03 10:43:22 -07:00
markjcrane 986784e3fa Base64 - Make sure the directory structure exists. 2016-02-03 10:01:43 -07:00
FusionPBX a698b32b2a Merge pull request #1421 from moteus/cache_support
Fix. cache.support always returns `false`
2016-02-03 08:31:27 -07:00
Alexey Melnichuk 2f8e950d34 Fix. Can not pick any options after IVR play `streamfile.lua`
Rewrite ivr functions to easy read code.
2016-02-03 16:53:22 +03:00
Alexey Melnichuk a1170e1396 Fix. Use domain name in streamfile.lua.
Fix. Unset input callback after play file done.
2016-02-03 15:20:50 +03:00
Alexey Melnichuk 05188ffd24 Fix. cache.support always returns `false` 2016-02-02 19:54:23 +03:00
Alexey Melnichuk 69be506311 Add. debug message to log. 2016-02-02 19:32:27 +03:00
Alexey Melnichuk b6ed2eebe9 Fix. Do not build context if there error. 2016-02-02 19:08:19 +03:00
markjcrane 1a0301f6f7 Call center used with xml handler does not have access to the session. Remove session and replace it with api global_getvar as session is not always available. 2016-02-01 11:16:23 -07:00
markjcrane 28b7905c76 LUA function format_ringback the session:getVariable must have quotes around the 'hold_music' string. Next check to see if the ringback is nil or an empty string first before trying to use 'match'. 2016-01-31 10:10:08 -07:00
FusionPBX 85218c9133 Merge pull request #1415 from mafoo/Enhance-ringback
Enhance ringback
2016-01-29 07:24:14 -07:00
mafoo b573f65410 converted callcenter to use common function 2016-01-29 11:26:21 +00:00
mafoo b655a064fd Converted uses of ringback to common function 2016-01-28 15:51:50 +00:00
markjcrane cf2a4601ff Remove the recordings_dir with automatic domain_name and add domain_name in a few places where it was missing. 2016-01-25 16:53:09 -07:00
markjcrane 48d220b93e Add recording file handling to the ivr xml handler. 2016-01-25 16:32:27 -07:00
markjcrane 46fd506ed2 Add domain name to the recordings path in ivr_menu.lua. 2016-01-25 16:31:04 -07:00
markjcrane d3e89f0540 Change the comment in check_password.lua. 2016-01-22 12:24:18 -07:00
Alexey Melnichuk da1aa87b9e Fix. Do not prompt password if there no mailbox. 2016-01-22 11:37:34 +03:00
FusionPBX eb77a26998 Merge pull request #1387 from mafoo/BugFix-Languages
BugFixes in languages.lua
2016-01-15 21:42:48 -07:00
Matthew Vale b0e4f19993 BugFixes in languages.lua
removed extra ;'s
fix file_handle:close to be inside the if null check
2016-01-15 10:35:19 +00:00
Alexey Melnichuk aaf9e52e48 Change. Move `fax_queue_*` scripts to `app/fax/resources/scripts` 2016-01-13 10:22:32 +03:00
markjcrane 0c39c98213 Show when we are clearing the cache for *78 or *79. 2016-01-12 19:34:57 -07:00
markjcrane 352a630f42 Add dsn_callcenter and improve the indentation. 2016-01-12 01:48:11 -07:00
markjcrane ce78189a80 Fix the FAX retry email. 2016-01-05 13:19:02 -07:00
markjcrane 98f0389947 Another adjustment to the xml. 2016-01-04 19:33:02 -07:00
markjcrane 31a395ab45 A few more xml adjustments for the IVR Menu and add a desription attribute for each IVR option. 2016-01-04 19:29:39 -07:00
markjcrane aa384869cc Fix a small bug with the ivr. 2016-01-04 19:19:39 -07:00
markjcrane 752a5acf8b Update the ivr menu to use memcache with the uuid as part of the key. 2016-01-04 19:09:29 -07:00
markjcrane 451b106c1e Continue work to make IVR menu work from XML handler. 2016-01-04 19:05:31 -07:00
markjcrane 2c22aea566 Rename ivr.lua to ivr.conf.lua. 2016-01-04 19:03:28 -07:00
markjcrane 1a4dc2a658 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-01-04 17:16:27 -07:00
markjcrane 5daf58be72 Using phrase uuid instead of the phrase name reason is this prevents the phrase from breaking when the phrase name is changed. 2016-01-04 17:16:14 -07:00
FusionPBX f062ddf289 Revert "cherry picked changes from 4.0 branch" 2016-01-04 13:13:48 -07:00
markjcrane 724afd7c17 FusionPBX source coding standard uses tabs instead of spaces for indentation. 2016-01-04 13:04:51 -07:00
markjcrane 72c1e23d56 Update destination.lua some preparation to extend it further. 2016-01-04 12:56:50 -07:00
Alexey Melnichuk bc9ffa431f Fix. Definition of `uuid` function in destination.lua. 2016-01-04 09:56:06 +03:00
markjcrane ccc44825e8 Change lang_path to phrases_dir in languages.lua. 2016-01-03 00:42:40 -07:00
markjcrane e83b727b7b Rename ring_member.lua to destination.lua. 2016-01-02 16:38:59 -07:00
markjcrane 2c4101e8d0 Move ring_member.lua to ring_groups/resources/scripts/ring_member.lua. 2016-01-02 13:21:34 -07:00
markjcrane 89b2da603f Improve ring_member.lua with consistent indentation, notes, and more if session:ready to prevent errors. 2016-01-02 13:09:28 -07:00
Matthew Vale 7c74d5cf48 cherry picked changes from 4.0 branch 2015-12-31 10:11:31 +00:00
markjcrane 6788b15184 Add record_ext to the recordings.lua. 2015-12-23 12:02:14 -07:00
markjcrane 6dea6e653c Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2015-12-22 21:30:55 -07:00
markjcrane 18e0ea3376 AND r.enabled = 'true' shows up on two lines change one to m.enabled and then add m.enabled to the second query. 2015-12-22 21:30:36 -07:00
FusionPBX c9a9182e72 Merge pull request #1341 from moteus/directory_acl_directory
Fix. Generate XML for mod_directory.
2015-12-22 20:54:25 -07:00
Alexey Melnichuk e708d38e01 Fix. Remove unused code. 2015-12-22 17:19:14 +03:00
markjcrane 4479760618 Fix the ring back on the XML handler -> callcenter.conf.lua. 2015-12-21 23:31:46 -07:00
Alexey Melnichuk 57a4970c77 Fix. Generate XML for mod_directory.
Fix. Generate XML for ACL only for ext which contain `cidr` attr.
Fix. Do not generate entire XML with all ext when sofia request gateways
2015-12-21 17:17:06 +03:00
markjcrane a089c6a76c Add all domain users to XML handler.directory.domain. 2015-12-20 01:01:52 -07:00
FusionPBX 6f7538bc9c Merge pull request #1334 from kpabijanskas/master
XML Handler incorrectly handling 'date-time' time conditions
2015-12-18 08:47:47 -07:00
markjcrane 401fbb56e2 Add 'to' variable to the first two parameters for freeswitch.email. 2015-12-15 21:10:18 -07:00
Karolis Pabijanskas e3520b9f5b This pull requests fixes XML Handler support for 'date-time' time codition. With this, date-time gets rendered as:
<condition date-time="2015-12-15 15:00~2015-12-16 15:00">

 Without this, the time condition WOULD get redered as:
 <condition field="date-time" expression="2015-12-15 15:00~2015-12-16 15:00">

 which is incorrect and would always match false in FreeSWITCH.

 FreeSWITCH docs for this are here: https://freeswitch.org/confluence/display/FREESWITCH/Time+of+Day+and+Holiday+Routing#TimeofDayandHolidayRouting-Variables

 All other time condition variables documented seem to be included in FusionPBX'es XML Handler.
2015-12-15 16:31:27 +00:00
FusionPBX daa0f9bb70 Merge pull request #1294 from moteus/fax_queue_mail_template
Add. mail templates for fax server responses.
2015-12-09 16:28:35 -08:00
FusionPBX 0547e9fce7 Merge pull request #1303 from blackc2004/patch-19
Update directory.lua
2015-12-09 15:02:48 -08:00
blackc2004 8d072ae13f Update index.lua 2015-12-09 14:04:59 -08:00
blackc2004 dca392fcc5 Update directory.lua 2015-12-09 14:03:17 -08:00
Alexey Melnichuk 92ea882398 Fix. Use task db connection to build template. 2015-12-09 14:56:02 +03:00
Alexey Melnichuk 7a45e14c8c Add. mail templates for fax server responses. 2015-12-09 12:43:40 +03:00
markjcrane 6387f37009 Prevent the conference alone sound from playing twice. 2015-12-07 16:30:03 -07:00
markjcrane cde9debb29 After removing domain name from the default recordings dir path need to add the domain name every where the recordings directory is currently used. 2015-12-06 13:37:35 -07:00
Alexey Melnichuk 5c8aa45d44 Fix. send_mail without file. 2015-12-04 16:18:53 +03:00
markjcrane 5d2c76b7e2 Seperate Cisco 7940/7960 from Cisco SPA so that both can work with check-sync for reboot and reprovision. 2015-12-01 21:12:52 -07:00
markjcrane 906cb13145 Add check-sync support for Linksys SPA. 2015-12-01 20:48:47 -07:00
FusionPBX 8bb6d70e64 Merge pull request #1273 from moteus/fax_queue
Add. `Tasks.send_mail_task` function to send task reply.
2015-12-01 11:01:32 -07:00
Alexey Melnichuk efc62b064b Remove unused code. 2015-12-01 16:24:53 +03:00
Alexey Melnichuk f8c86b42bc Add. `Tasks.send_mail_task` function to send task reply. 2015-12-01 15:46:52 +03:00
Alexey Melnichuk 20a84ee9b5 Fix. Remove global variable. 2015-12-01 14:35:17 +03:00
FusionPBX 10380a619b Merge pull request #1267 from moteus/fax_queue
Add. Send reply message after fax task done.
2015-11-30 11:05:19 -07:00
Alexey Melnichuk 6cfc24f8eb Fix. Send mail when fail create outbound channel. 2015-11-30 12:08:26 +03:00
Alexey Melnichuk 5339e39db8 Add. Send reply message after fax task done. 2015-11-30 11:57:09 +03:00
Alexey Melnichuk fedd5ba9fc Add. Text class to manage translate texts. 2015-11-30 10:22:55 +03:00
Alexey Melnichuk 85634c801e Change. Move fax_queue to app/fax. 2015-11-28 11:40:54 +03:00
markjcrane e4d850aa10 Rename the config.php file and a few minor adjustments to install_fusionpbx. 2015-11-27 19:03:25 -07:00
Alexey Melnichuk 83022b60b2 Fix. json encode x-headers 2015-11-27 16:29:52 +03:00
Alexey Melnichuk 406e95ab29 Add. `send_mail` wrapper function to freeswitch.email and v_mailto.php.
Fix. Send voicemail when set unknown language/dialect.
2015-11-27 15:47:14 +03:00
Alexey Melnichuk a439e7caa6 Add. log session uuid 2015-11-26 17:41:48 +03:00
Alexey Melnichuk ed595a3708 Fix. Remove task in next.lua (Fix preview commit) 2015-11-26 17:30:56 +03:00
Alexey Melnichuk b00229e5fc Fix. Remove task in next.lua 2015-11-26 17:25:15 +03:00
Alexey Melnichuk ac44787e36 Fix. problem when same session can release task multiple times.
It can be when originate has group dial-string. So it call `api_hangup_hook`
for each channel.
Now we release task in `retry.lua` only if originate success and this is same channel
which execute `exec.lua`.
If originate fail we release task `next.lua`
2015-11-26 17:23:33 +03:00
markjcrane 89c2f4ecb5 Correct the primary key of v_fax_tasks table. Coding standards require primary key to remove v_ prefix, singular form and add a _uuid postfix. Result is task_uuid has been changed to fax_task_uuid. 2015-11-25 08:51:54 -07:00
FusionPBX b562c4e5ec Merge pull request #1251 from moteus/fax_queue
Fax queue
2015-11-25 07:37:28 -08:00
Alexey Melnichuk 3e9222d3ab Fix. cleanup old tasks. 2015-11-25 13:21:02 +03:00
Alexey Melnichuk e51c890c41 Fix. Log output in retry.lua 2015-11-25 12:42:56 +03:00
Alexey Melnichuk e4c51396c8 Add. option to work with broken `affected_rows` FS 1.4 2015-11-24 18:49:21 +03:00
Alexey Melnichuk 6d1e73ca13 Fix. Add `split` function (required by lazy_settings). 2015-11-24 14:26:21 +03:00
markjcrane faad283331 Clear the dial_string variable so that it to prevent duplicate destinations. 2015-11-22 19:07:56 -07:00
Alexey Melnichuk b3cc3a8887 Add. Supports MySQL/SQLite to fax queue. 2015-11-20 10:38:51 +03:00
Alexey Melnichuk 82d858c2b8 Add. Basic fax_queue_monitor script.
To start
 From cli: `luarun fax_queue_monitor.lua`
 Autostart with FS: Add `<param name="startup-script" value="fax_queue_monitor.lua"/>` to `lua.conf.xml`
 From shell: call from `script_dir` `lua fax_queue_monitor.lua` (require installed Lua and some additional libraries).

To stop
  remove `fax_queue.tmp` file from `script_dir/run`
2015-11-19 13:19:59 +03:00
Alexey Melnichuk 1944c01820 Remove some log. 2015-11-18 16:41:13 +03:00
Alexey Melnichuk 21e3c62816 Rome some comments. 2015-11-18 16:32:00 +03:00
Alexey Melnichuk e769a0eafe Add. Lua part of fax_queue.
To poll active task you can run `luarun fax_queue_poll_once.lua`
2015-11-18 16:27:55 +03:00
markjcrane 9761699ae7 Add voicemail record-silence-threshold variable and change the default threshold from 30 to 300. 2015-11-16 16:59:11 -07:00
Alexey Melnichuk 31a0392577 Fix. Call intercept - a scenario where an outgoing call can be intercepted
This is same changes as in #1209.
2015-11-12 14:11:05 +03:00
FusionPBX 7bb1079dd6 Merge pull request #1229 from moteus/ivr_menu_exec_without_args
Fix. IVR menu option without arguments.
2015-11-10 18:12:03 -07:00
markjcrane c385f5fc0f New database class was implemented in call_forward.lua when using first_value must change select * from with the specific value desired. 2015-11-10 17:26:39 -07:00
markjcrane 0215800778 Change the Database:query to make the fn optional which will make it more backwards compatible with current code. This fixes an issue with recent movement to the database class in call_forward.lua. 2015-11-10 17:04:42 -07:00
markjcrane ca48132e40 Change enquote to quote. 2015-11-10 13:37:25 -07:00
Alexey Melnichuk bea4a02056 Fix. Intercept can find wrong channel. 2015-11-10 22:41:34 +03:00
FusionPBX c5cb52707f Merge pull request #1174 from moteus/intercept_load_balance
Add. Support intercept FIFO/CallCenter/Enterprise in load balancing mode
2015-11-10 11:55:18 -07:00
Alexey Melnichuk 5506d7ce80 Fix. function name 2015-11-10 20:49:46 +03:00
Alexey Melnichuk 2fe16021a1 Fix. always escape quote. 2015-11-10 19:33:01 +03:00
Alexey Melnichuk 5be99e2801 Fix. hungup_rx.lua works on Windows
1. Command should use only double quotes.
2. Application should not be quoted (I am not sure may be it is bug in FS `system` command).

So I use double quote on Windows and single quote on other system.
Also I quote strings only if they contain spaces.
To escape quote in string i just double it.
`you got "some text"` become to `you got ""some text"""`
2015-11-10 19:29:06 +03:00
Alexey Melnichuk 30109b4523 Fix. IVR menu option without arguments. 2015-11-10 17:56:40 +03:00
Alexey Melnichuk 85041fabea Merge branch 'master' into intercept_load_balance
# Conflicts:
#	resources/install/scripts/intercept_group.lua
2015-11-10 12:30:45 +03:00
markjcrane 00eee7aca3 Fix a problem where the ring group is only calling one external number when there are multiple to call. 2015-11-09 18:42:29 -07:00
Alexey Melnichuk 927e495a0e Update. call_forward.lua script
Fix. Set outbound caller id
Remove. Nested if
Use. cache class
Use. database class
2015-11-09 16:55:35 +03:00
Alexey Melnichuk dc0b71987b Update follow_me.lua
1. Use `cache` class so now it generates memcache events.
2. Do not use nested if (simplify code)
3. Use local variables.
4. Remove redundant checks.
2015-11-05 18:02:08 +03:00
markjcrane be5a8a31dd Add the functions to the path for channel_utils. 2015-11-03 16:44:51 -07:00
markjcrane 9e25d4d49a Add functions to the config require 'resources.functions.config' 2015-11-03 16:41:59 -07:00
Matthew Vale b9e8b3ef03 fix to use phrases_dir
changed phrases_dir to be dealt with inside app_defaults.php so it is retrieved once like the other paths
2015-11-03 11:16:05 +00:00
FusionPBX fd397f53c1 Merge pull request #1179 from moteus/call_flow
Fix small bugs and clear code in call_flow.
2015-11-03 03:30:02 -07:00
FusionPBX d937f29813 Merge pull request #1186 from moteus/cache_emit_event
Add. `cache` class emit MEMCACHE events.
2015-11-03 03:19:36 -07:00
FusionPBX 4a73bf880f Merge pull request #1202 from moteus/show_channels
Fix. Use `api show channels like` did not work on fusion with BDR.
2015-11-03 03:13:27 -07:00
Matthew Vale c1b5895219 reverted so branch is consistent for patch 2015-11-02 17:32:43 +00:00
Matthew Vale 3a9f2b0f24 changed phrases_dir to be dealt with inside app_defaults.php so it is retrieved once like the other paths 2015-11-02 09:53:42 +00:00
Matthew Vale 63bf36ac81 Fix. use settings for the phrases path rather than assuming 2015-10-30 16:16:56 +00:00
FusionPBX 8770332b5f Merge pull request #1214 from blackc2004/patch-10
Update directory.lua
2015-10-30 09:31:06 -06:00
Alexey Melnichuk 82d22322df Fix. Get DTMF in IVR when using phrases. 2015-10-30 17:33:26 +03:00
markjcrane e701b5a1b3 MWI only turn on the light for new messages. 2015-10-29 17:34:39 -06:00
blackc2004 3fbec7c0f1 Update directory.lua 2015-10-29 12:26:06 -07:00
FusionPBX 1a1a05bc61 Merge pull request #1209 from badcrc/master
Fix. Call intercept - a scenario where an outgoing call can be intercepted
2015-10-26 12:02:41 -06:00
koldoa b9c7b13e21 This fixed a scenario where an outgoing call can be picked up if the callee returns a 183 session progress with sdp 2015-10-26 17:17:02 +01:00
Alexey Melnichuk fb0aea39df Update comment. 2015-10-26 12:27:14 +03:00
Alexey Melnichuk e3a324a302 Use database class 2015-10-25 10:05:44 +03:00
Alexey Melnichuk 8b931e7751 Merge branch 'master' into show_channels 2015-10-25 10:00:05 +03:00
Alexey Melnichuk 54aca55836 Use local variables. 2015-10-25 09:57:20 +03:00
Alexey Melnichuk 55318897f6 Merge branch 'master' into intercept_load_balance
# Conflicts:
#	resources/install/scripts/resources/functions/database.lua
2015-10-25 09:34:19 +03:00
markjcrane 51087791e6 Play the message number first then the caller id number. 2015-10-24 21:12:43 -06:00
markjcrane cdd4cb5ccd Add vm_say_caller_id_number option for true or false. 2015-10-24 21:00:22 -06:00
markjcrane 448b681b91 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2015-10-24 20:09:54 -06:00
markjcrane 09e645ac2b Add voicemail caller id number announce as iterated. 2015-10-24 20:09:36 -06:00
FusionPBX 494afd97ca Merge pull request #1152 from moteus/database_class
Add. database class
2015-10-24 19:50:43 -06:00
Alexey Melnichuk 64cb9fd01f Add. cache `switchname` 2015-10-20 20:29:57 +03:00
Alexey Melnichuk c7197c1ccf Fix. Use `api show channels like` did not work on fusion with BDR. 2015-10-20 15:15:42 +03:00
markjcrane af64f66cc7 Fix a null error and translation for select option voicemail. 2015-10-19 20:58:16 -06:00
markjcrane 5d3ecc30c8 Add hold music option and update the call_block dialplan. 2015-10-19 18:30:55 -06:00
markjcrane 42fad3d597 Switch the hostname for conference center to switchname. 2015-10-16 10:34:54 -07:00
FusionPBX 7c454ccec2 Merge pull request #1197 from badcrc/master
This should do a better job detection active calls per extension in t…
2015-10-14 16:15:05 -07:00
markjcrane d850ac2e37 Listen for dtmf key presses when voicemail message is played. 2015-10-14 16:03:33 -07:00
koldoa f234e765b1 This should do a better job detection active calls per extension in the ring group with skip_active 2015-10-14 12:00:09 +02:00
markjcrane b44b009321 Call flow monitor reduce the sleep to 60 seconds. 2015-10-08 18:54:11 -07:00
markjcrane d667a31140 Change xml handler load balancing to xml_handler/resources/scripts/directory/directory.lua["fs_path"] 2015-10-08 11:03:48 -07:00
markjcrane d0ac25c265 Move the xml handler expire and debug settings to config.lua. 2015-10-08 08:34:35 -07:00
FusionPBX 71c3550c23 Merge pull request #1185 from moteus/enterprise_ring_group_timout
Fix. use timeout handler in Enterprise ring group
2015-10-06 19:33:50 -07:00
markjcrane 53bee05f8a Fix Gateways and SIP profiles for single tenant systems. 2015-10-06 19:28:57 -07:00
Alexey Melnichuk 94240c769b Add. `cache` class emit MEMCACHE events. 2015-10-06 16:01:24 +04:00
Alexey Melnichuk 5cb4e7b9b9 Fix. use timeout handler in Enterprise ring group
see e5a0134ec6 (commitcomment-13601198)
2015-10-06 11:05:15 +04:00
markjcrane 58edf1613d Add h hostname to option for the gateways. 2015-10-04 01:29:03 -06:00
markjcrane ef3b08b081 Fix sip_to_user and dialed_user for voicemail. 2015-10-02 17:46:39 -06:00
Alexey Melnichuk 679905e171 Fix small bags and clear code in call_flow.
Move code to turn on/off BLF to separate function.
```Lua
presence_in.turn_lamp( toggle == "false",
  call_flow_feature_code.."@"..domain_name,
  call_flow_uuid
);
```

Close temp file in call_flow_monitor because on Windows it prevent to remove it.
Connect/release to database inside call_flow_monitor loop.
Check successful connection to database in call_flow_monitor loop so monitor did not crash
if connection temporary lost.
2015-10-02 14:02:13 +04:00
markjcrane b8823225c5 Remove absolute_codec_string='PCMU,PCMA' from fax_retry.lua as it is not allowing PCMA. 2015-09-30 21:01:17 -06:00
Alexey Melnichuk c38d19b899 Change. Reduce search parent host name.
This can be done because child and parent channels have to be on same FS.
2015-09-28 11:35:12 +04:00
markjcrane b374e5bdc5 Fix the ring group missed call email body. 2015-09-27 00:52:47 -06:00
markjcrane 01d4219e1a Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2015-09-26 09:00:11 -06:00
markjcrane b27bcdd820 After event socket class was added it created a bug in FAX email and forward. It was unable to find the new EventSocket class adding the include resolves the problem. 2015-09-26 08:59:36 -06:00
Alexey Melnichuk e8aee11931 Add. Support intercept FIFO/CallCenter/Enterprise in load balancing mode.
Change. `intercept.lua` and `intercept_group.lua` merge in one `intercept.lua` file.
Call `intercept.lua` without arguments behave like `intercept_group.lua`.
2015-09-25 15:30:57 +04:00
FusionPBX d4e8be5b75 Merge pull request #1164 from moteus/intercept_enterprise_group
Fix. Intercept enterprise ring group.
2015-09-24 15:45:08 -06:00
FusionPBX 9617b9d6cf Merge pull request #1171 from rdissauer/fix/suppress-debug-messages
Fix. suppress debug messages
2015-09-24 15:19:20 -06:00
roman.dissauer 29ec9f7d18 forgot commenting out end 2015-09-24 09:29:57 +02:00
roman.dissauer c5036298b8 do not display voicemail sql debug messages 2015-09-24 09:29:57 +02:00
markjcrane b62818b911 Allow a device that is logged in already to be replaced with a new alternate device. 2015-09-23 20:09:16 -06:00
Alexey Melnichuk 9e538f4b71 Add. intercept for fifo calls 2015-09-23 14:40:05 +04:00
Alexey Melnichuk 8720866ce9 Add. intercept for call center calls 2015-09-23 13:08:22 +04:00
Alexey Melnichuk 279f194b39 Fix. Intercept enterprise ring group.
With enterprise call each outbound channel has its own call_uuid.
But we have to use `intercept` for call_uuid of inbound channel.
2015-09-22 19:33:41 +04:00
FusionPBX 0b77b33d9a Merge pull request #1155 from moteus/cache_delete
Fix. `cache.del` method.
2015-09-15 21:04:59 -06:00
markjcrane 9eba74f645 Get the channel variable in a way that will work with hangup. 2015-09-15 10:09:16 -06:00
markjcrane bd1551a369 Add multi-lingual support to the missed call emails. 2015-09-15 08:49:37 -06:00
Alexey Melnichuk 0c35f41e65 Fix. `cache.del` method.
Fix. cache.set returns boolean value.
Add. basic self_test
2015-09-15 18:02:46 +04:00
FusionPBX 36a7d342b0 Merge pull request #1146 from badcrc/master
Random ring groups
2015-09-14 10:38:18 -06:00
FusionPBX 5b95f27207 Merge pull request #1149 from moteus/cache_class
Add Log and Cache classes
2015-09-14 10:27:47 -06:00
markjcrane 5f7565b07c Email template add indentation to make it more readable. 2015-09-11 16:18:40 -06:00
markjcrane 16e0ea7e8c Change the directory.lua xml parameter from sip_force_contact to sip-force-contact. 2015-09-11 14:04:38 -06:00
Alexey Melnichuk d146029f59 Fix. load `file_exists` function 2015-09-10 14:36:30 +04:00
Alexey Melnichuk 60b0f48228 Add. database class
```Lua
local Database = require "resources.functions.database"
local dbh = Database.new('system')

--get the domain_uuid
if (domain_uuid == nil) and (domain_name ~= nil) then
  local sql = "SELECT domain_uuid FROM v_domains "
  sql = sql .. "WHERE domain_name='" .. domain_name .. "';"
  domain_uuid = dbh:first_value(sql)
end

local dbh_switch = Database.new('switch') -- check also SQLite file.

local row = dbh_switch:first_row(sql)
if row then
  ...
end
```
2015-09-10 14:29:13 +04:00
Alexey Melnichuk 59823f97dc Fix. Not found is treat as success for delete operation. 2015-09-09 16:52:52 +04:00
Alexey Melnichuk 8c2ea6e093 Add. Basic log class. 2015-09-09 10:45:49 +04:00
Alexey Melnichuk 029b806006 Add. Basic cache class
Fix. When memcache stopped and mod_memcache loaded dialplan did not build from DB.
2015-09-09 10:22:14 +04:00
markjcrane ec0479712c Change DND from loopback/*99[ext] to error/user_busy. 2015-09-08 14:38:46 -06:00
koldoa c52fd6c013 This should add better compatibility for more database backends 2015-09-07 12:51:12 +02:00
koldoa a737d217b6 Better code for ring groups 2015-09-07 11:48:10 +02:00
koldoa 05cdf54596 Script for enterling/leaving a ring group, based on the fifo code 2015-09-07 08:51:22 +02:00
koldoa 5eeb5081e9 Detection of SQL backend for random functions 2015-09-07 08:33:34 +02:00
koldoa 7a65bf2148 Random strategy for ring groups 2015-09-07 08:33:34 +02:00
markjcrane 672f2dffaf This last change will enable do not disturb to update the user status which will then show in the operator panel. 2015-09-05 11:26:13 -06:00
markjcrane 337dc7c822 Fix the sql in the do_not_disturb.lua. 2015-09-05 10:42:22 -06:00
markjcrane 29ac20c1be When *78 or *79 are used for DND update the user status and agent status. 2015-09-05 10:05:43 -06:00
markjcrane 5f7e8a663b Restore sip_from_user and 2 lines for continue to directory.lua. 2015-09-04 02:52:14 -06:00
markjcrane c2b0645c50 Restore directory.lua - this fixes load balancing as taught in the FusionPBX Advanced Class. 2015-09-04 02:38:17 -06:00
FusionPBX d5d075ef4f Merge pull request #1136 from moteus/record_ring_groups
Fix. Start recording only after call start and only for certain extension
2015-08-31 11:02:37 -06:00
Alexey Melnichuk 73cb5b02f1 Fix. Start recording only after call start and only for certain extension.
Fix. Always use record dir with domain name like it does `user_record` extension.
2015-08-31 15:47:06 +04:00
roman.dissauer 3864e64198 added german voicemail templates and modified language file 2015-08-31 12:52:15 +02:00
markjcrane b7b8984d2f Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2015-08-27 13:27:40 -06:00
markjcrane 5457427df3 Change require("mime") to require("mime.core"). 2015-08-27 13:27:24 -06:00
Alexey Melnichuk 398e126fd7 Fix. Delete number-alias from cache when set DND/Follome/Forward. 2015-08-26 13:44:34 +04:00
markjcrane 1b68a563df Change directory hostname to switchname which is a little more flexible. 2015-08-22 23:25:27 -06:00
Alexey Melnichuk d248168044 Fx. Comment 2015-08-21 17:20:55 +04:00
Alexey Melnichuk 01127ded32 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 9463beeaa0 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 e7c8cbd59b 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 7fb9a7f15e 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 911fd65aa1 Revert. Both legs can control of call. 2015-08-19 10:06:22 +04:00
Alexey Melnichuk 6d7271c793 Fix. Concatenate record extension 2015-08-18 15:49:56 +04:00
Alexey Melnichuk ae341a6aba 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 ee40ff8d4c Fax keep local updates. 2015-08-16 02:01:37 -06:00
markjcrane 10312a912a 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 8fdd55c917 IVR Menu allow one of the options to override direct dial to an extension. 2015-08-14 11:26:11 -06:00
markjcrane 5fe418910d Remove an extra line and change the console message. 2015-08-14 09:47:00 -06:00
FusionPBX 7ff1ed2124 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 8703dc1ab7 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 bfe2fb97f6 Change. Use toll_allow of extension who set call forward. 2015-08-14 13:27:47 +04:00
Alexey Melnichuk 3f3240e7c8 Fix. Off debug output 2015-08-14 12:26:34 +04:00
Alexey Melnichuk 8a5ad23d55 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 a666d65be7 Remove hostname on the acl memcache variable name. 2015-08-13 19:49:09 -06:00
markjcrane b0ea34d38d 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 3c7e6e16fd 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 ebe55cf7c8 Fix. Use number alias to forward call to VM when DND is on (Lua part) 2015-08-13 13:14:46 +04:00
markjcrane e032e5815b 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 46e9bdc49f Remove outbound restriction for intercept. 2015-08-12 23:38:46 -06:00
FusionPBX 6987bf9c49 Merge pull request #1091 from moteus/intercept_outbound
Fix. Allow intercept only outbound calls.
2015-08-12 23:34:43 -06:00
markjcrane e5d7a7c7b9 Add expire["acl.conf"] = "3600"; 2015-08-12 23:31:21 -06:00
markjcrane 941415fe13 Add acl.conf.lua to the xml handler. 2015-08-12 23:21:10 -06:00
Alexey Melnichuk 1bac6fa097 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 e6a85e776b 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 907a04a6da XML Handler - directory.lua change ext to username. 2015-08-11 20:36:01 -06:00
FusionPBX 1364725916 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 77fd3dfc7b 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 82b7d6fd79 Change '//' to '/'. This fixes a problem where its calling require when it should call dofile. 2015-08-11 20:25:34 -06:00
FusionPBX 237d6c5d90 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 32872d8c0d 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 87eb5a0399 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 5b291a896a Fix. Include config file. 2015-08-11 14:40:02 +04:00
Alexey Melnichuk 024abb1ac1 Fix. Group intercept extension with number alias 2015-08-11 14:18:25 +04:00
Alexey Melnichuk 69717e31d5 Revert "Revert "Change. Use `require "resources.functions.config"` to load co…" 2015-08-11 05:06:33 +03:00
FusionPBX d1f3b05cf6 Revert "Change. Use `require "resources.functions.config"` to load config file." 2015-08-10 11:50:29 -06:00
FusionPBX 8d9430352b 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 9b885b807d Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2015-08-10 11:22:11 -06:00
markjcrane 51b398f984 Ring group external destinations use the | as the delimiter for fail-over. 2015-08-10 11:21:48 -06:00
FusionPBX 0bff93f3a4 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 e78d4dc370 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 c27e9cef9a Fix. add functions/count.lua to preview commit. 2015-08-10 13:01:49 +04:00
Alexey Melnichuk a8142f527a Change. Use only `require` to load function.
Fix. Remove multiple definition of same function.
2015-08-10 12:43:06 +04:00
Alexey Melnichuk c5432630f3 Fix. Allow monitoring page conferences via `Active Conferences` app. 2015-08-10 11:43:32 +04:00
Luis Daniel Lucio Quiroz 780b69a253 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 b42aa40677 Fix. Use number-alias as caller_id_number variable. 2015-08-07 16:17:25 +04:00
Alexey Melnichuk 596cdb1184 Fix. Use number_alias in dial-string. 2015-08-07 15:18:52 +04:00
Alexey Melnichuk 59c1fbe2ef 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 73e0e7a3a8 Fix. Use `temp_dir` variable instead of hard coded `/tmp` 2015-08-07 11:52:18 +04:00
markjcrane 2a4621daaf Fix a problem with custom public context and XMl handler. 2015-07-31 21:03:22 -06:00
markjcrane c4639445d9 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 7e481f20b6 Fix. Correct path when user on `group_confirm_file` 2015-07-28 15:59:04 +04:00
markjcrane 4243764010 Remove trailing tabs. 2015-07-23 17:50:16 -06:00
markjcrane 5ff664246b Prevent nil errors in settings.lua. 2015-07-22 09:42:35 -06:00
Alexey Melnichuk 2234b42c07 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 a4b0b2d271 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 7cf424003c 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 c0d694a62b 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 d283075d64 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