Commit 4379f04a authored by Kirk Webb's avatar Kirk Webb

More changes to support GENI logins into PhantomNet.

parent 254599d1
......@@ -758,7 +758,7 @@ function SetDomainDefs()
}
# Given that this is an alternate domain, clear TBMAINSITE
$TBMAINSITE = 0;
#$TBMAINSITE = 0;
# Bail after the first domain match.
return 1;
......
......@@ -71,7 +71,7 @@ if ($message != "") {
echo "</font></center><br>\n";
}
if ($TBMAINSITE) {
if ($TBMAINSITE && !$ISALTDOMAIN) {
echo "<span class='picture'>
<center><font size=-1>In Memoriam</font></center><a href=jay.php>
<img width=80 height=85 src=jay.jpg></a><br clear=left>
......@@ -108,7 +108,7 @@ if ($TBMAINSITE) {
$sitefile = "index-" . strtolower($THISHOMEBASE) . ".html";
if (!file_exists($sitefile)) {
if ($TBMAINSITE)
if ($TBMAINSITE && !$ISALTDOMAIN)
$sitefile = "index-mainsite.html";
else
$sitefile = "index-nonmain.html";
......
......@@ -616,7 +616,7 @@ function WRITEEXPERIMENTMENU($firstinitstate) {
function WRITEADMINMENU() {
global $TBBASE, $TBDOCBASE, $TBMAINSITE;
global $PROTOGENI;
global $PROTOGENI, $ISALTDOMAIN;
global $login_status;
# Do we have a storage pool? The we support datasets.
......@@ -643,7 +643,7 @@ function WRITEADMINMENU() {
NavMenuButton("Edit Site Variables",
"$TBBASE/editsitevars.php3");
if ($TBMAINSITE) {
if ($TBMAINSITE && !$ISALTDOMAIN) {
NavMenuButton("Emulab Site List",
"$TBBASE/showsite_list.php");
}
......@@ -742,7 +742,7 @@ function WRITESIDEBAR() {
global $login_status, $login_user, $pid, $gid;
global $TBBASE, $TBDOCBASE, $BASEPATH, $WIKISUPPORT, $MAILMANSUPPORT;
global $BUGDBSUPPORT, $BUGDBURL, $CVSSUPPORT, $CHATSUPPORT, $TRACSUPPORT;
global $CHECKLOGIN_WIKINAME, $TBMAINSITE;
global $CHECKLOGIN_WIKINAME, $TBMAINSITE, $ISALTDOMAIN;
global $THISHOMEBASE;
global $currentusage, $FANCYBANNER, $ELABINELAB, $PLABSUPPORT;
global $WIKIDOCURL, $FORUMURL;
......@@ -794,7 +794,7 @@ function WRITESIDEBAR() {
else {
NavMenuButton("Projects on Emulab", "$TBDOCBASE/projectlist.php3");
}
if ($TBMAINSITE) {
if ($TBMAINSITE && !$ISALTDOMAIN) {
NavMenuButton("<font color=red>In Memoriam</font>",
"$TBDOCBASE/jay.php");
}
......@@ -933,7 +933,7 @@ function PAGEBEGINNING( $title, $nobanner = 0, $nocontent = 0,
$extra_headers = NULL, $view = NULL ) {
global $BASEPATH, $TBMAINSITE, $THISHOMEBASE, $ELABINELAB, $FANCYBANNER;
global $TBDIR, $WWW;
global $MAINPAGE;
global $MAINPAGE, $ISALTDOMAIN;
global $TBDOCBASE, $GENIRACK;
global $autorefresh, $currentusage, $javascript_debug, $login_user;
global $noAnalytics;
......@@ -968,7 +968,7 @@ function PAGEBEGINNING( $title, $nobanner = 0, $nocontent = 0,
echo "<!-- [if gt IE 6.0]><style type=\"text/css\">".
".menu ul li a:hover ul { top: 18px; }</style><![endif]> -->\n";
if ($TBMAINSITE) {
if ($TBMAINSITE && !$ISALTDOMAIN) {
echo "<meta name=\"keywords\" ".
"content=\"network, emulation, internet, emulator, ".
"mobile, wireless, robotic\">\n";
......@@ -1047,7 +1047,7 @@ function PAGEBEGINNING( $title, $nobanner = 0, $nocontent = 0,
# NOTE: This has to come before any images in the div for the
# float to work correctly.
#
if (!$TBMAINSITE) {
if (!$TBMAINSITE || $ISALTDOMAIN) {
echo "<a class='rightsidebuiltwith' ".
"href='http://www.emulab.net'>";
echo "<img src='$BASEPATH/fancy-builtwith.png'></a>\n";
......@@ -1129,9 +1129,10 @@ function PAGEBEGINNING( $title, $nobanner = 0, $nocontent = 0,
function FINISHSIDEBAR($nocontent = 0)
{
global $TBMAINSITE, $TBBASE, $BASEPATH, $currentusage, $login_user;
global $ISALTDOMAIN;
if (!$nocontent) {
if (!$TBMAINSITE) {
if (!$TBMAINSITE || $ISALTDOMAIN) {
#
# It is a violation of Emulab licensing restrictions to remove
# this logo!
......
......@@ -282,7 +282,7 @@ else {
<table align=center class=stealth border=0>
<tr><td class=stealth align=center><h1>News</h1></td></tr>
<?php
if ($TBMAINSITE && ! (isset($single) && $single) && !$protogeni) {
if ($TBMAINSITE && !$ISALTDOMAIN && ! (isset($single) && $single) && !$protogeni) {
echo "<tr><td class=stealth align=center>
<a href = 'doc/changelog.php3'>
(Changelog/Technical Details)</a></td></tr>\n";
......
......@@ -67,7 +67,7 @@ echo "<b>Tabular views: <a href='nodecontrol_list.php3?showtype=summary'>summary
<a href='nodecontrol_list.php3?showtype=pcs'>pcs</a>,
<a href='nodecontrol_list.php3?showtype=wireless'>
wireless</a>,";
if ($TBMAINSITE) {
if ($TBMAINSITE && !$ISALTDOMAIN) {
echo " <a href='nodecontrol_list.php3?showtype=widearea&typefilter=pcpg,pcpg-i2'>protogeni</a>,";
}
echo " <a href='nodecontrol_list.php3?showtype=widearea'>widearea</a>";
......
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