Commit Graph

785 Commits

Author SHA1 Message Date
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