From c0632cabbae6575ebe1cde0847f54e2decf3f63e Mon Sep 17 00:00:00 2001
From: Leigh B Stoller <stoller@flux.utah.edu>
Date: Thu, 5 Apr 2012 12:26:18 -0600
Subject: [PATCH] Bug Fix: Print out URNs in addition to HRNs.

---
 www/genihistory.php | 20 ++++++++++++++++----
 www/genislices.php  |  4 ++--
 www/showslice.php   |  4 ++--
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/www/genihistory.php b/www/genihistory.php
index 6eee1042f..7dbbe72fa 100644
--- a/www/genihistory.php
+++ b/www/genihistory.php
@@ -72,8 +72,8 @@ if (isset($showtypes["aggregates"])) {
     $table = array('#id'	   => 'aggregate',
 		   '#title'        => "Aggregate History",
 		   '#headings'     => array("idx"          => "ID",
-					    "slice_hrn"    => "Slice HRN",
-					    "creator_hrn"  => "Creator HRN",
+					    "slice_hrn"    => "Slice HRN/URN",
+					    "creator_hrn"  => "Creator HRN/URN",
 					    "created"      => "Created",
 					    "Destroyed"    => "Destroyed",
 					    "Manifest"     => "Manifest"));
@@ -85,12 +85,24 @@ if (isset($showtypes["aggregates"])) {
 	    $uuid        = $row["uuid"];
 	    $slice_hrn   = $row["slice_hrn"];
 	    $creator_hrn = $row["creator_hrn"];
+	    $slice_urn   = $row["slice_urn"];
+	    $creator_urn = $row["creator_urn"];
 	    $created     = $row["created"];
 	    $destroyed   = $row["destroyed"];
 
+	    # If we have urns, show those instead.
+	    $slice_info = $slice_hrn;
+	    if (isset($slice_urn)) {
+		$slice_info = "$slice_urn";
+	    }
+	    $creator_info = $creator_hrn;
+	    if (isset($creator_urn)) {
+		$creator_info = "$creator_urn";
+	    }
+
 	    $tablerow = array("idx"       => $idx,
-			      "hrn"       => $slice_hrn,
-			      "creator"   => $creator_hrn,
+			      "hrn"       => $slice_info,
+			      "creator"   => $creator_info,
 			      "created"   => $created,
 			      "destroyed" => $destroyed);
 
diff --git a/www/genislices.php b/www/genislices.php
index 8d4535687..5a9ff8d6b 100644
--- a/www/genislices.php
+++ b/www/genislices.php
@@ -1,7 +1,7 @@
 <?php
 #
 # EMULAB-COPYRIGHT
-# Copyright (c) 2000-2011 University of Utah and the Flux Group.
+# Copyright (c) 2000-2012 University of Utah and the Flux Group.
 # All rights reserved.
 #
 include("defs.php3");
@@ -39,7 +39,7 @@ else {
 #
 PAGEHEADER("Geni Slice List");
 
-if (! $isadmin) {
+if (! ($isadmin || STUDLY())) {
     USERERROR("You do not have permission to view Geni slice list!", 1);
 }
 
diff --git a/www/showslice.php b/www/showslice.php
index 1036eecc4..5b000c222 100644
--- a/www/showslice.php
+++ b/www/showslice.php
@@ -1,7 +1,7 @@
 <?php
 #
 # EMULAB-COPYRIGHT
-# Copyright (c) 2000-2011 University of Utah and the Flux Group.
+# Copyright (c) 2000-2012 University of Utah and the Flux Group.
 # All rights reserved.
 #
 include("defs.php3");
@@ -32,7 +32,7 @@ if (!isset($showtype)) {
 #
 PAGEHEADER("Geni Slice");
 
-if (! $isadmin) {
+if (! ($isadmin || STUDLY())) {
     USERERROR("You do not have permission to view Geni slices!", 1);
 }
 
-- 
GitLab