Commit Graph

818 Commits

Author SHA1 Message Date
markjcrane 08ea915070 In the IVR Menu make sure direct dial checks if the destination is an extension before sending the call to it. 2016-03-23 12:49:32 -06:00
markjcrane 33aed1c15d Update the disa.lua to prevent errors when caller hangs up before the destination is called. 2016-03-23 11:42:20 -06:00
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