From ed527755346bb4b01689e85b0be12de8a463dfdb Mon Sep 17 00:00:00 2001
From: Leigh B Stoller <stoller@flux.utah.edu>
Date: Mon, 20 Apr 2015 12:43:04 -0600
Subject: [PATCH] Changes to includes; need instance_defs.php in
 quickvm_sup.php.

---
 www/aptui/create-dataset.php | 4 ++--
 www/aptui/instantiate.php    | 4 ++--
 www/aptui/landing.php        | 4 ++--
 www/aptui/manage_profile.php | 4 ++--
 www/aptui/ppstart.php        | 4 ++--
 www/aptui/show-dataset.php   | 6 +++---
 www/aptui/show-profile.php   | 4 ++--
 www/aptui/status.php         | 4 ++--
 8 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/www/aptui/create-dataset.php b/www/aptui/create-dataset.php
index 4d07c4e27..66fff6784 100644
--- a/www/aptui/create-dataset.php
+++ b/www/aptui/create-dataset.php
@@ -25,8 +25,8 @@ chdir("..");
 include("defs.php3");
 chdir("apt");
 include("quickvm_sup.php");
-include("profile_defs.php");
-include("instance_defs.php");
+include_once("profile_defs.php");
+include_once("instance_defs.php");
 # Must be after quickvm_sup.php since it changes the auth domain.
 $page_title = "Create Dataset";
 
diff --git a/www/aptui/instantiate.php b/www/aptui/instantiate.php
index b18e2394b..9aa4b48df 100755
--- a/www/aptui/instantiate.php
+++ b/www/aptui/instantiate.php
@@ -28,8 +28,8 @@ include_once("geni_defs.php");
 include_once("webtask.php");
 chdir("apt");
 include("quickvm_sup.php");
-include("instance_defs.php");
-include("profile_defs.php");
+include_once("instance_defs.php");
+include_once("profile_defs.php");
 $page_title = "Instantiate a Profile";
 $dblink = GetDBLink("sa");
 
diff --git a/www/aptui/landing.php b/www/aptui/landing.php
index dbcad88b7..02d53a39a 100644
--- a/www/aptui/landing.php
+++ b/www/aptui/landing.php
@@ -1,6 +1,6 @@
 <?php
 #
-# Copyright (c) 2000-2014 University of Utah and the Flux Group.
+# Copyright (c) 2000-2015 University of Utah and the Flux Group.
 # 
 # {{{EMULAB-LICENSE
 # 
@@ -26,7 +26,7 @@ include("defs.php3");
 include_once("geni_defs.php");
 chdir("apt");
 include("quickvm_sup.php");
-include("instance_defs.php");
+include_once("instance_defs.php");
 
 #
 # Get current user but make sure coming in on SSL.
diff --git a/www/aptui/manage_profile.php b/www/aptui/manage_profile.php
index 7fc8cd66a..4710e9abc 100644
--- a/www/aptui/manage_profile.php
+++ b/www/aptui/manage_profile.php
@@ -26,8 +26,8 @@ include("defs.php3");
 include_once("webtask.php");
 chdir("apt");
 include("quickvm_sup.php");
-include("profile_defs.php");
-include("instance_defs.php");
+include_once("profile_defs.php");
+include_once("instance_defs.php");
 # Must be after quickvm_sup.php since it changes the auth domain.
 include_once("../session.php");
 $page_title = "Manage Profile";
diff --git a/www/aptui/ppstart.php b/www/aptui/ppstart.php
index a2bad528b..994769037 100644
--- a/www/aptui/ppstart.php
+++ b/www/aptui/ppstart.php
@@ -25,8 +25,8 @@ chdir("..");
 include("defs.php3");
 chdir("apt");
 include("quickvm_sup.php");
-include("profile_defs.php");
-include("instance_defs.php");
+include_once("profile_defs.php");
+include_once("instance_defs.php");
 
 #
 # Get current user.
diff --git a/www/aptui/show-dataset.php b/www/aptui/show-dataset.php
index 1d69f3193..1d79e6beb 100644
--- a/www/aptui/show-dataset.php
+++ b/www/aptui/show-dataset.php
@@ -27,9 +27,9 @@ include("lease_defs.php");
 include("imageid_defs.php");
 chdir("apt");
 include("quickvm_sup.php");
-include("dataset_defs.php");
-include("instance_defs.php");
-include("profile_defs.php");
+include_once("dataset_defs.php");
+include_once("instance_defs.php");
+include_once("profile_defs.php");
 # Must be after quickvm_sup.php since it changes the auth domain.
 $page_title = "Show Dataset";
 
diff --git a/www/aptui/show-profile.php b/www/aptui/show-profile.php
index b587ea69e..c6c468411 100644
--- a/www/aptui/show-profile.php
+++ b/www/aptui/show-profile.php
@@ -26,8 +26,8 @@ include("defs.php3");
 include_once("webtask.php");
 chdir("apt");
 include("quickvm_sup.php");
-include("profile_defs.php");
-include("instance_defs.php");
+include_once("profile_defs.php");
+include_once("instance_defs.php");
 $page_title = "Show Profile";
 
 #
diff --git a/www/aptui/status.php b/www/aptui/status.php
index bfbf0a02c..ea93b1965 100644
--- a/www/aptui/status.php
+++ b/www/aptui/status.php
@@ -28,8 +28,8 @@ include_once("geni_defs.php");
 include_once("webtask.php");
 chdir("apt");
 include("quickvm_sup.php");
-include("profile_defs.php");
-include("instance_defs.php");
+include_once("profile_defs.php");
+include_once("instance_defs.php");
 $page_title = "Experiment Status";
 $ajax_request = 0;
 
-- 
GitLab