Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emulab
emulab-stable
Commits
abeed676
Commit
abeed676
authored
Feb 19, 2019
by
Leigh B Stoller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Small fix to the new geni-lib feature check.
parent
91bf8a29
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
3 deletions
+6
-3
www/aptui/instantiate.ajax
www/aptui/instantiate.ajax
+6
-3
No files found.
www/aptui/instantiate.ajax
View file @
abeed676
...
@@ -850,6 +850,7 @@ function Do_RunScript()
...
@@ -850,6 +850,7 @@ function Do_RunScript()
global
$this_user
;
global
$this_user
;
global
$ajax_args
;
global
$ajax_args
;
global
$suexec_output
,
$suexec_output_array
;
global
$suexec_output
,
$suexec_output_array
;
$newgenilib
=
0
;
$script
=
""
;
$script
=
""
;
if
(
isset
(
$ajax_args
[
"script"
]))
{
if
(
isset
(
$ajax_args
[
"script"
]))
{
...
@@ -886,16 +887,18 @@ function Do_RunScript()
...
@@ -886,16 +887,18 @@ function Do_RunScript()
}
}
$this_idx
=
$this_user
->
uid_idx
();
$this_idx
=
$this_user
->
uid_idx
();
$this_uid
=
$this_user
->
uid
();
$this_uid
=
$this_user
->
uid
();
if
(
!
(
$profile
->
CanInstantiate
(
$this_user
)
||
ISADMIN
()))
{
if
(
!
(
$profile
->
CanInstantiate
(
$this_user
)
||
ISADMIN
()))
{
SPITAJAX_ERROR
(
1
,
"Not enough permission to instantiate profile"
);
SPITAJAX_ERROR
(
1
,
"Not enough permission to instantiate profile"
);
return
;
return
;
}
}
if
(
$profile
->
UseNewGeniLib
())
{
$newgenilib
=
1
;
}
}
}
if
(
preg_match
(
"/^import/m"
,
$script
))
{
if
(
preg_match
(
"/^import/m"
,
$script
))
{
$command
=
"webrungenilib"
;
$command
=
"webrungenilib"
;
if
(
Profile
::
UseN
ew
G
eni
L
ib
(
$this_user
)
)
{
if
(
$n
ew
g
eni
l
ib
)
{
$command
.
=
" -N "
;
$command
.
=
" -N "
;
}
}
}
}
...
...
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