Commit Graph

126 Commits

Author SHA1 Message Date
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