markjcrane
11f4fea479
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
5f5ae59c41
Remove the the condition on the direct dial.
2016-03-29 20:57:47 -06:00
markjcrane
0e73d0d3dc
Rollback changes to is_local.lua determined that switching to regex would lower perfomance adding an 'or' with a search for prefix would perform better.
2016-03-27 20:44:14 -06:00
markjcrane
abef8c5d3c
A global domain is optional. Using public context instead.
2016-03-27 04:46:01 -06:00
FusionPBX
b03d978bb0
Merge pull request #1512 from schraegervogel/master
...
initialize call_context
2016-03-27 04:25:22 -06:00
FusionPBX
5906618ff3
Merge pull request #1510 from moteus/databas_role
...
Add. `role` to be able select database backend in constructor.
2016-03-25 15:52:47 -06:00
schraegervogel
39754a505e
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
Alexey Melnichuk
423e0ab503
Add. `role` to be able select database backend in constructor.
...
To configure use `database.backend` option
It can be a string value like `database.backend = 'native'`.
So it will always use same backend.
Or it can be a table value like
```Lua
database.backend = {
main = 'native';
base64 = '';
}
```
Role `database.backend.main` is predefined and it equal to `native` if not set.
If there no role when Database class creates or role unknown role `main` is used
```Lua
dbh = Database.new('system') -- uses role `main`
dbh = Database.new('system', 'main') -- same as previews
dbh = Database.new('system', 'base64') -- uses role `base64`
dbh = Database.new('system', 'test') -- uses role `main`
```
2016-03-25 10:04:48 +03:00
FusionPBX
c5e804cb3c
Update acl.conf.lua
...
Change expire acl.conf to acl_conf
2016-03-25 01:00:43 -06:00
markjcrane
66e01ef9dc
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
e1b6087e04
Use regex with is_local.
2016-03-24 18:43:51 -06:00
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
db3c649aaf
Update the disa.lua to prevent errors when caller hangs up before the destination is called.
2016-03-23 11:42:20 -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
FusionPBX
93c4c56da2
Merge pull request #1461 from mafoo/BugFix-ring_groups
...
corrected function definition
2016-03-11 13:25:20 -07:00
FusionPBX
c6a68388a1
Merge pull request #1479 from mafoo/WhitespaceClean-resources/install/scripts
...
WhitespaceClean-resources/install/scripts
2016-03-11 13:20:17 -07:00
markjcrane
3898a18f42
Prevent custom sip port from breaking provision.lua and add prevent nil concatenation errors.
2016-03-11 10:31:11 -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
ad7e9336dd
Add missing call_direction for ring group destinations.
2016-03-10 18:10:49 -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
mafoo
49fe51710c
corrected function definition
...
fixed bug introduced on 2/1/2016 in destination.lua
fixed bug introduced on 2/1/2016 in ring_member.lua
2016-03-09 17:54:44 +00: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
49c3b3e991
Add ring_member.lua to app/ring_groups/resources/scripts/ring_member.lua.
2016-02-29 18:52:04 -07:00
Alexey Melnichuk
7e1481b747
Fix. FreeSWITCH also breaks loop if return string value which contain number.
...
```Lua
dbh:query(sql, function()
return "1" -- breaks loop
end)
2016-02-26 14:17:28 +03:00
Alexey Melnichuk
ebfcdc38be
Fix. LuaSQL db backend breaks loop only on positive numbers.
2016-02-26 13:57:32 +03:00
Alexey Melnichuk
c96a5bee48
Fix. ODBC db backend should breaks loop only when callback returns number ~= 0
...
```Lua
dbh:query(sql, function(row)
-- return 0 -- should not break loop
-- return true -- should not break loop
return 1 -- should break loop
end)
```
2016-02-26 13:52:27 +03:00
FusionPBX
d111ae4630
Merge pull request #1443 from moteus/database_backend
...
Database backend
2016-02-25 08:39:07 -07:00
Alexey Melnichuk
f498e84716
Fix. Add `#` to caller ID name when call from IVR
2016-02-24 16:28:38 +03:00
Alexey Melnichuk
65e014d73e
Move scripts to separate dirs.
2016-02-24 14:44:50 +03:00
markjcrane
de53ae149e
Fix a spelling mistake in the log message in dialplan.lua.
2016-02-22 13:17:04 -07:00
Alexey Melnichuk
e784cb3d6f
Fix. `unpack` moved to `table` in Lua 5.2
2016-02-20 15:22:28 +03:00
Alexey Melnichuk
a33230db15
Fix. `connected` method on LuaSQL backend.
2016-02-20 15:20:38 +03:00
Alexey Melnichuk
5afec68fb1
Add. Support multiple database backends.
...
```Lua
local Database = require 'resources.functions.database'
-- Default backend configured via xml_handler.db_backend = 'native'
dbh = Database.new("system")
-- To use other backends you can use
dbh = Database.backend.luasql("system")
```
2016-02-19 17:03:45 +03:00
FusionPBX
80758e8826
Merge pull request #1441 from moteus/page_caller_id_name
...
Fix. set caller id name in `page` application
2016-02-19 00:56:19 -07:00
markjcrane
acce2040ab
Company directory allow only setting the first or last name.
2016-02-16 13:05:25 -07:00
Alexey Melnichuk
7b20358284
Fix. set caller id name in `page` application
2016-02-16 13:36:14 +03:00
markjcrane
bbd05a9c2d
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
2016-02-10 13:49:46 -07:00
markjcrane
d61c7815f9
Prevent nil from crashing the lua script.
2016-02-10 13:49:31 -07:00
Alexey Melnichuk
c31047470d
Fix. Declare vars in correct scope.
2016-02-05 10:20:09 +03:00
Alexey Melnichuk
1bafdba135
Update log.
2016-02-04 20:00:12 +03:00
Alexey Melnichuk
9a70297909
Fix. Infinity loop. IVR ignores `max_failures`.
2016-02-04 19:42:42 +03:00
Alexey Melnichuk
5512276370
Fix. Allow multiple actions in IVR
2016-02-04 19:05:24 +03:00