Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
pve-manager
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
pve-manager
Commits
722f9bd3
Commit
722f9bd3
authored
Apr 20, 2015
by
Dietmar Maurer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Utils.js: add more regex for IPs
parent
efe86e5b
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
Utils.js
www/manager/Utils.js
+4
-1
Utils.js
www/manager5/Utils.js
+4
-0
No files found.
www/manager/Utils.js
View file @
722f9bd3
...
@@ -27,8 +27,8 @@ var IPV4_REGEXP = "(?:(?:" + IPV4_OCTET + "\\.){3}" + IPV4_OCTET + ")";
...
@@ -27,8 +27,8 @@ var IPV4_REGEXP = "(?:(?:" + IPV4_OCTET + "\\.){3}" + IPV4_OCTET + ")";
var
IPV6_H16
=
"
(?:[0-9a-fA-F]{1,4})
"
;
var
IPV6_H16
=
"
(?:[0-9a-fA-F]{1,4})
"
;
var
IPV6_LS32
=
"
(?:(?:
"
+
IPV6_H16
+
"
:
"
+
IPV6_H16
+
"
)|
"
+
IPV4_REGEXP
+
"
)
"
;
var
IPV6_LS32
=
"
(?:(?:
"
+
IPV6_H16
+
"
:
"
+
IPV6_H16
+
"
)|
"
+
IPV4_REGEXP
+
"
)
"
;
var
IP4_match
=
new
RegExp
(
"
^(?:
"
+
IPV4_REGEXP
+
"
)$
"
);
var
IP4_match
=
new
RegExp
(
"
^(?:
"
+
IPV4_REGEXP
+
"
)$
"
);
var
IP4_cidr_match
=
new
RegExp
(
"
^(?:
"
+
IPV4_REGEXP
+
"
)
\
/[1-3][0-9]?$
"
);
var
IPV6_REGEXP
=
"
(?:
"
+
var
IPV6_REGEXP
=
"
(?:
"
+
"
(?:(?:
"
+
"
(?:
"
+
IPV6_H16
+
"
:){6})
"
+
IPV6_LS32
+
"
)|
"
+
"
(?:(?:
"
+
"
(?:
"
+
IPV6_H16
+
"
:){6})
"
+
IPV6_LS32
+
"
)|
"
+
...
@@ -42,6 +42,9 @@ var IPV6_REGEXP = "(?:" +
...
@@ -42,6 +42,9 @@ var IPV6_REGEXP = "(?:" +
"
(?:(?:(?:(?:
"
+
IPV6_H16
+
"
:){0,7}
"
+
IPV6_H16
+
"
)?::
"
+
"
)
"
+
"
)
"
+
"
(?:(?:(?:(?:
"
+
IPV6_H16
+
"
:){0,7}
"
+
IPV6_H16
+
"
)?::
"
+
"
)
"
+
"
)
"
+
"
)
"
;
"
)
"
;
var
IP6_match
=
new
RegExp
(
"
^(?:
"
+
IPV6_REGEXP
+
"
)$
"
);
var
IP6_cidr_match
=
new
RegExp
(
"
^(?:
"
+
IPV6_REGEXP
+
"
)
\
/[0-9]{1,3}?$
"
);
var
IP64_match
=
new
RegExp
(
"
^(?:
"
+
IPV6_REGEXP
+
"
|
"
+
IPV4_REGEXP
+
"
)$
"
);
var
IP64_match
=
new
RegExp
(
"
^(?:
"
+
IPV6_REGEXP
+
"
|
"
+
IPV4_REGEXP
+
"
)$
"
);
Ext
.
define
(
'
PVE.Utils
'
,
{
statics
:
{
Ext
.
define
(
'
PVE.Utils
'
,
{
statics
:
{
...
...
www/manager5/Utils.js
View file @
722f9bd3
...
@@ -29,6 +29,7 @@ var IPV6_LS32 = "(?:(?:" + IPV6_H16 + ":" + IPV6_H16 + ")|" + IPV4_REGEXP + ")";
...
@@ -29,6 +29,7 @@ var IPV6_LS32 = "(?:(?:" + IPV6_H16 + ":" + IPV6_H16 + ")|" + IPV4_REGEXP + ")";
var
IP4_match
=
new
RegExp
(
"
^(?:
"
+
IPV4_REGEXP
+
"
)$
"
);
var
IP4_match
=
new
RegExp
(
"
^(?:
"
+
IPV4_REGEXP
+
"
)$
"
);
var
IP4_cidr_match
=
new
RegExp
(
"
^(?:
"
+
IPV4_REGEXP
+
"
)
\
/[1-3][0-9]?$
"
);
var
IPV6_REGEXP
=
"
(?:
"
+
var
IPV6_REGEXP
=
"
(?:
"
+
"
(?:(?:
"
+
"
(?:
"
+
IPV6_H16
+
"
:){6})
"
+
IPV6_LS32
+
"
)|
"
+
"
(?:(?:
"
+
"
(?:
"
+
IPV6_H16
+
"
:){6})
"
+
IPV6_LS32
+
"
)|
"
+
...
@@ -42,6 +43,9 @@ var IPV6_REGEXP = "(?:" +
...
@@ -42,6 +43,9 @@ var IPV6_REGEXP = "(?:" +
"
(?:(?:(?:(?:
"
+
IPV6_H16
+
"
:){0,7}
"
+
IPV6_H16
+
"
)?::
"
+
"
)
"
+
"
)
"
+
"
(?:(?:(?:(?:
"
+
IPV6_H16
+
"
:){0,7}
"
+
IPV6_H16
+
"
)?::
"
+
"
)
"
+
"
)
"
+
"
)
"
;
"
)
"
;
var
IP6_match
=
new
RegExp
(
"
^(?:
"
+
IPV6_REGEXP
+
"
)$
"
);
var
IP6_cidr_match
=
new
RegExp
(
"
^(?:
"
+
IPV6_REGEXP
+
"
)
\
/[0-9]{1,3}?$
"
);
var
IP64_match
=
new
RegExp
(
"
^(?:
"
+
IPV6_REGEXP
+
"
|
"
+
IPV4_REGEXP
+
"
)$
"
);
var
IP64_match
=
new
RegExp
(
"
^(?:
"
+
IPV6_REGEXP
+
"
|
"
+
IPV4_REGEXP
+
"
)$
"
);
Ext
.
define
(
'
PVE.Utils
'
,
{
statics
:
{
Ext
.
define
(
'
PVE.Utils
'
,
{
statics
:
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment