X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=applications%2Fluci-app-openvpn%2Fluasrc%2Fview%2Fopenvpn%2Fcbi-select-input-add.htm;h=e75bfda900bd3fcfb0fa9f42167dd34af00fcbff;hb=98cde82e4d585e432efcb468a3e4cdc52b685a25;hp=09da2eb22df799f9c423e673af0c7495c3decf8a;hpb=1a5b613b87b5623bb13c15c7af4de4108310d4ec;p=oweals%2Fluci.git

diff --git a/applications/luci-app-openvpn/luasrc/view/openvpn/cbi-select-input-add.htm b/applications/luci-app-openvpn/luasrc/view/openvpn/cbi-select-input-add.htm
index 09da2eb22..e75bfda90 100644
--- a/applications/luci-app-openvpn/luasrc/view/openvpn/cbi-select-input-add.htm
+++ b/applications/luci-app-openvpn/luasrc/view/openvpn/cbi-select-input-add.htm
@@ -3,7 +3,7 @@
 //<![CDATA[
 	function vpn_add()
 	{
-		var vpn_name     = div_add.querySelector("#instance_name1").value.replace(/[^\x00-\x7F]|[\s!@#$%^&*()+=\[\]{};':"\\|,<>\/?]/g,'');
+		var vpn_name     = div_add.querySelector("#instance_name1").value.replace(/[^\x00-\x7F]|[\s!@#$%^&*()\-+=\[\]{};':"\\|,<>\/?]/g,'');
 		var vpn_template = div_add.querySelector("#instance_template").value;
 		var form         = document.getElementsByName('cbi')[0];
 
@@ -31,7 +31,7 @@
 
 	function vpn_upload()
 	{
-		var vpn_name = div_upload.querySelector("#instance_name2").value.replace(/[^\x00-\x7F]|[\s!@#$%^&*()+=\[\]{};':"\\|,<>\/?]/g,'');
+		var vpn_name = div_upload.querySelector("#instance_name2").value.replace(/[^\x00-\x7F]|[\s!@#$%^&*()\-+=\[\]{};':"\\|,<>\/?]/g,'');
 		var vpn_file = document.getElementById("ovpn_file").value;
 		var form     = document.getElementsByName('cbi')[0];
 
@@ -77,10 +77,10 @@
 	<div class="table cbi-section-table">
 		<h4><%:Template based configuration%></h4>
 		<div class="tr cbi-section-table-row" id="div_add">
-			<div class="td">
+			<div class="td left">
 				<input type="text" maxlength="20" placeholder="Instance name" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.text" id="instance_name1" />
 			</div>
-			<div class="td">
+			<div class="td left">
 				<select id="instance_template" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.select">
 					<option value="" selected="selected" disabled="disabled"><%:Select template ...%></option>
 					<%- for k, v in luci.util.kspairs(self.add_select_options) do %>
@@ -88,19 +88,19 @@
 					<% end -%>
 				</select>
 			</div>
-			<div class="td">
+			<div class="td left">
 				<input class="cbi-button cbi-button-add" type="submit" onclick="vpn_add(); return false;" value="<%:Add%>" title="<%:Add template based configuration%>" /><br />
 			</div>
 		</div>
 		<h4><%:OVPN configuration file upload%></h4>
 		<div class="tr cbi-section-table-row" id="div_upload">
-			<div class="td">
+			<div class="td left">
 				<input type="text" maxlength="20" placeholder="Instance name" name="instance_name2" id="instance_name2" />
 			</div>
-			<div class="td">
+			<div class="td left">
 				<input type="file" name="ovpn_file" id="ovpn_file" accept="application/x-openvpn-profile,.ovpn" />
 			</div>
-			<div class="td">
+			<div class="td left">
 				<input class="cbi-button cbi-button-add" type="submit" onclick="vpn_upload(); return false;" value="<%:Upload%>" title="<%:Upload ovpn file%>" />
 			</div>
 		</div>