Cleanup of Algo ring parameter patch

2 files changed, 15 insertions, 15 deletions

diff --git a/provisioning-scripts.lua b/provisioning-scripts.lua
index 1126615..bb8fd14 100644
--- a/provisioning-scripts.lua
+++ b/provisioning-scripts.lua
@@ -476,8 +476,8 @@ mymodule.param_groups_to_params = {
 	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Algo 8180 Device'), (SELECT param_id FROM provisioning_params WHERE name='registrar'), null, false)",
 	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Algo 8180 Device'), (SELECT param_id FROM provisioning_params WHERE name='sntpserver'), null, false)",
 	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Algo 8180 Device'), (SELECT param_id FROM provisioning_params WHERE name='adminpassword'), null, false)",
-	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Algo 8180 Device'), (SELECT param_id FROM provisioning_params WHERE name='algoringvol'), '5', true)",
-	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Algo 8180 Device'), (SELECT param_id FROM provisioning_params WHERE name='algopagevol'), '5', true)",
+	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Algo 8180 Device'), (SELECT param_id FROM provisioning_params WHERE name='algoringvol'), null, true)",
+	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Algo 8180 Device'), (SELECT param_id FROM provisioning_params WHERE name='algopagevol'), null, true)",
 	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='CyberData Device'), (SELECT param_id FROM provisioning_params WHERE name='template'), '/etc/provisioning/templates/cyberdata-template.lua', 'f')",
 	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='CyberData Device'), (SELECT param_id FROM provisioning_params WHERE name='mac'), null, true)",
 	"INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='CyberData Device'), (SELECT param_id FROM provisioning_params WHERE name='registrar'), null, true)",
