Commit Graph

2076 Commits

Author SHA1 Message Date
markjcrane 8c33f72ed5 Set the default theme as the default. 2016-03-25 16:30:35 -06:00
reliberate d5c60df4fc Added: Bootstrap Framework - initial integration.
Added: Bootstrap Plugins - DateTimePicker, ColorPicker (in multiple apps)
Added: Default Theme - responsive
Removed: RightJS Framework - no longer needed.
Removed: Accessible Theme - superseded by Default theme.
Removed: Minimized Theme - superseded by Default theme.
Enhanced: Menu - responsiveness added.
Enhanced: Dashboard - responsiveness added.
Etc.
2016-03-25 16:29:20 -06:00
FusionPBX 0831a99dd0 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 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
Alexey Melnichuk 93e50ff1df 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 4ce2bb5c8f Update acl.conf.lua
Change expire acl.conf to acl_conf
2016-03-25 01:00:43 -06:00
markjcrane bb4113e210 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-03-24 23:08:45 -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
FusionPBX ddcb4cab28 Revert "Revert "Revert "search selects""" 2016-03-24 22:25:18 -06:00
FusionPBX d7b95e462b Revert "Revert "search selects"" 2016-03-24 22:03:37 -06:00
FusionPBX f9096f9cf1 Revert "search selects" 2016-03-24 22:02:41 -06:00
FusionPBX e9904a03da Merge pull request #1497 from blackc2004/master
search selects
2016-03-24 21:56:20 -06:00
FusionPBX b1a0e9026a Merge pull request #1503 from blackc2004/patch-37
Update directory_extensions.xml
2016-03-24 21:37:06 -06:00
FusionPBX 3c423e7f40 Merge pull request #1504 from blackc2004/patch-38
Update directory_extensions.xml
2016-03-24 21:28:46 -06:00
FusionPBX 7b90f54a67 Merge pull request #1505 from blackc2004/patch-39
Update directory_extensions.xml
2016-03-24 21:28:26 -06:00
FusionPBX e0d80a1c11 Merge pull request #1506 from blackc2004/patch-40
Update directory_extensions.xml
2016-03-24 21:28:01 -06:00
markjcrane 0047f48f45 Use regex with is_local. 2016-03-24 18:43:51 -06:00
markjcrane 9249e1db9a On windows force to / instead of the backslash \ as path. This fixes a problem where recording c:\pathtofusionpbx\recordings fails because the \r gets understood as a carriage return in the session:record in FreeSWITCH. 2016-03-24 15:02:04 -06:00
blackc2004 b69a21947b Update directory_extensions.xml 2016-03-24 08:38:53 -07:00
blackc2004 7479b73ff1 Update directory_extensions.xml 2016-03-24 08:38:39 -07:00
blackc2004 75829a94c9 Update directory_extensions.xml 2016-03-24 08:38:25 -07:00
blackc2004 2234dfae70 Update directory_extensions.xml 2016-03-24 08:38:07 -07:00
blackc2004 137d604e04 fix directory_extension for new contacts variable 2016-03-23 12:23:41 -07: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 33aed1c15d Update the disa.lua to prevent errors when caller hangs up before the destination is called. 2016-03-23 11:42:20 -06:00
blackc2004 c2e1755931 search selects 2016-03-22 15:42:46 -07:00
markjcrane 4a28244650 SPA122 - Set message waiting light to No when provisioning the device. 2016-03-21 23:45:05 -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 08b4e3138c Add destination number regex and string_to_regex function. 2016-03-17 13:22:03 -06:00
markjcrane 9cd30165d4 Change daylight_savings_start_date to daylight_savings_start_day as it is more accurate for representing the data. Add daylight_savings_start_time and daylight_savings_stop_time 2016-03-15 16:15:32 -06:00
markjcrane d1d041dc62 Update default settings add daylight_savings_start_month and date for the polycom templates. 2016-03-15 13:51:01 -06:00
markjcrane 36529ae05a Rolling back PHPMailer from version 5.2.14 to 5.2.2. The latest version had a problem with smtp authentication set to false it still tried to authenticate. 2016-03-15 02:58:23 -06:00
markjcrane 56350a8468 Update the Cisco 79xx templates to work with the new contacts array. 2016-03-14 18:56:00 -06:00
markjcrane 27829859b9 Add a missing semi-colon. 2016-03-12 22:16:22 -07:00
markjcrane f924453e1c Change $language_name to $text['language-name'] this will follow current naming standards in app_languages.php and reduces code needed in the text class. 2016-03-12 22:06:57 -07: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
FusionPBX 8a8629404a Merge pull request #1475 from mafoo/WhitespaceClean-resources/provision/polycom
WhitespaceClean-resources/provision/polycom
2016-03-11 13:34:49 -07:00
FusionPBX 3c85bc5999 Merge pull request #1476 from mafoo/WhitespaceClean-resources/provision/yealink
WhitespaceClean-resources/provision/yealink
2016-03-11 13:34:22 -07:00
FusionPBX 55993a1db7 Merge pull request #1474 from mafoo/WhitespaceClean-resources/provision/grandstream
WhitespaceClean-resources/provision/grandstream
2016-03-11 13:32:31 -07:00
FusionPBX bd6efe903c Merge pull request #1477 from mafoo/WhitespaceClean-resources/provision/mitel
WhitespaceClean-resources/provision/mitel
2016-03-11 13:32:01 -07:00
FusionPBX 489f1ef95f Merge pull request #1478 from mafoo/WhitespaceClean-resources/provision/others
WhitespaceClean-resources/provision/others
2016-03-11 13:31:33 -07:00
FusionPBX a22660bbff Merge pull request #1481 from mafoo/WhitespaceClean-resources/jquery
WhitespaceClean-resources/jquery
2016-03-11 13:27:02 -07:00
FusionPBX ee0df44e0d Merge pull request #1461 from mafoo/BugFix-ring_groups
corrected function definition
2016-03-11 13:25:20 -07:00
FusionPBX 54c1dcfdf1 Merge pull request #1472 from mafoo/WhitespaceClean-resources/classes
WhitespaceClean-resources/classes
2016-03-11 13:22:57 -07:00
FusionPBX 260bf24100 Merge pull request #1479 from mafoo/WhitespaceClean-resources/install/scripts
WhitespaceClean-resources/install/scripts
2016-03-11 13:20:17 -07:00
FusionPBX 55a8bb2686 Merge pull request #1473 from mafoo/WhitespaceClean-resources/provision/cisco
WhitespaceClean-resources/provision/cisco
2016-03-11 13:19:13 -07:00
FusionPBX 919eacb2a7 Merge pull request #1480 from mafoo/WhitespaceClean-resources/templates/conf
WhitespaceClean-resources/templates/conf
2016-03-11 13:18:21 -07:00
FusionPBX 88fe82308f Merge pull request #1482 from mafoo/WhitespaceClean-resources/edit_area
WhitespaceClean-resources/edit_area
2016-03-11 13:16:31 -07:00
FusionPBX 41dfdcef23 Merge pull request #1483 from mafoo/WhitespaceClean-resources/templates/engine/smarty
WhitespaceClean-resources/templates/smarty
2016-03-11 13:16:14 -07:00
FusionPBX 2be9c13080 Merge pull request #1484 from mafoo/WhitespaceClean-resources/others
WhitespaceClean-resources/others
2016-03-11 13:15:09 -07:00
markjcrane f5c2222f97 Prevent custom sip port from breaking provision.lua and add prevent nil concatenation errors. 2016-03-11 10:31:11 -07:00
mafoo 5e97c0df2c WhitespaceClean-resources/others
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 13:57:01 +00:00
mafoo 3f5d003c71 WhitespaceClean-resources/templates/smarty
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 13:45:32 +00:00
mafoo aca80b09c0 WhitespaceClean-resources/edit_area
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 13:29:29 +00:00
mafoo b0f383479a WhitespaceClean-resources/jquery
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 13:26:36 +00:00
mafoo 893216a2d2 WhitespaceClean-resources/templates/conf
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 13:24:27 +00: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
mafoo d68833f588 WhitespaceClean-resources/provision/others
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 12:22:24 +00:00
mafoo 5cae1fef28 WhitespaceClean-resources/provision/mitel
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 12:20:37 +00:00
mafoo d018f74ed3 WhitespaceClean-resources/provision/yealink
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 12:18:50 +00:00
mafoo 1f8f01cabb WhitespaceClean-resources/provision/polycom
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 12:16:24 +00:00
mafoo 713b29998b WhitespaceClean-resources/provision/grandstream
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 12:12:47 +00:00
mafoo 9a6cf80f06 WhitespaceClean-resources/provision/cisco
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 12:10:46 +00:00
mafoo 1726744f4e WhitespaceClean-resources/classes
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 12:08:26 +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 7b5d8f08c5 Add missing call_direction for ring group destinations. 2016-03-10 18:10:49 -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
mafoo 8ceec465ac 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 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 093235cca5 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-03-04 12:36:19 -07:00
markjcrane ac0f620302 Prevent a nil error for xml handler languages. 2016-03-04 12:35:37 -07:00
reliberate 39a31432ba User Dashboard: Minor layout optimizations.
Follow Me: Added search and minimized paging controls.
Extensions: Added minimized paging controls.
2016-03-03 19:01:58 -07:00
markjcrane cb8aaac1f7 Add ring_member.lua to app/ring_groups/resources/scripts/ring_member.lua. 2016-02-29 18:52:04 -07:00
Alexey Melnichuk f2c43cb441 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 bd4fa2a537 Fix. LuaSQL db backend breaks loop only on positive numbers. 2016-02-26 13:57:32 +03:00
Alexey Melnichuk b797775720 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
reliberate c469e12226 Languages: Corrected capitalization on 'false'. 2016-02-25 11:13:18 -07:00
FusionPBX bb13ec5063 Merge pull request #1443 from moteus/database_backend
Database backend
2016-02-25 08:39:07 -07:00
Luis Daniel Lucio Quiroz 56121737a9 Wrong variable in freeswitch.email
https://wiki.freeswitch.org/wiki/Mod_lua#freeswitch.email   

