Add missedcallhistoryenable and receivedcallhistoryenable params

callhistoryenable is now for placed calls only
makes these parameters consistent between snom and polycom

(cherry picked from commit d749574edabd2f8782a84bc46d953208085fa62f)

6 files changed, 39 insertions, 3 deletions

diff --git a/config/templates/ciscoata-template.lua b/config/templates/ciscoata-template.lua
index 323185d..b2724aa 100644
--- a/config/templates/ciscoata-template.lua
+++ b/config/templates/ciscoata-template.lua
@@ -23,6 +23,8 @@ values["regX"]["forwardnoanswer"] = ""
 values["regX"]["forwardnoanswerenable"] = boolean
 values["regX"]["password"] = ""
 -- Unimplemented -- values["services"]["callhistoryenable"] = boolean
+-- Unimplemented -- values["services"]["missedcallhistoryenable"] = boolean
+-- Unimplemented -- values["services"]["receivedcallhistoryenable"] = boolean
 values["services"]["callwaitingenable"] = boolean
 values["services"]["forwarding"] = boolean
 values["services"]["hotlineenable"] = boolean
diff --git a/config/templates/linksysata-template.lua b/config/templates/linksysata-template.lua
index b2fb038..5993492 100644
--- a/config/templates/linksysata-template.lua
+++ b/config/templates/linksysata-template.lua
@@ -21,6 +21,8 @@ values["regX"]["forwardnoanswer"] = ""
 values["regX"]["forwardnoanswerenable"] = false
 values["regX"]["password"] = ""
 -- Unimplemented -- values["services"]["callhistoryenable"] = true
+-- Unimplemented -- values["services"]["missedcallhistoryenable"] = true
+-- Unimplemented -- values["services"]["receivedcallhistoryenable"] = true
 values["services"]["callwaitingenable"] = true
 values["services"]["forwarding"] = true
 values["services"]["hotlinedestination"] = ""