@@ -1102,6 +1102,8 @@ mymodule.provisioning_params = {
 	"INSERT INTO provisioning_params VALUES(default, 'provpollingtime', 'select', 'Provisioning polling start time', 'The provisioning server is automatically polled for upgrades at random between the start time and one hour later', '02:00', '13', '', null)",
 	"INSERT INTO provisioning_params VALUES(default, 'militarytimeenable', 'boolean', '24-hour Clock Mode Enable', '', 'false', '14', '', null)",
 	"INSERT INTO provisioning_params VALUES(default, 'displaylang', 'select', 'Display screen language', 'Check if your phone supports the selected language', '', '15', '', null)",
+	"INSERT INTO provisioning_params VALUES(default, 'algoringvol', 'select', 'Ring Volume (Algo)', '', '5', '16', '', null)",
+	"INSERT INTO provisioning_params VALUES(default, 'algopagevol', 'select', 'Page Volume (Algo)', '', '5', '17', '', null)",
 
 	"INSERT INTO provisioning_params VALUES(default, 'extension', 'text', 'Extension', '', '', '101', '^%d*$', null)",
 	"INSERT INTO provisioning_params VALUES(default, 'password', 'text', 'Password', '', '', '102', '', null)",
@@ -1113,6 +1115,8 @@ mymodule.provisioning_params = {
 	"INSERT INTO provisioning_params VALUES(default, 'forwardall', 'text', 'Forward All Calls Destination', 'All calls will be transferred to this extension', '', '108', '', null)",
 	"INSERT INTO provisioning_params VALUES(default, 'callerid', 'text', 'Caller ID String', '', '', '109', '', null)",
 	"INSERT INTO provisioning_params VALUES(default, 'polycomringtone', 'select', 'Ring Tone (Polycom)', '', '2', '110', '', null)",
+	"INSERT INTO provisioning_params VALUES(default, 'algoringtone', 'select', 'Ring Tone (Algo)', '', 'warble2-med.wav', '111', '', null)",
+	"INSERT INTO provisioning_params VALUES(default, 'algopagetone', 'select', 'Page Tone (Algo)', '', 'warble2-med.wav', '112', '', null)",
 	"INSERT INTO provisioning_params VALUES(default, 'scaenable', 'boolean', 'Shared Call Appearance Enable', '', 'false', '120', '', null)",
 	"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)",
@@ -1133,10 +1137,6 @@ mymodule.provisioning_params = {
 	"INSERT INTO provisioning_params VALUES(default, 'softkey8', 'boolean', 'Soft Key 8 Enable', '', 'false', '308', '', null)",
 	"INSERT INTO provisioning_params VALUES(default, 'softkey9', 'boolean', 'Soft Key 9 Enable', '', 'false', '309', '', null)",
 	"INSERT INTO provisioning_params VALUES(default, 'softkey10', 'boolean', 'Soft Key 10 Enable', '', 'false', '310', '', null)",
-	"INSERT INTO provisioning_params VALUES(default, 'algoringtone', 'select', 'Ring Tone (Algo)', '', 'warble2-med.wav', '110', '', null)",
-	"INSERT INTO provisioning_params VALUES(default, 'algopagetone', 'select', 'Page Tone (Algo)', '', 'warble2-med.wav', '110', '', null)",
-	"INSERT INTO provisioning_params VALUES(default, 'algoringvol', 'select', 'Ring Volume (Algo)', '', '5', '16', '', null)",
-	"INSERT INTO provisioning_params VALUES(default, 'algopagevol', 'select', 'Page Volume (Algo)', '', '5', '17', '', null)",
 	"INSERT INTO provisioning_params VALUES(default, 'databaseversion', 'text', 'Provisioning Database Version', 'Do not edit or delete!', '6', '999', '', null)"
 }
 
diff --git a/upgradeprovisioning b/upgradeprovisioning
index 7cd301e..e338ba9 100755
--- a/upgradeprovisioning
+++ b/upgradeprovisioning
@@ -488,20 +488,20 @@ fi
 
 if [ "$version" -lt "6" ]; then
 	echo "Upgrading to database version 6"
-	
-	psql -U postgres -c "INSERT INTO provisioning_params VALUES(default, 'algoringtone', 'select', 'Ring Tone (Algo)', '', 'warble2-med.wav', '110', '', null)" provisioning
-	psql -U postgres -c "INSERT INTO provisioning_params VALUES(default, 'algopagetone', 'select', 'Page Tone (Algo)', '', 'warble2-med.wav', '110', '', null)" provisioning
+
 	psql -U postgres -c "INSERT INTO provisioning_params VALUES(default, 'algoringvol', 'select', 'Ring Volume (Algo)', '', '5', '16', '', null)" provisioning
 	psql -U postgres -c "INSERT INTO provisioning_params VALUES(default, 'algopagevol', 'select', 'Page Volume (Algo)', '', '5', '17', '', null)" provisioning
+	psql -U postgres -c "INSERT INTO provisioning_params VALUES(default, 'algoringtone', 'select', 'Ring Tone (Algo)', '', 'warble2-med.wav', '111', '', null)" provisioning
+	psql -U postgres -c "INSERT INTO provisioning_params VALUES(default, 'algopagetone', 'select', 'Page Tone (Algo)', '', 'warble2-med.wav', '112', '', null)" provisioning
+
+	psql -U postgres -c "INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Algo 8180 Device'), (SELECT param_id FROM provisioning_params WHERE name='algoringvol'), null, true)" provisioning
+	psql -U postgres -c "INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Algo 8180 Device'), (SELECT param_id FROM provisioning_params WHERE name='algopagevol'), null, true)" provisioning
 
-	psql -U postgres -c "INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Algo 8180 Device'), (SELECT param_id FROM provisioning_params WHERE name='algoringvol'), '5', true)" provisioning
-	psql -U postgres -c "INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Algo 8180 Device'), (SELECT param_id FROM provisioning_params WHERE name='algopagevol'), '5', true)" provisioning
-	
 	for a in $(seq 1 5); do
 		psql -U postgres -c "INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Ring Extension $a (Algo)'), (SELECT param_id FROM provisioning_params WHERE name='algoringtone'), null, true)" provisioning
 	done
 	psql -U postgres -c "INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Page Extension (Algo)'), (SELECT param_id FROM provisioning_params WHERE name='algopagetone'), null, true)" provisioning
-	
+
 	psql -U postgres -c "INSERT INTO provisioning_options VALUES((SELECT param_id FROM provisioning_params WHERE name='algoringtone'), 'Bell NA', 'bell-na.wav', '1')" provisioning
 	psql -U postgres -c "INSERT INTO provisioning_options VALUES((SELECT param_id FROM provisioning_params WHERE name='algoringtone'), 'Bell UK', 'bell-uk.wav', '2')" provisioning
 	psql -U postgres -c "INSERT INTO provisioning_options VALUES((SELECT param_id FROM provisioning_params WHERE name='algoringtone'), 'Buzzer', 'buzzer.wav', '3')" provisioning
@@ -513,7 +513,7 @@ if [ "$version" -lt "6" ]; then
 	psql -U postgres -c "INSERT INTO provisioning_options VALUES((SELECT param_id FROM provisioning_params WHERE name='algoringtone'), 'Warble Med', 'warble2-med.wav', '9')" provisioning
 	psql -U postgres -c "INSERT INTO provisioning_options VALUES((SELECT param_id FROM provisioning_params WHERE name='algoringtone'), 'Warble High', 'warble3-high.wav', '10')" provisioning
 	psql -U postgres -c "INSERT INTO provisioning_options VALUES((SELECT param_id FROM provisioning_params WHERE name='algoringtone'), 'Warble Trill', 'warble4-trill.wav', '11')" provisioning
-	
+
 	psql -U postgres -c "INSERT INTO provisioning_options VALUES((SELECT param_id FROM provisioning_params WHERE name='algopagetone'), 'None', 'None', '1')" provisioning
 	psql -U postgres -c "INSERT INTO provisioning_options VALUES((SELECT param_id FROM provisioning_params WHERE name='algopagetone'), 'Bell NA', 'bell-na.wav', '2')" provisioning
 	psql -U postgres -c "INSERT INTO provisioning_options VALUES((SELECT param_id FROM provisioning_params WHERE name='algopagetone'), 'Bell UK', 'bell-uk.wav', '3')" provisioning
@@ -526,7 +526,7 @@ if [ "$version" -lt "6" ]; then
 	psql -U postgres -c "INSERT INTO provisioning_options VALUES((SELECT param_id FROM provisioning_params WHERE name='algopagetone'), 'Warble Med', 'warble2-med.wav', '10')" provisioning
 	psql -U postgres -c "INSERT INTO provisioning_options VALUES((SELECT param_id FROM provisioning_params WHERE name='algopagetone'), 'Warble High', 'warble3-high.wav', '11')" provisioning
 	psql -U postgres -c "INSERT INTO provisioning_options VALUES((SELECT param_id FROM provisioning_params WHERE name='algopagetone'), 'Warble Trill', 'warble4-trill.wav', '12')" provisioning
-	
+
 	for a in $(seq 1 10); do
 		psql -U postgres -c "INSERT INTO provisioning_options VALUES((SELECT param_id FROM provisioning_params WHERE name='algoringvol'), '$a', '$a', '$a')" provisioning
 		psql -U postgres -c "INSERT INTO provisioning_options VALUES((SELECT param_id FROM provisioning_params WHERE name='algopagevol'), '$a', '$a', '$a')" provisioning