same as my other pull request
2016-02-24 19:59:54 -05:00
reliberate baf579c03e Edit: Added Find/Replace and Go To (Line) features in toolbar, rename Ace application folder. 2016-02-24 14:44:32 -07:00
reliberate e736538654 Edit: Addition of Ace editor application files in /resources 2016-02-24 12:32:41 -07:00
markjcrane cda89cd03c Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-02-24 10:43:16 -07:00
markjcrane 3d61355494 Update the wallpaper variable yealink_t29g_wallpaper. 2016-02-24 10:42:50 -07:00
Alexey Melnichuk 7c225b404a Fix. Add `#` to caller ID name when call from IVR 2016-02-24 16:28:38 +03:00
Alexey Melnichuk 466f85a0be Move scripts to separate dirs. 2016-02-24 14:44:50 +03:00
markjcrane fddef99e40 Update PHPMailer 5.2.2 to 5.2.14. 2016-02-22 15:00:57 -07:00
markjcrane af18c963c0 Rename .project.ROOT to project_root.php this conforms better with current file naming standards. 2016-02-22 14:01:18 -07:00
markjcrane 976fc1bc8f Increase the HTTPS security. 2016-02-22 13:18:37 -07:00
markjcrane 33192164ad Fix a spelling mistake in the log message in dialplan.lua. 2016-02-22 13:17:04 -07:00
markjcrane 724ea56dd5 Set max rotate on the FreeSWITCH logs to 10. 2016-02-22 13:15:55 -07:00
Alexey Melnichuk 4735d9f41c Fix. `unpack` moved to `table` in Lua 5.2 2016-02-20 15:22:28 +03:00
Alexey Melnichuk 6035d4033c Fix. `connected` method on LuaSQL backend. 2016-02-20 15:20:38 +03:00
Alexey Melnichuk 80746dbe3b 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 7e8e1996f0 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 acda022e25 Company directory allow only setting the first or last name. 2016-02-16 13:05:25 -07:00
Alexey Melnichuk 270508bf95 Fix. set caller id name in `page` application 2016-02-16 13:36:14 +03:00
markjcrane 9e029b27eb Fix a spelling problem in the demo_ivr.xml. 2016-02-11 13:35:12 -07:00
markjcrane 4e0f3e7918 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-02-10 13:49:46 -07:00
markjcrane e18a556643 Prevent nil from crashing the lua script. 2016-02-10 13:49:31 -07:00
bdstephenson 3e5353b9aa Update W52P Provisioning Template
account.1.subscribe_mwi should be set to '1' as per Yealink documentation. Not setting this may cause MWI to not work on the W52P.
2016-02-08 08:48:37 -05:00
Alexey Melnichuk b616736a29 Fix. Declare vars in correct scope. 2016-02-05 10:20:09 +03:00
Alexey Melnichuk b3764e21f9 Update log. 2016-02-04 20:00:12 +03:00
Alexey Melnichuk 9f818dfbbf Fix. Infinity loop. IVR ignores `max_failures`. 2016-02-04 19:42:42 +03:00
Alexey Melnichuk a9e4f5a3e6 Fix. Allow multiple actions in IVR 2016-02-04 19:05:24 +03:00
Alexey Melnichuk 1f9fbc6b7b Use logger class. 2016-02-04 16:05:35 +03:00
Alexey Melnichuk 2fe1337494 Simplify code 2016-02-04 13:20:30 +03:00
Alexey Melnichuk 834c0bce86 Merge remote-tracking branch 'upstream/master' into ivr_menu 2016-02-04 12:14:27 +03:00
FusionPBX 254ecafad3 Merge pull request #1420 from moteus/fix_partial_dialplan
Fix. Do not build context if there error.
2016-02-03 21:32:15 -07:00
markjcrane 5f5b70891c Update for provisioning. Add a new phone the Yealink t49g. 2016-02-03 20:02:59 -07:00
markjcrane 58bbf9ae7b Remove trailing whitespaces. 2016-02-03 19:03:16 -07:00
markjcrane aa020308d4 In vars.xml switch from hostname to the switchname. 2016-02-03 19:02:10 -07:00
markjcrane b7512ecc88 Include the mkdir function for the IVR Menu. 2016-02-03 10:43:22 -07:00
markjcrane 986784e3fa Base64 - Make sure the directory structure exists. 2016-02-03 10:01:43 -07:00
FusionPBX a698b32b2a Merge pull request #1421 from moteus/cache_support
Fix. cache.support always returns `false`
2016-02-03 08:31:27 -07:00
Alexey Melnichuk 2f8e950d34 Fix. Can not pick any options after IVR play `streamfile.lua`
Rewrite ivr functions to easy read code.
2016-02-03 16:53:22 +03:00
Alexey Melnichuk a1170e1396 Fix. Use domain name in streamfile.lua.
Fix. Unset input callback after play file done.
2016-02-03 15:20:50 +03:00
Alexey Melnichuk 05188ffd24 Fix. cache.support always returns `false` 2016-02-02 19:54:23 +03: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
markjcrane 1a0301f6f7 Call center used with xml handler does not have access to the session. Remove session and replace it with api global_getvar as session is not always available. 2016-02-01 11:16:23 -07:00
markjcrane 28b7905c76 LUA function format_ringback the session:getVariable must have quotes around the 'hold_music' string. Next check to see if the ringback is nil or an empty string first before trying to use 'match'. 2016-01-31 10:10:08 -07:00
markjcrane 167e3061aa Add polycom_digitmap variable for Polycom variable for provisioning. 2016-01-29 16:02:32 -07:00
markjcrane df78108b18 Mitel provisioning ensure the user_id is set for all keys. 2016-01-29 13:45:25 -07:00
markjcrane b61cf0cff7 More work on the Mitel key handling. 2016-01-29 12:10:55 -07:00
markjcrane 6b2949e9b2 Fix the Mitel key type. 2016-01-29 12:04:37 -07:00
markjcrane 0f420f275f Mitel Provisioning add a value for 'Addr' 2016-01-29 11:34:10 -07:00
markjcrane 73d2360b8a Remove the indentation on the Mitel key assignments so the resulting provisioning file is easier to read. 2016-01-29 11:14:49 -07:00
markjcrane 147bb801fe Update the Mitel template for Key Line use the key_id instead of key_line. 2016-01-29 11:05:05 -07:00
markjcrane b8c0c5f2dc Fix the syntax for the Mitel template. 2016-01-29 10:53:36 -07:00
markjcrane 861153fb05 Add Mitel 5330 provisioning templates. 2016-01-29 10:34:18 -07:00
markjcrane e763848e1d Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-01-29 10:32:03 -07:00
markjcrane bbc49caacc Improve the key handling in the Mitel. 2016-01-29 10:31:44 -07: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 e27ecec310 Change spandsp.conf.xml use-ecm from true to false. 2016-01-28 19:42:39 -07:00
mafoo b655a064fd Converted uses of ringback to common function 2016-01-28 15:51:50 +00:00
markjcrane 9787fe2087 Update the Cisco 794x personal contacts. 2016-01-25 20:42:48 -07: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
markjcrane 46fd506ed2 Add domain name to the recordings path in ivr_menu.lua. 2016-01-25 16:31:04 -07:00
markjcrane d3e89f0540 Change the comment in check_password.lua. 2016-01-22 12:24:18 -07:00
Alexey Melnichuk da1aa87b9e Fix. Do not prompt password if there no mailbox. 2016-01-22 11:37:34 +03:00
markjcrane 1b79c30ce0 Update the constructor in the vcard class. 2016-01-20 23:56:06 -07:00
markjcrane fe14179f0f Remove the polycom/tftp/site.cfg as its currently not working as expected. 2016-01-20 20:33:50 -07:00
markjcrane 3d687d3f39 Add a new polycom template for tftp. 2016-01-20 16:27:17 -07:00
Mafoo 56b34c34ca changed throw Exception to die
nothing ever eval runs the root.php so changed to die to cause a immediate report of error and stop code processing.
2016-01-20 11:30:31 +00:00
markjcrane 5efc4dd0b7 Add personal directory array for provisioning. 2016-01-19 22:14:02 -07:00
Mafoo 87dbd6b428 Added check for if .project.ROOT is missing
If a installation is missing the .project.ROOT previously it would just use the last search path as the project root (wrong) this will cause a Exception should it be unable to find it
2016-01-18 09:38:16 +00:00
markjcrane fa081456b1 Change $_SERVER['DOCUMENT_ROOT'].PROJECT_PATH to $_SERVER["PROJECT_ROOT"]. 2016-01-17 00:01:13 -07:00
markjcrane 4a1c02973d Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-01-16 21:42:40 -07:00
markjcrane 87b0a2344f Rename the cisco provision files for consistency. 2016-01-16 21:42:13 -07:00
blackc2004 e842e06f53 change file name 2016-01-16 11:30:49 -08:00
FusionPBX d298dad5cc Merge pull request #1331 from mafoo/BugFix-root.php_logic
Rollout new root.php
2016-01-16 10:09:44 -07:00
markjcrane 912e9dab28 Consolidate the SQL Queries for better performance. 2016-01-16 09:54:01 -07:00
FusionPBX 6e2cc41caf Merge pull request #1139 from joernott/master
Allow provisioning with internal addressbook and update snom320 tpl
2016-01-15 22:45:32 -07:00
FusionPBX 40d6c3f601 Merge pull request #1385 from blackc2004/master
yealink remote phone book
2016-01-15 22:40:55 -07:00
FusionPBX 697ddb08c9 Merge pull request #1384 from moteus/lua_conf_run_example
Add. Example of how run fax queue monitor.
2016-01-15 21:43:34 -07:00
FusionPBX eb77a26998 Merge pull request #1387 from mafoo/BugFix-Languages
BugFixes in languages.lua
2016-01-15 21:42:48 -07:00
blackc2004 6dc1f9b631 Update cidlookup.conf.xml 2016-01-15 20:11:38 -08:00
markjcrane 1a896d3cd2 Fix the domain name in MN_Generic.cfg. 2016-01-15 17:54:06 -07:00
markjcrane 7d5312520a Make the domain in MN_Generic.cfg dynamic. 2016-01-15 17:35:00 -07:00
markjcrane 4c5d644757 Mitel provisioning add MN_Generic.cfg and update the 5324 and 5340 templates. 2016-01-15 17:09:16 -07:00
markjcrane 492653b1e0 Add a line feed to the mitel/5324/MN_{$mac}.cfg template. 2016-01-15 14:27:53 -07:00
markjcrane 9d61033b87 Default mitel tftp_config to 2. 2016-01-15 14:15:53 -07:00
markjcrane dd7f473f8d Fix the domain_name syntax. 2016-01-15 13:45:32 -07:00
markjcrane 3da1d0b521 A few more adjustments for the Cisco 79xx directories. 2016-01-15 13:43:40 -07:00
markjcrane 725fc133ea Fix the syntax in the 7940 and 7960 directory-personal.xml configuration. 2016-01-15 13:36:46 -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
Matthew Vale 6999198492 added logic in cli mode to chdir to the correct directory first
the webserver would normally do this for us, but we need to do it
2016-01-14 16:25:05 +00:00
Matthew Vale b7e350b845 changed text.php to use $_SERVER["PROJECT_ROOT"] 2016-01-14 16:15:41 +00:00
blackc2004 526a20169e start of local extensions as remote phone book 2016-01-13 10:08:38 -08:00
Matthew Vale a41e89af76 Added full logic to support cli as well 2016-01-13 17:38:54 +00:00
Alexey Melnichuk a2d29679a8 Add. Example of how run fax queue monitor. 2016-01-13 10:40:21 +03:00
Alexey Melnichuk aaf9e52e48 Change. Move `fax_queue_*` scripts to `app/fax/resources/scripts` 2016-01-13 10:22:32 +03:00
markjcrane 3853bd85dc Complete adding application hangup. 2016-01-12 23:16:45 -07:00
markjcrane f0b57b1516 Add hangup to the destination select list. 2016-01-12 21:07:49 -07:00
markjcrane 56fa5dafba Comment out the languages not in use until they are needed. 2016-01-12 21:04:39 -07:00
markjcrane f63d786ca4 Remove the rss feed from the Mitel template. 2016-01-12 20:50:48 -07:00
markjcrane 0c39c98213 Show when we are clearing the cache for *78 or *79. 2016-01-12 19:34:57 -07:00
Matthew Vale 0176d30312 change to use '/' instead of DIRECTOR_SEPERATOR 2016-01-12 14:47:50 +00:00
Matthew Vale e6ad46cfbf Rollout of root.php 2016-01-12 13:55:39 +00:00
markjcrane 595f10ef2f Change array extensins to contact_extensions and add a new extension array. Remove trailing spaces. And add a new cisco 79xx directory called Our Phones. 2016-01-12 02:42:59 -07:00
markjcrane 352a630f42 Add dsn_callcenter and improve the indentation. 2016-01-12 01:48:11 -07:00
markjcrane 86b0e88d16 Fix the PostgreSQL query in cidlookup.conf.xml. 2016-01-08 18:15:45 -07:00
markjcrane 7ea8a14384 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-01-06 11:10:37 -07:00
blackc2004 7269520f99 another directory setting url typo 2016-01-06 09:43:25 -08:00
markjcrane 0da3b9fe4a Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-01-05 13:19:18 -07:00
markjcrane ce78189a80 Fix the FAX retry email. 2016-01-05 13:19:02 -07:00
blackc2004 9d99de26bc fix two files 2016-01-05 12:16:53 -08:00
blackc2004 868affab3a change ldap settings to be consistent across all yealink files 2016-01-05 12:14:03 -08:00
blackc2004 84a420d8df Update y000000000036.cfg 2016-01-05 11:20:33 -08:00
blackc2004 f022a5d104 Update y000000000029.cfg 2016-01-05 11:19:08 -08:00
FusionPBX 5ab294996f Merge pull request #1365 from blackc2004/patch-26
Update y000000000005.cfg
2016-01-05 11:40:50 -07:00
FusionPBX 38861efcf7 Merge pull request #1367 from blackc2004/patch-28
Update y000000000029.cfg
2016-01-05 11:40:07 -07:00
FusionPBX b5f9dfb69e Merge pull request #1364 from blackc2004/patch-27
Update y000000000046.cfg
2016-01-05 11:39:58 -07:00
blackc2004 f4ab98828d Update y000000000035.cfg 2016-01-05 09:58:00 -08:00
blackc2004 3303d0d907 Update y000000000029.cfg 2016-01-05 09:54:38 -08:00
blackc2004 4365535429 Update y000000000046.cfg 2016-01-05 09:53:43 -08:00
blackc2004 fe75094087 Update y000000000005.cfg 2016-01-05 09:51:58 -08: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 1a4dc2a658 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-01-04 17:16:27 -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
FusionPBX f062ddf289 Revert "cherry picked changes from 4.0 branch" 2016-01-04 13:13:48 -07:00
markjcrane 724afd7c17 FusionPBX source coding standard uses tabs instead of spaces for indentation. 2016-01-04 13:04:51 -07:00
markjcrane 72c1e23d56 Update destination.lua some preparation to extend it further. 2016-01-04 12:56:50 -07:00
Alexey Melnichuk bc9ffa431f Fix. Definition of `uuid` function in destination.lua. 2016-01-04 09:56:06 +03:00
markjcrane ccc44825e8 Change lang_path to phrases_dir in languages.lua. 2016-01-03 00:42:40 -07:00
markjcrane e83b727b7b Rename ring_member.lua to destination.lua. 2016-01-02 16:38:59 -07:00
markjcrane 122f0bb0a2 Remove the + from the format_phone function. 2016-01-02 16:22:19 -07:00
markjcrane 2c4101e8d0 Move ring_member.lua to ring_groups/resources/scripts/ring_member.lua. 2016-01-02 13:21:34 -07:00
markjcrane 89b2da603f Improve ring_member.lua with consistent indentation, notes, and more if session:ready to prevent errors. 2016-01-02 13:09:28 -07:00
Matthew Vale 7c74d5cf48 cherry picked changes from 4.0 branch 2015-12-31 10:11:31 +00:00
markjcrane 73b5c22b65 Add odbc-dsn to fifo.conf.xml 2015-12-29 23:47:20 -07:00
markjcrane 7d92c4e4a4 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2015-12-29 14:54:09 -07:00
markjcrane fe99226aa2 Trim the default codecs slightly. 2015-12-29 14:53:53 -07:00
Alexey Melnichuk 8ac7d708d3 Change. Reuse same esl connection to send cache event and command.
Fix. Implicitly close esl connection after do cache command.
2015-12-24 13:19:53 +03:00
markjcrane 3e09e32390 Change the .wav to ${record_ext} in the internal sip profiles. 2015-12-23 13:23:54 -07:00
markjcrane 6788b15184 Add record_ext to the recordings.lua. 2015-12-23 12:02:14 -07:00
markjcrane 6dea6e653c Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2015-12-22 21:30:55 -07:00
markjcrane 18e0ea3376 AND r.enabled = 'true' shows up on two lines change one to m.enabled and then add m.enabled to the second query. 2015-12-22 21:30:36 -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
markjcrane 5da1286329 Add session cookie httponly and set it to true. 2015-12-21 20:52:54 -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 e2feca300a Remove this->write_debug from the recursive functions. 2015-12-21 04:31:44 -07:00
markjcrane 302238dc67 Remove 'protected' from the function. 2015-12-21 04:28:23 -07:00
FusionPBX 73daad6e10 Merge pull request #1339 from mafoo/Enhance-resouce/functions.php
migrated install_switch's recursive_* routines
2015-12-21 04:25:29 -07:00
Matthew Vale c0cc276601 migrated install_switch's recursive_* routines 2015-12-21 10:54:48 +00:00
markjcrane 4fd6c57828 Shorten the Sofia User Agent to reduce SIP header size. User Agent by default includes version and git version number. 2015-12-21 03:41:37 -07:00
markjcrane 4df39487d0 Test if email_validate function exists and fix change the indentation from spaces to tabs. 2015-12-20 22:36:34 -07:00
markjcrane a089c6a76c Add all domain users to XML handler.directory.domain. 2015-12-20 01:01:52 -07:00
markjcrane fba3fb039f Add one line between each function. 2015-12-19 15:00:10 -07:00
FusionPBX bd914ba376 Merge pull request #1315 from mafoo/Enhance-Languages
Enhance languages
2015-12-19 09:20:42 -07:00
FusionPBX 6f7538bc9c Merge pull request #1334 from kpabijanskas/master
XML Handler incorrectly handling 'date-time' time conditions
2015-12-18 08:47:47 -07:00
markjcrane 1c592d5f39 Fix the sip_profiles/internal-ipv6 correct core-db-dsn to odbc-dsn. 2015-12-17 10:43:06 -07:00
markjcrane 7c061fab0f Change the version to 4.1 to represent that their are bug fixes and features added since 4.0.x. 2015-12-15 22:06:35 -07:00
markjcrane 401fbb56e2 Add 'to' variable to the first two parameters for freeswitch.email. 2015-12-15 21:10:18 -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
Matthew Vale 81b85c3caf Merge branch 'fusionpbx/master' into Enhance-Languages
Conflicts:
	app/extensions/app_languages.php
