@@ -200,7 +200,7 @@ |
||
| 200 | 200 | list($controller_service, $controller_method) = explode(':', $controller); |
| 201 | 201 | $controller_params = $symfony_request->attributes->get('_route_params'); |
| 202 | 202 | $controller_object = $this->phpbb_container->get($controller_service); |
| 203 | - $controller_class = get_class($controller_object); |
|
| 203 | + $controller_class = get_class($controller_object); |
|
| 204 | 204 | |
| 205 | 205 | $r = new \ReflectionMethod($controller_class, $controller_method); |
| 206 | 206 | $class_params = $r->getParameters(); |
@@ -15,77 +15,77 @@ |
||
| 15 | 15 | */ |
| 16 | 16 | class filemanager |
| 17 | 17 | { |
| 18 | - /** @var \phpbb\filesystem\filesystem */ |
|
| 19 | - protected $filesystem; |
|
| 18 | + /** @var \phpbb\filesystem\filesystem */ |
|
| 19 | + protected $filesystem; |
|
| 20 | 20 | |
| 21 | - /** @var \phpbb\user */ |
|
| 22 | - protected $user; |
|
| 21 | + /** @var \phpbb\user */ |
|
| 22 | + protected $user; |
|
| 23 | 23 | |
| 24 | - /** @var string */ |
|
| 25 | - protected $phpbb_root_path; |
|
| 24 | + /** @var string */ |
|
| 25 | + protected $phpbb_root_path; |
|
| 26 | 26 | |
| 27 | - /** @var string */ |
|
| 28 | - protected $user_dir = false; |
|
| 27 | + /** @var string */ |
|
| 28 | + protected $user_dir = false; |
|
| 29 | 29 | |
| 30 | - /** @var string */ |
|
| 31 | - protected $upload_dir = 'images/sitemaker_uploads/source/'; |
|
| 30 | + /** @var string */ |
|
| 31 | + protected $upload_dir = 'images/sitemaker_uploads/source/'; |
|
| 32 | 32 | |
| 33 | - /** |
|
| 34 | - * Constructor |
|
| 35 | - * |
|
| 36 | - * @param \phpbb\filesystem\filesystem $filesystem File system |
|
| 37 | - * @param \phpbb\user $user User object |
|
| 38 | - * @param string $phpbb_root_path phpBB root path |
|
| 39 | - */ |
|
| 40 | - public function __construct(\phpbb\filesystem\filesystem $filesystem, \phpbb\user $user, $phpbb_root_path) |
|
| 41 | - { |
|
| 42 | - $this->filesystem = $filesystem; |
|
| 43 | - $this->user = $user; |
|
| 44 | - $this->phpbb_root_path = $phpbb_root_path; |
|
| 45 | - } |
|
| 33 | + /** |
|
| 34 | + * Constructor |
|
| 35 | + * |
|
| 36 | + * @param \phpbb\filesystem\filesystem $filesystem File system |
|
| 37 | + * @param \phpbb\user $user User object |
|
| 38 | + * @param string $phpbb_root_path phpBB root path |
|
| 39 | + */ |
|
| 40 | + public function __construct(\phpbb\filesystem\filesystem $filesystem, \phpbb\user $user, $phpbb_root_path) |
|
| 41 | + { |
|
| 42 | + $this->filesystem = $filesystem; |
|
| 43 | + $this->user = $user; |
|
| 44 | + $this->phpbb_root_path = $phpbb_root_path; |
|
| 45 | + } |
|
| 46 | 46 | |
| 47 | - /** |
|
| 48 | - * @return string |
|
| 49 | - */ |
|
| 50 | - public function get_upload_dir() |
|
| 51 | - { |
|
| 52 | - return $this->upload_dir; |
|
| 53 | - } |
|
| 47 | + /** |
|
| 48 | + * @return string |
|
| 49 | + */ |
|
| 50 | + public function get_upload_dir() |
|
| 51 | + { |
|
| 52 | + return $this->upload_dir; |
|
| 53 | + } |
|
| 54 | 54 | |
| 55 | - /** |
|
| 56 | - * @return string |
|
| 57 | - */ |
|
| 58 | - public function get_upload_destination() |
|
| 59 | - { |
|
| 60 | - return $this->upload_dir . $this->get_user_dir(); |
|
| 61 | - } |
|
| 55 | + /** |
|
| 56 | + * @return string |
|
| 57 | + */ |
|
| 58 | + public function get_upload_destination() |
|
| 59 | + { |
|
| 60 | + return $this->upload_dir . $this->get_user_dir(); |
|
| 61 | + } |
|
| 62 | 62 | |
| 63 | - /** |
|
| 64 | - * @return string |
|
| 65 | - */ |
|
| 66 | - public function get_user_dir() |
|
| 67 | - { |
|
| 68 | - if (!$this->user_dir) |
|
| 69 | - { |
|
| 70 | - $this->set_user_dir(); |
|
| 71 | - } |
|
| 63 | + /** |
|
| 64 | + * @return string |
|
| 65 | + */ |
|
| 66 | + public function get_user_dir() |
|
| 67 | + { |
|
| 68 | + if (!$this->user_dir) |
|
| 69 | + { |
|
| 70 | + $this->set_user_dir(); |
|
| 71 | + } |
|
| 72 | 72 | |
| 73 | - return $this->user_dir; |
|
| 74 | - } |
|
| 73 | + return $this->user_dir; |
|
| 74 | + } |
|
| 75 | 75 | |
| 76 | - /** |
|
| 77 | - * @return string |
|
| 78 | - */ |
|
| 79 | - protected function set_user_dir() |
|
| 80 | - { |
|
| 81 | - // if user is not founder, they must have a directory |
|
| 82 | - $this->user_dir = ($this->user->data['user_type'] != USER_FOUNDER) ? 'users/' . $this->user->data['username'] . '/' : ''; |
|
| 76 | + /** |
|
| 77 | + * @return string |
|
| 78 | + */ |
|
| 79 | + protected function set_user_dir() |
|
| 80 | + { |
|
| 81 | + // if user is not founder, they must have a directory |
|
| 82 | + $this->user_dir = ($this->user->data['user_type'] != USER_FOUNDER) ? 'users/' . $this->user->data['username'] . '/' : ''; |
|
| 83 | 83 | |
| 84 | - $destination = $this->phpbb_root_path . $this->upload_dir . $this->user_dir; |
|
| 84 | + $destination = $this->phpbb_root_path . $this->upload_dir . $this->user_dir; |
|
| 85 | 85 | |
| 86 | - if (!is_dir($destination)) |
|
| 87 | - { |
|
| 88 | - $this->filesystem->mkdir($destination, 0755); |
|
| 89 | - } |
|
| 90 | - } |
|
| 86 | + if (!is_dir($destination)) |
|
| 87 | + { |
|
| 88 | + $this->filesystem->mkdir($destination, 0755); |
|
| 89 | + } |
|
| 90 | + } |
|
| 91 | 91 | } |