diff options
author | Ted Trask <ttrask01@yahoo.com> | 2013-10-09 21:10:06 +0000 |
---|---|---|
committer | Ted Trask <ttrask01@yahoo.com> | 2013-10-09 21:10:06 +0000 |
commit | ee0a9b946697ccc610b52b6dc182030fba225991 (patch) | |
tree | 0de8fd66e05012bfe8b1b258a336c609f3c92ef2 | |
parent | a8345974307b38d58dbfa352c7be93776e70ffa8 (diff) | |
download | acf-provisioning-ee0a9b946697ccc610b52b6dc182030fba225991.tar.bz2 acf-provisioning-ee0a9b946697ccc610b52b6dc182030fba225991.tar.xz |
Change use of require to work with Lua 5.2
25 files changed, 29 insertions, 29 deletions
diff --git a/cgi-bin/provisioning.cgi b/cgi-bin/provisioning.cgi index 1f86aa6..64e9134 100755 --- a/cgi-bin/provisioning.cgi +++ b/cgi-bin/provisioning.cgi @@ -1,7 +1,7 @@ #!/usr/bin/haserl --shell=lua <% -require "posix" +posix = require "posix" local path_info = ENV["PATH_INFO"] or ENV["REQUEST_URI"] or "" local root = ENV["DOCUMENT_ROOT"] or "" diff --git a/config/delete_device.lua b/config/delete_device.lua index 81c2afb..3b04894 100644 --- a/config/delete_device.lua +++ b/config/delete_device.lua @@ -1,7 +1,7 @@ -- This is the script run after deleting a device (and all of its params) local self, olddevice, oldparams = ... -require("posix") +posix = require("posix") local root = "/var/www/provisioning/htdocs/" diff --git a/config/notify_device b/config/notify_device index 3811d3f..c269147 100755 --- a/config/notify_device +++ b/config/notify_device @@ -1,5 +1,5 @@ #!/usr/bin/lua -require("socket") +socket = require("socket") validator = require("acf.validator") if not arg or #arg == 0 then diff --git a/config/templates/linksysata-template.lua b/config/templates/linksysata-template.lua index 73a1d1a..d05d512 100644 --- a/config/templates/linksysata-template.lua +++ b/config/templates/linksysata-template.lua @@ -68,7 +68,7 @@ xml_elem("CW_Setting", (values.services and values.services.callwaitingenable), -- Syntax: stdoffset[dst[offset][,start[/time],end[/time]]] -- Examples: 'GMT0' 'EST5EDT,M3.2.0,M11.1.0' '<GMT+5>5' -- Parse time zone variable -require('posixtz') +posixtz = require('posixtz') local tz = posixtz.parse(values.device.timezone) if tz then -- convert POSIX sign (W of GMT is '+') to Linksys (E of GMT is '+') diff --git a/config/templates/polycom-template.lua b/config/templates/polycom-template.lua index 81adc8f..9b02cb2 100644 --- a/config/templates/polycom-template.lua +++ b/config/templates/polycom-template.lua @@ -96,7 +96,7 @@ if values.device.sntpserver then end -- Parse time zone variable -require('posixtz') +posixtz = require('posixtz') local tz = posixtz.parse(values.device.timezone) if tz then diff --git a/config/templates/snom-template.lua b/config/templates/snom-template.lua index dc56f18..635ce3e 100644 --- a/config/templates/snom-template.lua +++ b/config/templates/snom-template.lua @@ -98,7 +98,7 @@ end -- Syntax: stdoffset[dst[offset][,start[/time],end[/time]]] -- Examples: 'GMT0' 'EST5EDT,M3.2.0,M11.1.0' '<GMT+5>5' -- Parse time zone variable -require('posixtz') +posixtz = require('posixtz') local tz = posixtz.parse(values.device.timezone) if tz then -- convert POSIX sign (W of GMT is '+') to Snom (E of GMT is '+') diff --git a/config/update_device_params.lua b/config/update_device_params.lua index 42560c3..775385c 100644 --- a/config/update_device_params.lua +++ b/config/update_device_params.lua @@ -1,7 +1,7 @@ -- This is the script run after editing device params local self, params, oldparams = ... -require("posix") +posix = require("posix") local root = "/var/www/provisioning/htdocs/" diff --git a/provisioning-dumpdatabase-html.lsp b/provisioning-dumpdatabase-html.lsp index d2ba0c7..e5f182a 100644 --- a/provisioning-dumpdatabase-html.lsp +++ b/provisioning-dumpdatabase-html.lsp @@ -1,5 +1,5 @@ <% local form, viewlibrary, page_info = ... -require("htmlviewfunctions") +htmlviewfunctions = require("htmlviewfunctions") html = require("acf.html") %> diff --git a/provisioning-editdevice-html.lsp b/provisioning-editdevice-html.lsp index 2f425e4..653758a 100644 --- a/provisioning-editdevice-html.lsp +++ b/provisioning-editdevice-html.lsp @@ -1,5 +1,5 @@ <% local form, viewlibrary, page_info, session = ... -require("htmlviewfunctions") +htmlviewfunctions = require("htmlviewfunctions") html = require("acf.html") %> diff --git a/provisioning-editdeviceparams-html.lsp b/provisioning-editdeviceparams-html.lsp index 54dad04..ef9a1ce 100644 --- a/provisioning-editdeviceparams-html.lsp +++ b/provisioning-editdeviceparams-html.lsp @@ -1,5 +1,5 @@ <% local form, viewlibrary, page_info, session = ... -require("htmlviewfunctions") +htmlviewfunctions = require("htmlviewfunctions") html = require("acf.html") %> diff --git a/provisioning-editparam-html.lsp b/provisioning-editparam-html.lsp index d03ed3b..574cd31 100644 --- a/provisioning-editparam-html.lsp +++ b/provisioning-editparam-html.lsp @@ -1,5 +1,5 @@ <% local form, viewlibrary, page_info = ... -require("htmlviewfunctions") +htmlviewfunctions = require("htmlviewfunctions") html = require("acf.html") %> diff --git a/provisioning-edittemplate-html.lsp b/provisioning-edittemplate-html.lsp index 6be6f65..d7f44e7 100644 --- a/provisioning-edittemplate-html.lsp +++ b/provisioning-edittemplate-html.lsp @@ -1,5 +1,5 @@ <% local form, viewlibrary, page_info = ... %> -<% require("htmlviewfunctions") %> +<% htmlviewfunctions = require("htmlviewfunctions") %> <% html = require("acf.html") %> <H1><%= html.html_escape(form.label) %></H1> diff --git a/provisioning-getclassvalues-html.lsp b/provisioning-getclassvalues-html.lsp index 8d02d1e..cf39cfa 100644 --- a/provisioning-getclassvalues-html.lsp +++ b/provisioning-getclassvalues-html.lsp @@ -1,5 +1,5 @@ <% local form, viewlibrary, page_info = ... -require("htmlviewfunctions") +htmlviewfunctions = require("htmlviewfunctions") html = require("acf.html") %> @@ -11,7 +11,7 @@ html = require("acf.html") <% htmlviewfunctions.displayitem(form.value.label) %> <H2>Parameter Values</H2> <% - require("session") + session = require("session") val = session.serialize("values", form.value.values.value) val = string.gsub(val, "[^\n]*%{%}\n", "") print("<pre>"..val.."</pre>") diff --git a/provisioning-listclasses-html.lsp b/provisioning-listclasses-html.lsp index f3f4db5..e1b9538 100644 --- a/provisioning-listclasses-html.lsp +++ b/provisioning-listclasses-html.lsp @@ -1,5 +1,5 @@ <% local view, viewlibrary, page_info, session = ... -require("htmlviewfunctions") +htmlviewfunctions = require("htmlviewfunctions") html = require("acf.html") %> diff --git a/provisioning-listclassgroups-html.lsp b/provisioning-listclassgroups-html.lsp index ba34fb3..4ec7605 100644 --- a/provisioning-listclassgroups-html.lsp +++ b/provisioning-listclassgroups-html.lsp @@ -1,5 +1,5 @@ <% local view, viewlibrary, page_info, session = ... -require("htmlviewfunctions") +htmlviewfunctions = require("htmlviewfunctions") html = require("acf.html") %> diff --git a/provisioning-listdevices-html.lsp b/provisioning-listdevices-html.lsp index 6e797d1..6bad516 100644 --- a/provisioning-listdevices-html.lsp +++ b/provisioning-listdevices-html.lsp @@ -1,5 +1,5 @@ <% local view, viewlibrary, page_info, session = ... -require("htmlviewfunctions") +htmlviewfunctions = require("htmlviewfunctions") html = require("acf.html") %> diff --git a/provisioning-listfiles-html.lsp b/provisioning-listfiles-html.lsp index fe27630..e94b207 100644 --- a/provisioning-listfiles-html.lsp +++ b/provisioning-listfiles-html.lsp @@ -1,5 +1,5 @@ <% local view, viewlibrary, page_info, session = ... -require("htmlviewfunctions") +htmlviewfunctions = require("htmlviewfunctions") html = require("acf.html") %> diff --git a/provisioning-listgroups-html.lsp b/provisioning-listgroups-html.lsp index a7afb6d..3154df6 100644 --- a/provisioning-listgroups-html.lsp +++ b/provisioning-listgroups-html.lsp @@ -1,5 +1,5 @@ <% local view, viewlibrary, page_info, session = ... -require("htmlviewfunctions") +htmlviewfunctions = require("htmlviewfunctions") html = require("acf.html") %> diff --git a/provisioning-listparams-html.lsp b/provisioning-listparams-html.lsp index f88cad8..e8f2f94 100644 --- a/provisioning-listparams-html.lsp +++ b/provisioning-listparams-html.lsp @@ -1,5 +1,5 @@ <% local view, viewlibrary, page_info, session = ... -require("htmlviewfunctions") +htmlviewfunctions = require("htmlviewfunctions") html = require("acf.html") %> diff --git a/provisioning-listrequests-html.lsp b/provisioning-listrequests-html.lsp index ce5801e..d6cfea6 100644 --- a/provisioning-listrequests-html.lsp +++ b/provisioning-listrequests-html.lsp @@ -1,5 +1,5 @@ <% local view, viewlibrary, page_info, session = ... -require("htmlviewfunctions") +htmlviewfunctions = require("htmlviewfunctions") html = require("acf.html") %> diff --git a/provisioning-listtemplates-html.lsp b/provisioning-listtemplates-html.lsp index 801b107..4adc23f 100644 --- a/provisioning-listtemplates-html.lsp +++ b/provisioning-listtemplates-html.lsp @@ -1,5 +1,5 @@ <% local view, viewlibrary, page_info, session = ... -require("htmlviewfunctions") +htmlviewfunctions = require("htmlviewfunctions") html = require("acf.html") %> diff --git a/provisioning-model.lua b/provisioning-model.lua index f32d34c..5f18b14 100644 --- a/provisioning-model.lua +++ b/provisioning-model.lua @@ -1,13 +1,13 @@ module (..., package.seeall) -- Load libraries -require("modelfunctions") -require("posix") +modelfunctions = require("modelfunctions") +posix = require("posix") fs = require("acf.fs") format = require("acf.format") validator = require("acf.validator") db = require("acf.db") -require("session") +session = require("session") -- Set variables local DatabaseName = "provisioning" diff --git a/provisioning-searchbyextension-html.lsp b/provisioning-searchbyextension-html.lsp index 8b24acc..5ab9228 100644 --- a/provisioning-searchbyextension-html.lsp +++ b/provisioning-searchbyextension-html.lsp @@ -1,5 +1,5 @@ <% local form, viewlibrary, page_info, session = ... -require("htmlviewfunctions") +htmlviewfunctions = require("htmlviewfunctions") html = require("acf.html") %> diff --git a/provisioning-searchbymac-html.lsp b/provisioning-searchbymac-html.lsp index 8034aa5..6e6c1cc 100644 --- a/provisioning-searchbymac-html.lsp +++ b/provisioning-searchbymac-html.lsp @@ -1,5 +1,5 @@ <% local form, viewlibrary, page_info, session = ... -require("htmlviewfunctions") +htmlviewfunctions = require("htmlviewfunctions") html = require("acf.html") %> diff --git a/provisioning-searchdevices-html.lsp b/provisioning-searchdevices-html.lsp index e34b9a0..824176d 100644 --- a/provisioning-searchdevices-html.lsp +++ b/provisioning-searchdevices-html.lsp @@ -1,5 +1,5 @@ <% local form, viewlibrary, page_info = ... -require("htmlviewfunctions") +htmlviewfunctions = require("htmlviewfunctions") html = require("acf.html") %> @@ -28,7 +28,7 @@ html = require("acf.html") <DT>Device ID</DT><DD><input class="text" type="text" value="<%= html.html_escape(form.value.result.value[1].device_id) %>" readonly="true"></DD> <H2>Parameter Values</H2> <% - require("session") + session = require("session") val = session.serialize("values", form.value.values.value) val = string.gsub(val, "[^\n]*%{%}\n", "") print("<pre>"..val.."</pre>") |