diff options
| author | Ted Trask <ttrask01@yahoo.com> | 2016-04-06 20:25:42 +0000 |
|---|---|---|
| committer | Ted Trask <ttrask01@yahoo.com> | 2016-04-06 20:25:42 +0000 |
| commit | 9e74f55111afa1bf79916b23679cb00acb6874ce (patch) | |
| tree | bc85b17563bbd4157f51674b6baae9c58aa76155 | |
| parent | 3e38d01b353823358c8163f30f9124f837b1658b (diff) | |
| download | acf-provisioning-9e74f55111afa1bf79916b23679cb00acb6874ce.tar.bz2 acf-provisioning-9e74f55111afa1bf79916b23679cb00acb6874ce.tar.xz | |
Fix validation for dtmfactivationcode and dtmfactivationduration
| -rw-r--r-- | provisioning-scripts.lua | 4 | ||||
| -rwxr-xr-x | upgradeprovisioning | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/provisioning-scripts.lua b/provisioning-scripts.lua index a95e83d..91c92b6 100644 --- a/provisioning-scripts.lua +++ b/provisioning-scripts.lua @@ -1120,8 +1120,8 @@ mymodule.provisioning_params = { "INSERT INTO provisioning_params values(default, 'cyberringvolume', 'select', 'Ring Volume (CyberData)', '', '4', '20', '', null)", "INSERT INTO provisioning_params values(default, 'cybermicgain', 'select', 'Microphone Gain (CyberData)', '', '4', '21', '', null)", "INSERT INTO provisioning_params values(default, 'activaterelaywithdtmf', 'boolean', 'Activate Relay with DTMF Enable', '', 'true', '22', '', null)", - "INSERT INTO provisioning_params values(default, 'dtmfactivationcode', 'text', 'Relay DTMF Activation Code', '', '321', '23', '^[*#0-9]*$', E'local value, functions, params = ...\nif value ~= \'\' then\nlocal len = string.len(value)\n if len >= 26 then\n return value, \'Maximum 25 digits\'\n end\nend\nreturn value')", - "INSERT INTO provisioning_params values(default, 'dtmfactivationduration', 'text', 'Relay DTMF Activation Duration', 'Value in seconds', '2', '24', '^%d*$', E'local value, functions, params = ...\nif value ~= \'\' then\nlocal len = string.len(value)\n if len >= 6 then\n return value, \'Maximum 5 digits\'\n end\nend\nreturn value')", + "INSERT INTO provisioning_params values(default, 'dtmfactivationcode', 'text', 'Relay DTMF Activation Code', '', '321', '23', '^[*#0-9]*$', E'local value, functions, params = ...\nif value ~= \"\" then\nlocal len = string.len(value)\n if len >= 26 then\n return value, \"Maximum 25 digits\"\n end\nend\nreturn value')", + "INSERT INTO provisioning_params values(default, 'dtmfactivationduration', 'text', 'Relay DTMF Activation Duration', 'Value in seconds', '2', '24', '^%d*$', E'local value, functions, params = ...\nif value ~= \"\" then\nlocal len = string.len(value)\n if len >= 6 then\n return value, \"Maximum 5 digits\"\n end\nend\nreturn value')", "INSERT INTO provisioning_params values(default, 'playtonewhilerelayactive', 'boolean', 'Relay Activation Tone Enable', '', 'true', '25', '', null)", "INSERT INTO provisioning_params values(default, 'activaterelayduringring', 'boolean', 'Activate Relay During Ring Enable', '', 'false', '26', '', null)", "INSERT INTO provisioning_params values(default, 'activaterelayduringcall', 'boolean', 'Activate Relay While Call Active Enable', '', 'false', '27', '', null)", diff --git a/upgradeprovisioning b/upgradeprovisioning index 92ea343..1b74551 100755 --- a/upgradeprovisioning +++ b/upgradeprovisioning @@ -575,8 +575,8 @@ if [ "$version" -lt "9" ]; then psql -U postgres -c "INSERT INTO provisioning_params values(default, 'cyberringvolume', 'select', 'Ring Volume (CyberData)', '', '4', '20', '', null)" provisioning psql -U postgres -c "INSERT INTO provisioning_params values(default, 'cybermicgain', 'select', 'Microphone Gain (CyberData)', '', '4', '21', '', null)" provisioning psql -U postgres -c "INSERT INTO provisioning_params values(default, 'activaterelaywithdtmf', 'boolean', 'Activate Relay with DTMF Enable', '', 'true', '22', '', null)" provisioning - psql -U postgres -c "INSERT INTO provisioning_params values(default, 'dtmfactivationcode', 'text', 'Relay DTMF Activation Code', '', '321', '23', '^[*#0-9]*$', E'local value, functions, params = ...\nif value ~= \'\' then\nlocal len = string.len(value)\n if len >= 26 then\n return value, \'Maximum 25 digits\'\n end\nend\nreturn value')" provisioning - psql -U postgres -c "INSERT INTO provisioning_params values(default, 'dtmfactivationduration', 'text', 'Relay DTMF Activation Duration', 'Value in seconds', '2', '24', '^%d*$', E'local value, functions, params = ...\nif value ~= \'\' then\nlocal len = string.len(value)\n if len >= 6 then\n return value, \'Maximum 5 digits\'\n end\nend\nreturn value')" provisioning + psql -U postgres -c "INSERT INTO provisioning_params values(default, 'dtmfactivationcode', 'text', 'Relay DTMF Activation Code', '', '321', '23', '^[*#0-9]*\$', E'local value, functions, params = ...\nif value ~= \"\" then\nlocal len = string.len(value)\n if len >= 26 then\n return value, \"Maximum 25 digits\"\n end\nend\nreturn value')" provisioning + psql -U postgres -c "INSERT INTO provisioning_params values(default, 'dtmfactivationduration', 'text', 'Relay DTMF Activation Duration', 'Value in seconds', '2', '24', '^%d*\$', E'local value, functions, params = ...\nif value ~= \"\" then\nlocal len = string.len(value)\n if len >= 6 then\n return value, \"Maximum 5 digits\"\n end\nend\nreturn value')" provisioning psql -U postgres -c "INSERT INTO provisioning_params values(default, 'playtonewhilerelayactive', 'boolean', 'Relay Activation Tone Enable', '', 'true', '25', '', null)" provisioning psql -U postgres -c "INSERT INTO provisioning_params values(default, 'activaterelayduringring', 'boolean', 'Activate Relay During Ring Enable', '', 'false', '26', '', null)" provisioning psql -U postgres -c "INSERT INTO provisioning_params values(default, 'activaterelayduringcall', 'boolean', 'Activate Relay While Call Active Enable', '', 'false', '27', '', null)" provisioning |