aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/filesystem.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2013-09-26 15:34:44 +0200
committerJoas Schilling <nickvergessen@gmx.de>2013-09-26 15:34:44 +0200
commit7525c49d454e1ff4a156709ea9ecc1dc0b28dd6e (patch)
tree9a7cf0bb2f985be79c51d4d0a1743a90b5532404 /phpBB/phpbb/filesystem.php
parente8303bc3199081d1f9f0679d3b98298ccdc49deb (diff)
downloadforums-7525c49d454e1ff4a156709ea9ecc1dc0b28dd6e.tar
forums-7525c49d454e1ff4a156709ea9ecc1dc0b28dd6e.tar.gz
forums-7525c49d454e1ff4a156709ea9ecc1dc0b28dd6e.tar.bz2
forums-7525c49d454e1ff4a156709ea9ecc1dc0b28dd6e.tar.xz
forums-7525c49d454e1ff4a156709ea9ecc1dc0b28dd6e.zip
[ticket/11852] Split filesystem and path_helper into 2 classes
PHPBB3-11852
Diffstat (limited to 'phpBB/phpbb/filesystem.php')
-rw-r--r--phpBB/phpbb/filesystem.php145
1 files changed, 0 insertions, 145 deletions
diff --git a/phpBB/phpbb/filesystem.php b/phpBB/phpbb/filesystem.php
index 662b6b866e..dbfaebe0fa 100644
--- a/phpBB/phpbb/filesystem.php
+++ b/phpBB/phpbb/filesystem.php
@@ -23,151 +23,6 @@ if (!defined('IN_PHPBB'))
*/
class filesystem
{
- /** @var \phpbb\symfony_request */
- protected $symfony_request;
-
- /** @var string */
- protected $phpbb_root_path;
-
- /** @var string */
- protected $adm_relative_path;
-
- /** @var string */
- protected $php_ext;
-
- /** @var string */
- protected $web_root_path;
-
- /**
- * Constructor
- *
- * @param \phpbb\symfony_request $symfony_request
- * @param string $phpbb_root_path Relative path to phpBB root
- * @param string $php_ext PHP extension (php)
- */
- public function __construct(\phpbb\symfony_request $symfony_request, $phpbb_root_path, $php_ext, $adm_relative_path = null)
- {
- $this->symfony_request = $symfony_request;
- $this->phpbb_root_path = $phpbb_root_path;
- $this->php_ext = $php_ext;
- $this->adm_relative_path = $adm_relative_path;
- }
-
- /**
- * Get the phpBB root path
- *
- * @return string
- */
- public function get_phpbb_root_path()
- {
- return $this->phpbb_root_path;
- }
-
- /**
- * Get the adm root path
- *
- * @return string
- */
- public function get_adm_relative_path()
- {
- return $this->adm_relative_path;
- }
-
- /**
- * Get the php extension
- *
- * @return string
- */
- public function get_php_ext()
- {
- return $this->php_ext;
- }
-
- /**
- * Update a path to the correct relative root path
- *
- * This replaces $phpbb_root_path . some_url with
- * get_web_root_path() . some_url OR if $phpbb_root_path
- * is not at the beginning of $path, just prepends the
- * web root path
- *
- * @param string $path The path to be updated
- * @return string
- */
- public function update_web_root_path($path)
- {
- $web_root_path = $this->get_web_root_path($this->symfony_request);
-
- if (strpos($path, $this->phpbb_root_path) === 0)
- {
- $path = substr($path, strlen($this->phpbb_root_path));
- }
-
- return $web_root_path . $path;
- }
-
- /**
- * Get a relative root path from the current URL
- *
- * @return string
- */
- public function get_web_root_path()
- {
- if ($this->symfony_request === null)
- {
- return $this->phpbb_root_path;
- }
-
- if (null !== $this->web_root_path)
- {
- return $this->web_root_path;
- }
-
- // Path info (e.g. /foo/bar)
- $path_info = $this->clean_path($this->symfony_request->getPathInfo());
-
- // Full request URI (e.g. phpBB/app.php/foo/bar)
- $request_uri = $this->symfony_request->getRequestUri();
-
- // Script name URI (e.g. phpBB/app.php)
- $script_name = $this->symfony_request->getScriptName();
-
- /*
- * If the path info is empty (single /), then we're not using
- * a route like app.php/foo/bar
- */
- if ($path_info === '/')
- {
- return $this->web_root_path = $this->phpbb_root_path;
- }
-
- // How many corrections might we need?
- $corrections = substr_count($path_info, '/');
-
- /*
- * If the script name (e.g. phpBB/app.php) exists in the
- * requestUri (e.g. phpBB/app.php/foo/template), then we
- * are have a non-rewritten URL.
- */
- if (strpos($request_uri, $script_name) === 0)
- {
- /*
- * Append ../ to the end of the phpbb_root_path as many times
- * as / exists in path_info
- */
- return $this->web_root_path = $this->phpbb_root_path . str_repeat('../', $corrections);
- }
-
- /*
- * If we're here it means we're at a re-written path, so we must
- * correct the relative path for web URLs. We must append ../
- * to the end of the root path as many times as / exists in path_info
- * less one time (because the script, e.g. /app.php, doesn't exist in
- * the URL)
- */
- return $this->web_root_path = $this->phpbb_root_path . str_repeat('../', $corrections - 1);
- }
-
/**
* Eliminates useless . and .. components from specified path.
*