diff --git a/desktop.php b/desktop.php index da806b2..d173891 100644 --- a/desktop.php +++ b/desktop.php @@ -4,8 +4,9 @@ * @version $Id: desktop.php 2934 2015-06-03 13:23:22Z elena $ * */ - + require_once('php/config.php'); + // error_reporting(E_ALL); if (!isset($_POST['username'])) { header('Location: index.html'); @@ -13,8 +14,8 @@ } if (!isset($_POST['username'])) die('<a href="index.html">LOGIN SVP</a>'); - $usrMgr = new UserMgr(); + $sessionID = $usrMgr->init(); if ($sessionID === FALSE) { header('Location: index.html?error=1'); @@ -109,7 +110,6 @@ var gatewayTimeout = '<?php if (defined('GATEWAY_TIMEOUT')) echo GATEWAY_TIMEOUT; else echo 300000; ?>'; // in msec var logExecTime = <?php echo (defined('LOG_EXEC_TIME') && (LOG_EXEC_TIME === TRUE) ? 'true' : 'false'); ?>; - //create mask class (LoadMask for elements has been deprecated, use Ext.dom.Element.mask & Ext.dom.Element.unmask) var AMDAMask = new Ext.Class({ show : function(interactivePlot) @@ -175,7 +175,7 @@ if (response && response.statusText) { if (response.timedout) - alert('Request processing time exceeds gateway timeout.<br/>In case of parameter from Remote Bases : please re-launch the same request in 10 min,<br/>otherwise contact AMDA team'); + alert('Request processing time exceeds gateway timeout\n In case of parameter from Remote Bases : please re-launch the same request in 10 min,\n otherwise select "non-screen" FileOutput or contact AMDA team'); else alert(response.statusText); } diff --git a/js/app/models/PlotObjects/PlotObjectConfig.js b/js/app/models/PlotObjects/PlotObjectConfig.js index 5998ea8..bb780d4 100644 --- a/js/app/models/PlotObjects/PlotObjectConfig.js +++ b/js/app/models/PlotObjects/PlotObjectConfig.js @@ -224,7 +224,7 @@ Ext.define('amdaPlotObj.PlotObjectConfig', { ], availableFileOutputsForPng : [ - {'key' : 'INTERACTIVE', 'value' : 'Interactive mode'}, + {'key' : 'INTERACTIVE', 'value' : 'screen'}, {'key' : 'TGZ', 'value' : 'tar+gzip archive'}, {'key' : 'ZIP', 'value' : 'zip archive'} ], -- libgit2 0.21.2