diff options
| author | Ted Trask <ttrask01@yahoo.com> | 2011-10-28 20:46:52 +0000 |
|---|---|---|
| committer | Ted Trask <ttrask01@yahoo.com> | 2011-10-28 20:46:52 +0000 |
| commit | e705c74958f5407ec67d5f588671e9e15df00c15 (patch) | |
| tree | 2c5be243ebfe614a51df7d253a65abd4c1b3f453 | |
| parent | f8cccd7fba66862a074070e7ac1e9b1e9eab3d8f (diff) | |
| download | acf-provisioning-e705c74958f5407ec67d5f588671e9e15df00c15.tar.bz2 acf-provisioning-e705c74958f5407ec67d5f588671e9e15df00c15.tar.xz | |
Added mailcallback parameter and fixed Standard Phone to have null value for mailbox
| -rwxr-xr-x | provisioning-scripts.lua | 4 | ||||
| -rw-r--r-- | templates/polycom-template.lua | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/provisioning-scripts.lua b/provisioning-scripts.lua index ce6fb28..444683a 100755 --- a/provisioning-scripts.lua +++ b/provisioning-scripts.lua @@ -525,7 +525,8 @@ param_groups_to_params = { "INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Standard Phone'), (SELECT param_id FROM provisioning_params WHERE name='callhistoryenable'), 'true', false)", "INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Standard Phone'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), 'true', false)", "INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Standard Phone'), (SELECT param_id FROM provisioning_params WHERE name='speeddialenable'), 'true', false)", - "INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Standard Phone'), (SELECT param_id FROM provisioning_params WHERE name='mailbox'), '', true)", + "INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Standard Phone'), (SELECT param_id FROM provisioning_params WHERE name='mailbox'), null, true)", + "INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Standard Phone'), (SELECT param_id FROM provisioning_params WHERE name='mailcallback'), null, true)", "INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Public Phone'), (SELECT param_id FROM provisioning_params WHERE name='forwarding'), 'false', false)", "INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Public Phone'), (SELECT param_id FROM provisioning_params WHERE name='hotlineenable'), 'false', false)", "INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Public Phone'), (SELECT param_id FROM provisioning_params WHERE name='callhistoryenable'), 'false', false)", @@ -572,6 +573,7 @@ provisioning_params = { "INSERT INTO provisioning_params VALUES(default, 'callwaitingenable', 'boolean', 'Call Waiting Enable', '', 'true', '205', '', null)", "INSERT INTO provisioning_params VALUES(default, 'speeddialenable', 'boolean', 'Speed Dial Enable', '', 'true', '206', '', null)", "INSERT INTO provisioning_params VALUES(default, 'mailbox', 'text', 'Voice Mailbox', 'Mailbox extension or URL', '', '207', '', null)", + "INSERT INTO provisioning_params VALUES(default, 'mailcallback', 'text', 'Voice Mailbox Callback', 'Extension or URL for mailbox message retrieval', '', '208', '', null)", } -- All of the (non-default) parameter values for all devices are stored here diff --git a/templates/polycom-template.lua b/templates/polycom-template.lua index 5ed35a3..81ad18f 100644 --- a/templates/polycom-template.lua +++ b/templates/polycom-template.lua @@ -39,6 +39,7 @@ hotlinedestination = string hotlineenable = boolean mailbox = string + mailcallback = string speeddialenable = boolean } --]] @@ -263,7 +264,11 @@ if values.services then if values.services.mailbox then xml_attr({ 'msg.mwi.1.subscribe' }, values.services.mailbox) xml_attr({ 'msg.mwi.1.callBackMode' }, "contact") - xml_attr({ 'msg.mwi.1.callBack' }, string.gsub(values.services.mailbox, "@.*", "")) + if values.services.mailcallback and values.services.mailcallback ~= "" then + xml_attr({ 'msg.mwi.1.callBack' }, values.services.mailcallback) + else + xml_attr({ 'msg.mwi.1.callBack' }, string.gsub(values.services.mailbox, "@.*", "")) + end end -- set local contact directory to be readonly or readwrite if not values.services.speeddialenable then |