floor12 / yii2-module-files

src/models/File.php

Braces +45 added lines, -30 removed lines

@@ -86,29 +86,37 @@ 
     {
         $icon = IconHelper::FILE;
 
-        if ($this->content_type == 'application/vnd.openxmlformats-officedocument.wordprocessingml.document')
-            $icon = IconHelper::FILE_WORD;
+        if ($this->content_type == 'application/vnd.openxmlformats-officedocument.wordprocessingml.document') {
+                    $icon = IconHelper::FILE_WORD;
+        }
 
-        if ($this->content_type == 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')
-            $icon = IconHelper::FILE_EXCEL;
+        if ($this->content_type == 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet') {
+                    $icon = IconHelper::FILE_EXCEL;
+        }
 
-        if ($this->content_type == 'application/vnd.openxmlformats-officedocument.presentationml.presentation')
-            $icon = IconHelper::FILE_POWERPOINT;
+        if ($this->content_type == 'application/vnd.openxmlformats-officedocument.presentationml.presentation') {
+                    $icon = IconHelper::FILE_POWERPOINT;
+        }
 
-        if ($this->content_type == 'application/x-zip-compressed')
-            $icon = IconHelper::FILE_ARCHIVE;
+        if ($this->content_type == 'application/x-zip-compressed') {
+                    $icon = IconHelper::FILE_ARCHIVE;
+        }
 
-        if ($this->content_type == 'application/octet-stream')
-            $icon = IconHelper::FILE_ARCHIVE;
+        if ($this->content_type == 'application/octet-stream') {
+                    $icon = IconHelper::FILE_ARCHIVE;
+        }
 
-        if (preg_match('/audio/', $this->content_type))
-            $icon = IconHelper::FILE_AUDIO;
+        if (preg_match('/audio/', $this->content_type)) {
+                    $icon = IconHelper::FILE_AUDIO;
+        }
 
-        if (preg_match('/pdf/', $this->content_type))
-            $icon = IconHelper::FILE_PDF;
+        if (preg_match('/pdf/', $this->content_type)) {
+                    $icon = IconHelper::FILE_PDF;
+        }
 
-        if ($this->type == FileType::VIDEO)
-            $icon = IconHelper::FILE_VIDEO;
+        if ($this->type == FileType::VIDEO) {
+                    $icon = IconHelper::FILE_VIDEO;
+        }
 
         return $icon;
     }
@@ -224,8 +232,9 @@ 
 
     public function getRootPreviewPath()
     {
-        if ($this->isSvg())
-            return $this->getRootPath();
+        if ($this->isSvg()) {
+                    return $this->getRootPath();
+        }
 
         return Yii::$app->getModule('files')->storageFullPath . DIRECTORY_SEPARATOR . $this->filename . '.jpg';
     }
@@ -256,8 +265,9 @@ 
 
     public function getHref()
     {
-        if (Yii::$app->getModule('files')->hostStatic)
-            return Yii::$app->getModule('files')->hostStatic . $this->filename;
+        if (Yii::$app->getModule('files')->hostStatic) {
+                    return Yii::$app->getModule('files')->hostStatic . $this->filename;
+        }
         return Url::to(['/files/default/get', 'hash' => $this->hash]);
     }
 
@@ -333,8 +343,9 @@ 
             isset($this->behaviors['files']) &&
             isset($this->behaviors['files']->attributes[$this->field]) &&
             isset($this->behaviors['files']->attributes[$this->field]['watermark'])
-        )
-            $this->behaviors['files']->attributes[$this->field]['watermark'];
+        ) {
+                    $this->behaviors['files']->attributes[$this->field]['watermark'];
+        }
     }
 
     /**
@@ -355,14 +366,17 @@ 
      */
     public function getPreviewWebPath(int $width = 0, bool $webp = false)
     {
-        if (!file_exists($this->getRootPath()))
-            return null;
+        if (!file_exists($this->getRootPath())) {
+                    return null;
+        }
 
-        if (!$this->isVideo() && !$this->isImage())
-            throw new \ErrorException('Requiested file is not an image and its implsible to resize it.');
+        if (!$this->isVideo() && !$this->isImage()) {
+                    throw new \ErrorException('Requiested file is not an image and its implsible to resize it.');
+        }
 
-        if (Yii::$app->getModule('files')->hostStatic)
-            return Yii::$app->getModule('files')->hostStatic . $this->makeNameWithSize($this->filename, $width, $height, $webp = false);
+        if (Yii::$app->getModule('files')->hostStatic) {
+                    return Yii::$app->getModule('files')->hostStatic . $this->makeNameWithSize($this->filename, $width, $height, $webp = false);
+        }
 
         return Url::toRoute(['/files/default/image', 'hash' => $this->hash, 'width' => $width, 'height' => $height, 'webp' => $webp]);
     }
