Commit Graph

159 Commits

Author SHA1 Message Date
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
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 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
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 33192164ad Fix a spelling mistake in the log message in dialplan.lua. 2016-02-22 13:17:04 -07: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
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
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
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
markjcrane 352a630f42 Add dsn_callcenter and improve the indentation. 2016-01-12 01:48:11 -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 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
markjcrane ccc44825e8 Change lang_path to phrases_dir in languages.lua. 2016-01-03 00:42:40 -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
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
blackc2004 dca392fcc5 Update directory.lua 2015-12-09 14:03:17 -08:00
markjcrane e4d850aa10 Rename the config.php file and a few minor adjustments to install_fusionpbx. 2015-11-27 19:03:25 -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
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
blackc2004 3fbec7c0f1 Update directory.lua 2015-10-29 12:26:06 -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
markjcrane 53bee05f8a Fix Gateways and SIP profiles for single tenant systems. 2015-10-06 19:28:57 -07:00
markjcrane 58edf1613d Add h hostname to option for the gateways. 2015-10-04 01:29:03 -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 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 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 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