Commit 1b67821c authored by Kirk Webb's avatar Kirk Webb

* Add Princeton IP subnet to the allowed list for viewing plabstats.php3

* Mention PlanetLab AUP on EZ creation page.
* Change language a bit RE PlanetLab AUP on the Portal doc page.
parent cfa878a2
......@@ -291,10 +291,13 @@ function SPITFORM($formfields, $errors)
<p><b>To finish creating your slice, edit the
following information as needed, and click
Submit. PlanetLab <font size=+1 color=red>
strongly advises </font> users
requires</font> users
to provide detail on what their slice will
be doing via it's description (i.e. what kind
of network traffic it will be producing).
Be sure to read over the
<a href='https://www.planet-lab.org/php/aup/'>
PlanetLab AUP</a> if you haven't already.
</b></p>
</center>\n";
} else {
......
......@@ -9,10 +9,12 @@
<h3>PlanetLab Policies</h3>
Before you start using Emulab's PlanetLab portal, be sure you have
Before you start using Emulab's PlanetLab Portal, be sure you have
read over the <a href="http://www.planet-lab.org/php/aup/"> PlanetLab
Acceptable Use Policy</a>. During the slice creation process, you will
be asked to provide a slice descrition. Please be detailed and accurate
Acceptable Use Policy</a>. Understand that your use of PlanetLab via
Emulab's portal is bound by the policies contained in this document.
During the slice creation process, you will
be asked to provide a slice description. Please be detailed and accurate
regarding the type of activity you expect your slice to produce, including
the nature and frequency of the network traffic involved.
......
......@@ -32,12 +32,14 @@ else {
if (!isset($SSL_PROTOCOL)) {
USERERROR("Must use https:// to access this page!", 1);
}
$subnet = long2ip(ip2long($REMOTE_ADDR) & ip2long("255.255.255.0"));
$subnet_c = long2ip(ip2long($REMOTE_ADDR) & ip2long("255.255.255.0"));
$subnet_b = long2ip(ip2long($REMOTE_ADDR) & ip2long("255.255.0.0"));
if (strcmp($subnet, "155.98.60.0") &&
strcmp($subnet, "155.98.63.0") &&
strcmp($subnet, "134.134.248.0") &&
strcmp($subnet, "134.134.136.0")) {
if (strcmp($subnet_c, "155.98.60.0") &&
strcmp($subnet_c, "155.98.63.0") &&
strcmp($subnet_c, "134.134.248.0") &&
strcmp($subnet_c, "134.134.136.0") &&
strcmp($subnet_b, "128.112.0.0")) {
USERERROR("You do not have permission to view this page ($subnet)!",
1);
}
......
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