2015-12-11 08:45:26 +00:00
blackc2004 0a08484546 CDR Stats Add ADV Search options request 1173
CDR Stats Add ADV Search options request 1173
2015-12-10 11:06:42 -08:00
Matthew Vale fe949cf048 Initial consolidation of common terms 2015-12-10 10:06:48 +00:00
Matthew Vale fc9a45d313 Added initial version of app/languages
for analyzing missing or overlapping with global text
2015-12-10 10:04:35 +00:00
Matthew Vale e2cc65874d Add Fallback language support to en-us 2015-12-10 09:57:54 +00:00
Matthew Vale e3f1e919da Migrate app_languages.php from core to resources 2015-12-10 09:57:08 +00:00
FusionPBX daa0f9bb70 Merge pull request #1294 from moteus/fax_queue_mail_template
Add. mail templates for fax server responses.
2015-12-09 16:28:35 -08:00
FusionPBX 0547e9fce7 Merge pull request #1303 from blackc2004/patch-19
Update directory.lua
2015-12-09 15:02:48 -08:00
blackc2004 8d072ae13f Update index.lua 2015-12-09 14:04:59 -08:00
blackc2004 dca392fcc5 Update directory.lua 2015-12-09 14:03:17 -08:00
Alexey Melnichuk 92ea882398 Fix. Use task db connection to build template. 2015-12-09 14:56:02 +03:00
Alexey Melnichuk 7a45e14c8c Add. mail templates for fax server responses. 2015-12-09 12:43:40 +03:00
markjcrane bc1fcebad3 Fix the domain name in the path for the inbound fax dialplan. 2015-12-08 22:34:23 -07:00
markjcrane 6387f37009 Prevent the conference alone sound from playing twice. 2015-12-07 16:30:03 -07:00
markjcrane 310b7f2b92 Correct the provision time zone variables used in the t48g template. 2015-12-06 14:53:20 -07:00
markjcrane cde9debb29 After removing domain name from the default recordings dir path need to add the domain name every where the recordings directory is currently used. 2015-12-06 13:37:35 -07:00
markjcrane 16abb2849f Remove the domain name from the switch recordings SESSION variable. The path for single and multi-tenant are handled the same and all will used their domain name. 2015-12-06 12:36:08 -07:00
markjcrane 689300e9cd Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2015-12-04 17:35:27 -07:00
markjcrane 5291abfe17 Update the wakeup phrases. 2015-12-04 17:35:02 -07:00
Alexey Melnichuk 5c8aa45d44 Fix. send_mail without file. 2015-12-04 16:18:53 +03:00
Matthew Vale 47ff30bce0 fix to the external IPv6 2015-12-03 15:42:52 +00:00
markjcrane 8ac5852137 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2015-12-02 20:37:26 -07:00
markjcrane 7f0f8ff1cd Change ntp server variable for Cisco 7940 and 7960 ntp_server_primary. 2015-12-02 20:36:47 -07:00
FusionPBX 6c10eaf21a Merge pull request #1271 from mafoo/Enhance_Install
Enhance install based on feedback
2015-12-02 10:22:44 -07:00
Matthew Vale 96a22b5321 made reference to install resource literal 2015-12-02 16:07:23 +00:00
markjcrane 5d2c76b7e2 Seperate Cisco 7940/7960 from Cisco SPA so that both can work with check-sync for reboot and reprovision. 2015-12-01 21:12:52 -07:00
markjcrane 906cb13145 Add check-sync support for Linksys SPA. 2015-12-01 20:48:47 -07:00
markjcrane 64c6dd0181 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2015-12-01 14:10:01 -07:00
markjcrane 706b80ea30 Add syncinfo.xml for cisco 7940 and 7960. 2015-12-01 14:09:44 -07:00
FusionPBX 8bb6d70e64 Merge pull request #1273 from moteus/fax_queue
Add. `Tasks.send_mail_task` function to send task reply.
2015-12-01 11:01:32 -07:00
Matthew Vale f0e2e8d735 Merge remote-tracking branch 'remotes/fusionpbx/master' into Enhance_Install
Conflicts:
	core/install/resources/classes/install_fusionpbx.php
