From ea56b6c77022e4f98908aae9f346bb725a14de7e Mon Sep 17 00:00:00 2001
From: Joseph White <jpwhite4@buffalo.edu>
Date: Tue, 25 Apr 2017 14:34:41 -0400
Subject: [PATCH 1/2] Remove unused code.

Looks like this code dates back to early 2011. At some point the
main implementation must have been removed but these changes were
erroneously left in.
---
 html/controllers/session_pool.php | 102 ------------------------------
 html/gui/js/Viewer.js             |   4 +-
 html/index.php                    |  25 --------
 3 files changed, 1 insertion(+), 130 deletions(-)
 delete mode 100644 html/controllers/session_pool.php

diff --git a/html/controllers/session_pool.php b/html/controllers/session_pool.php
deleted file mode 100644
index 7f49b6e2ba..0000000000
--- a/html/controllers/session_pool.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-
-   session_start();
-   
-   $response = array();
-   
-   // --------------------------------------
-   
-   assert_variable_set('operation');
-   assert_variable_set('variable');
-         
-   // --------------------------------------
-        
-   $variable = $_POST['variable'];
-   $operation = $_POST['operation'];
-   
-   // --------------------------------------
-   
-   // When setting/getting session variables this way, it is VERY important that certain
-   // keys (variable names) be written and accessed via this controller
-            
-   $allowed_names = array('cached_call');
-
-   // --------------------------------------
-      
-   switch($operation) {
-   
-      case "set_variable":
-        
-         if (!in_array($variable, $allowed_names)) {
-         
-            $response['success'] = false;
-            $response['message'] = "invalid use of this controller.  write access denied";   
-   
-            echo json_encode($response);         
-            
-            exit;
-            
-         }
-
-         assert_variable_set('value');
-                  
-         $_SESSION[$variable] = $_POST['value'];
-         
-         $response['success'] = true;
-         
-         break;
-   
-      case "get_variable":
-
-         if (!in_array($variable, $allowed_names)) {
-         
-            $response['success'] = false;
-            $response['message'] = "invalid use of this controller.  read access denied";   
-   
-            echo json_encode($response);         
-            
-            exit;
-            
-         }
-               
-         if (isset($_SESSION[$variable])) {
- 
-            $response['success'] = true;
-            $response[$variable] = $_SESSION[$variable];         
-            
-         }
-         else {
-         
-            $response['success'] = false;
-            $response['message'] = 'variable not set';           
-         
-         }
-      
-         break;
-         
-      default:
-      
-         $response['success'] = false;
-         $response['message'] = "unknown operation $operation";   
-         
-   }//switch
-      
-   echo json_encode($response);
-   
-   // ========================================================
-   
-   function assert_variable_set($var) {
- 
-      if (!isset($_POST[$var])) {
-   
-         $response['success'] = false;
-         $response['message'] = "$var not specified";   
-   
-         echo json_encode($response);
-         exit;
-   
-      }//if
-        
-   }//assert_variable_set
-   
-?>
\ No newline at end of file
diff --git a/html/gui/js/Viewer.js b/html/gui/js/Viewer.js
index e6bbcd9553..7ca58135d6 100644
--- a/html/gui/js/Viewer.js
+++ b/html/gui/js/Viewer.js
@@ -430,7 +430,7 @@ Ext.extend(CCR.xdmod.ui.Viewer, Ext.Viewport, {
             continue;
           }
           tabPanel.add(tabInstance);
-          if (tab.isDefault == true && !isCallCached) {
+          if (tab.isDefault) {
             tabToken = tabToken || mainTabToken + CCR.xdmod.ui.tokenDelimiter + tab.tab;
           }
         }
@@ -439,8 +439,6 @@ Ext.extend(CCR.xdmod.ui.Viewer, Ext.Viewport, {
           mainPanel.el.unmask();
         }
 
-        consultCallCache();
-
         //Conditionally present the profile if an e-mail address has not been set
         xsedeProfilePrompt();
 
diff --git a/html/index.php b/html/index.php
index f81acad09e..f013d3d644 100644
--- a/html/index.php
+++ b/html/index.php
@@ -491,8 +491,6 @@ function isReferrer($referrer)
 
       <script type="text/javascript">
 
-         var isCallCached = false;
-         var consultCallCache = function() {};
          var xsedeProfilePrompt = function() {};
 
          <?php if (!$userLoggedIn): ?>
@@ -511,18 +509,6 @@ function isReferrer($referrer)
          });
          <?php else: ?>
          <?php
-            if (isset($_SESSION['cached_call']) && !empty($_SESSION['cached_call'])) {
-         ?>
-
-            isCallCached = true;
-            consultCallCache = function() { CCR.xdmod.ui.Viewer.<?php print $_SESSION['cached_call']; ?> }
-
-         <?php
-
-               unset($_SESSION['cached_call']);
-
-            }
-
             // ==============================================
 
             $profile_editor_init_flag = '';
@@ -594,17 +580,6 @@ function isReferrer($referrer)
          <iframe id="x-history-frame"></iframe>
       </form>
 
-      <?php if (!$userLoggedIn): ?>
-      <!-- For caching calls (e.g. goToChart(...), made when an image thumbnail is clicked) -->
-      <form name="function_call_cacher" class="x-hidden" method="POST" action="index.php">
-         <input type="hidden" id="cached_call" name="cached_call" value="">
-      </form>
-      <?php endif; ?>
-
-      <div class="x-hidden">
-         <iframe name="pdf_target_frame"></iframe>
-      </div>
-
       <div id="viewer"> </div>
 
       <noscript>

From cb1af802ccd812f181c5707f98a6576accfda2e0 Mon Sep 17 00:00:00 2001
From: Joseph White <jpwhite4@buffalo.edu>
Date: Tue, 25 Apr 2017 16:07:24 -0400
Subject: [PATCH 2/2] Change indentation so that eslint is happy(ier).

---
 html/gui/js/Viewer.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/html/gui/js/Viewer.js b/html/gui/js/Viewer.js
index 7ca58135d6..8c6ed921e7 100644
--- a/html/gui/js/Viewer.js
+++ b/html/gui/js/Viewer.js
@@ -421,18 +421,18 @@ Ext.extend(CCR.xdmod.ui.Viewer, Ext.Viewport, {
         var tabToken;
 
         for (var i = 0; i < tabs.length; i++) {
-          var tab = tabs[i];
-          tab.mainTabToken = mainTabToken;
-          tab.id = tab.tab;
+            var tab = tabs[i];
+            tab.mainTabToken = mainTabToken;
+            tab.id = tab.tab;
 
-          var tabInstance = CCR.getInstance(tab.javascriptReference, tab.javascriptClass, tab);
-          if (!tabInstance) {
-            continue;
-          }
-          tabPanel.add(tabInstance);
-          if (tab.isDefault) {
-            tabToken = tabToken || mainTabToken + CCR.xdmod.ui.tokenDelimiter + tab.tab;
-          }
+            var tabInstance = CCR.getInstance(tab.javascriptReference, tab.javascriptClass, tab);
+            if (!tabInstance) {
+                continue;
+            }
+            tabPanel.add(tabInstance);
+            if (tab.isDefault) {
+                tabToken = tabToken || mainTabToken + CCR.xdmod.ui.tokenDelimiter + tab.tab;
+            }
         }
 
         if (mainPanel.el) {