Merge pull request #278 from nmav/ocserv

[project/luci.git] / applications / luci-asterisk / luasrc / controller / asterisk.lua

diff --git a/applications/luci-asterisk/luasrc/controller/asterisk.lua b/applications/luci-asterisk/luasrc/controller/asterisk.lua
index 3bd369d..54b9525 100644 (file)
--- a/applications/luci-asterisk/luasrc/controller/asterisk.lua
+++ b/applications/luci-asterisk/luasrc/controller/asterisk.lua
@@ -17,7 +17,7 @@ module("luci.controller.asterisk", package.seeall)
 
 function index()
 
-       entry({"admin", "services", "asterisk"},                                  cbi("asterisk"),                        "Asterisk",                           80).i18n = "asterisk"
+       entry({"admin", "services", "asterisk"},                                  cbi("asterisk"),                        "Asterisk",                           80)
 
        entry({"admin", "services", "asterisk", "voice"},         cbi("asterisk-voice"),      "Voice Functions",        1)
        entry({"admin", "services", "asterisk", "meetme"},        cbi("asterisk-meetme"),     "Meetme Conferences",     2)
@@ -40,19 +40,26 @@ function index()
                cbi("asterisk-mod-res-feature"), "Feature Module Configuration", 9 )
 
 
-       entry({"admin", "asterisk"},                            cbi("asterisk/main"),           "Asterisk",  99).i18n = "asterisk"
+       entry({"admin", "asterisk"},                                    cbi("asterisk/main"),                   "Asterisk",  99).i18n = "asterisk"
 
-       entry({"admin", "asterisk", "phones"},                  cbi("asterisk/phones"),         "Phones",       1)
-       entry({"admin", "asterisk", "phones", "sip"},           cbi("asterisk/phone_sip"),      nil,            1).leaf = true
-       --entry({"admin", "asterisk", "phones", "exten"},       cbi("asterisk/phone_exten"),    "Extensions",   2).leaf = true
+       entry({"admin", "asterisk", "phones"},                          cbi("asterisk/phones"),                 "Phones",       1)
+       entry({"admin", "asterisk", "phones", "sip"},                   cbi("asterisk/phone_sip"),              nil,            1).leaf = true
+       --entry({"admin", "asterisk", "phones", "exten"},               cbi("asterisk/phone_exten"),            "Extensions",   2).leaf = true
 
-       entry({"admin", "asterisk", "trunks"},                  cbi("asterisk/trunks"),         "Trunks",       2)
-       entry({"admin", "asterisk", "trunks", "sip"},           cbi("asterisk/trunk_sip"),      nil,            1).leaf = true
+       entry({"admin", "asterisk", "trunks"},                          cbi("asterisk/trunks"),                 "Trunks",       2)
+       entry({"admin", "asterisk", "trunks", "sip"},                   cbi("asterisk/trunk_sip"),              nil,            1).leaf = true
 
-       --entry({"admin", "asterisk", "dialplans"},                     cbi("asterisk/dialplans"),      "Call Routing", 3)
-       entry({"admin", "asterisk", "dialplans"},                       call("handle_dialplan"),        "Call Routing", 3)
-       entry({"admin", "asterisk", "dialplans", "out"},        cbi("asterisk/dialplan_out"),   nil,            1).leaf = true
-       entry({"admin", "asterisk", "dialplans", "zones"},      call("handle_dialzones"),               "Dial Zones",   2).leaf = true
+       entry({"admin", "asterisk", "voicemail"},                       cbi("asterisk/voicemail"),              "Voicemail",    3)
+       entry({"admin", "asterisk", "voicemail", "mailboxes"},  cbi("asterisk/voicemail"),                      "Mailboxes",    1)
+       entry({"admin", "asterisk", "voicemail", "settings"},   cbi("asterisk/voicemail_settings"),     "Settings",     2)
+
+       entry({"admin", "asterisk", "meetme"},                          cbi("asterisk/meetme"),                 "MeetMe",               4)
+       entry({"admin", "asterisk", "meetme", "rooms"},                 cbi("asterisk/meetme"),                         "Rooms",                1)
+       entry({"admin", "asterisk", "meetme", "settings"},              cbi("asterisk/meetme_settings"),        "Settings",     2)
+
+       entry({"admin", "asterisk", "dialplans"},                               call("handle_dialplan"),                "Call Routing", 5)
+       entry({"admin", "asterisk", "dialplans", "out"},                cbi("asterisk/dialplan_out"),           nil,            1).leaf = true
+       entry({"admin", "asterisk", "dialplans", "zones"},              call("handle_dialzones"),                       "Dial Zones",   2).leaf = true
 
 end
 
@@ -78,8 +85,6 @@ function handle_dialplan()
                        if #newinc > 0 then
                                uci:set("asterisk", plan.name, "include", newinc)
                        end
-
-                       uci:save("asterisk")
                end
        end
 
@@ -98,8 +103,6 @@ function handle_dialplan()
                        if #newinc > 0 then
                                uci:set("asterisk", plan.name, "include", newinc)
                        end
-
-                       uci:save("asterisk")
                end
        end
 
@@ -108,7 +111,6 @@ function handle_dialplan()
                if #v > 0 and plan then
                        uci:delete_all("asterisk", "dialplanvoice",
                                { extension=v, dialplan=plan.name })
-                       uci:save("asterisk")
                end
        end
 
@@ -124,7 +126,28 @@ function handle_dialplan()
                                voicebox                = vbox.number,
                                voicecontext    = vbox.context
                        })
-                       uci:save("asterisk")
+               end
+       end
+
+       for k, v in pairs(luci.http.formvaluetable("delmeetme")) do
+               local plan = ast.dialplan.plan(k)
+               if #v > 0 and plan then
+                       uci:delete_all("asterisk", "dialplanmeetme",
+                               { extension=v, dialplan=plan.name })
+               end
+       end
+
+       for k, v in pairs(luci.http.formvaluetable("addmeetme")) do
+               local plan = ast.dialplan.plan(k)
+               local meetme = ast.meetme.room(v)
+               if plan and meetme then
+                       local mext = luci.http.formvalue("addmeetmeext.%s" % plan.name)
+                       mext = ( mext and #mext > 0 ) and mext or meetme.room
+                       uci:section("asterisk", "dialplanmeetme", nil, {
+                               dialplan        = plan.name,
+                               extension       = mext,
+                               room            = meetme.room
+                       })
                end
        end
 
@@ -132,7 +155,6 @@ function handle_dialplan()
        if aname and #aname > 0 then
                if aname:match("^[a-zA-Z0-9_]+$") then
                        uci:section("asterisk", "dialplan", aname, { })
-                       uci:save("asterisk")
                else
                        err = true
                end
@@ -142,11 +164,14 @@ function handle_dialplan()
        if dname and #dname > 0 then
                if uci:get("asterisk", dname) == "dialplan" then
                        uci:delete("asterisk", dname)
-                       uci:save("asterisk")
+                       uci:delete_all("asterisk", "dialplanvoice", { dialplan=dname })
+                       uci:delete_all("asterisk", "dialplanmeetme", { dialplan=dname })
                end
        end
 
+       uci:save("asterisk")
        ast.uci_resync()
+
        luci.template.render("asterisk/dialplans", { create_error = err })
 end