2015-12-01 16:21:10 +00:00
Matthew Vale a936bbcf74 moved config_lua responsibility to install_switch 2015-12-01 15:13:33 +00:00
Alexey Melnichuk efc62b064b Remove unused code. 2015-12-01 16:24:53 +03:00
Alexey Melnichuk f8c86b42bc Add. `Tasks.send_mail_task` function to send task reply. 2015-12-01 15:46:52 +03:00
Matthew Vale 42e9771791 use fixed value for the replacement as DIRECTORY_SEPARATOR changes per platform 2015-12-01 11:44:24 +00:00
Matthew Vale d520226c87 corrected the normalizer 2015-12-01 11:35:23 +00:00
Alexey Melnichuk 20a84ee9b5 Fix. Remove global variable. 2015-12-01 14:35:17 +03:00
Matthew Vale db1e53296e db_create not create_db
corrected version detection
corrected constant
2015-12-01 10:23:24 +00:00
Matthew Vale d305dd2f79 added normalize_path 2015-12-01 10:11:39 +00:00
markjcrane e7ee8fb0f8 Add an additional line feed to the grandstream/gxp21xx template. 2015-11-30 13:42:06 -07:00
markjcrane d4303df93a Adjust the spaces and remove the extra device key type. 2015-11-30 13:39:17 -07:00
markjcrane ea16b7ea8c Add a missing plus in the template. 2015-11-30 13:35:31 -07:00
markjcrane 1f7923908f Adjust the type / mode in the Grandstream gxp21xx template. 2015-11-30 13:33:46 -07:00
markjcrane 675544a655 Add a few more keys parameters to the Grandstream gxp21xx template. 2015-11-30 12:50:41 -07:00
markjcrane 170260a8a5 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2015-11-30 12:33:48 -07:00
markjcrane ba0a00bc84 Add expansion aka side car support to the Grandstream gxp21xx template. 2015-11-30 12:33:27 -07:00
FusionPBX 10380a619b Merge pull request #1267 from moteus/fax_queue
Add. Send reply message after fax task done.
2015-11-30 11:05:19 -07:00
Alexey Melnichuk 6cfc24f8eb Fix. Send mail when fail create outbound channel. 2015-11-30 12:08:26 +03:00
Alexey Melnichuk 5339e39db8 Add. Send reply message after fax task done. 2015-11-30 11:57:09 +03:00
Alexey Melnichuk fedd5ba9fc Add. Text class to manage translate texts. 2015-11-30 10:22:55 +03:00
markjcrane 6fa7dcfa30 Synchronize the cisco 7940 with the 7940 template. 2015-11-28 21:12:16 -07:00