Commit 0a33df36 authored by Kirk Webb's avatar Kirk Webb

Fixes to prior commit. Restore accidentally removed pnet start page.

parent ba77f01b
......@@ -36,7 +36,7 @@ $PNET_DOMVIEW = array('hide_sidebar' => 0, 'hide_banner' => 0,
'hide_copyright' => 0, 'show_pnet' => 1);
$ALTERNATE_DOMAINS[] =
array('phantom',
array('/phantom/',
array('THISHOMEBASE' => 'PhantomNet',
'DOMVIEW' => $PNET_DOMVIEW
));
......
......@@ -670,9 +670,10 @@ function SetDomainDefs()
{
global $WWWHOST, $OURDOMAIN, $WWW, $THISHOMEBASE, $TBAUTHDOMAIN, $TBBASE;
global $TBDOCBASE, $TBWWW, $WIKINODE, $TBMAINSITE;
global $ALTERNATE_DOMAINS;
global $ALTERNATE_DOMAINS, $DOMVIEW;
foreach ($ALTERNATE_DOMAINS as list($dpat, $ovr)) {
foreach ($ALTERNATE_DOMAINS as $altdom) {
list($dpat, $ovr) = $altdom;
if (preg_match($dpat, $_SERVER['SERVER_NAME']) == 1) {
# Replacement defs derived from the virtual domain itself.
$WWWHOST = $_SERVER['SERVER_NAME'];
......
......@@ -1487,7 +1487,7 @@ function GETUSERVIEW() {
# Get a view, based on incoming virtual domain name. See SetDomainDefs()
# in defs.php3 for more details.
#
function GETDOMAINVIEW() {
function GETDOMVIEW() {
global $DOMVIEW;
if (isset($DOMVIEW)) {
......
<?php
#
# Copyright (c) 2014 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
# This file is part of the Emulab network testbed software.
#
# This file is free software: you can redistribute it and/or modify it
# under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation, either version 3 of the License, or (at
# your option) any later version.
#
# This file is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
# License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this file. If not, see <http://www.gnu.org/licenses/>.
#
# }}}
#
require("defs.php3");
$optargs = OptionalPageArguments("stayhome", PAGEARG_BOOLEAN);
#
# The point of this is to redirect logged in users to their My Emulab
# page.
#
CheckRedirect();
PAGEHEADER("PhantomNet - Mobility Testbed", NULL, $RSS_HEADER_PNNEWS);
#
# Show special banner message, if set.
#
$message = TBGetSiteVar("web/banner");
if ($message != "") {
echo "<center><font color=Red size=+1>\n";
echo "$message\n";
echo "</font></center><br>\n";
}
#
# PhantomNet front page content.
#
readfile("index-phantomnet.html");
#
# Standard Testbed Footer
#
PAGEFOOTER();
?>
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