* luci/app/asterisk: add initial cbi definitions, needs cleanup

17 files changed, 1777 insertions, 274 deletions

diff --git a/applications/luci-asterisk/luasrc/controller/asterisk.lua b/applications/luci-asterisk/luasrc/controller/asterisk.lua
new file mode 100644
index 000000000..541c67ef3
--- /dev/null
+++ b/applications/luci-asterisk/luasrc/controller/asterisk.lua
@@ -0,0 +1,42 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+module("luci.controller.asterisk", package.seeall)
+
+function index()
+
+	entry({"admin", "services", "asterisk"}, 				  cbi("asterisk"), 			  "Asterisk",				80).i18n = "asterisk"
+
+	entry({"admin", "services", "asterisk", "voice"},         cbi("asterisk-voice"),      "Voice Functions",        1)
+	entry({"admin", "services", "asterisk", "meetme"},        cbi("asterisk-meetme"),     "Meetme Conferences",     2)
+
+	entry({"admin", "services", "asterisk", "iax-conns"},     cbi("asterisk-iax-connections"), "IAX Connections",   3)
+	entry({"admin", "services", "asterisk", "sip-conns"},     cbi("asterisk-sip-connections"), "SIP Connections", 	4)
+
+	entry({"admin", "services", "asterisk", "dialplans"},     cbi("asterisk-dialplans"),  "Dial Plans", 			5)
+
+	entry({"admin", "services", "asterisk", "mod"},           cbi("asterisk-mod-app"),    "Modules", 				4)
+	entry({"admin", "services", "asterisk", "mod", "app"},    cbi("asterisk-mod-app"),    "Applications", 			1)
+	entry({"admin", "services", "asterisk", "mod", "cdr"},    cbi("asterisk-mod-cdr"),    "Call Detail Records", 	2)
+	entry({"admin", "services", "asterisk", "mod", "chan"},   cbi("asterisk-mod-chan"),   "Channels", 				3)
+	entry({"admin", "services", "asterisk", "mod", "codec"},  cbi("asterisk-mod-codec"),  "Codecs", 				4)
+	entry({"admin", "services", "asterisk", "mod", "format"}, cbi("asterisk-mod-format"), "Format",					5)
+	entry({"admin", "services", "asterisk", "mod", "func"},   cbi("asterisk-mod-func"),   "Functions", 				6)
+	entry({"admin", "services", "asterisk", "mod", "pbx"},    cbi("asterisk-mod-pbx"),    "PBX", 					7)
+	entry({"admin", "services", "asterisk", "mod", "res"},    cbi("asterisk-mod-res"),    "Resources", 				8)
+	entry({"admin", "services", "asterisk", "mod", "res", "feature"},
+		cbi("asterisk-mod-res-feature"), "Feature Module Configuration", 9 )
+
+end
diff --git a/applications/luci-asterisk/luasrc/i18n/asterisk.en.lua b/applications/luci-asterisk/luasrc/i18n/asterisk.en.lua
index 6c59e6b72..aa5796b4a 100644
--- a/applications/luci-asterisk/luasrc/i18n/asterisk.en.lua
+++ b/applications/luci-asterisk/luasrc/i18n/asterisk.en.lua
@@ -1,274 +1,251 @@
-asterisk_asterisk = "Asterisk General Options"
-asterisk_asterisk_agidir = "AGI directory"
-asterisk_asterisk_cacherecordfiles = "Cache recorded sound files during recording"
-asterisk_asterisk_debug = "Debug Level"
-asterisk_asterisk_dontwarn = "Disable some warnings"
-asterisk_asterisk_dumpcore = "Dump core on crash"
-asterisk_asterisk_highpriority = "High Priority"
-asterisk_asterisk_initcrypto = "Initialise Crypto"
-asterisk_asterisk_internaltiming = "Use Internal Timing"
-asterisk_asterisk_logdir = "Log directory"
-asterisk_asterisk_maxcalls = "Maximum number of calls allowed"
-asterisk_asterisk_maxload = "Maximum load to stop accepting new calls"
-asterisk_asterisk_nocolor = "Disable console colors"
-asterisk_asterisk_recordcachedir = "Sound files Cache directory"
-asterisk_asterisk_rungroup = "The Group to run as"
-asterisk_asterisk_runuser = "The User to run as"
-asterisk_asterisk_spooldir = "Voicemail Spool directory"
-asterisk_asterisk_systemname = "Prefix UniquID with system name"
-asterisk_asterisk_transcodeviasln = "Build transcode paths via SLINEAR, not directly"
-asterisk_asterisk_transmitsilenceduringrecord = "Transmit SLINEAR silence while recording a channel"
-asterisk_asterisk_verbose = "Verbose Level"
-asterisk_asterisk_zone = "Time Zone"
-
-asterisk_dialplan = "Section dialplan"
-asterisk_dialplan_include = "include"
-
-asterisk_dialplanexten = "Dialplan Extension"
-
-asterisk_dialplangeneral = "Dialplan General Options"
-asterisk_dialplangeneral_allowtransfer = "Allow transfer"
-asterisk_dialplangeneral_canreinvite = "Reinvite/redirect media connections"
-asterisk_dialplangeneral_clearglobalvars = "Clear global vars"
-
-asterisk_dialplangoto = "Dialplan Goto"
-
-asterisk_dialplanmeetme = "Dialplan Conference"
-
-asterisk_dialplansaytime = "Dialplan Time"
-
-asterisk_dialplanvoice = "Dialplan Voicemail"
-
-asterisk_dialzone = "Dial Zones for Dialplan"
-asterisk_dialzone_addprefix = "Prefix to add matching dialplans"
-asterisk_dialzone_international = "Match International prefix"
-asterisk_dialzone_localprefix = "Prefix (0) to add/remove to/from international numbers"
-asterisk_dialzone_localzone = "localzone"
-asterisk_dialzone_match = "Match plan"
-asterisk_dialzone_uses = "Connection to use"
-
-asterisk_featuremap = "Feature Key maps"
-asterisk_featuremap_atxfer = "Attended transfer key"
-asterisk_featuremap_blindxfer = "Blind transfer key"
-asterisk_featuremap_disconnect = "Key to Disconnect call"
-asterisk_featuremap_parkcall = "Key to Park call"
-
-asterisk_featurepark = "Parking Feature"
-asterisk_featurepark_adsipark = "ADSI Park"
-asterisk_featurepark_atxfernoanswertimeout = "Attended transfer timeout (sec)"
-asterisk_featurepark_automon = "One touch record key"
-asterisk_featurepark_context = "Name of call context for parking"
-asterisk_featurepark_courtesytone = "Sound file to play to parked caller"
-asterisk_featurepark_featuredigittimeout = "Max time (ms) between digits for feature activation"
-asterisk_featurepark_findslot = "Method to Find Parking slot"
-asterisk_featurepark_parkedmusicclass = "parkedmusicclass"
-asterisk_featurepark_parkedplay = "Play courtesy tone to"
-asterisk_featurepark_parkenabled = "Enable Parking"
-asterisk_featurepark_parkext = "Extension to dial to park"
-asterisk_featurepark_parkingtime = "Parking time (secs)"
-asterisk_featurepark_parkpos = "Range of extensions for call parking"
-asterisk_featurepark_pickupexten = "Pickup extension"
-asterisk_featurepark_transferdigittimeout = "Seconds to wait bewteen digits when transferring"
-asterisk_featurepark_xferfailsound = "sound when attended transfer is complete"
-asterisk_featurepark_xfersound = "Sound when attended transfer fails"
-
-asterisk_hardwarereboot = "Reload Hardware Config"
-asterisk_hardwarereboot_method = "Reboot Method"
-asterisk_hardwarereboot_param = "Parameter"
-
-asterisk_iax = "SIP Connection"
-asterisk_iax_alwaysinternational = "Always Dial International"
-asterisk_iax_context = "context"
-asterisk_iax_countrycode = "Country Code for connection"
-asterisk_iax_extension = "Add as Extension"
-asterisk_iax_host = "Host name (or blank)"
-asterisk_iax_internationalprefix = "International Dial Prefix"
-asterisk_iax_prefix = "Dial Prefix (for external line)"
-asterisk_iax_secret = "Secret"
-asterisk_iax_timeout = "Dial Timeout (sec)"
-asterisk_iax_type = "Option type"
-asterisk_iax_username = "User name"
-
-asterisk_iaxgeneral = "IAX General Options"
-asterisk_iaxgeneral_allow = "Allow Codecs"
-asterisk_iaxgeneral_canreinvite = "Reinvite/redirect media connections"
-asterisk_iaxgeneral_static = "Static"
-asterisk_iaxgeneral_writeprotect = "Write Protect"
-
-asterisk_meetme = "Meetme Conference"
-asterisk_meetme_adminpin = "Admin PIN"
-asterisk_meetme_pin = "Meeting PIN"
-
-asterisk_meetmegeneral = "Meetme Conference General Options"
-asterisk_meetmegeneral_audiobuffers = "Number of 20ms audio buffers to be used"
-
-asterisk_module = "Modules"
-asterisk_module_appalarmreceiver = "Alarm Receiver Application"
-asterisk_module_appauthenticate = "Authentication Application"
-asterisk_module_appcdr = "Make sure asterisk doesnt save CDR"
-asterisk_module_appchanisavail = "Check if channel is available"
-asterisk_module_appchanspy = "Listen in on any channel"
-asterisk_module_appcontrolplayback = "Control Playback Application"
-asterisk_module_appcut = "Cuts up variables"
-asterisk_module_appdb = "Database access functions"
-asterisk_module_appdial = "Dialing Application"
-asterisk_module_appdictate = "Virtual Dictation Machine Application"
-asterisk_module_appdirectedpickup = "Directed Call Pickup Support"
-asterisk_module_appdirectory = "Extension Directory"
-asterisk_module_appdisa = "DISA (Direct Inward System Access) Application"
-asterisk_module_appdumpchan = "Dump channel variables Application"
-asterisk_module_appecho = "Simple Echo Application"
-asterisk_module_appenumlookup = "ENUM Lookup"
-asterisk_module_appeval = "Reevaluates strings"
-asterisk_module_appexec = "Executes applications"
-asterisk_module_appexternalivr = "External IVR application interface"
-asterisk_module_appforkcdr = "Fork The CDR into 2 seperate entities"
-asterisk_module_appgetcpeid = "Get ADSI CPE ID"
-asterisk_module_appgroupcount = "Group Management Routines"
-asterisk_module_appices = "Encode and Stream via icecast and ices"
-asterisk_module_appimage = "Image Transmission Application"
-asterisk_module_applookupblacklist = "Look up Caller*ID name/number from black"
-asterisk_module_applookupcidname = "Look up CallerID Name from local databas"
-asterisk_module_appmacro = "Extension Macros"
-asterisk_module_appmath = "A simple math Application"
-asterisk_module_appmd5 = "MD5 checksum Application"
-asterisk_module_appmilliwatt = "Digital Milliwatt (mu-law) Test Application"
-asterisk_module_appmixmonitor = "Record a call and mix the audio during the recording"
-asterisk_module_appparkandannounce = "Call Parking and Announce Application"
-asterisk_module_appplayback = "Trivial Playback Application"
-asterisk_module_appprivacy = "Require phone number to be entered"
-asterisk_module_appqueue = "True Call Queueing"
-asterisk_module_apprandom = "Random goto"
-asterisk_module_appread = "Read Variable Application"
-asterisk_module_appreadfile = "Read in a file"
-asterisk_module_apprealtime = "Realtime Data Lookup/Rewrite"
-asterisk_module_apprecord = "Trivial Record Application"
-asterisk_module_appsayunixtime = "Say time"
-asterisk_module_appsenddtmf = "Send DTMF digits Application"
-asterisk_module_appsendtext = "Send Text Applications"
-asterisk_module_appsetcallerid = "Set CallerID Application"
-asterisk_module_appsetcdruserfield = "CDR user field apps"
-asterisk_module_appsetcidname = "load => .so ; Set CallerID Name"
-asterisk_module_appsetcidnum = "load => .so ; Set CallerID Number"
-asterisk_module_appsetrdnis = "Set RDNIS Number"
-asterisk_module_appsettransfercapability = "Set ISDN Transfer Capability"
-asterisk_module_appsms = "SMS/PSTN handler"
-asterisk_module_appsofthangup = "Hangs up the requested channel"
-asterisk_module_appstack = "Stack Routines"
-asterisk_module_appsystem = "Generic System() application"
-asterisk_module_apptalkdetect = "Playback with Talk Detection"
-asterisk_module_apptest = "Interface Test Application"
-asterisk_module_apptransfer = "Transfer"
-asterisk_module_apptxtcidname = "TXTCIDName"
-asterisk_module_appurl = "Send URL Applications"
-asterisk_module_appuserevent = "Custom User Event Application"
-asterisk_module_appverbose = "Send verbose output"
-asterisk_module_appvoicemail = "Voicemail"
-asterisk_module_appwaitforring = "Waits until first ring after time"
-asterisk_module_appwaitforsilence = "Wait For Silence Application"
-asterisk_module_appwhile = "While Loops and Conditional Execution"
-asterisk_module_cdrcsv = "Comma Separated Values CDR Backend"
-asterisk_module_cdrcustom = "Customizable Comma Separated Values CDR Backend"
-asterisk_module_cdrmanager = "Asterisk Call Manager CDR Backend"
-asterisk_module_cdrmysql = "MySQL CDR Backend"
-asterisk_module_cdrpgsql = "PostgreSQL CDR Backend"
-asterisk_module_cdrsqlite = "SQLite CDR Backend"
-asterisk_module_chanagent = "Agent Proxy Channel"
-asterisk_module_chanalsa = "Channel driver for GTalk"
-asterisk_module_changtalk = "Channel driver for GTalk"
-asterisk_module_chaniax2 = "Option chan_iax2"
-asterisk_module_chanlocal = "Local Proxy Channel"
-asterisk_module_chansip = "Session Initiation Protocol (SIP)"
-asterisk_module_codecamu = "A-law and Mulaw direct Coder/Decoder"
-asterisk_module_codecadpcm = "Adaptive Differential PCM Coder/Decoder"
-asterisk_module_codecalaw = "A-law Coder/Decoder"
-asterisk_module_codecg726 = "ITU G.726-32kbps G726 Transcoder"
-asterisk_module_codecgsm = "GSM/PCM16 (signed linear) Codec Translation"
-asterisk_module_codecspeex = "Speex/PCM16 (signed linear) Codec Translator"
-asterisk_module_codeculaw = "Mu-law Coder/Decoder"
-asterisk_module_formatau = "Sun Microsystems AU format (signed linear)"
-asterisk_module_formatg723 = "G.723.1 Simple Timestamp File Format"
-asterisk_module_formatg726 = "Raw G.726 (16/24/32/40kbps) data"
-asterisk_module_formatg729 = "Raw G729 data"
-asterisk_module_formatgsm = "Raw GSM data"
-asterisk_module_formath263 = "Raw h263 data"
-asterisk_module_formatjpeg = "JPEG (Joint Picture Experts Group) Image"
-asterisk_module_formatpcm = "Raw uLaw 8khz Audio support (PCM)"
-asterisk_module_formatpcmalaw = "load => .so ; Raw aLaw 8khz PCM Audio support"
-asterisk_module_formatsln = "Raw Signed Linear Audio support (SLN)"
-asterisk_module_formatvox = "Dialogic VOX (ADPCM) File Format"
-asterisk_module_formatwav = "Microsoft WAV format (8000hz Signed Line"
-asterisk_module_formatwavgsm = "Microsoft WAV format (Proprietary GSM)"
-asterisk_module_funccallerid = "Caller ID related dialplan functions"
-asterisk_module_funcenum = "ENUM Functions"
-asterisk_module_funcuri = "URI encoding / decoding functions"
-asterisk_module_pbxael = "Asterisk Extension Language Compiler"
-asterisk_module_pbxconfig = "Text Extension Configuration"
-asterisk_module_pbxfunctions = "load => .so ; Builtin dialplan functions"
-asterisk_module_pbxloopback = "Loopback Switch"
-asterisk_module_pbxrealtime = "Realtime Switch"
-asterisk_module_pbxspool = "Outgoing Spool Support"
-asterisk_module_pbxwilcalu = "Wil Cal U (Auto Dialer)"
-asterisk_module_resconfigmysql = "MySQL Config Resource"
-asterisk_module_resconfigodbc = "ODBC Config Resource"
-asterisk_module_resconfigpgsql = "PGSQL Module"
-asterisk_module_rescrypto = "Cryptographic Digital Signatures"
-asterisk_module_resfeatures = "Call Parking Resource"
-asterisk_module_resindications = "Indications Configuration"
-asterisk_module_resmonitor = "Call Monitoring Resource"
-asterisk_module_resmusiconhold = "Music On Hold Resource"
-asterisk_module_resodbc = "ODBC Resource"
-asterisk_module_ressmdi = "SMDI Module"
-asterisk_module_ressnmp = "SNMP Module"
-
-asterisk_moh = "Music On Hold"
-asterisk_moh_application = "Application"
-asterisk_moh_directory = "Directory of Music"
-asterisk_moh_mode = "Option mode"
-asterisk_moh_random = "Random Play"
-
-asterisk_sip = "SIP Connection"
-asterisk_sip_alwaysinternational = "Always Dial International"
-asterisk_sip_canreinvite = "Reinvite/redirect media connections"
-asterisk_sip_context = "context"
-asterisk_sip_countrycode = "Country Code for connection"
-asterisk_sip_dtmfmode = "DTMF mode"
-asterisk_sip_extension = "Add as Extension"
-asterisk_sip_fromdomain = "Primary domain identity for From: headers"
-asterisk_sip_fromuser = "From user (required by many SIP providers)"
-asterisk_sip_host = "Host name (or blank)"
-asterisk_sip_incoming = "Ring on incoming dialplan contexts"
-asterisk_sip_insecure = "Allow Insecure for"
-asterisk_sip_internationalprefix = "International Dial Prefix"
-asterisk_sip_mailbox = "Mailbox for MWI"
-asterisk_sip_nat = "NAT between phone and Asterisk"
-asterisk_sip_pedantic = "Check tags in headers"
-asterisk_sip_port = "SIP Port"
-asterisk_sip_prefix = "Dial Prefix (for external line)"
-asterisk_sip_qualify = "Reply Timeout (ms) for down connection"
-asterisk_sip_register = "Register connection"
-asterisk_sip_secret = "Secret"
-asterisk_sip_selfmailbox = "Dial own extension for mailbox"
-asterisk_sip_timeout = "Dial Timeout (sec)"
-asterisk_sip_type = "Client Type"
-asterisk_sip_username = "Username"
-
-asterisk_sipgeneral = "Section sipgeneral"
-asterisk_sipgeneral_allow = "Allow codecs"
-asterisk_sipgeneral_port = "SIP Port"
-asterisk_sipgeneral_realm = "SIP realm"
-
-asterisk_voicegeneral = "Voicemail general options"
-asterisk_voicegeneral_serveremail = "From Email address of server"
-
-asterisk_voicemail = "Voice Mail boxes"
-asterisk_voicemail_attach = "Email contains attachment"
-asterisk_voicemail_email = "Email"
-asterisk_voicemail_name = "Display Name"
-asterisk_voicemail_password = "Password"
-asterisk_voicemail_zone = "zone"
-
-asterisk_voicezone = "Voice Zone settings"
-asterisk_voicezone_message = "Message Format"
-asterisk_voicezone_zone = "Time Zone"
-
+asterisk_asterisk = 'Asterisk General Options'
+asterisk_asterisk_agidir = 'AGI directory'
+asterisk_asterisk_cacherecordfiles = 'Cache recorded sound files during recording'
+asterisk_asterisk_debug = 'Debug Level'
+asterisk_asterisk_dontwarn = 'Disable some warnings'
+asterisk_asterisk_dumpcore = 'Dump core on crash'
+asterisk_asterisk_highpriority = 'High Priority'
+asterisk_asterisk_initcrypto = 'Initialise Crypto'
+asterisk_asterisk_internaltiming = 'Use Internal Timing'
+asterisk_asterisk_logdir = 'Log directory'
+asterisk_asterisk_maxcalls = 'Maximum number of calls allowed'
+asterisk_asterisk_maxload = 'Maximum load to stop accepting new calls'
+asterisk_asterisk_nocolor = 'Disable console colors'
+asterisk_asterisk_recordcachedir = 'Sound files Cache directory'
+asterisk_asterisk_rungroup = 'The Group to run as'
+asterisk_asterisk_runuser = 'The User to run as'
+asterisk_asterisk_spooldir = 'Voicemail Spool directory'
+asterisk_asterisk_systemname = 'Prefix UniquID with system name'
+asterisk_asterisk_transcodeviasln = 'Build transcode paths via SLINEAR, not directly'
+asterisk_asterisk_transmitsilenceduringrecord = 'Transmit SLINEAR silence while recording a channel'
+asterisk_asterisk_verbose = 'Verbose Level'
+asterisk_asterisk_zone = 'Time Zone'
+asterisk_dialplan = 'Section dialplan'
+asterisk_dialplan_include = 'include'
+asterisk_dialplanexten = 'Dialplan Extension'
+asterisk_dialplangeneral = 'Dialplan General Options'
+asterisk_dialplangeneral_allowtransfer = 'Allow transfer'
+asterisk_dialplangeneral_canreinvite = 'Reinvite/redirect media connections'
+asterisk_dialplangeneral_clearglobalvars = 'Clear global vars'
+asterisk_dialplangoto = 'Dialplan Goto'
+asterisk_dialplanmeetme = 'Dialplan Conference'
+asterisk_dialplansaytime = 'Dialplan Time'
+asterisk_dialplanvoice = 'Dialplan Voicemail'
+asterisk_dialzone = 'Dial Zones for Dialplan'
+asterisk_dialzone_addprefix = 'Prefix to add matching dialplans'
+asterisk_dialzone_international = 'Match International prefix'
+asterisk_dialzone_localprefix = 'Prefix (0) to add/remove to/from international numbers'
+asterisk_dialzone_localzone = 'localzone'
+asterisk_dialzone_match = 'Match plan'
+asterisk_dialzone_uses = 'Connection to use'
+asterisk_featuremap = 'Feature Key maps'
+asterisk_featuremap_atxfer = 'Attended transfer key'
+asterisk_featuremap_blindxfer = 'Blind transfer key'
+asterisk_featuremap_disconnect = 'Key to Disconnect call'
+asterisk_featuremap_parkcall = 'Key to Park call'
+asterisk_featurepark = 'Parking Feature'
+asterisk_featurepark_adsipark = 'ADSI Park'
+asterisk_featurepark_atxfernoanswertimeout = 'Attended transfer timeout (sec)'
+asterisk_featurepark_automon = 'One touch record key'
+asterisk_featurepark_context = 'Name of call context for parking'
+asterisk_featurepark_courtesytone = 'Sound file to play to parked caller'
+asterisk_featurepark_featuredigittimeout = 'Max time (ms) between digits for feature activation'
+asterisk_featurepark_findslot = 'Method to Find Parking slot'
+asterisk_featurepark_parkedmusicclass = 'parkedmusicclass'
+asterisk_featurepark_parkedplay = 'Play courtesy tone to'
+asterisk_featurepark_parkenabled = 'Enable Parking'
+asterisk_featurepark_parkext = 'Extension to dial to park'
+asterisk_featurepark_parkingtime = 'Parking time (secs)'
+asterisk_featurepark_parkpos = 'Range of extensions for call parking'
+asterisk_featurepark_pickupexten = 'Pickup extension'
+asterisk_featurepark_transferdigittimeout = 'Seconds to wait bewteen digits when transferring'
+asterisk_featurepark_xferfailsound = 'sound when attended transfer is complete'
+asterisk_featurepark_xfersound = 'Sound when attended transfer fails'
+asterisk_hardwarereboot = 'Reload Hardware Config'
+asterisk_hardwarereboot_method = 'Reboot Method'
+asterisk_hardwarereboot_param = 'Parameter'
+asterisk_iax = 'SIP Connection'
+asterisk_iax_alwaysinternational = 'Always Dial International'
+asterisk_iax_context = 'context'
+asterisk_iax_countrycode = 'Country Code for connection'
+asterisk_iax_extension = 'Add as Extension'
+asterisk_iax_host = 'Host name (or blank)'
+asterisk_iax_internationalprefix = 'International Dial Prefix'
+asterisk_iax_prefix = 'Dial Prefix (for external line)'
+asterisk_iax_secret = 'Secret'
+asterisk_iax_timeout = 'Dial Timeout (sec)'
+asterisk_iax_type = 'Option type'
+asterisk_iax_username = 'User name'
+asterisk_iaxgeneral = 'IAX General Options'
+asterisk_iaxgeneral_allow = 'Allow Codecs'
+asterisk_iaxgeneral_canreinvite = 'Reinvite/redirect media connections'
+asterisk_iaxgeneral_static = 'Static'
+asterisk_iaxgeneral_writeprotect = 'Write Protect'
+asterisk_meetme = 'Meetme Conference'
+asterisk_meetme_adminpin = 'Admin PIN'
+asterisk_meetme_pin = 'Meeting PIN'
+asterisk_meetmegeneral = 'Meetme Conference General Options'
+asterisk_meetmegeneral_audiobuffers = 'Number of 20ms audio buffers to be used'
+asterisk_module = 'Modules'
+asterisk_module_appalarmreceiver = 'Alarm Receiver Application'
+asterisk_module_appauthenticate = 'Authentication Application'
+asterisk_module_appcdr = 'Make sure asterisk doesnt save CDR'
+asterisk_module_appchanisavail = 'Check if channel is available'
+asterisk_module_appchanspy = 'Listen in on any channel'
+asterisk_module_appcontrolplayback = 'Control Playback Application'
+asterisk_module_appcut = 'Cuts up variables'
+asterisk_module_appdb = 'Database access functions'
+asterisk_module_appdial = 'Dialing Application'
+asterisk_module_appdictate = 'Virtual Dictation Machine Application'
+asterisk_module_appdirectedpickup = 'Directed Call Pickup Support'
+asterisk_module_appdirectory = 'Extension Directory'
+asterisk_module_appdisa = 'DISA (Direct Inward System Access) Application'
+asterisk_module_appdumpchan = 'Dump channel variables Application'
+asterisk_module_appecho = 'Simple Echo Application'
+asterisk_module_appenumlookup = 'ENUM Lookup'
+asterisk_module_appeval = 'Reevaluates strings'
+asterisk_module_appexec = 'Executes applications'
+asterisk_module_appexternalivr = 'External IVR application interface'
+asterisk_module_appforkcdr = 'Fork The CDR into 2 seperate entities'
+asterisk_module_appgetcpeid = 'Get ADSI CPE ID'
+asterisk_module_appgroupcount = 'Group Management Routines'
+asterisk_module_appices = 'Encode and Stream via icecast and ices'
+asterisk_module_appimage = 'Image Transmission Application'
+asterisk_module_applookupblacklist = 'Look up Caller*ID name/number from black'
+asterisk_module_applookupcidname = 'Look up CallerID Name from local databas'
+asterisk_module_appmacro = 'Extension Macros'
+asterisk_module_appmath = 'A simple math Application'
+asterisk_module_appmd5 = 'MD5 checksum Application'
+asterisk_module_appmilliwatt = 'Digital Milliwatt (mu-law) Test Application'
+asterisk_module_appmixmonitor = 'Record a call and mix the audio during the recording'
+asterisk_module_appparkandannounce = 'Call Parking and Announce Application'
+asterisk_module_appplayback = 'Trivial Playback Application'
+asterisk_module_appprivacy = 'Require phone number to be entered'
+asterisk_module_appqueue = 'True Call Queueing'
+asterisk_module_apprandom = 'Random goto'
+asterisk_module_appread = 'Read Variable Application'
+asterisk_module_appreadfile = 'Read in a file'
+asterisk_module_apprealtime = 'Realtime Data Lookup/Rewrite'
+asterisk_module_apprecord = 'Trivial Record Application'
+asterisk_module_appsayunixtime = 'Say time'
+asterisk_module_appsenddtmf = 'Send DTMF digits Application'
+asterisk_module_appsendtext = 'Send Text Applications'
+asterisk_module_appsetcallerid = 'Set CallerID Application'
+asterisk_module_appsetcdruserfield = 'CDR user field apps'
+asterisk_module_appsetcidname = 'load =&gt; .so ; Set CallerID Name'
+asterisk_module_appsetcidnum = 'load =&gt; .so ; Set CallerID Number'
+asterisk_module_appsetrdnis = 'Set RDNIS Number'
+asterisk_module_appsettransfercapability = 'Set ISDN Transfer Capability'
+asterisk_module_appsms = 'SMS/PSTN handler'
+asterisk_module_appsofthangup = 'Hangs up the requested channel'
+asterisk_module_appstack = 'Stack Routines'
+asterisk_module_appsystem = 'Generic System() application'
+asterisk_module_apptalkdetect = 'Playback with Talk Detection'
+asterisk_module_apptest = 'Interface Test Application'
+asterisk_module_apptransfer = 'Transfer'
+asterisk_module_apptxtcidname = 'TXTCIDName'
+asterisk_module_appurl = 'Send URL Applications'
+asterisk_module_appuserevent = 'Custom User Event Application'
+asterisk_module_appverbose = 'Send verbose output'
+asterisk_module_appvoicemail = 'Voicemail'
+asterisk_module_appwaitforring = 'Waits until first ring after time'
+asterisk_module_appwaitforsilence = 'Wait For Silence Application'
+asterisk_module_appwhile = 'While Loops and Conditional Execution'
+asterisk_module_cdrcsv = 'Comma Separated Values CDR Backend'
+asterisk_module_cdrcustom = 'Customizable Comma Separated Values CDR Backend'
+asterisk_module_cdrmanager = 'Asterisk Call Manager CDR Backend'
+asterisk_module_cdrmysql = 'MySQL CDR Backend'
+asterisk_module_cdrpgsql = 'PostgreSQL CDR Backend'
+asterisk_module_cdrsqlite = 'SQLite CDR Backend'
+asterisk_module_chanagent = 'Agent Proxy Channel'
+asterisk_module_chanalsa = 'Channel driver for GTalk'
+asterisk_module_changtalk = 'Channel driver for GTalk'
+asterisk_module_chaniax2 = 'Option chan_iax2'
+asterisk_module_chanlocal = 'Local Proxy Channel'
+asterisk_module_chansip = 'Session Initiation Protocol (SIP)'
+asterisk_module_codecadpcm = 'Adaptive Differential PCM Coder/Decoder'
+asterisk_module_codecalaw = 'A-law Coder/Decoder'
+asterisk_module_codecamu = 'A-law and Mulaw direct Coder/Decoder'
+asterisk_module_codecg726 = 'ITU G.726-32kbps G726 Transcoder'
+asterisk_module_codecgsm = 'GSM/PCM16 (signed linear) Codec Translation'
+asterisk_module_codecspeex = 'Speex/PCM16 (signed linear) Codec Translator'
+asterisk_module_codeculaw = 'Mu-law Coder/Decoder'
+asterisk_module_formatau = 'Sun Microsystems AU format (signed linear)'
+asterisk_module_formatg723 = 'G.723.1 Simple Timestamp File Format'
+asterisk_module_formatg726 = 'Raw G.726 (16/24/32/40kbps) data'
+asterisk_module_formatg729 = 'Raw G729 data'
+asterisk_module_formatgsm = 'Raw GSM data'
+asterisk_module_formath263 = 'Raw h263 data'
+asterisk_module_formatjpeg = 'JPEG (Joint Picture Experts Group) Image'
+asterisk_module_formatpcm = 'Raw uLaw 8khz Audio support (PCM)'
+asterisk_module_formatpcmalaw = 'load =&gt; .so ; Raw aLaw 8khz PCM Audio support'
+asterisk_module_formatsln = 'Raw Signed Linear Audio support (SLN)'
+asterisk_module_formatvox = 'Dialogic VOX (ADPCM) File Format'
+asterisk_module_formatwav = 'Microsoft WAV format (8000hz Signed Line'
+asterisk_module_formatwavgsm = 'Microsoft WAV format (Proprietary GSM)'
+asterisk_module_funccallerid = 'Caller ID related dialplan functions'
+asterisk_module_funcenum = 'ENUM Functions'
+asterisk_module_funcuri = 'URI encoding / decoding functions'
+asterisk_module_pbxael = 'Asterisk Extension Language Compiler'
+asterisk_module_pbxconfig = 'Text Extension Configuration'
+asterisk_module_pbxfunctions = 'load =&gt; .so ; Builtin dialplan functions'
+asterisk_module_pbxloopback = 'Loopback Switch'
+asterisk_module_pbxrealtime = 'Realtime Switch'
+asterisk_module_pbxspool = 'Outgoing Spool Support'
+asterisk_module_pbxwilcalu = 'Wil Cal U (Auto Dialer)'
+asterisk_module_resconfigmysql = 'MySQL Config Resource'
+asterisk_module_resconfigodbc = 'ODBC Config Resource'
+asterisk_module_resconfigpgsql = 'PGSQL Module'
+asterisk_module_rescrypto = 'Cryptographic Digital Signatures'
+asterisk_module_resfeatures = 'Call Parking Resource'
+asterisk_module_resindications = 'Indications Configuration'
+asterisk_module_resmonitor = 'Call Monitoring Resource'
+asterisk_module_resmusiconhold = 'Music On Hold Resource'
+asterisk_module_resodbc = 'ODBC Resource'
+asterisk_module_ressmdi = 'SMDI Module'
+asterisk_module_ressnmp = 'SNMP Module'
+asterisk_moh = 'Music On Hold'
+asterisk_moh_application = 'Application'
+asterisk_moh_directory = 'Directory of Music'
+asterisk_moh_mode = 'Option mode'
+asterisk_moh_random = 'Random Play'
+asterisk_sip = 'SIP Connection'
+asterisk_sip_alwaysinternational = 'Always Dial International'
+asterisk_sip_canreinvite = 'Reinvite/redirect media connections'
+asterisk_sip_context = 'context'
+asterisk_sip_countrycode = 'Country Code for connection'
+asterisk_sip_dtmfmode = 'DTMF mode'
+asterisk_sip_extension = 'Add as Extension'
+asterisk_sip_fromdomain = 'Primary domain identity for From: headers'
+asterisk_sip_fromuser = 'From user (required by many SIP providers)'
+asterisk_sip_host = 'Host name (or blank)'
+asterisk_sip_incoming = 'Ring on incoming dialplan contexts'
+asterisk_sip_insecure = 'Allow Insecure for'
+asterisk_sip_internationalprefix = 'International Dial Prefix'
+asterisk_sip_mailbox = 'Mailbox for MWI'
+asterisk_sip_nat = 'NAT between phone and Asterisk'
+asterisk_sip_pedantic = 'Check tags in headers'
+asterisk_sip_port = 'SIP Port'
+asterisk_sip_prefix = 'Dial Prefix (for external line)'
+asterisk_sip_qualify = 'Reply Timeout (ms) for down connection'
+asterisk_sip_register = 'Register connection'
+asterisk_sip_secret = 'Secret'
+asterisk_sip_selfmailbox = 'Dial own extension for mailbox'
+asterisk_sip_timeout = 'Dial Timeout (sec)'
+asterisk_sip_type = 'Client Type'
+asterisk_sip_username = 'Username'
+asterisk_sipgeneral = 'Section sipgeneral'
+asterisk_sipgeneral_allow = 'Allow codecs'
+asterisk_sipgeneral_port = 'SIP Port'
+asterisk_sipgeneral_realm = 'SIP realm'
+asterisk_voicegeneral = 'Voicemail general options'
+asterisk_voicegeneral_serveremail = 'From Email address of server'
+asterisk_voicemail = 'Voice Mail boxes'
+asterisk_voicemail_attach = 'Email contains attachment'
+asterisk_voicemail_email = 'Email'
+asterisk_voicemail_name = 'Display Name'
+asterisk_voicemail_password = 'Password'
+asterisk_voicemail_zone = 'zone'
+asterisk_voicezone = 'Voice Zone settings'
+asterisk_voicezone_message = 'Message Format'
+asterisk_voicezone_zone = 'Time Zone'
diff --git a/applications/luci-asterisk/luasrc/model/cbi/asterisk-dialplans.lua b/applications/luci-asterisk/luasrc/model/cbi/asterisk-dialplans.lua
new file mode 100644
index 000000000..efecc575c
--- /dev/null
+++ b/applications/luci-asterisk/luasrc/model/cbi/asterisk-dialplans.lua
@@ -0,0 +1,96 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+cbimap = Map("asterisk", "asterisk", "")
+
+dialplan = cbimap:section(TypedSection, "dialplan", "Section dialplan", "")
+dialplan.addremove = true
+dialplan.dynamic = true
+
+include = dialplan:option(Value, "include", "", "")
+include.rmempty = true
+
+
+dialplanexten = cbimap:section(TypedSection, "dialplanexten", "Dialplan Extension", "")
+dialplanexten.anonymous = true
+dialplanexten.addremove = true
+dialplanexten.dynamic = true
+
+
+dialplangeneral = cbimap:section(TypedSection, "dialplangeneral", "Dialplan General Options", "")
+dialplangeneral.anonymous = true
+dialplangeneral.addremove = true
+
+allowtransfer = dialplangeneral:option(Flag, "allowtransfer", "Allow transfer", "")
+allowtransfer.rmempty = true
+
+canreinvite = dialplangeneral:option(ListValue, "canreinvite", "Reinvite/redirect media connections", "")
+canreinvite:value("yes", "Yes")
+canreinvite:value("nonat", "Yes when not behind NAT")
+canreinvite:value("update", "Use UPDATE rather than INVITE for path redirection")
+canreinvite:value("no", "No")
+canreinvite.rmempty = true
+
+clearglobalvars = dialplangeneral:option(Flag, "clearglobalvars", "Clear global vars", "")
+clearglobalvars.rmempty = true
+
+
+dialplangoto = cbimap:section(TypedSection, "dialplangoto", "Dialplan Goto", "")
+dialplangoto.anonymous = true
+dialplangoto.addremove = true
+dialplangoto.dynamic = true
+
+
+dialplanmeetme = cbimap:section(TypedSection, "dialplanmeetme", "Dialplan Conference", "")
+dialplanmeetme.anonymous = true
+dialplanmeetme.addremove = true
+dialplanmeetme.dynamic = true
+
+
+dialplansaytime = cbimap:section(TypedSection, "dialplansaytime", "Dialplan Time", "")
+dialplansaytime.anonymous = true
+dialplansaytime.addremove = true
+dialplansaytime.dynamic = true
+
+
+dialplanvoice = cbimap:section(TypedSection, "dialplanvoice", "Dialplan Voicemail", "")
+dialplanvoice.anonymous = true
+dialplanvoice.addremove = true
+dialplanvoice.dynamic = true
+
+
+dialzone = cbimap:section(TypedSection, "dialzone", "Dial Zones for Dialplan", "")
+dialzone.addremove = true
+
+addprefix = dialzone:option(Value, "addprefix", "Prefix to add matching dialplans", "")
+addprefix.rmempty = true
+
+international = dialzone:option(DynamicList, "international", "Match International prefix", "")
+international.rmempty = true
+
+localprefix = dialzone:option(Value, "localprefix", "Prefix (0) to add/remove to/from international numbers", "")
+localprefix.rmempty = true
+
+localzone = dialzone:option(Value, "localzone", "", "")
+localzone.rmempty = true
+
+match = dialzone:option(Value, "match", "Match plan", "")
+match.rmempty = true
+
+uses = dialzone:option(Value, "uses", "Connection to use", "")
+uses.rmempty = true
+
+
+return cbimap
diff --git a/applications/luci-asterisk/luasrc/model/cbi/asterisk-iax-connections.lua b/applications/luci-asterisk/luasrc/model/cbi/asterisk-iax-connections.lua
new file mode 100644
index 000000000..a6b361e49
--- /dev/null
+++ b/applications/luci-asterisk/luasrc/model/cbi/asterisk-iax-connections.lua
@@ -0,0 +1,58 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+cbimap = Map("asterisk", "asterisk", "")
+
+iax = cbimap:section(TypedSection, "iax", "IAX Connection", "")
+iax.addremove = true
+
+alwaysinternational = iax:option(Flag, "alwaysinternational", "Always Dial International", "")
+alwaysinternational.optional = true
+
+context = iax:option(Value, "context", "", "")
+context.optional = true
+
+countrycode = iax:option(Value, "countrycode", "Country Code for connection", "")
+countrycode.optional = true
+
+extension = iax:option(Value, "extension", "Add as Extension", "")
+extension.optional = true
+
+host = iax:option(Value, "host", "Host name (or blank)", "")
+host.optional = true
+
+internationalprefix = iax:option(Value, "internationalprefix", "International Dial Prefix", "")
+internationalprefix.optional = true
+
+prefix = iax:option(Value, "prefix", "Dial Prefix (for external line)", "")
+prefix.optional = true
+
+secret = iax:option(Value, "secret", "Secret", "")
+secret.optional = true
+
+timeout = iax:option(Value, "timeout", "Dial Timeout (sec)", "")
+timeout.optional = true
+
+type = iax:option(ListValue, "type", "Option type", "")
+type:value("friend", "Friend (outbound/inbound)")
+type:value("user", "User (inbound - authenticate by \"from\")")
+type:value("peer", "Peer (outbound - match by host)")
+type.optional = true
+
+username = iax:option(Value, "username", "User name", "")
+username.optional = true
+
+
+return cbimap
diff --git a/applications/luci-asterisk/luasrc/model/cbi/asterisk-meetme.lua b/applications/luci-asterisk/luasrc/model/cbi/asterisk-meetme.lua
new file mode 100644
index 000000000..4025e8749
--- /dev/null
+++ b/applications/luci-asterisk/luasrc/model/cbi/asterisk-meetme.lua
@@ -0,0 +1,35 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+cbimap = Map("asterisk", "asterisk", "")
+
+meetme = cbimap:section(TypedSection, "meetme", "Meetme Conference", "")
+
+adminpin = meetme:option(Value, "adminpin", "Admin PIN", "")
+adminpin.rmempty = true
+
+pin = meetme:option(Value, "pin", "Meeting PIN", "")
+pin.rmempty = true
+
+
+meetmegeneral = cbimap:section(TypedSection, "meetmegeneral", "Meetme Conference General Options", "")
+meetmegeneral.anonymous = true
+meetmegeneral.addremove = true
+
+audiobuffers = meetmegeneral:option(Value, "audiobuffers", "Number of 20ms audio buffers to be used", "")
+audiobuffers.rmempty = true
+
+
+return cbimap
diff --git a/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-app.lua b/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-app.lua
new file mode 100644
index 000000000..0a0a2d512
--- /dev/null
+++ b/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-app.lua
@@ -0,0 +1,391 @@
+cbimap = Map("asterisk", "asterisk", "")
+
+module = cbimap:section(TypedSection, "module", "Modules", "")
+module.anonymous = true
+
+app_alarmreceiver = module:option(ListValue, "app_alarmreceiver", "Alarm Receiver Application", "")
+app_alarmreceiver:value("yes", "Load")
+app_alarmreceiver:value("no", "Do Not Load")
+app_alarmreceiver:value("auto", "Load as Required")
+app_alarmreceiver.rmempty = true
+
+app_authenticate = module:option(ListValue, "app_authenticate", "Authentication Application", "")
+app_authenticate:value("yes", "Load")
+app_authenticate:value("no", "Do Not Load")
+app_authenticate:value("auto", "Load as Required")
+app_authenticate.rmempty = true
+
+app_cdr = module:option(ListValue, "app_cdr", "Make sure asterisk doesnt save CDR", "")
+app_cdr:value("yes", "Load")
+app_cdr:value("no", "Do Not Load")
+app_cdr:value("auto", "Load as Required")
+app_cdr.rmempty = true
+
+app_chanisavail = module:option(ListValue, "app_chanisavail", "Check if channel is available", "")
+app_chanisavail:value("yes", "Load")
+app_chanisavail:value("no", "Do Not Load")
+app_chanisavail:value("auto", "Load as Required")
+app_chanisavail.rmempty = true
+
+app_chanspy = module:option(ListValue, "app_chanspy", "Listen in on any channel", "")
+app_chanspy:value("yes", "Load")
+app_chanspy:value("no", "Do Not Load")
+app_chanspy:value("auto", "Load as Required")
+app_chanspy.rmempty = true
+
+app_controlplayback = module:option(ListValue, "app_controlplayback", "Control Playback Application", "")
+app_controlplayback:value("yes", "Load")
+app_controlplayback:value("no", "Do Not Load")
+app_controlplayback:value("auto", "Load as Required")
+app_controlplayback.rmempty = true
+
+app_cut = module:option(ListValue, "app_cut", "Cuts up variables", "")
+app_cut:value("yes", "Load")
+app_cut:value("no", "Do Not Load")
+app_cut:value("auto", "Load as Required")
+app_cut.rmempty = true
+
+app_db = module:option(ListValue, "app_db", "Database access functions", "")
+app_db:value("yes", "Load")
+app_db:value("no", "Do Not Load")
+app_db:value("auto", "Load as Required")
+app_db.rmempty = true
+
+app_dial = module:option(ListValue, "app_dial", "Dialing Application", "")
+app_dial:value("yes", "Load")
+app_dial:value("no", "Do Not Load")
+app_dial:value("auto", "Load as Required")
+app_dial.rmempty = true
+
+app_dictate = module:option(ListValue, "app_dictate", "Virtual Dictation Machine Application", "")
+app_dictate:value("yes", "Load")
+app_dictate:value("no", "Do Not Load")
+app_dictate:value("auto", "Load as Required")
+app_dictate.rmempty = true
+
+app_directed_pickup = module:option(ListValue, "app_directed_pickup", "Directed Call Pickup Support", "")
+app_directed_pickup:value("yes", "Load")
+app_directed_pickup:value("no", "Do Not Load")
+app_directed_pickup:value("auto", "Load as Required")
+app_directed_pickup.rmempty = true
+
+app_directory = module:option(ListValue, "app_directory", "Extension Directory", "")
+app_directory:value("yes", "Load")
+app_directory:value("no", "Do Not Load")
+app_directory:value("auto", "Load as Required")
+app_directory.rmempty = true
+
+app_disa = module:option(ListValue, "app_disa", "DISA (Direct Inward System Access) Application", "")
+app_disa:value("yes", "Load")
+app_disa:value("no", "Do Not Load")
+app_disa:value("auto", "Load as Required")
+app_disa.rmempty = true
+
+app_dumpchan = module:option(ListValue, "app_dumpchan", "Dump channel variables Application", "")
+app_dumpchan:value("yes", "Load")
+app_dumpchan:value("no", "Do Not Load")
+app_dumpchan:value("auto", "Load as Required")
+app_dumpchan.rmempty = true
+
+app_echo = module:option(ListValue, "app_echo", "Simple Echo Application", "")
+app_echo:value("yes", "Load")
+app_echo:value("no", "Do Not Load")
+app_echo:value("auto", "Load as Required")
+app_echo.rmempty = true
+
+app_enumlookup = module:option(ListValue, "app_enumlookup", "ENUM Lookup", "")
+app_enumlookup:value("yes", "Load")
+app_enumlookup:value("no", "Do Not Load")
+app_enumlookup:value("auto", "Load as Required")
+app_enumlookup.rmempty = true
+
+app_eval = module:option(ListValue, "app_eval", "Reevaluates strings", "")
+app_eval:value("yes", "Load")
+app_eval:value("no", "Do Not Load")
+app_eval:value("auto", "Load as Required")
+app_eval.rmempty = true
+
+app_exec = module:option(ListValue, "app_exec", "Executes applications", "")
+app_exec:value("yes", "Load")
+app_exec:value("no", "Do Not Load")
+app_exec:value("auto", "Load as Required")
+app_exec.rmempty = true
+
+app_externalivr = module:option(ListValue, "app_externalivr", "External IVR application interface", "")
+app_externalivr:value("yes", "Load")
+app_externalivr:value("no", "Do Not Load")
+app_externalivr:value("auto", "Load as Required")
+app_externalivr.rmempty = true
+
+app_forkcdr = module:option(ListValue, "app_forkcdr", "Fork The CDR into 2 seperate entities", "")
+app_forkcdr:value("yes", "Load")
+app_forkcdr:value("no", "Do Not Load")
+app_forkcdr:value("auto", "Load as Required")
+app_forkcdr.rmempty = true
+
+app_getcpeid = module:option(ListValue, "app_getcpeid", "Get ADSI CPE ID", "")
+app_getcpeid:value("yes", "Load")
+app_getcpeid:value("no", "Do Not Load")
+app_getcpeid:value("auto", "Load as Required")
+app_getcpeid.rmempty = true
+
+app_groupcount = module:option(ListValue, "app_groupcount", "Group Management Routines", "")
+app_groupcount:value("yes", "Load")
+app_groupcount:value("no", "Do Not Load")
+app_groupcount:value("auto", "Load as Required")
+app_groupcount.rmempty = true
+
+app_ices = module:option(ListValue, "app_ices", "Encode and Stream via icecast and ices", "")
+app_ices:value("yes", "Load")
+app_ices:value("no", "Do Not Load")
+app_ices:value("auto", "Load as Required")
+app_ices.rmempty = true
+
+app_image = module:option(ListValue, "app_image", "Image Transmission Application", "")
+app_image:value("yes", "Load")
+app_image:value("no", "Do Not Load")
+app_image:value("auto", "Load as Required")
+app_image.rmempty = true
+
+app_lookupblacklist = module:option(ListValue, "app_lookupblacklist", "Look up Caller*ID name/number from black", "")
+app_lookupblacklist:value("yes", "Load")
+app_lookupblacklist:value("no", "Do Not Load")
+app_lookupblacklist:value("auto", "Load as Required")
+app_lookupblacklist.rmempty = true
+
+app_lookupcidname = module:option(ListValue, "app_lookupcidname", "Look up CallerID Name from local databas", "")
+app_lookupcidname:value("yes", "Load")
+app_lookupcidname:value("no", "Do Not Load")
+app_lookupcidname:value("auto", "Load as Required")
+app_lookupcidname.rmempty = true
+
+app_macro = module:option(ListValue, "app_macro", "Extension Macros", "")
+app_macro:value("yes", "Load")
+app_macro:value("no", "Do Not Load")
+app_macro:value("auto", "Load as Required")
+app_macro.rmempty = true
+
+app_math = module:option(ListValue, "app_math", "A simple math Application", "")
+app_math:value("yes", "Load")
+app_math:value("no", "Do Not Load")
+app_math:value("auto", "Load as Required")
+app_math.rmempty = true
+
+app_md5 = module:option(ListValue, "app_md5", "MD5 checksum Application", "")
+app_md5:value("yes", "Load")
+app_md5:value("no", "Do Not Load")
+app_md5:value("auto", "Load as Required")
+app_md5.rmempty = true
+
+app_milliwatt = module:option(ListValue, "app_milliwatt", "Digital Milliwatt (mu-law) Test Application", "")
+app_milliwatt:value("yes", "Load")
+app_milliwatt:value("no", "Do Not Load")
+app_milliwatt:value("auto", "Load as Required")
+app_milliwatt.rmempty = true
+
+app_mixmonitor = module:option(ListValue, "app_mixmonitor", "Record a call and mix the audio during the recording", "")
+app_mixmonitor:value("yes", "Load")
+app_mixmonitor:value("no", "Do Not Load")
+app_mixmonitor:value("auto", "Load as Required")
+app_mixmonitor.rmempty = true
+
+app_parkandannounce = module:option(ListValue, "app_parkandannounce", "Call Parking and Announce Application", "")
+app_parkandannounce:value("yes", "Load")
+app_parkandannounce:value("no", "Do Not Load")
+app_parkandannounce:value("auto", "Load as Required")
+app_parkandannounce.rmempty = true
+
+app_playback = module:option(ListValue, "app_playback", "Trivial Playback Application", "")
+app_playback:value("yes", "Load")
+app_playback:value("no", "Do Not Load")
+app_playback:value("auto", "Load as Required")
+app_playback.rmempty = true
+
+app_privacy = module:option(ListValue, "app_privacy", "Require phone number to be entered", "")
+app_privacy:value("yes", "Load")
+app_privacy:value("no", "Do Not Load")
+app_privacy:value("auto", "Load as Required")
+app_privacy.rmempty = true
+
+app_queue = module:option(ListValue, "app_queue", "True Call Queueing", "")
+app_queue:value("yes", "Load")
+app_queue:value("no", "Do Not Load")
+app_queue:value("auto", "Load as Required")
+app_queue.rmempty = true
+
+app_random = module:option(ListValue, "app_random", "Random goto", "")
+app_random:value("yes", "Load")
+app_random:value("no", "Do Not Load")
+app_random:value("auto", "Load as Required")
+app_random.rmempty = true
+
+app_read = module:option(ListValue, "app_read", "Read Variable Application", "")
+app_read:value("yes", "Load")
+app_read:value("no", "Do Not Load")
+app_read:value("auto", "Load as Required")
+app_read.rmempty = true
+
+app_readfile = module:option(ListValue, "app_readfile", "Read in a file", "")
+app_readfile:value("yes", "Load")
+app_readfile:value("no", "Do Not Load")
+app_readfile:value("auto", "Load as Required")
+app_readfile.rmempty = true
+
+app_realtime = module:option(ListValue, "app_realtime", "Realtime Data Lookup/Rewrite", "")
+app_realtime:value("yes", "Load")
+app_realtime:value("no", "Do Not Load")
+app_realtime:value("auto", "Load as Required")
+app_realtime.rmempty = true
+
+app_record = module:option(ListValue, "app_record", "Trivial Record Application", "")
+app_record:value("yes", "Load")
+app_record:value("no", "Do Not Load")
+app_record:value("auto", "Load as Required")
+app_record.rmempty = true
+
+app_sayunixtime = module:option(ListValue, "app_sayunixtime", "Say time", "")
+app_sayunixtime:value("yes", "Load")
+app_sayunixtime:value("no", "Do Not Load")
+app_sayunixtime:value("auto", "Load as Required")
+app_sayunixtime.rmempty = true
+
+app_senddtmf = module:option(ListValue, "app_senddtmf", "Send DTMF digits Application", "")
+app_senddtmf:value("yes", "Load")
+app_senddtmf:value("no", "Do Not Load")
+app_senddtmf:value("auto", "Load as Required")
+app_senddtmf.rmempty = true
+
+app_sendtext = module:option(ListValue, "app_sendtext", "Send Text Applications", "")
+app_sendtext:value("yes", "Load")
+app_sendtext:value("no", "Do Not Load")
+app_sendtext:value("auto", "Load as Required")
+app_sendtext.rmempty = true
+
+app_setcallerid = module:option(ListValue, "app_setcallerid", "Set CallerID Application", "")
+app_setcallerid:value("yes", "Load")
+app_setcallerid:value("no", "Do Not Load")
+app_setcallerid:value("auto", "Load as Required")
+app_setcallerid.rmempty = true
+
+app_setcdruserfield = module:option(ListValue, "app_setcdruserfield", "CDR user field apps", "")
+app_setcdruserfield:value("yes", "Load")
+app_setcdruserfield:value("no", "Do Not Load")
+app_setcdruserfield:value("auto", "Load as Required")
+app_setcdruserfield.rmempty = true
+
+app_setcidname = module:option(ListValue, "app_setcidname", "load => .so ; Set CallerID Name", "")
+app_setcidname:value("yes", "Load")
+app_setcidname:value("no", "Do Not Load")
+app_setcidname:value("auto", "Load as Required")
+app_setcidname.rmempty = true
+
+app_setcidnum = module:option(ListValue, "app_setcidnum", "load => .so ; Set CallerID Number", "")
+app_setcidnum:value("yes", "Load")
+app_setcidnum:value("no", "Do Not Load")
+app_setcidnum:value("auto", "Load as Required")
+app_setcidnum.rmempty = true
+
+app_setrdnis = module:option(ListValue, "app_setrdnis", "Set RDNIS Number", "")
+app_setrdnis:value("yes", "Load")
+app_setrdnis:value("no", "Do Not Load")
+app_setrdnis:value("auto", "Load as Required")
+app_setrdnis.rmempty = true
+
+app_settransfercapability = module:option(ListValue, "app_settransfercapability", "Set ISDN Transfer Capability", "")
+app_settransfercapability:value("yes", "Load")
+app_settransfercapability:value("no", "Do Not Load")
+app_settransfercapability:value("auto", "Load as Required")
+app_settransfercapability.rmempty = true
+
+app_sms = module:option(ListValue, "app_sms", "SMS/PSTN handler", "")
+app_sms:value("yes", "Load")
+app_sms:value("no", "Do Not Load")
+app_sms:value("auto", "Load as Required")
+app_sms.rmempty = true
+
+app_softhangup = module:option(ListValue, "app_softhangup", "Hangs up the requested channel", "")
+app_softhangup:value("yes", "Load")
+app_softhangup:value("no", "Do Not Load")
+app_softhangup:value("auto", "Load as Required")
+app_softhangup.rmempty = true
+
+app_stack = module:option(ListValue, "app_stack", "Stack Routines", "")
+app_stack:value("yes", "Load")
+app_stack:value("no", "Do Not Load")
+app_stack:value("auto", "Load as Required")
+app_stack.rmempty = true
+
+app_system = module:option(ListValue, "app_system", "Generic System() application", "")
+app_system:value("yes", "Load")
+app_system:value("no", "Do Not Load")
+app_system:value("auto", "Load as Required")
+app_system.rmempty = true
+
+app_talkdetect = module:option(ListValue, "app_talkdetect", "Playback with Talk Detection", "")
+app_talkdetect:value("yes", "Load")
+app_talkdetect:value("no", "Do Not Load")
+app_talkdetect:value("auto", "Load as Required")
+app_talkdetect.rmempty = true
+
+app_test = module:option(ListValue, "app_test", "Interface Test Application", "")
+app_test:value("yes", "Load")
+app_test:value("no", "Do Not Load")
+app_test:value("auto", "Load as Required")
+app_test.rmempty = true
+
+app_transfer = module:option(ListValue, "app_transfer", "Transfer", "")
+app_transfer:value("yes", "Load")
+app_transfer:value("no", "Do Not Load")
+app_transfer:value("auto", "Load as Required")
+app_transfer.rmempty = true
+
+app_txtcidname = module:option(ListValue, "app_txtcidname", "TXTCIDName", "")
+app_txtcidname:value("yes", "Load")
+app_txtcidname:value("no", "Do Not Load")
+app_txtcidname:value("auto", "Load as Required")
+app_txtcidname.rmempty = true
+
+app_url = module:option(ListValue, "app_url", "Send URL Applications", "")
+app_url:value("yes", "Load")
+app_url:value("no", "Do Not Load")
+app_url:value("auto", "Load as Required")
+app_url.rmempty = true
+
+app_userevent = module:option(ListValue, "app_userevent", "Custom User Event Application", "")
+app_userevent:value("yes", "Load")
+app_userevent:value("no", "Do Not Load")
+app_userevent:value("auto", "Load as Required")
+app_userevent.rmempty = true
+
+app_verbose = module:option(ListValue, "app_verbose", "Send verbose output", "")
+app_verbose:value("yes", "Load")
+app_verbose:value("no", "Do Not Load")
+app_verbose:value("auto", "Load as Required")
+app_verbose.rmempty = true
+
+app_voicemail = module:option(ListValue, "app_voicemail", "Voicemail", "")
+app_voicemail:value("yes", "Load")
+app_voicemail:value("no", "Do Not Load")
+app_voicemail:value("auto", "Load as Required")
+app_voicemail.rmempty = true
+
+app_waitforring = module:option(ListValue, "app_waitforring", "Waits until first ring after time", "")
+app_waitforring:value("yes", "Load")
+app_waitforring:value("no", "Do Not Load")
+app_waitforring:value("auto", "Load as Required")
+app_waitforring.rmempty = true
+
+app_waitforsilence = module:option(ListValue, "app_waitforsilence", "Wait For Silence Application", "")
+app_waitforsilence:value("yes", "Load")
+app_waitforsilence:value("no", "Do Not Load")
+app_waitforsilence:value("auto", "Load as Required")
+app_waitforsilence.rmempty = true
+
+app_while = module:option(ListValue, "app_while", "While Loops and Conditional Execution", "")
+app_while:value("yes", "Load")
+app_while:value("no", "Do Not Load")
+app_while:value("auto", "Load as Required")
+app_while.rmempty = true
+
+
+return cbimap
diff --git a/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-cdr.lua b/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-cdr.lua
new file mode 100644
index 000000000..ee1960d1b
--- /dev/null
+++ b/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-cdr.lua
@@ -0,0 +1,58 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+cbimap = Map("asterisk", "asterisk", "")
+
+module = cbimap:section(TypedSection, "module", "Modules", "")
+module.anonymous = true
+
+cdr_csv = module:option(ListValue, "cdr_csv", "Comma Separated Values CDR Backend", "")
+cdr_csv:value("yes", "Load")
+cdr_csv:value("no", "Do Not Load")
+cdr_csv:value("auto", "Load as Required")
+cdr_csv.rmempty = true
+
+cdr_custom = module:option(ListValue, "cdr_custom", "Customizable Comma Separated Values CDR Backend", "")
+cdr_custom:value("yes", "Load")
+cdr_custom:value("no", "Do Not Load")
+cdr_custom:value("auto", "Load as Required")
+cdr_custom.rmempty = true
+
+cdr_manager = module:option(ListValue, "cdr_manager", "Asterisk Call Manager CDR Backend", "")
+cdr_manager:value("yes", "Load")
+cdr_manager:value("no", "Do Not Load")
+cdr_manager:value("auto", "Load as Required")
+cdr_manager.rmempty = true
+
+cdr_mysql = module:option(ListValue, "cdr_mysql", "MySQL CDR Backend", "")
+cdr_mysql:value("yes", "Load")
+cdr_mysql:value("no", "Do Not Load")
+cdr_mysql:value("auto", "Load as Required")
+cdr_mysql.rmempty = true
+
+cdr_pgsql = module:option(ListValue, "cdr_pgsql", "PostgreSQL CDR Backend", "")
+cdr_pgsql:value("yes", "Load")
+cdr_pgsql:value("no", "Do Not Load")
+cdr_pgsql:value("auto", "Load as Required")
+cdr_pgsql.rmempty = true
+
+cdr_sqlite = module:option(ListValue, "cdr_sqlite", "SQLite CDR Backend", "")
+cdr_sqlite:value("yes", "Load")
+cdr_sqlite:value("no", "Do Not Load")
+cdr_sqlite:value("auto", "Load as Required")
+cdr_sqlite.rmempty = true
+
+
+return cbimap
diff --git a/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-chan.lua b/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-chan.lua
new file mode 100644
index 000000000..835cbdcfa
--- /dev/null
+++ b/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-chan.lua
@@ -0,0 +1,56 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+cbimap = Map("asterisk", "asterisk", "")
+
+
+module = cbimap:section(TypedSection, "module", "Modules", "")
+module.anonymous = true
+
+chan_agent = module:option(ListValue, "chan_agent", "Agent Proxy Channel", "")
+chan_agent:value("yes", "Load")
+chan_agent:value("no", "Do Not Load")
+chan_agent:value("auto", "Load as Required")
+chan_agent.rmempty = true
+
+chan_alsa = module:option(ListValue, "chan_alsa", "Channel driver for GTalk", "")
+chan_alsa:value("yes", "Load")
+chan_alsa:value("no", "Do Not Load")
+chan_alsa:value("auto", "Load as Required")
+chan_alsa.rmempty = true
+
+chan_gtalk = module:option(ListValue, "chan_gtalk", "Channel driver for GTalk", "")
+chan_gtalk:value("yes", "Load")
+chan_gtalk:value("no", "Do Not Load")
+chan_gtalk:value("auto", "Load as Required")
+chan_gtalk.rmempty = true
+
+chan_iax2 = module:option(Flag, "chan_iax2", "Option chan_iax2", "")
+chan_iax2.rmempty = true
+
+chan_local = module:option(ListValue, "chan_local", "Local Proxy Channel", "")
+chan_local:value("yes", "Load")
+chan_local:value("no", "Do Not Load")
+chan_local:value("auto", "Load as Required")
+chan_local.rmempty = true
+
+chan_sip = module:option(ListValue, "chan_sip", "Session Initiation Protocol (SIP)", "")
+chan_sip:value("yes", "Load")
+chan_sip:value("no", "Do Not Load")
+chan_sip:value("auto", "Load as Required")
+chan_sip.rmempty = true
+
+
+return cbimap
diff --git a/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-codec.lua b/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-codec.lua
new file mode 100644
index 000000000..3c8d95840
--- /dev/null
+++ b/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-codec.lua
@@ -0,0 +1,64 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+cbimap = Map("asterisk", "asterisk", "")
+
+module = cbimap:section(TypedSection, "module", "Modules", "")
+module.anonymous = true
+
+codec_a_mu = module:option(ListValue, "codec_a_mu", "A-law and Mulaw direct Coder/Decoder", "")
+codec_a_mu:value("yes", "Load")
+codec_a_mu:value("no", "Do Not Load")
+codec_a_mu:value("auto", "Load as Required")
+codec_a_mu.rmempty = true
+
+codec_adpcm = module:option(ListValue, "codec_adpcm", "Adaptive Differential PCM Coder/Decoder", "")
+codec_adpcm:value("yes", "Load")
+codec_adpcm:value("no", "Do Not Load")
+codec_adpcm:value("auto", "Load as Required")
+codec_adpcm.rmempty = true
+
+codec_alaw = module:option(ListValue, "codec_alaw", "A-law Coder/Decoder", "")
+codec_alaw:value("yes", "Load")
+codec_alaw:value("no", "Do Not Load")
+codec_alaw:value("auto", "Load as Required")
+codec_alaw.rmempty = true
+
+codec_g726 = module:option(ListValue, "codec_g726", "ITU G.726-32kbps G726 Transcoder", "")
+codec_g726:value("yes", "Load")
+codec_g726:value("no", "Do Not Load")
+codec_g726:value("auto", "Load as Required")
+codec_g726.rmempty = true
+
+codec_gsm = module:option(ListValue, "codec_gsm", "GSM/PCM16 (signed linear) Codec Translation", "")
+codec_gsm:value("yes", "Load")
+codec_gsm:value("no", "Do Not Load")
+codec_gsm:value("auto", "Load as Required")
+codec_gsm.rmempty = true
+
+codec_speex = module:option(ListValue, "codec_speex", "Speex/PCM16 (signed linear) Codec Translator", "")
+codec_speex:value("yes", "Load")
+codec_speex:value("no", "Do Not Load")
+codec_speex:value("auto", "Load as Required")
+codec_speex.rmempty = true
+
+codec_ulaw = module:option(ListValue, "codec_ulaw", "Mu-law Coder/Decoder", "")
+codec_ulaw:value("yes", "Load")
+codec_ulaw:value("no", "Do Not Load")
+codec_ulaw:value("auto", "Load as Required")
+codec_ulaw.rmempty = true
+
+
+return cbimap
diff --git a/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-format.lua b/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-format.lua
new file mode 100644
index 000000000..da3989b2d
--- /dev/null
+++ b/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-format.lua
@@ -0,0 +1,100 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+cbimap = Map("asterisk", "asterisk", "")
+
+module = cbimap:section(TypedSection, "module", "Modules", "")
+module.anonymous = true
+
+format_au = module:option(ListValue, "format_au", "Sun Microsystems AU format (signed linear)", "")
+format_au:value("yes", "Load")
+format_au:value("no", "Do Not Load")
+format_au:value("auto", "Load as Required")
+format_au.rmempty = true
+
+format_g723 = module:option(ListValue, "format_g723", "G.723.1 Simple Timestamp File Format", "")
+format_g723:value("yes", "Load")
+format_g723:value("no", "Do Not Load")
+format_g723:value("auto", "Load as Required")
+format_g723.rmempty = true
+
+format_g726 = module:option(ListValue, "format_g726", "Raw G.726 (16/24/32/40kbps) data", "")
+format_g726:value("yes", "Load")
+format_g726:value("no", "Do Not Load")
+format_g726:value("auto", "Load as Required")
+format_g726.rmempty = true
+
+format_g729 = module:option(ListValue, "format_g729", "Raw G729 data", "")
+format_g729:value("yes", "Load")
+format_g729:value("no", "Do Not Load")
+format_g729:value("auto", "Load as Required")
+format_g729.rmempty = true
+
+format_gsm = module:option(ListValue, "format_gsm", "Raw GSM data", "")
+format_gsm:value("yes", "Load")
+format_gsm:value("no", "Do Not Load")
+format_gsm:value("auto", "Load as Required")
+format_gsm.rmempty = true
+
+format_h263 = module:option(ListValue, "format_h263", "Raw h263 data", "")
+format_h263:value("yes", "Load")
+format_h263:value("no", "Do Not Load")
+format_h263:value("auto", "Load as Required")
+format_h263.rmempty = true
+
+format_jpeg = module:option(ListValue, "format_jpeg", "JPEG (Joint Picture Experts Group) Image", "")
+format_jpeg:value("yes", "Load")
+format_jpeg:value("no", "Do Not Load")
+format_jpeg:value("auto", "Load as Required")
+format_jpeg.rmempty = true
+
+format_pcm = module:option(ListValue, "format_pcm", "Raw uLaw 8khz Audio support (PCM)", "")
+format_pcm:value("yes", "Load")
+format_pcm:value("no", "Do Not Load")
+format_pcm:value("auto", "Load as Required")
+format_pcm.rmempty = true
+
+format_pcm_alaw = module:option(ListValue, "format_pcm_alaw", "load => .so ; Raw aLaw 8khz PCM Audio support", "")
+format_pcm_alaw:value("yes", "Load")
+format_pcm_alaw:value("no", "Do Not Load")
+format_pcm_alaw:value("auto", "Load as Required")
+format_pcm_alaw.rmempty = true
+
+format_sln = module:option(ListValue, "format_sln", "Raw Signed Linear Audio support (SLN)", "")
+format_sln:value("yes", "Load")
+format_sln:value("no", "Do Not Load")
+format_sln:value("auto", "Load as Required")
+format_sln.rmempty = true
+
+format_vox = module:option(ListValue, "format_vox", "Dialogic VOX (ADPCM) File Format", "")
+format_vox:value("yes", "Load")
+format_vox:value("no", "Do Not Load")
+format_vox:value("auto", "Load as Required")
+format_vox.rmempty = true
+
+format_wav = module:option(ListValue, "format_wav", "Microsoft WAV format (8000hz Signed Line", "")
+format_wav:value("yes", "Load")
+format_wav:value("no", "Do Not Load")
+format_wav:value("auto", "Load as Required")
+format_wav.rmempty = true
+
+format_wav_gsm = module:option(ListValue, "format_wav_gsm", "Microsoft WAV format (Proprietary GSM)", "")
+format_wav_gsm:value("yes", "Load")
+format_wav_gsm:value("no", "Do Not Load")
+format_wav_gsm:value("auto", "Load as Required")
+format_wav_gsm.rmempty = true
+
+
+return cbimap
diff --git a/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-func.lua b/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-func.lua
new file mode 100644
index 000000000..7d80641f3
--- /dev/null
+++ b/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-func.lua
@@ -0,0 +1,40 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+cbimap = Map("asterisk", "asterisk", "")
+
+module = cbimap:section(TypedSection, "module", "Modules", "")
+module.anonymous = true
+
+func_callerid = module:option(ListValue, "func_callerid", "Caller ID related dialplan functions", "")
+func_callerid:value("yes", "Load")
+func_callerid:value("no", "Do Not Load")
+func_callerid:value("auto", "Load as Required")
+func_callerid.rmempty = true
+
+func_enum = module:option(ListValue, "func_enum", "ENUM Functions", "")
+func_enum:value("yes", "Load")
+func_enum:value("no", "Do Not Load")
+func_enum:value("auto", "Load as Required")
+func_enum.rmempty = true
+
+func_uri = module:option(ListValue, "func_uri", "URI encoding / decoding functions", "")
+func_uri:value("yes", "Load")
+func_uri:value("no", "Do Not Load")
+func_uri:value("auto", "Load as Required")
+func_uri.rmempty = true
+
+
+return cbimap
diff --git a/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-pbx.lua b/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-pbx.lua
new file mode 100644
index 000000000..8b22b5cb2
--- /dev/null
+++ b/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-pbx.lua
@@ -0,0 +1,64 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+cbimap = Map("asterisk", "asterisk", "")
+
+module = cbimap:section(TypedSection, "module", "Modules", "")
+module.anonymous = true
+
+pbx_ael = module:option(ListValue, "pbx_ael", "Asterisk Extension Language Compiler", "")
+pbx_ael:value("yes", "Load")
+pbx_ael:value("no", "Do Not Load")
+pbx_ael:value("auto", "Load as Required")
+pbx_ael.rmempty = true
+
+pbx_config = module:option(ListValue, "pbx_config", "Text Extension Configuration", "")
+pbx_config:value("yes", "Load")
+pbx_config:value("no", "Do Not Load")
+pbx_config:value("auto", "Load as Required")
+pbx_config.rmempty = true
+
+pbx_functions = module:option(ListValue, "pbx_functions", "load => .so ; Builtin dialplan functions", "")
+pbx_functions:value("yes", "Load")
+pbx_functions:value("no", "Do Not Load")
+pbx_functions:value("auto", "Load as Required")
+pbx_functions.rmempty = true
+
+pbx_loopback = module:option(ListValue, "pbx_loopback", "Loopback Switch", "")
+pbx_loopback:value("yes", "Load")
+pbx_loopback:value("no", "Do Not Load")
+pbx_loopback:value("auto", "Load as Required")
+pbx_loopback.rmempty = true
+
+pbx_realtime = module:option(ListValue, "pbx_realtime", "Realtime Switch", "")
+pbx_realtime:value("yes", "Load")
+pbx_realtime:value("no", "Do Not Load")
+pbx_realtime:value("auto", "Load as Required")
+pbx_realtime.rmempty = true
+
+pbx_spool = module:option(ListValue, "pbx_spool", "Outgoing Spool Support", "")
+pbx_spool:value("yes", "Load")
+pbx_spool:value("no", "Do Not Load")
+pbx_spool:value("auto", "Load as Required")
+pbx_spool.rmempty = true
+
+pbx_wilcalu = module:option(ListValue, "pbx_wilcalu", "Wil Cal U (Auto Dialer)", "")
+pbx_wilcalu:value("yes", "Load")
+pbx_wilcalu:value("no", "Do Not Load")
+pbx_wilcalu:value("auto", "Load as Required")
+pbx_wilcalu.rmempty = true
+
+
+return cbimap
diff --git a/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-res-feature.lua b/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-res-feature.lua
new file mode 100644
index 000000000..e2d9df7ae
--- /dev/null
+++ b/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-res-feature.lua
@@ -0,0 +1,111 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+cbimap = Map("asterisk", "asterisk", "")
+
+featuremap = cbimap:section(TypedSection, "featuremap", "Feature Key maps", "")
+featuremap.anonymous = true
+featuremap.addremove = true
+
+atxfer = featuremap:option(Value, "atxfer", "Attended transfer key", "")
+atxfer.rmempty = true
+
+blindxfer = featuremap:option(Value, "blindxfer", "Blind transfer key", "")
+blindxfer.rmempty = true
+
+disconnect = featuremap:option(Value, "disconnect", "Key to Disconnect call", "")
+disconnect.rmempty = true
+
+parkcall = featuremap:option(Value, "parkcall", "Key to Park call", "")
+parkcall.rmempty = true
+
+
+featurepark = cbimap:section(TypedSection, "featurepark", "Parking Feature", "")
+featurepark.anonymous = true
+featurepark.addremove = true
+
+adsipark = featurepark:option(Flag, "adsipark", "ADSI Park", "")
+adsipark.rmempty = true
+adsipark:depends({ ["asterisk.featurepark.parkenabled"] = "true" })
+
+atxfernoanswertimeout = featurepark:option(Value, "atxfernoanswertimeout", "Attended transfer timeout (sec)", "")
+atxfernoanswertimeout.rmempty = true
+atxfernoanswertimeout:depends({ ["asterisk.featurepark.parkenabled"] = "true" })
+
+automon = featurepark:option(Value, "automon", "One touch record key", "")
+automon.rmempty = true
+automon:depends({ ["asterisk.featurepark.parkenabled"] = "true" })
+
+context = featurepark:option(Value, "context", "Name of call context for parking", "")
+context.rmempty = true
+context:depends({ ["asterisk.featurepark.parkenabled"] = "true" })
+
+courtesytone = featurepark:option(Value, "courtesytone", "Sound file to play to parked caller", "")
+courtesytone.rmempty = true
+courtesytone:depends({ ["asterisk.featurepark.parkenabled"] = "true" })
+
+featuredigittimeout = featurepark:option(Value, "featuredigittimeout", "Max time (ms) between digits for feature activation", "")
+featuredigittimeout.rmempty = true
+featuredigittimeout:depends({ ["asterisk.featurepark.parkenabled"] = "true" })
+
+findslot = featurepark:option(ListValue, "findslot", "Method to Find Parking slot", "")
+findslot:value("first", "First available slot")
+findslot:value("next", "Next free parking space")
+findslot.rmempty = true
+findslot:depends({ ["asterisk.featurepark.parkenabled"] = "true" })
+
+parkedmusicclass = featurepark:option(Value, "parkedmusicclass", "", "")
+parkedmusicclass.rmempty = true
+
+parkedplay = featurepark:option(ListValue, "parkedplay", "Play courtesy tone to", "")
+parkedplay:value("caller", "Caller")
+parkedplay:value("parked", "Parked user")
+parkedplay:value("both", "Both")
+parkedplay.rmempty = true
+parkedplay:depends({ ["asterisk.featurepark.parkenabled"] = "true" })
+
+parkenabled = featurepark:option(Flag, "parkenabled", "Enable Parking", "")
+parkenabled.rmempty = true
+
+parkext = featurepark:option(Value, "parkext", "Extension to dial to park", "")
+parkext.rmempty = true
+parkext:depends({ ["asterisk.featurepark.parkenabled"] = "true" })
+
+parkingtime = featurepark:option(Value, "parkingtime", "Parking time (secs)", "")
+parkingtime.rmempty = true
+parkingtime:depends({ ["asterisk.featurepark.parkenabled"] = "true" })
+
+parkpos = featurepark:option(Value, "parkpos", "Range of extensions for call parking", "")
+parkpos.rmempty = true
+parkpos:depends({ ["asterisk.featurepark.parkenabled"] = "true" })
+
+pickupexten = featurepark:option(Value, "pickupexten", "Pickup extension", "")
+pickupexten.rmempty = true
+pickupexten:depends({ ["asterisk.featurepark.parkenabled"] = "true" })
+
+transferdigittimeout = featurepark:option(Value, "transferdigittimeout", "Seconds to wait bewteen digits when transferring", "")
+transferdigittimeout.rmempty = true
+transferdigittimeout:depends({ ["asterisk.featurepark.parkenabled"] = "true" })
+
+xferfailsound = featurepark:option(Value, "xferfailsound", "sound when attended transfer is complete", "")
+xferfailsound.rmempty = true
+xferfailsound:depends({ ["asterisk.featurepark.parkenabled"] = "true" })
+
+xfersound = featurepark:option(Value, "xfersound", "Sound when attended transfer fails", "")
+xfersound.rmempty = true
+xfersound:depends({ ["asterisk.featurepark.parkenabled"] = "true" })
+
+
+return cbimap
diff --git a/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-res.lua b/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-res.lua
new file mode 100644
index 000000000..5ef6bddd4
--- /dev/null
+++ b/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-res.lua
@@ -0,0 +1,88 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+cbimap = Map("asterisk", "asterisk", "")
+
+module = cbimap:section(TypedSection, "module", "Modules", "")
+module.anonymous = true
+
+res_config_mysql = module:option(ListValue, "res_config_mysql", "MySQL Config Resource", "")
+res_config_mysql:value("yes", "Load")
+res_config_mysql:value("no", "Do Not Load")
+res_config_mysql:value("auto", "Load as Required")
+res_config_mysql.rmempty = true
+
+res_config_odbc = module:option(ListValue, "res_config_odbc", "ODBC Config Resource", "")
+res_config_odbc:value("yes", "Load")
+res_config_odbc:value("no", "Do Not Load")
+res_config_odbc:value("auto", "Load as Required")
+res_config_odbc.rmempty = true
+
+res_config_pgsql = module:option(ListValue, "res_config_pgsql", "PGSQL Module", "")
+res_config_pgsql:value("yes", "Load")
+res_config_pgsql:value("no", "Do Not Load")
+res_config_pgsql:value("auto", "Load as Required")
+res_config_pgsql.rmempty = true
+
+res_crypto = module:option(ListValue, "res_crypto", "Cryptographic Digital Signatures", "")
+res_crypto:value("yes", "Load")
+res_crypto:value("no", "Do Not Load")
+res_crypto:value("auto", "Load as Required")
+res_crypto.rmempty = true
+
+res_features = module:option(ListValue, "res_features", "Call Parking Resource", "")
+res_features:value("yes", "Load")
+res_features:value("no", "Do Not Load")
+res_features:value("auto", "Load as Required")
+res_features.rmempty = true
+
+res_indications = module:option(ListValue, "res_indications", "Indications Configuration", "")
+res_indications:value("yes", "Load")
+res_indications:value("no", "Do Not Load")
+res_indications:value("auto", "Load as Required")
+res_indications.rmempty = true
+
+res_monitor = module:option(ListValue, "res_monitor", "Call Monitoring Resource", "")
+res_monitor:value("yes", "Load")
+res_monitor:value("no", "Do Not Load")
+res_monitor:value("auto", "Load as Required")
+res_monitor.rmempty = true
+
+res_musiconhold = module:option(ListValue, "res_musiconhold", "Music On Hold Resource", "")
+res_musiconhold:value("yes", "Load")
+res_musiconhold:value("no", "Do Not Load")
+res_musiconhold:value("auto", "Load as Required")
+res_musiconhold.rmempty = true
+
+res_odbc = module:option(ListValue, "res_odbc", "ODBC Resource", "")
+res_odbc:value("yes", "Load")
+res_odbc:value("no", "Do Not Load")
+res_odbc:value("auto", "Load as Required")
+res_odbc.rmempty = true
+
+res_smdi = module:option(ListValue, "res_smdi", "SMDI Module", "")
+res_smdi:value("yes", "Load")
+res_smdi:value("no", "Do Not Load")
+res_smdi:value("auto", "Load as Required")
+res_smdi.rmempty = true
+
+res_snmp = module:option(ListValue, "res_snmp", "SNMP Module", "")
+res_snmp:value("yes", "Load")
+res_snmp:value("no", "Do Not Load")
+res_snmp:value("auto", "Load as Required")
+res_snmp.rmempty = true
+
+
+return cbimap
diff --git a/applications/luci-asterisk/luasrc/model/cbi/asterisk-sip-connections.lua b/applications/luci-asterisk/luasrc/model/cbi/asterisk-sip-connections.lua
new file mode 100644
index 000000000..3ec1a7019
--- /dev/null
+++ b/applications/luci-asterisk/luasrc/model/cbi/asterisk-sip-connections.lua
@@ -0,0 +1,107 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+cbimap = Map("asterisk", "asterisk", "")
+
+sip = cbimap:section(TypedSection, "sip", "SIP Connection", "")
+sip.addremove = true
+
+alwaysinternational = sip:option(Flag, "alwaysinternational", "Always Dial International", "")
+alwaysinternational.optional = true
+
+canreinvite = sip:option(ListValue, "canreinvite", "Reinvite/redirect media connections", "")
+canreinvite:value("yes", "Yes")
+canreinvite:value("nonat", "Yes when not behind NAT")
+canreinvite:value("update", "Use UPDATE rather than INVITE for path redirection")
+canreinvite:value("no", "No")
+canreinvite.optional = true
+
+context = sip:option(Value, "context", "", "")
+context.optional = true
+
+countrycode = sip:option(Value, "countrycode", "Country Code for connection", "")
+countrycode.optional = true
+
+dtmfmode = sip:option(ListValue, "dtmfmode", "DTMF mode", "")
+dtmfmode:value("info", "Use RFC2833 or INFO for the BudgeTone")
+dtmfmode:value("rfc2833", "Use RFC2833 for the BudgeTone")
+dtmfmode:value("inband", "Use Inband (only with ulaw/alaw)")
+dtmfmode.optional = true
+
+extension = sip:option(Value, "extension", "Add as Extension", "")
+extension.optional = true
+
+fromdomain = sip:option(Value, "fromdomain", "Primary domain identity for From: headers", "")
+fromdomain.optional = true
+
+fromuser = sip:option(Value, "fromuser", "From user (required by many SIP providers)", "")
+fromuser.optional = true
+
+host = sip:option(Value, "host", "Host name (or blank)", "")
+host.optional = true
+
+incoming = sip:option(DynamicList, "incoming", "Ring on incoming dialplan contexts", "")
+incoming.optional = true
+
+insecure = sip:option(ListValue, "insecure", "Allow Insecure for", "")
+insecure:value("port", "Allow mismatched port number")
+insecure:value("invite", "Do not require auth of incoming INVITE")
+insecure:value("port,invite", "Allow mismatched port and Do not require auth of incoming INVITE")
+insecure.optional = true
+
+internationalprefix = sip:option(Value, "internationalprefix", "International Dial Prefix", "")
+internationalprefix.optional = true
+
+mailbox = sip:option(Value, "mailbox", "Mailbox for MWI", "")
+mailbox.optional = true
+
+nat = sip:option(Flag, "nat", "NAT between phone and Asterisk", "")
+nat.optional = true
+
+pedantic = sip:option(Flag, "pedantic", "Check tags in headers", "")
+pedantic.optional = true
+
+port = sip:option(Value, "port", "SIP Port", "")
+port.optional = true
+
+prefix = sip:option(Value, "prefix", "Dial Prefix (for external line)", "")
+prefix.optional = true
+
+qualify = sip:option(Value, "qualify", "Reply Timeout (ms) for down connection", "")
+qualify.optional = true
+
+register = sip:option(Flag, "register", "Register connection", "")
+register.optional = true
+
+secret = sip:option(Value, "secret", "Secret", "")
+secret.optional = true
+
+selfmailbox = sip:option(Flag, "selfmailbox", "Dial own extension for mailbox", "")
+selfmailbox.optional = true
+
+timeout = sip:option(Value, "timeout", "Dial Timeout (sec)", "")
+timeout.optional = true
+
+type = sip:option(ListValue, "type", "Client Type", "")
+type:value("friend", "Friend (outbound/inbound)")
+type:value("user", "User (inbound - authenticate by \"from\")")
+type:value("peer", "Peer (outbound - match by host)")
+type.optional = true
+
+username = sip:option(Value, "username", "Username", "")
+username.optional = true
+
+
+return cbimap
diff --git a/applications/luci-asterisk/luasrc/model/cbi/asterisk-voice.lua b/applications/luci-asterisk/luasrc/model/cbi/asterisk-voice.lua
new file mode 100644
index 000000000..117a11d55
--- /dev/null
+++ b/applications/luci-asterisk/luasrc/model/cbi/asterisk-voice.lua
@@ -0,0 +1,54 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+cbimap = Map("asterisk", "asterisk", "")
+
+voicegeneral = cbimap:section(TypedSection, "voicegeneral", "Voicemail general options", "")
+voicegeneral.anonymous = true
+voicegeneral.addremove = true
+
+serveremail = voicegeneral:option(Value, "serveremail", "From Email address of server", "")
+serveremail.rmempty = true
+
+
+voicemail = cbimap:section(TypedSection, "voicemail", "Voice Mail boxes", "")
+
+attach = voicemail:option(Flag, "attach", "Email contains attachment", "")
+attach.rmempty = true
+
+email = voicemail:option(Value, "email", "Email", "")
+email.rmempty = true
+
+name = voicemail:option(Value, "name", "Display Name", "")
+name.rmempty = true
+
+password = voicemail:option(Value, "password", "Password", "")
+password.rmempty = true
+
+zone = voicemail:option(Value, "zone", "", "")
+zone.rmempty = true
+
+
+voicezone = cbimap:section(TypedSection, "voicezone", "Voice Zone settings", "")
+voicezone.addremove = true
+
+message = voicezone:option(Value, "message", "Message Format", "")
+message.rmempty = true
+
+zone = voicezone:option(Value, "zone", "Time Zone", "")
+zone.rmempty = true
+
+
+return cbimap
diff --git a/applications/luci-asterisk/luasrc/model/cbi/asterisk.lua b/applications/luci-asterisk/luasrc/model/cbi/asterisk.lua
new file mode 100644
index 000000000..7580f22ec
--- /dev/null
+++ b/applications/luci-asterisk/luasrc/model/cbi/asterisk.lua
@@ -0,0 +1,162 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+cbimap = Map("asterisk", "asterisk", "")
+
+asterisk = cbimap:section(TypedSection, "asterisk", "Asterisk General Options", "")
+asterisk.anonymous = true
+
+agidir = asterisk:option(Value, "agidir", "AGI directory", "")
+agidir.rmempty = true
+
+cache_record_files = asterisk:option(Flag, "cache_record_files", "Cache recorded sound files during recording", "")
+cache_record_files.rmempty = true
+
+debug = asterisk:option(Value, "debug", "Debug Level", "")
+debug.rmempty = true
+
+dontwarn = asterisk:option(Flag, "dontwarn", "Disable some warnings", "")
+dontwarn.rmempty = true
+
+dumpcore = asterisk:option(Flag, "dumpcore", "Dump core on crash", "")
+dumpcore.rmempty = true
+
+highpriority = asterisk:option(Flag, "highpriority", "High Priority", "")
+highpriority.rmempty = true
+
+initcrypto = asterisk:option(Flag, "initcrypto", "Initialise Crypto", "")
+initcrypto.rmempty = true
+
+internal_timing = asterisk:option(Flag, "internal_timing", "Use Internal Timing", "")
+internal_timing.rmempty = true
+
+logdir = asterisk:option(Value, "logdir", "Log directory", "")
+logdir.rmempty = true
+
+maxcalls = asterisk:option(Value, "maxcalls", "Maximum number of calls allowed", "")
+maxcalls.rmempty = true
+
+maxload = asterisk:option(Value, "maxload", "Maximum load to stop accepting new calls", "")
+maxload.rmempty = true
+
+nocolor = asterisk:option(Flag, "nocolor", "Disable console colors", "")
+nocolor.rmempty = true
+
+record_cache_dir = asterisk:option(Value, "record_cache_dir", "Sound files Cache directory", "")
+record_cache_dir.rmempty = true
+record_cache_dir:depends({ ["cache_record_files"] = "true" })
+
+rungroup = asterisk:option(Flag, "rungroup", "The Group to run as", "")
+rungroup.rmempty = true
+
+runuser = asterisk:option(Flag, "runuser", "The User to run as", "")
+runuser.rmempty = true
+
+spooldir = asterisk:option(Value, "spooldir", "Voicemail Spool directory", "")
+spooldir.rmempty = true
+
+systemname = asterisk:option(Value, "systemname", "Prefix UniquID with system name", "")
+systemname.rmempty = true
+
+transcode_via_sln = asterisk:option(Flag, "transcode_via_sln", "Build transcode paths via SLINEAR, not directly", "")
+transcode_via_sln.rmempty = true
+
+transmit_silence_during_record = asterisk:option(Flag, "transmit_silence_during_record", "Transmit SLINEAR silence while recording a channel", "")
+transmit_silence_during_record.rmempty = true
+
+verbose = asterisk:option(Value, "verbose", "Verbose Level", "")
+verbose.rmempty = true
+
+zone = asterisk:option(Value, "zone", "Time Zone", "")
+zone.rmempty = true
+
+
+hardwarereboot = cbimap:section(TypedSection, "hardwarereboot", "Reload Hardware Config", "")
+
+method = hardwarereboot:option(ListValue, "method", "Reboot Method", "")
+method:value("web", "Web URL (wget)")
+method:value("system", "program to run")
+method.rmempty = true
+
+param = hardwarereboot:option(Value, "param", "Parameter", "")
+param.rmempty = true
+
+
+iaxgeneral = cbimap:section(TypedSection, "iaxgeneral", "IAX General Options", "")
+iaxgeneral.anonymous = true
+iaxgeneral.addremove = true
+
+allow = iaxgeneral:option(MultiValue, "allow", "Allow Codecs", "")
+allow:value("alaw", "alaw")
+allow:value("gsm", "gsm")
+allow:value("g726", "g726")
+allow.rmempty = true
+
+canreinvite = iaxgeneral:option(ListValue, "canreinvite", "Reinvite/redirect media connections", "")
+canreinvite:value("yes", "Yes")
+canreinvite:value("nonat", "Yes when not behind NAT")
+canreinvite:value("update", "Use UPDATE rather than INVITE for path redirection")
+canreinvite:value("no", "No")
+canreinvite.rmempty = true
+
+static = iaxgeneral:option(Flag, "static", "Static", "")
+static.rmempty = true
+
+writeprotect = iaxgeneral:option(Flag, "writeprotect", "Write Protect", "")
+writeprotect.rmempty = true
+
+
+sipgeneral = cbimap:section(TypedSection, "sipgeneral", "Section sipgeneral", "")
+sipgeneral.anonymous = true
+sipgeneral.addremove = true
+
+allow = sipgeneral:option(MultiValue, "allow", "Allow codecs", "")
+allow:value("ulaw", "ulaw")
+allow:value("alaw", "alaw")
+allow:value("gsm", "gsm")
+allow:value("g726", "g726")
+allow.rmempty = true
+
+port = sipgeneral:option(Value, "port", "SIP Port", "")
+port.rmempty = true
+
+realm = sipgeneral:option(Value, "realm", "SIP realm", "")
+realm.rmempty = true
+
+
+moh = cbimap:section(TypedSection, "moh", "Music On Hold", "")
+
+application = moh:option(Value, "application", "Application", "")
+application.rmempty = true
+application:depends({ ["asterisk.moh.mode"] = "custom" })
+
+directory = moh:option(Value, "directory", "Directory of Music", "")
+directory.rmempty = true
+
+mode = moh:option(ListValue, "mode", "Option mode", "")
+mode:value("system", "program to run")
+mode:value("files", "Read files from directory")
+mode:value("quietmp3", "Quite MP3")
+mode:value("mp3", "Loud MP3")
+mode:value("mp3nb", "unbuffered MP3")
+mode:value("quietmp3nb", "Quiet Unbuffered MP3")
+mode:value("custom", "Run a custom application")
+mode.rmempty = true
+
+random = moh:option(Flag, "random", "Random Play", "")
+random.rmempty = true
+
+
+return cbimap