markjcrane
785071cde6
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
8a0331925a
Fix a spelling mistake in xml handler ivr.conf.lua.
2016-03-20 00:49:21 -06:00
markjcrane
57e212ff42
Fix direct dial for IVR using the xml handler.
2016-03-19 18:13:49 -06:00
markjcrane
ed2898aa33
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
2016-03-11 14:21:28 -07:00
markjcrane
8588a4caea
Get the domain_name from the array.
2016-03-11 14:21:08 -07:00
mafoo
b7555579bf
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
11c2176a15
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
56c3bde940
Use a more efficient way to get the domain name for xml handler - dialplan.
2016-03-10 08:18:46 -07:00
markjcrane
39b38738d8
Increase efficiency xml handler section dialplan.
2016-03-09 13:09:25 -07:00
markjcrane
47ea47710c
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
010a237c09
Handle the phrases_dir nil in a more flexible way.
2016-03-04 15:51:10 -07:00
markjcrane
7cbb32dcd3
Ensure the phrases_dir is not nil.
2016-03-04 15:08:58 -07:00
markjcrane
fb8046accb
Prevent a nil error for xml handler languages.
2016-03-04 12:35:37 -07:00
markjcrane
de53ae149e
Fix a spelling mistake in the log message in dialplan.lua.
2016-02-22 13:17:04 -07:00
Alexey Melnichuk
48b3aa2917
Add. debug message to log.
2016-02-02 19:32:27 +03:00
Alexey Melnichuk
057d487ee7
Fix. Do not build context if there error.
2016-02-02 19:08:19 +03:00
FusionPBX
012655ab23
Merge pull request #1415 from mafoo/Enhance-ringback
...
Enhance ringback
2016-01-29 07:24:14 -07:00
mafoo
02566294cb
converted callcenter to use common function
2016-01-29 11:26:21 +00:00
markjcrane
495bafd3f5
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
7d375d05de
Add recording file handling to the ivr xml handler.
2016-01-25 16:32:27 -07:00
Matthew Vale
0111fff25b
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
2a04a88b69
Add dsn_callcenter and improve the indentation.
2016-01-12 01:48:11 -07:00
markjcrane
b9eae2a150
Another adjustment to the xml.
2016-01-04 19:33:02 -07:00
markjcrane
8ee96d3136
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
23460f69c5
Fix a small bug with the ivr.
2016-01-04 19:19:39 -07:00
markjcrane
7885323d37
Update the ivr menu to use memcache with the uuid as part of the key.
2016-01-04 19:09:29 -07:00
markjcrane
499c3c8928
Continue work to make IVR menu work from XML handler.
2016-01-04 19:05:31 -07:00
markjcrane
8d604061f5
Rename ivr.lua to ivr.conf.lua.
2016-01-04 19:03:28 -07:00
markjcrane
aac6d4ff96
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
8c52b1167f
Change lang_path to phrases_dir in languages.lua.
2016-01-03 00:42:40 -07:00
FusionPBX
e060e53783
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
639426f1d2
Fix. Remove unused code.
2015-12-22 17:19:14 +03:00
markjcrane
56499a6cc3
Fix the ring back on the XML handler -> callcenter.conf.lua.
2015-12-21 23:31:46 -07:00
Alexey Melnichuk
d1c07df479
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
80d0a7bdc4
Add all domain users to XML handler.directory.domain.
2015-12-20 01:01:52 -07:00
Karolis Pabijanskas
03f5396e56
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
b64a94fdc6
Update directory.lua
2015-12-09 14:03:17 -08:00
markjcrane
e0ff445922
Rename the config.php file and a few minor adjustments to install_fusionpbx.
2015-11-27 19:03:25 -07:00
Matthew Vale
b073d792d5
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
35762486e1
reverted so branch is consistent for patch
2015-11-02 17:32:43 +00:00
Matthew Vale
fee216cc13
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
8793159dad
Fix. use settings for the phrases path rather than assuming
2015-10-30 16:16:56 +00:00
blackc2004
f8388cc8f4
Update directory.lua
2015-10-29 12:26:06 -07:00
markjcrane
33897a3abd
Change xml handler load balancing to xml_handler/resources/scripts/directory/directory.lua["fs_path"]
2015-10-08 11:03:48 -07:00
markjcrane
a3d64af450
Move the xml handler expire and debug settings to config.lua.
2015-10-08 08:34:35 -07:00
markjcrane
c2a4b78b79
Fix Gateways and SIP profiles for single tenant systems.
2015-10-06 19:28:57 -07:00
markjcrane
c0d758be86
Add h hostname to option for the gateways.
2015-10-04 01:29:03 -06:00
FusionPBX
9e0c8cffd9
Merge pull request #1149 from moteus/cache_class
...
Add Log and Cache classes
2015-09-14 10:27:47 -06:00
markjcrane
c21657cc7f
Change the directory.lua xml parameter from sip_force_contact to sip-force-contact.
2015-09-11 14:04:38 -06:00
Alexey Melnichuk
528d04b942
Add. Basic log class.
2015-09-09 10:45:49 +04:00
Alexey Melnichuk
4cb99be806
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
765d34668c
Restore sip_from_user and 2 lines for continue to directory.lua.
2015-09-04 02:52:14 -06:00
markjcrane
30b6c8990c
Restore directory.lua - this fixes load balancing as taught in the FusionPBX Advanced Class.
2015-09-04 02:38:17 -06:00
markjcrane
a49bd861ca
Change directory hostname to switchname which is a little more flexible.
2015-08-22 23:25:27 -06:00
Alexey Melnichuk
d7bc826c30
Fx. Comment
2015-08-21 17:20:55 +04:00
Alexey Melnichuk
148d2b42f2
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
fdfa8f715f
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
897b32be80
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
09c4dd79d0
Remove hostname on the acl memcache variable name.
2015-08-13 19:49:09 -06:00
markjcrane
47c8fb090d
Add expire["acl.conf"] = "3600";
2015-08-12 23:31:21 -06:00
markjcrane
b44cacd07a
Add acl.conf.lua to the xml handler.
2015-08-12 23:21:10 -06:00
FusionPBX
81003e35d8
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
42d9548fac
XML Handler - directory.lua change ext to username.
2015-08-11 20:36:01 -06:00
FusionPBX
c117b071e6
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
9087c09182
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
3e16e69adb
Revert "Revert "Change. Use `require "resources.functions.config"` to load co…"
2015-08-11 05:06:33 +03:00
FusionPBX
2a2dd209df
Revert "Change. Use `require "resources.functions.config"` to load config file."
2015-08-10 11:50:29 -06:00
FusionPBX
559aa61fbd
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
cd21e26893
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
703b61636a
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
f1e082bc03
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
b97ae86283
Fix. Use number-alias as caller_id_number variable.
2015-08-07 16:17:25 +04:00
Alexey Melnichuk
bfa72cc78a
Fix. Use number_alias in dial-string.
2015-08-07 15:18:52 +04:00
Alexey Melnichuk
630d9e020c
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
785136eca9
Fix. Use `temp_dir` variable instead of hard coded `/tmp`
2015-08-07 11:52:18 +04:00
markjcrane
a1fdd5c220
Fix a problem with custom public context and XMl handler.
2015-07-31 21:03:22 -06:00
Alexey Melnichuk
57808740ef
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
59e4f6b91f
Merge pull request #1023 from moteus/ext-dial-string
...
Fix. Use extension to generate dial-string in xml_handler
2015-07-18 12:54:24 -07:00
Alexey Melnichuk
61f5e77cfb
Fix. Use `temp_dir` to debug dialplan xml file
2015-07-16 12:56:13 +04:00
Alexey Melnichuk
fec3b0f14c
Fix. xml_handler/directory generate vm params based on number_alias
2015-07-07 18:16:21 +04:00
Alexey Melnichuk
1d5bb75f2d
Fix. Use extension to generate dial-string in xml_handler
...
When uses number_alias contact should be searched by extension name.
2015-07-07 17:47:50 +04:00
Mark Crane
cafc371c88
Fix a problem where the inbound context has public in the name with public@ as a prefix and .public as a suffix.
2015-06-30 18:42:52 +00:00
Mark Crane
ad34763c8d
Set call_screen_enabled as a variable in directory.lua.
2015-06-23 20:33:22 +00:00
Mark Crane
1510c1c631
Add extension_call_screen permission, and add call_screen_enabled to extensions/extension_edit.php.
2015-06-23 20:06:44 +00:00
Mark Crane
6252e5bfb0
Fix call center xml handler domain.
2015-06-18 20:08:54 +00:00
Mark Crane
7cec657e76
Add a missing quote fixes a problem with call center using xml handler and fix the indentation.
2015-06-18 19:25:42 +00:00
Mark Crane
0bcea327b9
Add a missing quote fixes a problem with call center using xml handler.
2015-06-18 19:20:51 +00:00
luis daniel lucio quiroz
5a168e3779
load balancing fixed
2015-06-11 01:43:30 +00:00
Mark Crane
3de401da03
Fix hold music when used with Conference Center and XML Handler.
2015-06-04 22:43:46 +00:00
luis daniel lucio quiroz
7b5b36ffa0
mod_verto xml handler support
2015-05-30 22:14:01 +00:00
Mark Crane
d14507fdf8
Add missed call email notification.
2015-05-29 03:56:49 +00:00
Mark Crane
28c4f7ea50
Page conference settings need page caller controls. For non modertor 0 mute and press again to unmute.
2015-05-14 01:56:11 +00:00
Mark Crane
a9107f4edf
Remove ;; from the XML Handler.
2015-05-13 16:43:30 +00:00
Mark Crane
b1a33cf477
Change leg_timeout for call_timeout in the xml handler directory.
2015-05-05 07:34:19 +00:00
Mark Crane
b701652c78
Fix the sip profile enabled by changing the alias from 's' to a 'p'.
2015-05-05 05:34:00 +00:00
Mark Crane
f79c9925f0
Add support for the new sip profiles enabled field.
2015-05-02 05:08:41 +00:00
Nate Jones
cad0b090b6
XML Handler: Include missing language macros.
2015-04-30 06:59:24 +00:00
Mark Crane
a6f9ac0214
Fix conference sound file problem and add the missing profiles that are in the standard conference.conf.xml file.
2015-04-22 22:45:05 +00:00
luis daniel lucio quiroz
deaaf0c4eb
missing space & mysql support
2015-04-12 17:40:58 +00:00
Digital Daz
572d83a828
First part of fix for load balancing - Prevent stale hostname being used for expired registration that has not yet been purged by freeswitch
2015-04-12 10:08:47 +00:00
Mark Crane
17c68d7e2b
Prevent a bad domain_name from causing a nil error for reverse authentication.
2015-04-04 06:24:41 +00:00
Mark Crane
fb7ded71ce
Set auto-gain-level to 0 or disabled.
2015-04-01 10:18:48 +00:00
Mark Crane
95344623ce
Fix the XML for languages.lua.
2015-03-24 06:21:47 +00:00
Mark Crane
4385aac2dd
Remove trailing spaces or tabs.
2015-03-18 20:51:13 +00:00
Mark Crane
006af7d74d
Fix the indentation in callcenter.conf.lua.
2015-03-11 19:33:07 +00:00
Mark Crane
700f27d89f
Call Center XML Handler now generates XML correctly.
2015-03-11 19:28:18 +00:00
Mark Crane
3406ff62b4
Add the missing include for the languages section.
2015-03-09 23:49:15 +00:00
Mark Crane
a1055b60a3
Add time-of-day to the XML handler.
2015-03-09 15:51:49 +00:00
Mark Crane
4642a6e4a5
Add XML Handler section language.
2015-03-09 05:26:10 +00:00
Digital Daz
3dd2ec4a2e
Remove a log line used for debug
2015-02-25 20:40:51 +00:00
Digital Daz
ad82d7fe49
Fixed a couple of typos and changed the way the DSN is inserted.
2015-02-25 20:35:22 +00:00
Mark Crane
7887e4ddd3
Add callcenter.conf.lua for xml handler.
2015-02-21 09:33:36 +00:00
Mark Crane
5fefdd595b
Tested gateway with registration set to false on 1.4.15 no longer requires a username and password so it is no longer required in fusionpbx when the registration is set to false.
2015-01-29 07:07:54 +00:00
Mark Crane
d4f2c57455
Get the values from the database and set them as lua variables.
2014-12-03 09:02:54 +00:00
Mark Crane
2495e9e935
Set extension variables for forward all, busy, no answer, and do not disturb.
2014-12-03 08:05:41 +00:00
luis daniel lucio quiroz
fb02f54a6a
xml_handler directory.lua is now tolerant when no memcache available, fix a nil variable
2014-11-27 14:43:28 +00:00
Mark Crane
d9ce24a7a2
Revert r7258 as caused problems with endpoints receiving calls.
2014-11-26 20:54:44 +00:00
Mark Crane
3daa03d2a5
Fix the alias for the XML handler.
2014-11-21 04:37:43 +00:00
Mark Crane
0d166590dd
xml_handler will bind if memcached is down
2014-11-13 08:51:46 +00:00
Mark Crane
71bfd161b3
Replace if statement so that it doesn't cause a problem with user_exist.
2014-10-22 00:32:00 +00:00
Mark Crane
7508c06034
Fix the xml handler nil error for number_alias and fix some indentation.
2014-10-21 19:30:40 +00:00
Mark Crane
fe4d4c64a4
disable registration for number-alias
2014-10-21 10:01:30 +00:00
Mark Crane
759621255a
Fix the xml handler nil error for number_alias.
2014-10-15 17:32:02 +00:00
Mark Crane
7d5f648f10
Fix XML handler with number_alias.
2014-10-13 20:10:14 +00:00
Mark Crane
0665e83aa4
Add voicemail params to the directory section of the xml handler
2014-10-03 06:17:43 +00:00
Mark Crane
d15bf10ed8
Fix a problem where in rare cases dialplan was cached without global dialplans
2014-09-15 15:56:18 +00:00
Mark Crane
28eb38d0ad
XML Handler dialplan set dialplan to 1 hour cache timeout
2014-08-22 07:40:34 +00:00
Mark Crane
c7dff4a4a4
Check the length of user_record
2014-08-03 12:35:24 +00:00
Mark Crane
cfb833aa25
Reduce one request to the database and create a better domains array
2014-07-10 05:23:53 +00:00
Mark Crane
0c9e632607
Add domain info to the xml handler for inbound routes
2014-07-09 05:40:17 +00:00
Mark Crane
f0e1d9a59b
Fix the identation on the xml handler directory xml
2014-07-04 18:20:11 +00:00
Mark Crane
48c6645688
Add global dialplan option when using the xml handler.
2014-07-02 04:02:50 +00:00
Mark Crane
6af80a602a
Prevent an error on the reverse authentication for the xml handler when its sent and invalid domain from FreeSWITCH.
2014-06-27 19:41:31 +00:00
Mark Crane
7a01104700
Ensure the gateway_uuid is lower case
2014-06-24 06:40:29 +00:00
luis daniel lucio quiroz
ca3f246e37
I updated my email
2014-06-22 18:38:46 +00:00
Mark Crane
7dd9553707
Add mute.lua and unmute.lua files
2014-05-02 09:34:56 +00:00
Mark Crane
5e0eb315f8
Add emergency caller id name to the extension xml and to xml handler.
2014-05-01 04:59:33 +00:00
Mark Crane
f0dc0d7183
Add a a check to see if the dial_string is null then add a default dial string
2014-04-30 20:54:30 +00:00
Mark Crane
a9ff275b7b
Add user_record to the xml_handler section: directory
2014-04-03 17:45:10 +00:00
Mark Crane
392111d825
Time for a major improvement to LUA XML handler efficiency.
2014-02-23 06:34:56 +00:00
Mark Crane
786242e24d
Use the correct database connection object.
2014-01-03 20:07:36 +00:00
Mark Crane
ce37b50d54
Fix this error: [ERR] freeswitch_lua.cpp:374 DBH NOT Connected. Caused by releasing DBH which is done in the parent script.
2013-12-24 16:25:16 +00:00
luis daniel lucio quiroz
1c27162779
previous changes reverted, agreed with mcrane
2013-12-23 20:21:25 +00:00
luis daniel lucio quiroz
fc126bcea3
database_host nil prevention
2013-12-23 00:39:02 +00:00
luis daniel lucio quiroz
0652016ad7
dialed_extension assigned before showing
2013-12-23 00:34:34 +00:00
luis daniel lucio quiroz
7e0b913dc1
fix a dbh sintax that fails in some servers, seems old sintax is not supported
2013-12-23 00:29:54 +00:00
luis daniel lucio quiroz
aa69e59b0c
dialed_extensions was nil when coming from ringing group
2013-12-22 19:06:00 +00:00
Mark Crane
e7386519ce
Change the gateway name to gateway_uuid in the XML handler.
2013-12-06 08:26:55 +00:00
Mark Crane
8696e82b8c
Remove dbh:release(); from directory.lua because its done in the parent script after this script completes.
2013-11-25 20:56:27 +00:00
Mark Crane
849f2d05e3
Edge case fix ring group when an extension is not registered.
2013-11-19 05:59:47 +00:00