72f2dbab31
Corrects some cases where dialplan conditions were not fully handled ( #1850 )
...
* Remove unsed variable
* Fix cases where time condition are lost
When processing a new condition statement and condition_tag_status == "open",
then there has been a previous condition statement that is in one of three
possible states:
(1) a previous condition of type default has been saved into the
'condition' string and will need to be output as XML with either '>' or '/>'
(2) one or more time conditions have been saved into the
'condition_attribute' string. More time conditions may be added.
After the last time condition it will need to be output as XML with either '>' or '/>'
(3) a previous <condition ....> start tag has already been output as XML
and needs to be closed with a </condition> statement.
The change here checks for all three above situations at the places where
pending condition statements need to be finalized.
Note that when processing condition new statements and we are finalizing
a previous time condition, the XML statement uses the 'condition_break'
value from the previous loop, therefore setting condition_break for the
new condition must be after previous conditions are finalized.
At the start of each new extension, initialize 'condition' and
'condition_attribute'.
* Remove unused variables
* Indent one block to match surrounding code at same level
* Prevent two dialplans uuids being merged into single extension
If a dialplan manager entry ended with an action statement NOT inside
a condition, the generated XML would combine this dialplan uuid with the next
uuid by not closing and reopening a new extension. This change ensures
each dialplan uuid is enclosed in it own <extension></extension>.
2016-08-25 08:50:54 -06:00
b72f36f1c3
Update bind_target for ring groups default to peer if sip_authorized = true then set to both.
2016-08-20 23:59:10 -06:00
22c20dc6ec
Update bind digit action and set call_direction to inline=true
2016-08-20 22:07:35 -06:00
3e4abb8121
Update index.lua
2016-08-20 20:31:04 -06:00
034b325b38
Update record_message.lua
2016-08-20 18:54:02 -06:00
a052465b0d
Update index.lua
2016-08-17 09:55:08 -06:00
d3dc83067a
Update directory.lua
2016-08-15 21:50:44 -06:00
467b89e061
Update ivr.conf.lua
...
Add direct dial message to the IVR Menu so that it states 'your call is being transferred' or 'that was an invalid entry'.
2016-08-14 10:26:32 -06:00
02ecec3cc1
Update ivr.conf.lua
...
Since we are checking the direct dial for user_exists we can allow more up to 11 digits by default.
2016-08-13 20:04:23 -06:00
6ab6f710f3
Update ivr.conf.lua
...
Check to see if the number dialed matches an extension if it does then transfer to the extension if it doesn't then transfer the call back to the IVR Menu.
2016-08-13 19:57:15 -06:00
252f4db916
Add. `force_ping` option for extension ( #1809 )
...
* Add. `force_ping` option for extension
This option force FS send SIP OPTIONS message to
detect if this reged device still available.
* Update language file.
2016-08-11 09:46:54 -06:00
29050e29f3
Create forward_add_intro.lua
2016-08-10 16:10:22 -06:00
0a4a5d573c
Update directory.lua
2016-08-08 09:45:16 -06:00
975bf3084e
Update index.lua
2016-08-05 08:42:51 -06:00
983680491b
Update index.lua
...
Set regex_match = false; before the loop.
2016-08-03 00:23:58 -06:00
868c7dd153
Change. Use `service::control` event to control services ( #1790 )
...
* Change. Use `service::control` event to control services
This is more FS way. E.g. sofia sends `sofia::register` event
and add all information to headers. So now `service` script
emit `fusion::service::control` event and each service responsible
for test its own name. This also allows add in future evnets to
e.g. monitor service status like `fusion::service::satus` so it
will be possible write service which will be restart services.
* Change. rename service name from `flow` to `call_flow`
2016-08-02 14:00:49 -06:00
2ab876d5c4
Update ivr.conf.lua
...
IVR Menu direct dial move it before the options defined by the users so that users can override it.
2016-08-02 10:17:02 -06:00
c87e0f6f05
Update macro.lua
...
Add forward_add_intro to macro.lua.
2016-07-29 09:46:56 -06:00
5a66d97dc2
Update index.lua
...
Improve on the call center agent status use agent_authorized true instead of auto_authorized.
2016-07-27 19:17:10 -06:00
f08094dea1
Allow * 22 login/logout of queue without password by adding variable auto_authorized to dialplan ( #1776 )
2016-07-27 19:13:50 -06:00
d47151ba8d
Add `service` script and make timout optional for EventConsumer ctor ( #1775 )
...
* Change. Pass pid file first. Because there really no need pass timeout.
Add. `fsc` script to be able shutdown MWI and Call Flow subscribe services.
* Change. rename `fsc` to `service`.
* Change. Use `stop` command instead of `shutdown`
2016-07-26 11:58:37 -06:00
e8ab1e4a89
Update languages.lua
...
Don't cache the not found.
2016-07-24 00:22:18 -06:00
32f803a1b3
Update languages.lua
...
When handling phrases get the specific phrase instead of all of them. Remove the code that tried to build the XML from the file system. Replace it with a 'not found' response so that FreeSWITCH will check the filesystem for the XML of the phrase that was not found.
2016-07-24 00:09:48 -06:00
4ed30bfe53
Enhance Voicemail Emails ( #1738 )
...
* Renamed template variable account to voicemail_id and adjusted all
templates
* Added ${voicemail_description}
* Added ${voicemail_name_formatted} (will render the voicemail identifier in accordance with Default/Domain Settings > Voicemail > display_domain_name)
* Updated templates to be consistent spacing
* Updated templates to include use of ${voicemail_name_formatted}
* Changed ${account} to be voicemail_name_formatted instead of id
2016-07-22 09:23:03 -06:00
e1feb2364d
Add silence_stream to default voicemail message ( #1761 )
...
This corrects the issue in #1760 , where the default voicemail message was not being played and instead skipped directly to recording (start recording tone).
2016-07-18 22:55:41 -06:00
77712fcbf9
Update conference.conf.lua
...
Add conference controls to the xml handler.
2016-07-17 15:42:14 -06:00
da8349207a
Update conference.conf.lua
...
Conference profile parameters are now working from the database.
2016-07-17 01:15:35 -06:00
3bf7b917d4
Update play_greeting.lua
...
Voicemail greeting will not play after being transferred from IVR #1749 . Replace session:streamFile( with session:execute("playback", fixes this problem.
2016-07-15 08:43:53 -06:00
44196ae739
Fix. Fusion set rate=48000 to all streams. ( #1746 )
2016-07-12 08:09:54 -06:00
904a52434a
BugFix-Add PROJECT_PATH for lua ( #1740 )
...
added project_path for lua to use where it needs to build urls
2016-07-08 13:12:37 -06:00
cae644c8a1
Add. EventConsumer class. ( #1741 )
...
Rewrite MWI and CallFlow subscribe handlers based on EventConsumer class.
Also on my test VirtualBox/Debian system Lua function `os.clock` produce
very strange result(delta ~0.015 for 1 second) so I switch to `os.time`.
Now to to stop this background Lua scripts it possible send CUSTOM event
with subclass `fusion::XXX::shutdown`. Where XXX is `mwi` or `flow`.
Usage of EventConsumer class
```Lua
-- create new object with timeout one minute
local events = EventConsumer.new(60000)
-- bind to some FS event
events:bind("SHUTDOW", function(self, name, event) ... end)
-- bind to another FS event with subclass
events:bind("CUSTOM::fusion::mwi::shutdown", function(self, name, event) ... end)
-- handle timeout event
events:on("TIMEOUT", function(self, name) ... end)
--run event loop
events:run()
```
2016-07-08 13:10:43 -06:00
39bc0cad29
Update local_stream.conf.lua
...
Set a default rate for chime list if one is not provided.
2016-07-06 16:27:22 -06:00
3d1f5b6866
Add. Support multiple events. ( #1736 )
...
Now subscriber stops and remove pid files when FS shutdown.
So if you use Status->Services you will see correct status.
2016-07-06 12:37:16 -06:00
b7506b5b18
Fix. Send message count in each MWI notify. ( #1728 )
...
* move send event code to separate function
* move get message count to separate function
2016-07-01 10:08:55 -06:00
069ad5d580
Update local_stream.conf.lua
...
Add a more generic query to make this code compatible with MySQL/Mariadb.
2016-06-30 10:03:32 -06:00
8a72e2afd8
Add. Event handler to support MWI. ( #1720 )
...
* Add. Event handler to support MWI.
* Fix. store cache only when get data from memcache
* Change. Use UUID as PID.
2016-06-30 09:55:37 -06:00
2f9c1a7c9f
Update local_stream.conf.lua
...
Changes to the conditions that build the name to make sure it builds it correctly.
2016-06-30 01:40:48 -06:00
b0c69d6703
Update local_stream.conf.lua
...
Use the name/rate for global music on hold or domain_name/name/rate for local. If configuring as a default leave the /rate off the end of the string.
2016-06-30 01:18:17 -06:00
bc670abb32
Update local_stream.conf.lua
...
Remove the default stream will handle it another way.
2016-06-29 17:19:21 -06:00
eb8b64dcd3
Update local_stream.conf.lua
...
Use UUID for the name of the stream. Add a default to handle systems using default.
2016-06-29 16:25:17 -06:00
bc46191440
Update local_stream.conf.lua
...
Check if row.music_on_hold_timer_name is empty.
2016-06-28 12:24:31 -06:00
2d49b1b211
Change. remove CC configuration dependencies from mod_commands. ( #1711 )
2016-06-27 07:52:29 -06:00
a4dfa0c04d
Fix. Set default values for max length settings ( #1706 )
2016-06-26 11:42:33 -06:00
7a9a4bc3da
Fix. Load required libraries in voicemail. ( #1705 )
2016-06-26 09:03:21 -06:00
8f26972c20
Update ivr.conf.lua
...
If the IVR Menu recordings are base64 don't update the path.
2016-06-24 18:40:14 -06:00
3e2dea7b70
Get the settings.recordings.storage_type for the ivr menu using xml handler.
2016-06-24 14:55:16 -06:00
628c825201
Enhance-make voicemail length configurable ( #1702 )
...
allow the voicemail max_lengths to be configured from domain/default
settings
2016-06-24 10:28:47 -06:00
653a5e007d
Update local_stream.conf.lua
...
Music on hold set the default timer name to 'soft'.
2016-06-23 16:42:12 -06:00
6af584afd5
Uncomment two lines to restore the debug check.
2016-06-23 15:46:59 -06:00
8c7be13133
Add full path to the music on hold chime list.
2016-06-23 15:29:14 -06:00
022247c280
Update music_on_hold_timer to timer_name.
2016-06-23 13:35:53 -06:00
6d6a3a3574
Increase the voicemail greeting length that is allowed to 90 seconds.
2016-06-21 18:35:05 -06:00
7e801f0b76
Correct the variable name.
2016-06-13 19:06:59 -06:00
0ae7d5e2e4
Replace the variable with the path to the sounds directory.
2016-06-13 19:04:23 -06:00
bd6b2fb18f
Rename local_stream.lua to local_stream.conf.lua.
2016-06-13 18:50:41 -06:00
e026c3e5e6
Add local_stream.lua to xml_handler.
2016-06-13 18:30:32 -06:00
43543f8b0c
remove SMS ( #1612 )
2016-05-24 12:57:46 -06:00
a78d09cfd5
Add support for twilio ( #1610 )
...
added support for twilio and made it a bit easier to add support for
other carriers as well.
2016-05-24 02:02:36 -06:00
93fe11851b
Flowroute SMS ( #1603 )
...
* Fix Yealink provisioning for contacts/groups
Fix the Yealink provision templates to allow for directory_extensions,
groups and users.
* Fix group_uuid and user_uuid messup
* Yealink directory and provisioning changes
Includes the changes from PR 1582 with some fixes to the SQL.
Also merged all the directory_* options into ONE directory.xml
Will need to call the it with any of these:
http://mydomain/app/provision/?file=directory.xml&contacts=groups
http://mydomain/app/provision/?file=directory.xml&contacts=users
http://mydomain/app/provision/?file=directory.xml&contacts=extensions
http://mydomain/app/provision/?file=directory.xml&contacts=all
* Flow route SMS
2016-05-19 12:09:49 -06:00
619912324c
Fix. Use correct database for Call Center while FS load. ( #1597 )
...
Problem that `mod_commands` may load after than `mod_callcenter` and there no function `global_getvar`
So current code just create database with name `INVALID COMMAND!.db`.
2016-05-13 08:03:48 -06:00
c630449636
Remove contact_email from v_contacts table as this was replaced by the v_contact_emails table.
2016-04-14 10:40:25 -06:00
d824e80f06
Fix. send fax file as PDF in response message
2016-04-05 13:48:50 +03:00
7f082bdef3
Add a missing permission on backup.
2016-04-04 19:51:22 -06:00
3ad26f1965
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
38858b3f6b
Remove the the condition on the direct dial.
2016-03-29 20:57:47 -06:00
ec4f523caf
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
2cd979b30c
A global domain is optional. Using public context instead.
2016-03-27 04:46:01 -06:00
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
4ce2bb5c8f
Update acl.conf.lua
...
Change expire acl.conf to acl_conf
2016-03-25 01:00:43 -06:00
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
0047f48f45
Use regex with is_local.
2016-03-24 18:43:51 -06:00
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
fafe273c18
Fix a spelling mistake in xml handler ivr.conf.lua.
2016-03-20 00:49:21 -06:00
2a280afea9
Fix direct dial for IVR using the xml handler.
2016-03-19 18:13:49 -06:00
61987425af
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
2016-03-11 14:21:28 -07:00
c11459fae8
Get the domain_name from the array.
2016-03-11 14:21:08 -07:00
ee0df44e0d
Merge pull request #1461 from mafoo/BugFix-ring_groups
...
corrected function definition
2016-03-11 13:25:20 -07:00
260bf24100
Merge pull request #1479 from mafoo/WhitespaceClean-resources/install/scripts
...
WhitespaceClean-resources/install/scripts
2016-03-11 13:20:17 -07:00
f5c2222f97
Prevent custom sip port from breaking provision.lua and add prevent nil concatenation errors.
2016-03-11 10:31:11 -07:00
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
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
7b5d8f08c5
Add missing call_direction for ring group destinations.
2016-03-10 18:10:49 -07:00
833860e067
Use a more efficient way to get the domain name for xml handler - dialplan.
2016-03-10 08:18:46 -07:00
d14d4aeb8a
Increase efficiency xml handler section dialplan.
2016-03-09 13:09:25 -07:00
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
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
90a9e55b77
Handle the phrases_dir nil in a more flexible way.
2016-03-04 15:51:10 -07:00
9ffcf3d872
Ensure the phrases_dir is not nil.
2016-03-04 15:08:58 -07:00
ac0f620302
Prevent a nil error for xml handler languages.
2016-03-04 12:35:37 -07:00
cb8aaac1f7
Add ring_member.lua to app/ring_groups/resources/scripts/ring_member.lua.
2016-02-29 18:52:04 -07:00
33192164ad
Fix a spelling mistake in the log message in dialplan.lua.
2016-02-22 13:17:04 -07:00
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
58bbf9ae7b
Remove trailing whitespaces.
2016-02-03 19:03:16 -07:00
986784e3fa
Base64 - Make sure the directory structure exists.
2016-02-03 10:01:43 -07:00
69be506311
Add. debug message to log.
2016-02-02 19:32:27 +03:00
b6ed2eebe9
Fix. Do not build context if there error.
2016-02-02 19:08:19 +03:00
85218c9133
Merge pull request #1415 from mafoo/Enhance-ringback
...
Enhance ringback
2016-01-29 07:24:14 -07:00
b573f65410
converted callcenter to use common function
2016-01-29 11:26:21 +00:00
b655a064fd
Converted uses of ringback to common function
2016-01-28 15:51:50 +00:00
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
48d220b93e
Add recording file handling to the ivr xml handler.
2016-01-25 16:32:27 -07:00
d3e89f0540
Change the comment in check_password.lua.
2016-01-22 12:24:18 -07:00
da1aa87b9e
Fix. Do not prompt password if there no mailbox.
2016-01-22 11:37:34 +03:00
eb77a26998
Merge pull request #1387 from mafoo/BugFix-Languages
...
BugFixes in languages.lua
2016-01-15 21:42:48 -07:00
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
aaf9e52e48
Change. Move `fax_queue_*` scripts to `app/fax/resources/scripts`
2016-01-13 10:22:32 +03:00
352a630f42
Add dsn_callcenter and improve the indentation.
2016-01-12 01:48:11 -07:00
98f0389947
Another adjustment to the xml.
2016-01-04 19:33:02 -07:00
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
aa384869cc
Fix a small bug with the ivr.
2016-01-04 19:19:39 -07:00
752a5acf8b
Update the ivr menu to use memcache with the uuid as part of the key.
2016-01-04 19:09:29 -07:00
451b106c1e
Continue work to make IVR menu work from XML handler.
2016-01-04 19:05:31 -07:00
2c22aea566
Rename ivr.lua to ivr.conf.lua.
2016-01-04 19:03:28 -07:00
1a4dc2a658
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
2016-01-04 17:16:27 -07:00
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
f062ddf289
Revert "cherry picked changes from 4.0 branch"
2016-01-04 13:13:48 -07:00
72c1e23d56
Update destination.lua some preparation to extend it further.
2016-01-04 12:56:50 -07:00
bc9ffa431f
Fix. Definition of `uuid` function in destination.lua.
2016-01-04 09:56:06 +03:00
ccc44825e8
Change lang_path to phrases_dir in languages.lua.
2016-01-03 00:42:40 -07:00
e83b727b7b
Rename ring_member.lua to destination.lua.
2016-01-02 16:38:59 -07:00
2c4101e8d0
Move ring_member.lua to ring_groups/resources/scripts/ring_member.lua.
2016-01-02 13:21:34 -07:00
7c74d5cf48
cherry picked changes from 4.0 branch
2015-12-31 10:11:31 +00:00
6dea6e653c
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
2015-12-22 21:30:55 -07:00
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
c9a9182e72
Merge pull request #1341 from moteus/directory_acl_directory
...
Fix. Generate XML for mod_directory.
2015-12-22 20:54:25 -07:00
e708d38e01
Fix. Remove unused code.
2015-12-22 17:19:14 +03:00
4479760618
Fix the ring back on the XML handler -> callcenter.conf.lua.
2015-12-21 23:31:46 -07:00
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
a089c6a76c
Add all domain users to XML handler.directory.domain.
2015-12-20 01:01:52 -07:00
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
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
0547e9fce7
Merge pull request #1303 from blackc2004/patch-19
...
Update directory.lua
2015-12-09 15:02:48 -08:00
8d072ae13f
Update index.lua
2015-12-09 14:04:59 -08:00
dca392fcc5
Update directory.lua
2015-12-09 14:03:17 -08:00
92ea882398
Fix. Use task db connection to build template.
2015-12-09 14:56:02 +03:00
7a45e14c8c
Add. mail templates for fax server responses.
2015-12-09 12:43:40 +03:00
6387f37009
Prevent the conference alone sound from playing twice.
2015-12-07 16:30:03 -07:00
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
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
906cb13145
Add check-sync support for Linksys SPA.
2015-12-01 20:48:47 -07:00
efc62b064b
Remove unused code.
2015-12-01 16:24:53 +03:00
f8c86b42bc
Add. `Tasks.send_mail_task` function to send task reply.
2015-12-01 15:46:52 +03:00
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
6cfc24f8eb
Fix. Send mail when fail create outbound channel.
2015-11-30 12:08:26 +03:00
5339e39db8
Add. Send reply message after fax task done.
2015-11-30 11:57:09 +03:00
fedd5ba9fc
Add. Text class to manage translate texts.
2015-11-30 10:22:55 +03:00
85634c801e
Change. Move fax_queue to app/fax.
2015-11-28 11:40:54 +03:00
e4d850aa10
Rename the config.php file and a few minor adjustments to install_fusionpbx.
2015-11-27 19:03:25 -07:00
406e95ab29
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
faad283331
Clear the dial_string variable so that it to prevent duplicate destinations.
2015-11-22 19:07:56 -07:00
nostikj
markjcrane
Alexey Melnichuk
DigiDaz
Mafoo
pixel2920
Chris Black
Alexey Melnichuk
schraegervogel
Karolis Pabijanskas