Commit Graph

542 Commits

Author SHA1 Message Date
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
markjcrane de53ae149e Fix a spelling mistake in the log message in dialplan.lua. 2016-02-22 13:17:04 -07:00
FusionPBX 6e3792bf05 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 f525d2bbda Remove trailing whitespaces. 2016-02-03 19:03:16 -07:00
markjcrane 4bb748a300 Base64 - Make sure the directory structure exists. 2016-02-03 10:01:43 -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
mafoo ef31b4082d Converted uses of ringback to common function 2016-01-28 15:51:50 +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
markjcrane 19945b5095 Change the comment in check_password.lua. 2016-01-22 12:24:18 -07:00
Alexey Melnichuk e4e6fe92a9 Fix. Do not prompt password if there no mailbox. 2016-01-22 11:37:34 +03:00
FusionPBX fad8343802 Merge pull request #1387 from mafoo/BugFix-Languages
BugFixes in languages.lua
2016-01-15 21:42:48 -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
Alexey Melnichuk 49a6a760dd Change. Move `fax_queue_*` scripts to `app/fax/resources/scripts` 2016-01-13 10:22:32 +03: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 85e28ae838 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-01-04 17:16:27 -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
FusionPBX f208e06a9d Revert "cherry picked changes from 4.0 branch" 2016-01-04 13:13:48 -07:00
markjcrane e823b991d1 Update destination.lua some preparation to extend it further. 2016-01-04 12:56:50 -07:00
Alexey Melnichuk f50a535e02 Fix. Definition of `uuid` function in destination.lua. 2016-01-04 09:56:06 +03:00
markjcrane 8c52b1167f Change lang_path to phrases_dir in languages.lua. 2016-01-03 00:42:40 -07:00
markjcrane 16ca1ebb99 Rename ring_member.lua to destination.lua. 2016-01-02 16:38:59 -07:00
markjcrane 5f3cc182fe Move ring_member.lua to ring_groups/resources/scripts/ring_member.lua. 2016-01-02 13:21:34 -07:00
Matthew Vale 4fdb6e9916 cherry picked changes from 4.0 branch 2015-12-31 10:11:31 +00:00
markjcrane 91a0f1370e Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2015-12-22 21:30:55 -07:00
markjcrane d8ca3245c5 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 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
FusionPBX 3df36af619 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 60928c5b3d Merge pull request #1303 from blackc2004/patch-19
Update directory.lua
2015-12-09 15:02:48 -08:00
blackc2004 0778fd2d2e Update index.lua 2015-12-09 14:04:59 -08:00
blackc2004 b64a94fdc6 Update directory.lua 2015-12-09 14:03:17 -08:00
Alexey Melnichuk 9e001af711 Fix. Use task db connection to build template. 2015-12-09 14:56:02 +03:00
Alexey Melnichuk c5e2441161 Add. mail templates for fax server responses. 2015-12-09 12:43:40 +03:00
markjcrane 595609e267 Prevent the conference alone sound from playing twice. 2015-12-07 16:30:03 -07:00
markjcrane ff8b838b5e 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 3c9bac53ed 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 b2d4749559 Add check-sync support for Linksys SPA. 2015-12-01 20:48:47 -07:00
Alexey Melnichuk 019597362f Remove unused code. 2015-12-01 16:24:53 +03:00
Alexey Melnichuk 119758ed77 Add. `Tasks.send_mail_task` function to send task reply. 2015-12-01 15:46:52 +03:00
FusionPBX a074c65bed 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 aec2777f62 Fix. Send mail when fail create outbound channel. 2015-11-30 12:08:26 +03:00
Alexey Melnichuk c9be5948c0 Add. Send reply message after fax task done. 2015-11-30 11:57:09 +03:00
Alexey Melnichuk 3a5fc397ba Add. Text class to manage translate texts. 2015-11-30 10:22:55 +03:00
Alexey Melnichuk 46aa5f8049 Change. Move fax_queue to app/fax. 2015-11-28 11:40:54 +03:00
markjcrane e0ff445922 Rename the config.php file and a few minor adjustments to install_fusionpbx. 2015-11-27 19:03:25 -07:00
Alexey Melnichuk 84f3fde716 Add. `send_mail` wrapper function to freeswitch.email and v_mailto.php.
Fix. Send voicemail when set unknown language/dialect.
2015-11-27 15:47:14 +03:00
markjcrane 7749088fd8 Clear the dial_string variable so that it to prevent duplicate destinations. 2015-11-22 19:07:56 -07:00
markjcrane 44ec8d5942 Add voicemail record-silence-threshold variable and change the default threshold from 30 to 300. 2015-11-16 16:59:11 -07:00
markjcrane 6cc9040787 Change enquote to quote. 2015-11-10 13:37:25 -07:00
Alexey Melnichuk 78acf51737 Fix. function name 2015-11-10 20:49:46 +03:00
Alexey Melnichuk 9f88d17e70 Fix. always escape quote. 2015-11-10 19:33:01 +03:00
Alexey Melnichuk 455a1a088f Fix. hungup_rx.lua works on Windows
1. Command should use only double quotes.
2. Application should not be quoted (I am not sure may be it is bug in FS `system` command).

So I use double quote on Windows and single quote on other system.
Also I quote strings only if they contain spaces.
To escape quote in string i just double it.
`you got "some text"` become to `you got ""some text"""`
2015-11-10 19:29:06 +03:00
markjcrane 53702b1973 Fix a problem where the ring group is only calling one external number when there are multiple to call. 2015-11-09 18:42:29 -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
FusionPBX 5ca779d08c Merge pull request #1202 from moteus/show_channels
Fix. Use `api show channels like` did not work on fusion with BDR.
2015-11-03 03:13:27 -07: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
FusionPBX a555722874 Merge pull request #1214 from blackc2004/patch-10
Update directory.lua
2015-10-30 09:31:06 -06:00
markjcrane 1c6f58ca03 MWI only turn on the light for new messages. 2015-10-29 17:34:39 -06:00
blackc2004 f8388cc8f4 Update directory.lua 2015-10-29 12:26:06 -07:00
Alexey Melnichuk fb3fb16002 Merge branch 'master' into show_channels 2015-10-25 10:00:05 +03:00
markjcrane bf3c374e13 Play the message number first then the caller id number. 2015-10-24 21:12:43 -06:00
markjcrane 8f67f2c4c1 Add vm_say_caller_id_number option for true or false. 2015-10-24 21:00:22 -06:00
markjcrane 128bb6d857 Add voicemail caller id number announce as iterated. 2015-10-24 20:09:36 -06:00
Alexey Melnichuk c7c299e050 Fix. Use `api show channels like` did not work on fusion with BDR. 2015-10-20 15:15:42 +03:00
markjcrane 749533b479 Fix a null error and translation for select option voicemail. 2015-10-19 20:58:16 -06:00
markjcrane 710a3fa696 Add hold music option and update the call_block dialplan. 2015-10-19 18:30:55 -06:00
markjcrane a63cbada9b Switch the hostname for conference center to switchname. 2015-10-16 10:34:54 -07:00
FusionPBX dc1c66366c Merge pull request #1197 from badcrc/master
This should do a better job detection active calls per extension in t…
2015-10-14 16:15:05 -07:00
markjcrane 5a2e78dc29 Listen for dtmf key presses when voicemail message is played. 2015-10-14 16:03:33 -07:00
koldoa b1abaccb3f This should do a better job detection active calls per extension in the ring group with skip_active 2015-10-14 12:00:09 +02: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