diff --git a/config/templates/polycom-template.lua b/config/templates/polycom-template.lua
index e3a4313..a6f3b2a 100644
--- a/config/templates/polycom-template.lua
+++ b/config/templates/polycom-template.lua
@@ -40,6 +40,8 @@
 			-- Assuming that services will not be nil
 			services = {
 				callhistoryenable = boolean
+				missedcallhistoryenable = boolean
+				receivedcallhistoryenable = boolean
 				callwaitingenable = boolean
 				forwarding = boolean
 				hotlinedestination = string
@@ -197,6 +199,12 @@ if values.services then
 	if not values.services.callhistoryenable then
 		xml_attr({ 'feature.callListPlaced.enabled' }, '0')
 	end
+	if not values.services.missedcallhistoryenable then
+		xml_attr({ 'feature.callListMissed.enabled' }, '0')
+	end
+	if not values.services.receivedcallhistoryenable then
+		xml_attr({ 'feature.callListReceived.enabled' }, '0')
+	end
 	if not values.services.callwaitingenable then
 		-- only allow one call per line key
 		xml_attr({ 'call.callsPerLineKey' }, '1' )
diff --git a/config/templates/snom-template.lua b/config/templates/snom-template.lua
index 19c529e..f12aa59 100644
--- a/config/templates/snom-template.lua
+++ b/config/templates/snom-template.lua
@@ -23,6 +23,8 @@ values["regX"]["callerid"] = ""
 values["regX"]["extension"] = ""
 values["regX"]["password"] = ""
 values["services"]["callhistoryenable"] = true
+values["services"]["missedcallhistoryenable"] = true
+values["services"]["receivedcallhistoryenable"] = true
 values["services"]["callwaitingenable"] = true
 values["services"]["forwarding"] = true
 values["services"]["hotlinedestination"] = ""
@@ -146,8 +148,8 @@ for pg, pg_t in pairs(values) do
 		if pg_t.extension ~= "" then
 			xml_elem('user_active', 'on', 'R', num )
 			xml_elem('record_dialed_calls', values.services.callhistoryenable, 'R', num)
-			xml_elem('record_missed_calls', values.services.callhistoryenable, 'R', num)
-			xml_elem('record_received_calls', values.services.callhistoryenable, 'R', num)
+			xml_elem('record_missed_calls', values.services.missedcallhistoryenable, 'R', num)
+			xml_elem('record_received_calls', values.services.receivedcallhistoryenable, 'R', num)
 			xml_elem('user_host', values.device.registrar, 'R', num )
 			if values.device.musiconhold and values.device.musiconhold ~= "" then
 				xml_elem('user_moh', 'sip:'..values.device.musiconhold, 'R', num)
diff --git a/provisioning-scripts.lua b/provisioning-scripts.lua
index e6d4b89..03e0ecd 100644
--- a/provisioning-scripts.lua
+++ b/provisioning-scripts.lua
@@ -1081,6 +1081,8 @@ mymodule.param_groups_to_params = {
 	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Office Phone'), (SELECT param_id FROM provisioning_params WHERE name='forwarding'), 'true', false)",
 	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Office 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='Office 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='Office Phone'), (SELECT param_id FROM provisioning_params WHERE name='missedcallhistoryenable'), 'true', false)",
+	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Office Phone'), (SELECT param_id FROM provisioning_params WHERE name='receivedcallhistoryenable'), 'true', false)",
 	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Office 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='Office 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='Office Phone'), (SELECT param_id FROM provisioning_params WHERE name='mailbox'), null, true)",
@@ -1100,6 +1102,8 @@ mymodule.param_groups_to_params = {
 	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Residential Phone'), (SELECT param_id FROM provisioning_params WHERE name='forwarding'), 'true', false)",
 	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Residential 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='Residential 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='Residential Phone'), (SELECT param_id FROM provisioning_params WHERE name='missedcallhistoryenable'), 'true', false)",
+	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Residential Phone'), (SELECT param_id FROM provisioning_params WHERE name='receivedcallhistoryenable'), 'true', false)",
 	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Residential 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='Residential 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='Residential Phone'), (SELECT param_id FROM provisioning_params WHERE name='mailbox'), null, true)",
@@ -1119,6 +1123,8 @@ mymodule.param_groups_to_params = {
 	"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)",
+	"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='missedcallhistoryenable'), 'true', 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='receivedcallhistoryenable'), 'true', 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='callwaitingenable'), 'true', 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='speeddialenable'), '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='provpollingtime'), '02:00', false)",
@@ -1137,6 +1143,8 @@ mymodule.param_groups_to_params = {
 	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Hotline'), (SELECT param_id FROM provisioning_params WHERE name='hotlineenable'), 'true', false)",
 	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Hotline'), (SELECT param_id FROM provisioning_params WHERE name='hotlinedestination'), '', true)",
 	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Hotline'), (SELECT param_id FROM provisioning_params WHERE name='callhistoryenable'), 'false', false)",
+	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Hotline'), (SELECT param_id FROM provisioning_params WHERE name='missedcallhistoryenable'), 'false', false)",
+	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Hotline'), (SELECT param_id FROM provisioning_params WHERE name='receivedcallhistoryenable'), 'false', false)",
 	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Hotline'), (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='Hotline'), (SELECT param_id FROM provisioning_params WHERE name='speeddialenable'), 'false', false)",
 	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Hotline'), (SELECT param_id FROM provisioning_params WHERE name='provpollingtime'), '02:00', false)",
@@ -1279,7 +1287,9 @@ mymodule.provisioning_params = {
 	"INSERT INTO provisioning_params VALUES(default, 'forwarding', 'boolean', 'Forwarding Enable', '', 'true', '201', '', null)",
 	"INSERT INTO provisioning_params VALUES(default, 'hotlineenable', 'boolean', 'Hotline Enable', '', 'false', '202', '', null)",
 	"INSERT INTO provisioning_params VALUES(default, 'hotlinedestination', 'text', 'Hotline Destination', '', '', '203', '', null)",
-	"INSERT INTO provisioning_params VALUES(default, 'callhistoryenable', 'boolean', 'Call History Enable', '', 'true', '204', '', null)",
+	"INSERT INTO provisioning_params VALUES(default, 'callhistoryenable', 'boolean', 'Placed Call History Enable', '', 'true', '204', '', null)",
+	"INSERT INTO provisioning_params VALUES(default, 'missedcallhistoryenable', 'boolean', 'Missed Call History Enable', '', 'true', '204', '', null)",
+	"INSERT INTO provisioning_params VALUES(default, 'receivedcallhistoryenable', 'boolean', 'Received Call History Enable', '', 'true', '204', '', null)",
 	"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)",
diff --git a/upgradeprovisioning b/upgradeprovisioning
index 6e1d07b..58556c4 100755
--- a/upgradeprovisioning
+++ b/upgradeprovisioning
@@ -745,6 +745,18 @@ if [ "$version" -lt "12" ]; then
 	psql -U postgres -c "INSERT INTO provisioning_params VALUES(default, 'clockenable', 'boolean', 'Clock Enable', '', 'true', '14', '', null)" provisioning
 	psql -U postgres -c "INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Polycom Device'), (SELECT param_id FROM provisioning_params WHERE name='clockenable'), null, false)" provisioning
 
+	psql -U postgres -c "UPDATE provisioning_params SET(label)=('Placed Call History Enable') WHERE name='callhistoryenable'" provisioning
+	psql -U postgres -c "INSERT INTO provisioning_params VALUES(default, 'missedcallhistoryenable', 'boolean', 'Missed Call History Enable', '', 'true', '204', '', null)" provisioning
+	psql -U postgres -c "INSERT INTO provisioning_params VALUES(default, 'receivedcallhistoryenable', 'boolean', 'Received Call History Enable', '', 'true', '204', '', null)" provisioning
+	psql -U postgres -c "INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Office Phone'), (SELECT param_id FROM provisioning_params WHERE name='missedcallhistoryenable'), 'true', false)" provisioning
+	psql -U postgres -c "INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Office Phone'), (SELECT param_id FROM provisioning_params WHERE name='receivedcallhistoryenable'), 'true', false)" provisioning
+	psql -U postgres -c "INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Residential Phone'), (SELECT param_id FROM provisioning_params WHERE name='missedcallhistoryenable'), 'true', false)" provisioning
+	psql -U postgres -c "INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Residential Phone'), (SELECT param_id FROM provisioning_params WHERE name='receivedcallhistoryenable'), 'true', false)" provisioning
+	psql -U postgres -c "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='missedcallhistoryenable'), 'true', false)" provisioning
+	psql -U postgres -c "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='receivedcallhistoryenable'), 'true', false)" provisioning
+	psql -U postgres -c "INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Hotline'), (SELECT param_id FROM provisioning_params WHERE name='missedcallhistoryenable'), 'false', false)" provisioning
+	psql -U postgres -c "INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Hotline'), (SELECT param_id FROM provisioning_params WHERE name='receivedcallhistoryenable'), 'false', false)" provisioning
+
 	# database
 	psql -U postgres -c "UPDATE provisioning_params SET value='12' WHERE name='databaseversion'" provisioning
 fi