@@ -11,13 +11,10 @@ |
||
| 11 | 11 | |
| 12 | 12 | namespace Icybee\Modules\Files\Block; |
| 13 | 13 | |
| 14 | -use ICanBoogie\I18n; |
|
| 15 | 14 | use ICanBoogie\Operation; |
| 16 | - |
|
| 17 | 15 | use Brickrouge\Element; |
| 18 | 16 | use Brickrouge\Document; |
| 19 | 17 | use Brickrouge\Form; |
| 20 | - |
|
| 21 | 18 | use Icybee\Modules\Files as Root; |
| 22 | 19 | use Icybee\Modules\Files\File; |
| 23 | 20 | |
@@ -36,8 +36,8 @@ discard block |
||
| 36 | 36 | { |
| 37 | 37 | parent::add_assets($document); |
| 38 | 38 | |
| 39 | - $document->css->add(Root\DIR . 'public/edit.css'); |
|
| 40 | - $document->js->add(Root\DIR . 'public/edit.js'); |
|
| 39 | + $document->css->add(Root\DIR.'public/edit.css'); |
|
| 40 | + $document->js->add(Root\DIR.'public/edit.js'); |
|
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | protected function lazy_get_values() |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | |
| 53 | 53 | protected function lazy_get_children() |
| 54 | 54 | { |
| 55 | - $folder = \ICanBoogie\REPOSITORY . 'tmp'; |
|
| 55 | + $folder = \ICanBoogie\REPOSITORY.'tmp'; |
|
| 56 | 56 | |
| 57 | 57 | if (!is_writable($folder)) |
| 58 | 58 | { |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | |
| 61 | 61 | Element::CHILDREN => [ |
| 62 | 62 | |
| 63 | - $this->t('The folder %folder is not writable !', [ '%folder' => $folder ]) |
|
| 63 | + $this->t('The folder %folder is not writable !', ['%folder' => $folder]) |
|
| 64 | 64 | |
| 65 | 65 | ] |
| 66 | 66 | ]; |
@@ -117,9 +117,9 @@ discard block |
||
| 117 | 117 | |
| 118 | 118 | Form::LABEL => 'file', |
| 119 | 119 | Element::REQUIRED => empty($nid), |
| 120 | - \Brickrouge\File::FILE_WITH_LIMIT => $this->app->site->metas[$this->module->flat_id . '.max_file_size'], |
|
| 120 | + \Brickrouge\File::FILE_WITH_LIMIT => $this->app->site->metas[$this->module->flat_id.'.max_file_size'], |
|
| 121 | 121 | Element::WEIGHT => -100, |
| 122 | - \Brickrouge\File::T_UPLOAD_URL => Operation::encode($this->module->id . '/upload'), |
|
| 122 | + \Brickrouge\File::T_UPLOAD_URL => Operation::encode($this->module->id.'/upload'), |
|
| 123 | 123 | |
| 124 | 124 | 'value' => $path |
| 125 | 125 | |
@@ -14,7 +14,6 @@ |
||
| 14 | 14 | use ICanBoogie\Errors; |
| 15 | 15 | use ICanBoogie\HTTP\Request; |
| 16 | 16 | use ICanBoogie\HTTP\File as HTTPFile; |
| 17 | - |
|
| 18 | 17 | use Icybee\Modules\Files\File; |
| 19 | 18 | use Icybee\Modules\Files\Module; |
| 20 | 19 | |
@@ -111,17 +111,17 @@ discard block |
||
| 111 | 111 | if ($file && $file->is_valid) |
| 112 | 112 | { |
| 113 | 113 | $filename = \ICanBoogie\generate_v4_uuid(); |
| 114 | - $pathname = \ICanBoogie\REPOSITORY . 'tmp' . DIRECTORY_SEPARATOR . $filename; |
|
| 114 | + $pathname = \ICanBoogie\REPOSITORY.'tmp'.DIRECTORY_SEPARATOR.$filename; |
|
| 115 | 115 | |
| 116 | 116 | $file->move($pathname); |
| 117 | 117 | } |
| 118 | - else if ($path && strpos($path, \ICanBoogie\strip_root(\ICanBoogie\REPOSITORY . "files")) !== 0) |
|
| 118 | + else if ($path && strpos($path, \ICanBoogie\strip_root(\ICanBoogie\REPOSITORY."files")) !== 0) |
|
| 119 | 119 | { |
| 120 | 120 | $file = $this->resolve_request_file_from_pathname($path); |
| 121 | 121 | |
| 122 | 122 | if (!$file) |
| 123 | 123 | { |
| 124 | - $this->response->errors->add(File::HTTP_FILE, "Invalid or deleted file: %pathname", [ 'pathname' => $path ]); |
|
| 124 | + $this->response->errors->add(File::HTTP_FILE, "Invalid or deleted file: %pathname", ['pathname' => $path]); |
|
| 125 | 125 | } |
| 126 | 126 | } |
| 127 | 127 | |
@@ -161,7 +161,7 @@ discard block |
||
| 161 | 161 | $error_message = $errors->add( |
| 162 | 162 | File::HTTP_FILE, |
| 163 | 163 | "Maximum file size is :size Mb", |
| 164 | - [ ':size' => round($max_file_size / 1024) ] |
|
| 164 | + [':size' => round($max_file_size / 1024)] |
|
| 165 | 165 | ); |
| 166 | 166 | } |
| 167 | 167 | |
@@ -170,7 +170,7 @@ discard block |
||
| 170 | 170 | $error_message = $errors->add( |
| 171 | 171 | File::HTTP_FILE, |
| 172 | 172 | "Only the following file types are accepted: %accepted.", |
| 173 | - [ '%accepted' => implode(', ', $this->accept) |
|
| 173 | + ['%accepted' => implode(', ', $this->accept) |
|
| 174 | 174 | ]); |
| 175 | 175 | } |
| 176 | 176 | |
@@ -220,7 +220,7 @@ discard block |
||
| 220 | 220 | protected function resolve_request_file_from_pathname($pathname) |
| 221 | 221 | { |
| 222 | 222 | $filename = basename($pathname); |
| 223 | - $info_pathname = \ICanBoogie\REPOSITORY . 'tmp' . DIRECTORY_SEPARATOR . $filename . '.info'; |
|
| 223 | + $info_pathname = \ICanBoogie\REPOSITORY.'tmp'.DIRECTORY_SEPARATOR.$filename.'.info'; |
|
| 224 | 224 | |
| 225 | 225 | if (!file_exists($info_pathname)) |
| 226 | 226 | { |
@@ -12,12 +12,10 @@ |
||
| 12 | 12 | namespace Icybee\Modules\Files\Routing; |
| 13 | 13 | |
| 14 | 14 | use ICanBoogie\HTTP\FileResponse; |
| 15 | -use ICanBoogie\HTTP\Request; |
|
| 16 | 15 | use ICanBoogie\Routing\Controller; |
| 17 | 16 | use ICanBoogie\Binding\Routing\ControllerBindings; |
| 18 | 17 | use ICanBoogie\Binding\Routing\ForwardUndefinedPropertiesToApplication; |
| 19 | 18 | use ICanBoogie\Module\ControllerBindings as ModuleBindings; |
| 20 | - |
|
| 21 | 19 | use Icybee\Modules\Files\Binding\CoreBindings; |
| 22 | 20 | use Icybee\Modules\Files\File; |
| 23 | 21 | |
@@ -79,7 +79,7 @@ |
||
| 79 | 79 | return new FileResponse($pathname, $this->request, [ |
| 80 | 80 | |
| 81 | 81 | FileResponse::OPTION_ETAG => $pathname->hash, |
| 82 | - FileResponse::OPTION_FILENAME => $record->title . $record->extension, |
|
| 82 | + FileResponse::OPTION_FILENAME => $record->title.$record->extension, |
|
| 83 | 83 | FileResponse::OPTION_MIME => $record->mime |
| 84 | 84 | |
| 85 | 85 | ]); |
@@ -11,7 +11,7 @@ |
||
| 11 | 11 | */ |
| 12 | 12 | class DownloadColumn extends ManageBlock\Column |
| 13 | 13 | { |
| 14 | - public function __construct(ManageBlock $manager, $id, array $options=[]) |
|
| 14 | + public function __construct(ManageBlock $manager, $id, array $options = []) |
|
| 15 | 15 | { |
| 16 | 16 | parent::__construct($manager, $id, [ |
| 17 | 17 | |
@@ -29,7 +29,7 @@ |
||
| 29 | 29 | { |
| 30 | 30 | $value = $modifiers['size']; |
| 31 | 31 | |
| 32 | - if (in_array($value, [ 'l', 'm', 's' ])) |
|
| 32 | + if (in_array($value, ['l', 'm', 's'])) |
|
| 33 | 33 | { |
| 34 | 34 | $filters['size'] = $value; |
| 35 | 35 | } |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | */ |
| 26 | 26 | static public function encode($data) |
| 27 | 27 | { |
| 28 | - return strtr(base64_encode($data), [ '+' => '-', '/' => '_' ]); |
|
| 28 | + return strtr(base64_encode($data), ['+' => '-', '/' => '_']); |
|
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | /** |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | */ |
| 38 | 38 | static public function decode($data) |
| 39 | 39 | { |
| 40 | - return base64_decode(strtr($data, [ '-' => '+', '_' => '/' ])); |
|
| 40 | + return base64_decode(strtr($data, ['-' => '+', '_' => '/'])); |
|
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | /** |
@@ -12,7 +12,6 @@ |
||
| 12 | 12 | namespace Icybee\Modules\Files; |
| 13 | 13 | |
| 14 | 14 | use Brickrouge\Element; |
| 15 | -use ICanBoogie\I18n; |
|
| 16 | 15 | |
| 17 | 16 | class FileUpload extends \Brickrouge\File |
| 18 | 17 | { |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | |
| 38 | 38 | foreach ($details as $detail) |
| 39 | 39 | { |
| 40 | - $rc .= '<li>' . $detail . '</li>'; |
|
| 40 | + $rc .= '<li>'.$detail.'</li>'; |
|
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | $rc .= '</ul>'; |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | |
| 55 | 55 | 'class' => "icon-download-alt", |
| 56 | 56 | 'href' => $path, |
| 57 | - 'title' => $this->t('download', [], [ 'scope' => 'fileupload.element' ]) |
|
| 57 | + 'title' => $this->t('download', [], ['scope' => 'fileupload.element']) |
|
| 58 | 58 | |
| 59 | 59 | ]); |
| 60 | 60 | } |
@@ -14,7 +14,6 @@ |
||
| 14 | 14 | use ICanBoogie\Errors; |
| 15 | 15 | use ICanBoogie\HTTP\Request; |
| 16 | 16 | use ICanBoogie\HTTP\File as HTTPFile; |
| 17 | - |
|
| 18 | 17 | use Icybee\Modules\Files\File; |
| 19 | 18 | use Icybee\Modules\Files\Module; |
| 20 | 19 | |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | { |
| 28 | 28 | static $index; |
| 29 | 29 | |
| 30 | - return $index ?: $index = new FileStorageIndex(\ICanBoogie\REPOSITORY . 'files-index'); |
|
| 30 | + return $index ?: $index = new FileStorageIndex(\ICanBoogie\REPOSITORY.'files-index'); |
|
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | /** |
@@ -39,6 +39,6 @@ discard block |
||
| 39 | 39 | { |
| 40 | 40 | static $manager; |
| 41 | 41 | |
| 42 | - return $manager ?: $manager = new FileStorage(\ICanBoogie\REPOSITORY . 'files', $app->file_storage_index); |
|
| 42 | + return $manager ?: $manager = new FileStorage(\ICanBoogie\REPOSITORY.'files', $app->file_storage_index); |
|
| 43 | 43 | } |
| 44 | 44 | } |
@@ -12,12 +12,10 @@ |
||
| 12 | 12 | namespace Icybee\Modules\Files\Routing; |
| 13 | 13 | |
| 14 | 14 | use ICanBoogie\HTTP\FileResponse; |
| 15 | -use ICanBoogie\HTTP\Request; |
|
| 16 | 15 | use ICanBoogie\Routing\Controller; |
| 17 | 16 | use ICanBoogie\Binding\Routing\ControllerBindings; |
| 18 | 17 | use ICanBoogie\Binding\Routing\ForwardUndefinedPropertiesToApplication; |
| 19 | 18 | use ICanBoogie\Module\ControllerBindings as ModuleBindings; |
| 20 | - |
|
| 21 | 19 | use Icybee\Modules\Files\Binding\CoreBindings; |
| 22 | 20 | use Icybee\Modules\Files\File; |
| 23 | 21 | |
@@ -79,7 +79,7 @@ |
||
| 79 | 79 | return new FileResponse($pathname, $this->request, [ |
| 80 | 80 | |
| 81 | 81 | FileResponse::OPTION_ETAG => $pathname->hash, |
| 82 | - FileResponse::OPTION_FILENAME => $record->title . $record->extension, |
|
| 82 | + FileResponse::OPTION_FILENAME => $record->title.$record->extension, |
|
| 83 | 83 | FileResponse::OPTION_MIME => $record->mime |
| 84 | 84 | |
| 85 | 85 | ]); |