Merge pull request #1735 from sumpfralle/olsr-jsoninfo-parser-handle-empty-result

[oweals/luci.git] / applications / luci-app-openvpn / luasrc / controller / openvpn.lua

diff --git a/applications/luci-app-openvpn/luasrc/controller/openvpn.lua b/applications/luci-app-openvpn/luasrc/controller/openvpn.lua
index 61592d0fac8472705256a94eec40e2a60d0895f1..55c29d1c2ac29c14534a95b09cef47d6307e2b34 100644 (file)
--- a/applications/luci-app-openvpn/luasrc/controller/openvpn.lua
+++ b/applications/luci-app-openvpn/luasrc/controller/openvpn.lua
@@ -5,11 +5,11 @@
 module("luci.controller.openvpn", package.seeall)
 
 function index()
-       entry( {"admin", "services", "openvpn"}, cbi("openvpn"), _("OpenVPN") )
-       entry( {"admin", "services", "openvpn", "basic"},    cbi("openvpn-basic"),    nil ).leaf = true
-       entry( {"admin", "services", "openvpn", "advanced"}, cbi("openvpn-advanced"), nil ).leaf = true
-       entry( {"admin", "services", "openvpn", "file"},     form("openvpn-file"),    nil ).leaf = true
-       entry( {"admin", "services", "openvpn", "upload"},   call("ovpn_upload"))
+       entry( {"admin", "vpn", "openvpn"}, cbi("openvpn"), _("OpenVPN") )
+       entry( {"admin", "vpn", "openvpn", "basic"},    cbi("openvpn-basic"),    nil ).leaf = true
+       entry( {"admin", "vpn", "openvpn", "advanced"}, cbi("openvpn-advanced"), nil ).leaf = true
+       entry( {"admin", "vpn", "openvpn", "file"},     form("openvpn-file"),    nil ).leaf = true
+       entry( {"admin", "vpn", "openvpn", "upload"},   call("ovpn_upload"))
 end
 
 function ovpn_upload()
@@ -18,7 +18,7 @@ function ovpn_upload()
        local util   = require("luci.util")
        local uci    = require("luci.model.uci").cursor()
        local upload = http.formvalue("ovpn_file")
-       local name   = string.gsub(util.shellquote(http.formvalue("instance_name2")), "'", "")
+       local name   = http.formvalue("instance_name2")
        local file   = "/etc/openvpn/" ..name.. ".ovpn"
 
        if name and upload then
@@ -50,5 +50,5 @@ function ovpn_upload()
                        end
                end
        end
-       http.redirect(luci.dispatcher.build_url('admin/services/openvpn'))
+       http.redirect(luci.dispatcher.build_url('admin/vpn/openvpn'))
 end