All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit 239038ad authored by Leigh B Stoller's avatar Leigh B Stoller

Enable new portal based image images everywhere.

parent ac94cd95
......@@ -52,7 +52,7 @@ $image_gid = $image->gid();
$image_name = $image->imagename();
$image_path = $image->path();
if ($TBMAINSITE && !$classic) {
if (!$classic) {
$url = "apt/snapshot-image.php?imageid=$imageid&version=$version";
if (isset($target)) {
$url .= "&node=$target";
......
......@@ -100,7 +100,7 @@ if (isset($baseosinfo) && $baseosinfo->def_parentosid()) {
# In general, there is no reason for a mere user to do anything but
# clone or snapshot an existing image.
#
if ($TBMAINSITE && isset($baseimage) && !$classic && !$ec2) {
if (!$classic && !$ec2) {
$imageid = $baseimage->imageid();
$version = $baseimage->version();
......
......@@ -54,7 +54,7 @@ if (!$image->AccessCheck($this_user, $TB_IMAGEID_READINFO)) {
USERERROR("You do not have permission to access ImageID $imageid.", 1);
}
if ($image->ezid() && $TBMAINSITE && !$classic) {
if ($image->ezid() && !$classic) {
header("Location: apt/show-image.php?imageid=$imageid&version=$version");
return;
}
......
......@@ -39,7 +39,7 @@ $optargs = OptionalPageArguments("searchfor", PAGEARG_STRING,
"searchby", PAGEARG_STRING,
"classic", PAGEARG_BOOLEAN);
if ($TBMAINSITE && !$classic) {
if (!$classic) {
header("Location: apt/images.php");
return;
}
......
......@@ -41,7 +41,7 @@ $optargs = OptionalPageArguments("classic", PAGEARG_BOOLEAN);
# Need these below
$node_id = $node->node_id();
if ($TBMAINSITE && !$classic) {
if (!$classic) {
header("Location: apt/show-node.php?node_id=$node_id");
return;
}
......
......@@ -47,7 +47,7 @@ $osid = $osinfo->osid();
$osname = $osinfo->osname();
$version = $osinfo->vers();
if ($osinfo->ezid() && $TBMAINSITE && !$classic) {
if ($osinfo->ezid() && !$classic) {
header("Location: apt/show-image.php?imageid=$osid&version=$version");
return;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment