Changes to includes; need instance_defs.php in quickvm_sup.php.

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";
 

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");
 

www/aptui/landing.php

 <?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.

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";

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.

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";
 

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";
 
 #

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;