You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2016/03/17 17:38:37 UTC
[02/11] airavata-php-gateway git commit: Changes in file paths.
Changes in file paths.
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/86fcae72
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/86fcae72
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/86fcae72
Branch: refs/heads/master
Commit: 86fcae72f23ff8e06efce8bbf9dfcd90cc4ec54a
Parents: 8ac4051
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Wed Mar 16 15:20:32 2016 -0400
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Wed Mar 16 15:20:32 2016 -0400
----------------------------------------------------------------------
app/controllers/FilemanagerController.php | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/86fcae72/app/controllers/FilemanagerController.php
----------------------------------------------------------------------
diff --git a/app/controllers/FilemanagerController.php b/app/controllers/FilemanagerController.php
index 127358f..710dc41 100644
--- a/app/controllers/FilemanagerController.php
+++ b/app/controllers/FilemanagerController.php
@@ -33,7 +33,11 @@ class FilemanagerController extends BaseController
}
*/
$DATA_ROOT = Config::get("pga_config.airavata")["experiment-data-absolute-path"];
- $data_path = $DATA_ROOT . "/" . $path;
+ if( strpos($path, $DATA_ROOT) !== false)
+ $data_path = $DATA_ROOT . "/" . $path;
+ else
+ $data_path = $path;
+
if (!file_exists( $data_path))
echo FileManager::msg(False, "$path does not exist");
if (is_dir( $data_path))