Commit Graph

239 Commits

Author SHA1 Message Date
Alexey Melnichuk 44196ae739 Fix. Fusion set rate=48000 to all streams. (#1746) 2016-07-12 08:09:54 -06:00
FusionPBX 39bc0cad29 Update local_stream.conf.lua
Set a default rate for chime list if one is not provided.
2016-07-06 16:27:22 -06:00
FusionPBX 069ad5d580 Update local_stream.conf.lua
Add a more generic query to make this code compatible with MySQL/Mariadb.
2016-06-30 10:03:32 -06:00
FusionPBX 2f9c1a7c9f Update local_stream.conf.lua
Changes to the conditions that build the name to make sure it builds it correctly.
2016-06-30 01:40:48 -06:00
FusionPBX b0c69d6703 Update local_stream.conf.lua
Use the name/rate for global music on hold or domain_name/name/rate for local. If configuring as a default leave the /rate off the end of the string.
2016-06-30 01:18:17 -06:00
FusionPBX bc670abb32 Update local_stream.conf.lua
Remove the default stream will handle it another way.
2016-06-29 17:19:21 -06:00
FusionPBX eb8b64dcd3 Update local_stream.conf.lua
Use UUID for the name of the stream. Add a default to handle systems using default.
2016-06-29 16:25:17 -06:00
FusionPBX bc46191440 Update local_stream.conf.lua
Check if row.music_on_hold_timer_name is empty.
2016-06-28 12:24:31 -06:00
Alexey Melnichuk 2d49b1b211 Change. remove CC configuration dependencies from mod_commands. (#1711) 2016-06-27 07:52:29 -06:00
FusionPBX 8f26972c20 Update ivr.conf.lua
If the IVR Menu recordings are base64 don't update the path.
2016-06-24 18:40:14 -06:00
markjcrane 3e2dea7b70 Get the settings.recordings.storage_type for the ivr menu using xml handler. 2016-06-24 14:55:16 -06:00
FusionPBX 653a5e007d Update local_stream.conf.lua
Music on hold set the default timer name to 'soft'.
2016-06-23 16:42:12 -06:00
markjcrane 6af584afd5 Uncomment two lines to restore the debug check. 2016-06-23 15:46:59 -06:00
markjcrane 8c7be13133 Add full path to the music on hold chime list. 2016-06-23 15:29:14 -06:00
markjcrane 022247c280 Update music_on_hold_timer to timer_name. 2016-06-23 13:35:53 -06:00
markjcrane 7e801f0b76 Correct the variable name. 2016-06-13 19:06:59 -06:00
markjcrane 0ae7d5e2e4 Replace the variable with the path to the sounds directory. 2016-06-13 19:04:23 -06:00
markjcrane bd6b2fb18f Rename local_stream.lua to local_stream.conf.lua. 2016-06-13 18:50:41 -06:00
markjcrane e026c3e5e6 Add local_stream.lua to xml_handler. 2016-06-13 18:30:32 -06:00
Alexey Melnichuk 619912324c Fix. Use correct database for Call Center while FS load. (#1597)
Problem that `mod_commands` may load after than `mod_callcenter` and there no function `global_getvar`
So current code just create database with name `INVALID COMMAND!.db`.
2016-05-13 08:03:48 -06:00
markjcrane 7f082bdef3 Add a missing permission on backup. 2016-04-04 19:51:22 -06:00
markjcrane 3ad26f1965 Change expire["sofia_conf"] to expire["sofia"] and expire["acl_conf"] to expire["acl"]. Then add a default value to prevent nil errors when the conf.lua script has not been updated. 2016-04-02 08:32:43 -06:00
markjcrane 38858b3f6b Remove the the condition on the direct dial. 2016-03-29 20:57:47 -06:00
markjcrane 2cd979b30c A global domain is optional. Using public context instead. 2016-03-27 04:46:01 -06:00
schraegervogel 919b383c6e initialize call_context
If you use xml_locate dialplan from fs_cli, you get an error, to prevent this I intialized call_context with the "domain"-var
2016-03-25 17:28:10 +01:00
FusionPBX 4ce2bb5c8f Update acl.conf.lua
Change expire acl.conf to acl_conf
2016-03-25 01:00:43 -06:00
markjcrane 4a31b2343e Change to the new context require renaming two variables to be consistent and to prevent a problem. 2016-03-24 23:08:23 -06:00
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 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
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
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
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
markjcrane a666d65be7 Remove hostname on the acl memcache variable name. 2015-08-13 19:49:09 -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
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
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
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
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
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