Commit bae0ca71 authored by Mike Hibler's avatar Mike Hibler

Fix a couple of PHP warnings.

Something to do while sitting at home waiting for the stump remover...
parent 8f3eae23
...@@ -535,7 +535,7 @@ if (isset($types['garcia']) || ...@@ -535,7 +535,7 @@ if (isset($types['garcia']) ||
($expstate == $TB_EXPTSTATE_ACTIVE ? ($expstate == $TB_EXPTSTATE_ACTIVE ?
"?pid=$exp_pid&eid=$exp_eid" : "")); "?pid=$exp_pid&eid=$exp_eid" : ""));
if ($expstate == $TB_EXPTSTATE_SWAPPED) { if ($expstate == $TB_EXPTSTATE_SWAPPED) {
if ($types['static-mica2']) { if (isset($types['static-mica2']) && $types['static-mica2']) {
WRITESUBMENUBUTTON("Selector Applet", WRITESUBMENUBUTTON("Selector Applet",
"robotrack/selector.php3?". "robotrack/selector.php3?".
"pid=$exp_pid&eid=$exp_eid"); "pid=$exp_pid&eid=$exp_eid");
......
<?php <?php
# #
# EMULAB-COPYRIGHT # EMULAB-COPYRIGHT
# Copyright (c) 2007 University of Utah and the Flux Group. # Copyright (c) 2007, 2010 University of Utah and the Flux Group.
# All rights reserved. # All rights reserved.
# #
require("defs.php3"); require("defs.php3");
...@@ -53,7 +53,7 @@ if (!preg_match('/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $IP) || ...@@ -53,7 +53,7 @@ if (!preg_match('/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $IP) ||
$query_result = $query_result =
DBQueryFatal("select IP from widearea_nodeinfo where privkey='$privkey'"); DBQueryFatal("select IP from widearea_nodeinfo where privkey='$privkey'");
if (! mysql_num_rows($query_result)) { if (! mysql_num_rows($query_result)) {
SPITSTATUS(WASTATUS_PRIVKEY); SPITSTATUS(WASTATUS_BADPRIVKEY);
return; 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