diff options
Diffstat (limited to 'applications/luci-asterisk/luasrc/view/asterisk/dialplans.htm')
| -rw-r--r-- | applications/luci-asterisk/luasrc/view/asterisk/dialplans.htm | 200 |
1 files changed, 98 insertions, 102 deletions
diff --git a/applications/luci-asterisk/luasrc/view/asterisk/dialplans.htm b/applications/luci-asterisk/luasrc/view/asterisk/dialplans.htm index 7432cebf3..217fc6e3c 100644 --- a/applications/luci-asterisk/luasrc/view/asterisk/dialplans.htm +++ b/applications/luci-asterisk/luasrc/view/asterisk/dialplans.htm @@ -17,53 +17,11 @@ $Id$ <% local uci = luci.model.uci.cursor_state() + local ast = require "luci.asterisk" - function find_rules(plan) - local r = { } - if plan and plan.include then - local i = luci.util.split(plan.include, "%s+", nil, true) - for _, i in ipairs(i) do - i = uci:get("asterisk", "dialzone", i) - if i then - r[#r+1] = i - end - end - end - return r - end - - dp_lookup_table = { } - - function dialplan_lookup(s) - if not dp_lookup_table[s['.name']] then - s.childs = { } - s.matches = type(s.match) == "table" and s.match or { s.match } - s.name, s.type = s['.name'], s['.type'] - s['.name'], s['.type'] = nil, nil - dp_lookup_table[s.name] = s - end - end - - uci:foreach("asterisk", "dialplan", dialplan_lookup) - uci:foreach("asterisk", "dialzone", dialplan_lookup) - - for k, p in pairs(dp_lookup_table) do - if p.include then - local i = type(p.include) == "string" - and luci.util.split(p.include, "%s+", nil, true) or p.include - - for _, i in ipairs(i) do - i = dp_lookup_table[i] - if i then - p.childs[#p.childs+1] = i - i.parent = p - end - end - end - end - - function digit_pattern(s) - return "<code style='padding: 2px; border:1px solid #CCCCCC; background-color: #FFFFFF'>%s</code>" % s + function digit_pattern(s,t) + return "<code style='padding: 2px; border:1px solid #CCCCCC; background-color: #FFFFFF'%s>%s</code>" + %{ t and " title='" .. t .. "'" or "", s } end function rowstyle(i) @@ -72,18 +30,33 @@ $Id$ } end - function link_trunks(s) - local l = { } - for s in s:gmatch("(%S+)") do - if s:match("^[sS][iI][pP]/") then - l[#l+1] = '<a href="%s">%s</a>' %{ - luci.dispatcher.build_url("admin", "asterisk", "trunks", - "sip", (s:gsub("^.+/",""))), - (s:gsub("^.+/","SIP: ")) - } + function format_matches(z) + local html = { } + + if z.localprefix then + for _, m in ipairs(z.matches) do + html[#html+1] = + digit_pattern(z.localprefix, "local prefix") .. " " .. + digit_pattern(m) + end + end + + if #z.intlmatches > 0 then + for _, i in ipairs(z.intlmatches) do + for _, m in ipairs(z.matches) do + html[#html+1] = "%s %s" %{ + digit_pattern("(%s)" % i, "intl. prefix"), + digit_pattern(m) + } + end + end + else + for _, m in ipairs(z.matches) do + html[#html+1] = digit_pattern(m) end end - return '<small>%s</small>' % table.concat(l, ", ") + + return table.concat(html, "; ") end %> @@ -100,69 +73,92 @@ $Id$ <div class="cbi-map-descr"></div><!-- tblsection --> <fieldset class="cbi-section" id="cbi-asterisk-sip"> <!--<legend>Dialplans</legend>--> - <div class="cbi-section-descr"></div> - - - - + <div class="cbi-section-descr"> + Here you can manage your dial plans which are used to route outgoing calls from your local extensions. + </div> - <% for name, plan in luci.util.kspairs(dp_lookup_table) do - if plan.type == "dialplan" then %> + <% for i, plan in pairs(ast.dialplan.plans()) do %> <div class="cbi-section-node"> <table class="cbi-section-table"> <tr class="cbi-section-table-titles"> - <th style="text-align: left; padding: 3px" class="cbi-section-table-cell" colspan="5"> - <big> Dialplan <em><%=name%></em></big> + <th style="text-align: left; padding: 3px" class="cbi-section-table-cell"> + <big>Dialplan <em><%=plan.name%></em></big> </th> + <td> + <a href="<%=luci.dispatcher.build_url('admin', 'asterisk', 'dialplans')%>?delplan=<%=plan.name%>"> + <img style="border:none" alt="Remove this dialplan" title="Remove this dialplan" src="/luci-static/resources/cbi/remove.gif" /> + </a> + </td> </tr> - <tr class="cbi-section-table-descr"> - <th style="width: 5%; text-align:right" class="cbi-section-table-cell">Prepend</th> - <th style="width: 20%; text-align:left" class="cbi-section-table-cell">- Match</th> - <th style="text-align:left" class="cbi-section-table-cell">Trunk</th> - <th style="width: 40%; text-align:left" class="cbi-section-table-cell">Description</th> - <th style="width: 4%; text-align:left" class="cbi-section-table-cell"></th> - </tr> - - <% for i, rule in pairs(plan.childs) do - if rule.type == "dialzone" then %> + <!-- dialzones --> + <% local zones_used = { } %> + <% for i, zone in ipairs(plan.zones) do zones_used[zone.name] = true %> <tr class="cbi-section-table-row <%=rowstyle(i)%>"> - <td style="text-align:right" class="cbi-value-field"> - <% for _ in ipairs(rule.matches) do %> - <%=rule.addprefix and digit_pattern(rule.addprefix)%> <br /> - <% end %> - </td> - <td style="text-align:left" class="cbi-value-field"> - <% for _, m in ipairs(rule.matches) do %> - <%=rule.localprefix and "%s " % digit_pattern(rule.localprefix)%> - <%=digit_pattern(m)%><br /> - <% end %> + <td style="text-align: left; padding: 3px" class="cbi-section-table-cell"> + <strong>└ Dialzone <em><%=zone.name%></em></strong> + <p style="padding-left: 1em; margin-bottom:0"> + Description: <%=zone.description%><br /> + Lines: + <%=ast.tools.hyperlinks( + zone.trunks, function(v) + return luci.dispatcher.build_url("admin", "asterisk", "trunks", "%s") % v:lower() + end + )%><br /> + Matches: + <%=format_matches(zone)%> + </p> </td> - <td style="text-align:left" class="cbi-value-field"> - <%=rule.uses and link_trunks(rule.uses)%> - </td> - <td style="text-align:left" class="cbi-value-field"> - <%=rule.description or rule.name%> - </td> - <td style="text-align:left" class="cbi-value-field"> - <a href="<%=luci.dispatcher.build_url('admin', 'asterisk', 'dialplans', 'out', rule.name)%>"> - <img style="border:none" alt="Edit entry" title="Edit entry" src="/luci-static/resources/cbi/edit.gif" /> + <td style="width:5%" class="cbi-value-field"> + <a href="<%=luci.dispatcher.build_url('admin', 'asterisk', 'dialplans', 'out', zone.name)%>"> + <img style="border:none" alt="Edit dialzone" title="Edit dialzone" src="/luci-static/resources/cbi/edit.gif" /> </a> - <a href="<%=luci.dispatcher.build_url('admin', 'asterisk', 'dialplans')%>?delete=<%=rule.name%>"> - <img style="border:none" alt="Delete entry" title="Delete entry" src="/luci-static/resources/cbi/remove.gif" /> + <a href="<%=luci.dispatcher.build_url('admin', 'asterisk', 'dialplans')%>?delzone.<%=plan.name%>=<%=zone.name%>"> + <img style="border:none" alt="Remove from this dialplan" title="Remove from this dialplan" src="/luci-static/resources/cbi/remove.gif" /> </a> </td> </tr> - <% end end %> + <% end %> + + <tr class="cbi-section-table-row"> + <td style="text-align: left; padding: 3px" class="cbi-section-table-cell" colspan="2"> + <hr style="margin-bottom:0.5em; border-width:0 0 1px 0" /> + <select style="width:30%" name="addzone.<%=plan.name%>"> + <option value="">-- Add dialzone --</option> + <% for _, zone in pairs(ast.dialzone.zones()) do %> + <% if not zones_used[zone.name] then %> + <option value="<%=zone.name%>"><%=zone.name%> (<%=zone.description%>)</option> + <% end %> + <% end %> + </select> + <input type="submit" class="cbi-button cbi-button-add" value=" » " title="Add Zone ..."/> + + <a href="<%=luci.dispatcher.build_url('admin/asterisk/dialplans/zones')%>" class="cbi-title-ref">Manage dialzones</a> + </td> + </tr> + <!-- /dialzones --> + </table> - <div class="cbi-section-create cbi-tblsection-create"> - <input type="text" class="cbi-section-create-name" name="create_entry.<%=name%>"/> - <input type="submit" class="cbi-button cbi-button-add" value="Add entry" title="Add entry"/> - </div> + <div class="cbi-section-create cbi-tblsection-create"></div> </div> <br /> - <% end end %> + <% end %> + + <div class="cbi-section-node"> + <div class="cbi-section-create cbi-tblsection-create" style="padding: 3px"> + <h3>Create a new dialplan</h3> + The name is required and must be unique. It may only contain the characters A-Z, a-z, 0-9 and _ .<br /> + + <%- if create_error then %> + <br /><span style="color:red">Invalid name given!</span><br /> + <% end -%> + + <br /> + <input type="text" class="cbi-section-create-name" name="addplan" style="width:200px" /> + <input type="submit" class="cbi-button cbi-button-add" value="Add dialplan" title="Add dialplan"/> + </div> + </div> </fieldset> </div> |