From c00bf864c4c2a947f58bfcd70cac99f15d05de45 Mon Sep 17 00:00:00 2001 From: vargenau Date: Wed, 17 Jul 2013 12:08:03 +0000 Subject: [PATCH] Use forge_get_config('groupdir_prefix') git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@8832 96ab9672-09ca-45d6-a79d-3d69d39ca109 --- g | 6 +++--- view.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/g b/g index aa1d05af8..6340a4e6f 100644 --- a/g +++ b/g @@ -117,7 +117,7 @@ if (! isset($group_id) || ! isset($project)) { define('ENABLE_RATEIT', $wc->getWikiConfig('ENABLE_RATEIT')); - define('UPLOAD_FILE_PATH', '/opt/groups/'.WIKI_NAME.'/www/uploads/'); + define('UPLOAD_FILE_PATH', forge_get_config('groupdir_prefix').'/'.WIKI_NAME.'/www/uploads/'); // define('UPLOAD_DATA_PATH', SERVER_URL . '/www/'.WIKI_NAME.'/uploads/'); if ($project->isPublic()) { define('UPLOAD_DATA_PATH', '/www/'.WIKI_NAME.'/uploads/'); @@ -225,8 +225,8 @@ if (! isset($group_id) || ! isset($project)) { define('ENABLE_REVERSE_DNS', false); // Web DAV location - define('DEFAULT_DUMP_DIR', "/opt/groups/".$group_name."/wikidump/"); - define('HTML_DUMP_DIR', "/opt/groups/".$group_name."/wikidumphtml/"); + define('DEFAULT_DUMP_DIR', forge_get_config('groupdir_prefix').'/'.$group_name."/wikidump/"); + define('HTML_DUMP_DIR', forge_get_config('groupdir_prefix').'/'.$group_name."/wikidumphtml/"); define('COMPRESS_OUTPUT', false); diff --git a/view.php b/view.php index d7c7a8dd1..255c86965 100644 --- a/view.php +++ b/view.php @@ -75,7 +75,7 @@ array_shift($arr); array_shift($arr); $path = join('/', $arr); -$basepath = realpath('/opt/groups/' . $project->getUnixName() . '/www/uploads/'); +$basepath = realpath(forge_get_config('groupdir_prefix') .'/'. $project->getUnixName() . '/www/uploads/'); $filepath = realpath($basepath . '/' . $path); $filename = basename($filepath); -- 2.42.0