Commit Graph

279 Commits

Author SHA1 Message Date
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
Alexey Melnichuk 59c1fbe2ef 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 73e0e7a3a8 Fix. Use `temp_dir` variable instead of hard coded `/tmp` 2015-08-07 11:52:18 +04:00
markjcrane 2a4621daaf Fix a problem with custom public context and XMl handler. 2015-07-31 21:03:22 -06:00
Alexey Melnichuk a4b0b2d271 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 be89d5bce3 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 42ebf34104 Fix. Use `temp_dir` to debug dialplan xml file 2015-07-16 12:56:13 +04:00
Alexey Melnichuk b4435c974e Fix. xml_handler/directory generate vm params based on number_alias 2015-07-07 18:16:21 +04:00
Alexey Melnichuk 86b0b21e7b 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 22203b66b0 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 e40abdda91 Set call_screen_enabled as a variable in directory.lua. 2015-06-23 20:33:22 +00:00
Mark Crane 22dd5b6658 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 e13582eb28 Fix call center xml handler domain. 2015-06-18 20:08:54 +00:00
Mark Crane 5b95222742 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 732e1230fa 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 27bb9d1735 load balancing fixed 2015-06-11 01:43:30 +00:00
Mark Crane 14dea03d06 Fix hold music when used with Conference Center and XML Handler. 2015-06-04 22:43:46 +00:00
luis daniel lucio quiroz f32397252e mod_verto xml handler support 2015-05-30 22:14:01 +00:00
Mark Crane 68fab86633 Add missed call email notification. 2015-05-29 03:56:49 +00:00
Mark Crane c800fc3b67 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 77100085b4 Remove ;; from the XML Handler. 2015-05-13 16:43:30 +00:00
Mark Crane 6b552b7025 Change leg_timeout for call_timeout in the xml handler directory. 2015-05-05 07:34:19 +00:00
Mark Crane a1fdee00c6 Fix the sip profile enabled by changing the alias from 's' to a 'p'. 2015-05-05 05:34:00 +00:00
Mark Crane 614f7f3165 Add support for the new sip profiles enabled field. 2015-05-02 05:08:41 +00:00
Nate Jones b62d377712 XML Handler: Include missing language macros. 2015-04-30 06:59:24 +00:00
Mark Crane 9ad4a5850a 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 a4a76efb49 missing space & mysql support 2015-04-12 17:40:58 +00:00
Digital Daz 659e10a8c0 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 a8cdcf013c Prevent a bad domain_name from causing a nil error for reverse authentication. 2015-04-04 06:24:41 +00:00
Mark Crane 2bbca0837c Set auto-gain-level to 0 or disabled. 2015-04-01 10:18:48 +00:00
Mark Crane 3859511572 Fix the XML for languages.lua. 2015-03-24 06:21:47 +00:00
Mark Crane 34968ce2c2 Remove trailing spaces or tabs. 2015-03-18 20:51:13 +00:00
Mark Crane 09196fac55 Fix the indentation in callcenter.conf.lua. 2015-03-11 19:33:07 +00:00
Mark Crane 1f20397a57 Call Center XML Handler now generates XML correctly. 2015-03-11 19:28:18 +00:00
Mark Crane 0cd32b4f7e Add the missing include for the languages section. 2015-03-09 23:49:15 +00:00
Mark Crane 88ba2e161a Add time-of-day to the XML handler. 2015-03-09 15:51:49 +00:00
Mark Crane 0d6f9b8d64 Add XML Handler section language. 2015-03-09 05:26:10 +00:00
Digital Daz 1a15020275 Remove a log line used for debug 2015-02-25 20:40:51 +00:00
Digital Daz 2cef65a708 Fixed a couple of typos and changed the way the DSN is inserted. 2015-02-25 20:35:22 +00:00
Mark Crane ce74b2d0fb Add callcenter.conf.lua for xml handler. 2015-02-21 09:33:36 +00:00
Mark Crane 30706fa11d 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 ad81b6ea5b Get the values from the database and set them as lua variables. 2014-12-03 09:02:54 +00:00
Mark Crane 14babb88ed 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 f6b1ee0736 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 130c45d0b6 Revert r7258 as caused problems with endpoints receiving calls. 2014-11-26 20:54:44 +00:00
Mark Crane 36d3c995b7 Fix the alias for the XML handler. 2014-11-21 04:37:43 +00:00
Mark Crane 3b9743226a xml_handler will bind if memcached is down 2014-11-13 08:51:46 +00:00
Mark Crane 899e5a853c Replace if statement so that it doesn't cause a problem with user_exist. 2014-10-22 00:32:00 +00:00
Mark Crane 593c063602 Fix the xml handler nil error for number_alias and fix some indentation. 2014-10-21 19:30:40 +00:00
Mark Crane 5535c57a96 disable registration for number-alias 2014-10-21 10:01:30 +00:00
Mark Crane a190165f02 Fix the xml handler nil error for number_alias. 2014-10-15 17:32:02 +00:00
Mark Crane 605b7a631f Fix XML handler with number_alias. 2014-10-13 20:10:14 +00:00
Mark Crane 1cbfc1cd13 Add voicemail params to the directory section of the xml handler 2014-10-03 06:17:43 +00:00
Mark Crane 97e84ad81a Fix a problem where in rare cases dialplan was cached without global dialplans 2014-09-15 15:56:18 +00:00
Mark Crane 041c20b6e6 XML Handler dialplan set dialplan to 1 hour cache timeout 2014-08-22 07:40:34 +00:00
Mark Crane 79c687417f Check the length of user_record 2014-08-03 12:35:24 +00:00
Mark Crane d9f6d900e4 Reduce one request to the database and create a better domains array 2014-07-10 05:23:53 +00:00
Mark Crane 0d1ca315a4 Add domain info to the xml handler for inbound routes 2014-07-09 05:40:17 +00:00
Mark Crane eaae4d7eb7 Fix the identation on the xml handler directory xml 2014-07-04 18:20:11 +00:00
Mark Crane 3626cebc4c Add global dialplan option when using the xml handler. 2014-07-02 04:02:50 +00:00
Mark Crane 9882c0af4e 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 be571646fa Ensure the gateway_uuid is lower case 2014-06-24 06:40:29 +00:00
luis daniel lucio quiroz 458fb5cc1c I updated my email 2014-06-22 18:38:46 +00:00
Mark Crane 74ae6fc900 Add mute.lua and unmute.lua files 2014-05-02 09:34:56 +00:00
Mark Crane 52b946f575 Add emergency caller id name to the extension xml and to xml handler. 2014-05-01 04:59:33 +00:00
Mark Crane 492452de64 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 54c9a95d39 Add user_record to the xml_handler section: directory 2014-04-03 17:45:10 +00:00
Mark Crane dfba7f9405 Time for a major improvement to LUA XML handler efficiency. 2014-02-23 06:34:56 +00:00
Mark Crane 58530d843e Use the correct database connection object. 2014-01-03 20:07:36 +00:00
Mark Crane 67ee471d5f 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 e7d3d5c934 previous changes reverted, agreed with mcrane 2013-12-23 20:21:25 +00:00
luis daniel lucio quiroz fbc34dfab8 database_host nil prevention 2013-12-23 00:39:02 +00:00
luis daniel lucio quiroz a85673b66f dialed_extension assigned before showing 2013-12-23 00:34:34 +00:00
luis daniel lucio quiroz 41ea11528c 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 f306ff68ea dialed_extensions was nil when coming from ringing group 2013-12-22 19:06:00 +00:00
Mark Crane 91d489b8b2 Change the gateway name to gateway_uuid in the XML handler. 2013-12-06 08:26:55 +00:00
Mark Crane ee7a772b40 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 8131f3473e Edge case fix ring group when an extension is not registered. 2013-11-19 05:59:47 +00:00
Mark Crane 137176ae1f Add a additional debug information and fix some problems in directory.lua. 2013-11-17 11:44:02 +00:00
Mark Crane ed56592d78 Make sofia.conf.lua hostname backwards compatible. 2013-11-13 08:26:18 +00:00
Mark Crane 452e323152 Add hostname to sofia.conf.lua 2013-11-12 16:09:07 +00:00
Mark Crane df31794cf8 Add reverse-auth-lookup to the xml handler script. 2013-11-12 08:44:32 +00:00
Mark Crane a10b8cceee Check the local hostname in the xml handler. 2013-11-12 08:43:13 +00:00
Mark Crane e5b72715f0 Comment out the voicemail fields in the xml handler. 2013-10-08 22:26:25 +00:00
Mark Crane b9425a0a6a Additional monitoring of a busy server showed that it was the cache only that needed to be removed. 2013-09-29 10:08:27 +00:00
Mark Crane 88466b5356 Remove this code from the xml handler which made it unable to find some extensions that existed. 2013-09-29 09:22:16 +00:00
Mark Crane c1bf255d62 Add number alias so that it will work with the xml handler. 2013-08-21 17:53:17 +00:00
Mark Crane a5ed0ac2f2 Add xml handler fixed sip call forward. 2013-07-25 06:04:15 +00:00
Mark Crane 9287c49fb0 Remove cache that was too broad and caused "can't find user" errors under certain circumstances. 2013-06-15 06:59:07 +00:00
Mark Crane 896fdb37b2 Move the includes/install to resources/install 2013-06-09 02:42:36 +00:00