@@ -118,8 +118,9 @@ |
||
118 | 118 | function rotate($direction) |
119 | 119 | { |
120 | 120 | $degrees = 90; |
121 | - if ($direction == 2) |
|
122 | - $degrees = 270; |
|
121 | + if ($direction == 2) { |
|
122 | + $degrees = 270; |
|
123 | + } |
|
123 | 124 | $this->image = imagerotate($this->image, $degrees, 0); |
124 | 125 | } |
125 | 126 |
@@ -44,11 +44,13 @@ |
||
44 | 44 | |
45 | 45 | $this->getView()->registerJs("yiiDownloadAllLink = '" . Url::toRoute('files/default/zip') . "'", View::POS_BEGIN, 'yiiDownloadAllLink'); |
46 | 46 | |
47 | - if ($this->passFirst && sizeof($this->files) > 0) |
|
48 | - $this->files = array_slice($this->files, 1); |
|
47 | + if ($this->passFirst && sizeof($this->files) > 0) { |
|
48 | + $this->files = array_slice($this->files, 1); |
|
49 | + } |
|
49 | 50 | |
50 | - if (empty($this->files)) |
|
51 | - return null; |
|
51 | + if (empty($this->files)) { |
|
52 | + return null; |
|
53 | + } |
|
52 | 54 | |
53 | 55 | return $this->render('fileListWidget', [ |
54 | 56 | 'files' => $this->files, |
@@ -50,7 +50,8 @@ discard block |
||
50 | 50 | <?= $model->title ?> |
51 | 51 | </div> |
52 | 52 | </a> |
53 | - <?php else: ?> |
|
53 | + <?php else { |
|
54 | + : ?> |
|
54 | 55 | |
55 | 56 | |
56 | 57 | <div data-title="<?= $model->title ?>" |
@@ -78,7 +79,9 @@ discard block |
||
78 | 79 | <?= Yii::t('files', 'View') ?> |
79 | 80 | </a> |
80 | 81 | </li> |
81 | - <?php endif; ?> |
|
82 | + <?php endif; |
|
83 | +} |
|
84 | +?> |
|
82 | 85 | </ul> |
83 | 86 | |
84 | 87 | <?php endif; ?> |
@@ -27,18 +27,21 @@ discard block |
||
27 | 27 | public function __construct(array $data) |
28 | 28 | { |
29 | 29 | |
30 | - if (!isset($data['id'])) |
|
31 | - throw new BadRequestHttpException('ID of file is not set.'); |
|
30 | + if (!isset($data['id'])) { |
|
31 | + throw new BadRequestHttpException('ID of file is not set.'); |
|
32 | + } |
|
32 | 33 | |
33 | - if (!isset($data['title'])) |
|
34 | - throw new BadRequestHttpException('Title of file is not set.'); |
|
34 | + if (!isset($data['title'])) { |
|
35 | + throw new BadRequestHttpException('Title of file is not set.'); |
|
36 | + } |
|
35 | 37 | |
36 | 38 | $this->_title = $data['title']; |
37 | 39 | |
38 | 40 | $this->_file = File::findOne($data['id']); |
39 | 41 | |
40 | - if (!$this->_file) |
|
41 | - throw new NotFoundHttpException('File not found.'); |
|
42 | + if (!$this->_file) { |
|
43 | + throw new NotFoundHttpException('File not found.'); |
|
44 | + } |
|
42 | 45 | |
43 | 46 | } |
44 | 47 | |
@@ -50,8 +53,9 @@ discard block |
||
50 | 53 | { |
51 | 54 | $this->_file->title = $this->_title; |
52 | 55 | |
53 | - if (!$this->_file->save()) |
|
54 | - throw new BadRequestHttpException('Unable to save file.'); |
|
56 | + if (!$this->_file->save()) { |
|
57 | + throw new BadRequestHttpException('Unable to save file.'); |
|
58 | + } |
|
55 | 59 | |
56 | 60 | return $this->_title; |
57 | 61 | } |
@@ -30,14 +30,17 @@ discard block |
||
30 | 30 | { |
31 | 31 | $this->_file = File::findOne($data['id']); |
32 | 32 | |
33 | - if (!$this->_file) |
|
34 | - throw new NotFoundHttpException('File not found'); |
|
33 | + if (!$this->_file) { |
|
34 | + throw new NotFoundHttpException('File not found'); |
|
35 | + } |
|
35 | 36 | |
36 | - if ($this->_file->type != FileType::IMAGE) |
|
37 | - throw new BadRequestHttpException('Requested file is not an image.'); |
|
37 | + if ($this->_file->type != FileType::IMAGE) { |
|
38 | + throw new BadRequestHttpException('Requested file is not an image.'); |
|
39 | + } |
|
38 | 40 | |
39 | - if (!file_exists($this->_file->rootPath)) |
|
40 | - throw new BadRequestHttpException('File not found in file storage.'); |
|
41 | + if (!file_exists($this->_file->rootPath)) { |
|
42 | + throw new BadRequestHttpException('File not found in file storage.'); |
|
43 | + } |
|
41 | 44 | |
42 | 45 | $this->_height = (int)$data['height']; |
43 | 46 | $this->_width = (int)$data['width']; |
@@ -79,8 +82,9 @@ discard block |
||
79 | 82 | if ($this->_file->save()) { |
80 | 83 | @unlink($oldPath); |
81 | 84 | return $this->_file->href; |
82 | - } else |
|
83 | - throw new ErrorException("Error while saving file model."); |
|
85 | + } else { |
|
86 | + throw new ErrorException("Error while saving file model."); |
|
87 | + } |
|
84 | 88 | |
85 | 89 | |
86 | 90 | } |
@@ -20,14 +20,17 @@ discard block |
||
20 | 20 | public function __construct($storagePath) |
21 | 21 | { |
22 | 22 | |
23 | - if (!$storagePath) |
|
24 | - throw new ErrorException('Storage path not set for path generator.'); |
|
23 | + if (!$storagePath) { |
|
24 | + throw new ErrorException('Storage path not set for path generator.'); |
|
25 | + } |
|
25 | 26 | |
26 | - if (!file_exists($storagePath)) |
|
27 | - mkdir($storagePath); |
|
27 | + if (!file_exists($storagePath)) { |
|
28 | + mkdir($storagePath); |
|
29 | + } |
|
28 | 30 | |
29 | - if (!file_exists($storagePath)) |
|
30 | - throw new ErrorException('Unable to create storage.'); |
|
31 | + if (!file_exists($storagePath)) { |
|
32 | + throw new ErrorException('Unable to create storage.'); |
|
33 | + } |
|
31 | 34 | |
32 | 35 | $folderName0 = rand(10, 99); |
33 | 36 | $folderName1 = rand(10, 99); |
@@ -38,10 +41,12 @@ discard block |
||
38 | 41 | $fullPath0 = $storagePath . $path0; |
39 | 42 | $fullPath1 = $storagePath . $path1; |
40 | 43 | |
41 | - if (!file_exists($fullPath0)) |
|
42 | - mkdir($fullPath0); |
|
43 | - if (!file_exists($fullPath1)) |
|
44 | - mkdir($fullPath1); |
|
44 | + if (!file_exists($fullPath0)) { |
|
45 | + mkdir($fullPath0); |
|
46 | + } |
|
47 | + if (!file_exists($fullPath1)) { |
|
48 | + mkdir($fullPath1); |
|
49 | + } |
|
45 | 50 | |
46 | 51 | $this->path = $path1 . DIRECTORY_SEPARATOR . md5(rand(0, 1000) . time()); |
47 | 52 | } |
@@ -46,7 +46,7 @@ |
||
46 | 46 | $commands[] = "find {$module->storageFullPath} -regextype egrep -regex \".+/.{32}\..{3,4}\.jpg\" -exec rm -rf {} \;"; |
47 | 47 | $commands[] = "find {$module->cacheFullPath} -regextype egrep -regex \".+/.{32}\..{3,4}\.jpg\" -exec rm -rf {} \;"; |
48 | 48 | |
49 | - array_map(function ($command) { |
|
49 | + array_map(function($command) { |
|
50 | 50 | exec($command); |
51 | 51 | }, $commands); |
52 | 52 |
@@ -29,9 +29,11 @@ discard block |
||
29 | 29 | { |
30 | 30 | $time = strtotime('- 6 hours'); |
31 | 31 | $files = File::find()->where(['object_id' => '0'])->andWhere(['<', 'created', $time])->all(); |
32 | - if ($files) foreach ($files as $file) { |
|
32 | + if ($files) { |
|
33 | + foreach ($files as $file) { |
|
33 | 34 | $file->delete(); |
34 | 35 | } |
36 | + } |
|
35 | 37 | } |
36 | 38 | |
37 | 39 | /** |
@@ -60,22 +62,26 @@ discard block |
||
60 | 62 | { |
61 | 63 | $ffmpeg = Yii::$app->getModule('files')->ffmpeg; |
62 | 64 | |
63 | - if (!file_exists($ffmpeg)) |
|
64 | - return $this->stdout("ffmpeg is not found: {$ffmpeg}" . PHP_EOL, Console::FG_RED); |
|
65 | + if (!file_exists($ffmpeg)) { |
|
66 | + return $this->stdout("ffmpeg is not found: {$ffmpeg}" . PHP_EOL, Console::FG_RED); |
|
67 | + } |
|
65 | 68 | |
66 | - if (!is_executable($ffmpeg)) |
|
67 | - return $this->stdout("ffmpeg is not executable: {$ffmpeg}" . PHP_EOL, Console::FG_RED); |
|
69 | + if (!is_executable($ffmpeg)) { |
|
70 | + return $this->stdout("ffmpeg is not executable: {$ffmpeg}" . PHP_EOL, Console::FG_RED); |
|
71 | + } |
|
68 | 72 | |
69 | 73 | $file = File::find() |
70 | 74 | ->where(['type' => FileType::VIDEO, 'video_status' => VideoStatus::QUEUE]) |
71 | 75 | ->andWhere(['!=', 'object_id', 0]) |
72 | 76 | ->one(); |
73 | 77 | |
74 | - if (!$file) |
|
75 | - return $this->stdout("Convert queue is empty" . PHP_EOL, Console::FG_GREEN); |
|
78 | + if (!$file) { |
|
79 | + return $this->stdout("Convert queue is empty" . PHP_EOL, Console::FG_GREEN); |
|
80 | + } |
|
76 | 81 | |
77 | - if (!file_exists($file->rootPath)) |
|
78 | - return $this->stdout("Source file is not found: {$file->rootPath}" . PHP_EOL, Console::FG_RED); |
|
82 | + if (!file_exists($file->rootPath)) { |
|
83 | + return $this->stdout("Source file is not found: {$file->rootPath}" . PHP_EOL, Console::FG_RED); |
|
84 | + } |
|
79 | 85 | |
80 | 86 | |
81 | 87 | $file->video_status = VideoStatus::CONVERTING; |
@@ -17,8 +17,9 @@ discard block |
||
17 | 17 | use yii\helpers\Html; |
18 | 18 | use yii\web\View; |
19 | 19 | |
20 | -if (is_array($model)) |
|
20 | +if (is_array($model)) { |
|
21 | 21 | $model = $model[0]; |
22 | +} |
|
22 | 23 | |
23 | 24 | $doc_contents = [ |
24 | 25 | 'application/msword', |
@@ -38,7 +39,8 @@ discard block |
||
38 | 39 | <?= Html::hiddenInput((new ReflectionClass($model->class))->getShortName() . "[{$model->field}_ids][]", $model->id) ?> |
39 | 40 | </div> |
40 | 41 | |
41 | - <?php else: ?> |
|
42 | + <?php else { |
|
43 | + : ?> |
|
42 | 44 | |
43 | 45 | <div data-title="<?= $model->title ?>" |
44 | 46 | id="yii2-file-object-<?= $model->id ?>" |
@@ -52,7 +54,9 @@ discard block |
||
52 | 54 | <?php if ($model->type != FileType::IMAGE): ?> |
53 | 55 | <?= $model->icon ?> |
54 | 56 | <?= $model->title ?> |
55 | - <?php endif; ?> |
|
57 | + <?php endif; |
|
58 | +} |
|
59 | +?> |
|
56 | 60 | </div> |
57 | 61 | <?php endif; ?> |
58 | 62 |
@@ -33,11 +33,13 @@ discard block |
||
33 | 33 | { |
34 | 34 | $this->_file = $file; |
35 | 35 | |
36 | - if ($this->_file->type != FileType::IMAGE) |
|
37 | - throw new ErrorException('This file is not an image.'); |
|
36 | + if ($this->_file->type != FileType::IMAGE) { |
|
37 | + throw new ErrorException('This file is not an image.'); |
|
38 | + } |
|
38 | 39 | |
39 | - if (!file_exists($this->_file->rootPath)) |
|
40 | - throw new ErrorException('File not found on disk'); |
|
40 | + if (!file_exists($this->_file->rootPath)) { |
|
41 | + throw new ErrorException('File not found on disk'); |
|
42 | + } |
|
41 | 43 | |
42 | 44 | $this->_maxHeight = $maxHeight; |
43 | 45 | $this->_maxWidth = $maxWidth; |
@@ -51,16 +53,18 @@ discard block |
||
51 | 53 | */ |
52 | 54 | public function execute(): bool |
53 | 55 | { |
54 | - if ($this->_file->content_type == 'image/svg+xml') |
|
55 | - return true; |
|
56 | + if ($this->_file->content_type == 'image/svg+xml') { |
|
57 | + return true; |
|
58 | + } |
|
56 | 59 | |
57 | 60 | $image = new SimpleImage(); |
58 | 61 | $image->load($this->_file->rootPath); |
59 | 62 | |
60 | 63 | if ($image->getWidth() > $this->_maxWidth || $image->getHeight() > $this->_maxHeight) { |
61 | 64 | $image->resizeToWidth($this->_maxWidth); |
62 | - if ($this->_file->content_type == 'image/png') |
|
63 | - $this->_imageType = IMAGETYPE_PNG; |
|
65 | + if ($this->_file->content_type == 'image/png') { |
|
66 | + $this->_imageType = IMAGETYPE_PNG; |
|
67 | + } |
|
64 | 68 | $image->save($this->_file->rootPath, $this->_imageType, $this->_compression); |
65 | 69 | $this->_file->size = filesize($this->_file->rootPath); |
66 | 70 | return $this->_file->save(false, ['size']); |