@@ -406,8 +420,9 @@ 
      */
     public function getPreviewRootPath($width = 0, $webp = false)
     {
-        if (!$this->isVideo() && !$this->isImage())
-            throw new \ErrorException('Requiested file is not an image and its implsible to resize it.');
+        if (!$this->isVideo() && !$this->isImage()) {
+                    throw new \ErrorException('Requiested file is not an image and its implsible to resize it.');
+        }
         return $this->makeNameWithSize($this->rootPath, $width, $webp);
     }
 

src/components/PictureWidget.php

Braces +3 added lines, -2 removed lines

@@ -26,8 +26,9 @@
      */
     public function run(): ?string
     {
-        if (!in_array($this->model->type, [FileType::IMAGE, FileType::VIDEO]))
-            return null;
+        if (!in_array($this->model->type, [FileType::IMAGE, FileType::VIDEO])) {
+                    return null;
+        }
         return $this->render('pictureWidget', [
             'model' => $this->model,
             'width' => $this->width,

src/components/VideoWidget.php

Braces +3 added lines, -2 removed lines

@@ -21,8 +21,9 @@
      */
     public function run(): ?string
     {
-        if ($this->model->type !== FileType::VIDEO)
-            return null;
+        if ($this->model->type !== FileType::VIDEO) {
+                    return null;
+        }
         $source = Html::tag('source', null, ['src' => $this->model->getHref(), 'type' => $this->model->content_type]);
         return Html::tag('video', $source, $this->options);
     }

src/actions/GetPreviewAction.php

Braces +12 added lines, -8 removed lines

@@ -46,14 +46,17 @@ 
     private function loadAndCheckModel(string $hash): void
     {
         $this->model = File::findOne(['hash' => $hash]);
-        if (!$this->model)
-            throw new NotFoundHttpException("Запрашиваемый файл не найден");
+        if (!$this->model) {
+                    throw new NotFoundHttpException("Запрашиваемый файл не найден");
+        }
 
-        if (!$this->model->isImage() && !$this->model->isVideo())
-            throw new NotFoundHttpException("Запрашиваемый файл не является изображением");
+        if (!$this->model->isImage() && !$this->model->isVideo()) {
+                    throw new NotFoundHttpException("Запрашиваемый файл не является изображением");
+        }
 
-        if (!file_exists($this->model->rootPath))
-            throw new NotFoundHttpException('Запрашиваемый файл не найден на диске.');
+        if (!file_exists($this->model->rootPath)) {
+                    throw new NotFoundHttpException('Запрашиваемый файл не найден на диске.');
+        }
     }
 
     /**
@@ -65,8 +68,9 @@ 
     {
         $filename = Yii::createObject(ImagePreviewer::class, [$this->model, $width, $webp])->getUrl();
 
-        if (!file_exists($filename))
-            throw new NotFoundHttpException('Запрашиваемый файл не найден на диске.');
+        if (!file_exists($filename)) {
+                    throw new NotFoundHttpException('Запрашиваемый файл не найден на диске.');
+        }
 
         $response = Yii::$app->response;
         $response->format = Response::FORMAT_RAW;

src/actions/GetFileAction.php

Braces +6 added lines, -4 removed lines

@@ -14,11 +14,13 @@
     {
         $model = File::findOne(['hash' => $hash]);
 
-        if (!$model)
-            throw new NotFoundHttpException("Запрашиваемый файл не найден");
+        if (!$model) {
+                    throw new NotFoundHttpException("Запрашиваемый файл не найден");
+        }
 
-        if (!file_exists($model->rootPath))
-            throw new NotFoundHttpException('Запрашиваемый файл не найден на диске.');
+        if (!file_exists($model->rootPath)) {
+                    throw new NotFoundHttpException('Запрашиваемый файл не найден на диске.');
+        }
 
         Yii::$app->response->headers->set('Last-Modified', date("c", $model->created));
         Yii::$app->response->headers->set('Cache-Control', 'public, max-age=' . (60 * 60 * 24 * 15));

src/controllers/DefaultController.php

Braces +18 added lines, -12 removed lines

@@ -72,8 +72,9 @@ 
      */
     private function checkFormToken()
     {
-        if (in_array($this->action->id, $this->actionsToCheck) && FileInputWidget::generateToken() != Yii::$app->request->post('_fileFormToken'))
-            throw new BadRequestHttpException('File-form token is wrong or missing.');
+        if (in_array($this->action->id, $this->actionsToCheck) && FileInputWidget::generateToken() != Yii::$app->request->post('_fileFormToken')) {
+                    throw new BadRequestHttpException('File-form token is wrong or missing.');
+        }
     }
 
     /**
@@ -86,12 +87,14 @@ 
 
         $zip = new  ZipArchive;
         $filename = Yii::getAlias("@webroot/assets/files.zip");
-        if (file_exists($filename))
-            @unlink($filename);
+        if (file_exists($filename)) {
+                    @unlink($filename);
+        }
         if (sizeof($files) && $zip->open($filename, ZipArchive::CREATE)) {
 
-            foreach ($files as $file)
-                $zip->addFile($file->rootPath, $file->title);
+            foreach ($files as $file) {
+                            $zip->addFile($file->rootPath, $file->title);
+            }
 
             $zip->close();
             header("Pragma: public");
@@ -163,8 +166,9 @@ 
 
         $view = Yii::$app->request->post('mode') == 'single' ? "_single" : "_file";
 
-        if ($ratio)
-            $this->getView()->registerJs("initCropper({$model->id}, '{$model->href}', {$ratio}, true);");
+        if ($ratio) {
+                    $this->getView()->registerJs("initCropper({$model->id}, '{$model->href}', {$ratio}, true);");
+        }
 
         return $this->renderAjax($view, [
             'model' => $model,
@@ -190,8 +194,9 @@ 
     {
         $model = File::findOne(['hash' => $hash]);
 
-        if (!$model)
-            throw new NotFoundHttpException("Запрашиваемый файл не найден в базе.");
+        if (!$model) {
+                    throw new NotFoundHttpException("Запрашиваемый файл не найден в базе.");
+        }
 
         $response = Yii::$app->response;
         $response->format = Response::FORMAT_RAW;
@@ -200,8 +205,9 @@ 
         Yii::$app->response->headers->set('Last-Modified', date("c", $model->created));
         Yii::$app->response->headers->set('Cache-Control', 'public, max-age=' . (60 * 60 * 24 * 15));
 
-        if (!file_exists($model->rootPreviewPath))
-            throw new NotFoundHttpException('Preview not found.');
+        if (!file_exists($model->rootPreviewPath)) {
+                    throw new NotFoundHttpException('Preview not found.');
+        }
 
         $response->sendFile($model->rootPreviewPath, 'preview.jpg');
 

src/logic/VideoFrameExtractor.php

Braces +12 added lines, -8 removed lines

@@ -18,14 +18,17 @@ 
     {
         $this->ffmpegBin = Yii::$app->getModule('files')->ffmpeg;
 
-        if (!file_exists($this->ffmpegBin))
-            throw new \ErrorException("ffmpeg is not found: {$this->ffmpegBin}");
+        if (!file_exists($this->ffmpegBin)) {
+                    throw new \ErrorException("ffmpeg is not found: {$this->ffmpegBin}");
+        }
 
-        if (!is_executable($this->ffmpegBin))
-            throw new \ErrorException("ffmpeg is not executable: {$this->ffmpegBin}");
+        if (!is_executable($this->ffmpegBin)) {
+                    throw new \ErrorException("ffmpeg is not executable: {$this->ffmpegBin}");
+        }
 
-        if (!is_file($videoSourceFilename))
-            throw new \ErrorException('File not found on disk.');
+        if (!is_file($videoSourceFilename)) {
+                    throw new \ErrorException('File not found on disk.');
+        }
 
         $this->videoSourceFilename = $videoSourceFilename;
         $this->outputImageFilename = $outputImageFilename;
@@ -38,8 +41,9 @@ 
     {
         $command = "{$this->ffmpegBin} -i {$this->videoSourceFilename}  -ss 00:00:03.000 -vframes 1  {$this->outputImageFilename}";
         exec($command, $out, $result);
-        if ($result !== 0)
-            throw new \ErrorException('FFmpeg frame extracting fail:' . print_r($out, true));
+        if ($result !== 0) {
+                    throw new \ErrorException('FFmpeg frame extracting fail:' . print_r($out, true));
+        }
     }
 
 }

src/logic/ImagePreviewer.php

Braces +33 added lines, -22 removed lines

@@ -30,8 +30,9 @@ 
         $this->width = $width;
         $this->webp = $webp;
 
-        if (!$this->model->isImage() && !$this->model->isVideo())
-            throw new ErrorException('File is not an image or video.');
+        if (!$this->model->isImage() && !$this->model->isVideo()) {
+                    throw new ErrorException('File is not an image or video.');
+        }
     }
 
     /**
@@ -39,8 +40,9 @@ 
      */
     public function getUrl()
     {
-        if ($this->model->isSvg())
-            return $this->model->getRootPath();
+        if ($this->model->isSvg()) {
+                    return $this->model->getRootPath();
+        }
 
         $cachePath = Yii::$app->getModule('files')->cacheFullPath;
         $jpegName = $this->model->makeNameWithSize($this->model->filename, $this->width);
@@ -54,21 +56,25 @@ 
         $sourceImagePath = $this->model->rootPath;
         if ($this->model->isVideo()) {
             $sourceImagePath = $this->fileName . '.jpeg';
-            if (!is_file($sourceImagePath))
-                Yii::createObject(VideoFrameExtractor::class, [
+            if (!is_file($sourceImagePath)) {
+                            Yii::createObject(VideoFrameExtractor::class, [
                     $this->model->rootPath,
                     $sourceImagePath
                 ])->extract();
+            }
         }
 
-        if (!is_file($this->fileName) || filesize($this->fileName) == 0)
-            $this->createPreview($sourceImagePath);
+        if (!is_file($this->fileName) || filesize($this->fileName) == 0) {
+                    $this->createPreview($sourceImagePath);
+        }
 
-        if ($this->webp && !file_exists($this->fileNameWebp))
-            $this->createPreviewWebp();
+        if ($this->webp && !file_exists($this->fileNameWebp)) {
+                    $this->createPreviewWebp();
+        }
 
-        if ($this->webp)
-            return $this->fileNameWebp;
+        if ($this->webp) {
+                    return $this->fileNameWebp;
+        }
 
         return $this->fileName;
     }
@@ -78,20 +84,24 @@ 
      */
     protected function prepareFolder()
     {
-        if (!file_exists(Yii::$app->getModule('files')->cacheFullPath))
-            mkdir(Yii::$app->getModule('files')->cacheFullPath);
+        if (!file_exists(Yii::$app->getModule('files')->cacheFullPath)) {
+                    mkdir(Yii::$app->getModule('files')->cacheFullPath);
+        }
         $folders = [];
         $lastFolder = '/';
         $explodes = explode('/', $this->fileName);
         array_pop($explodes);
-        if (empty($explodes))
-            return;
+        if (empty($explodes)) {
+                    return;
+        }
         foreach ($explodes as $folder) {
-            if (empty($folder))
-                continue;
+            if (empty($folder)) {
+                            continue;
+            }
             $lastFolder = $lastFolder . $folder . '/';
-            if (!file_exists($lastFolder))
-                mkdir($lastFolder);
+            if (!file_exists($lastFolder)) {
+                            mkdir($lastFolder);
+            }
             $folders[] = $lastFolder;
         }
     }
@@ -113,8 +123,9 @@ 
         }
 
         $saveType = $img->image_type;
-        if ($saveType == IMG_WEBP || $saveType == IMG_QUADRATIC)
-            $saveType = IMG_JPEG;
+        if ($saveType == IMG_WEBP || $saveType == IMG_QUADRATIC) {
+                    $saveType = IMG_JPEG;
+        }
         $img->save($this->fileName, $saveType);
     }