floor12 / yii2-module-files

src/models/File.php

Braces +45 added lines, -30 removed lines

@@ -87,29 +87,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;
     }
@@ -233,8 +241,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';
     }
@@ -257,8 +266,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]);
     }
 
@@ -357,14 +367,17 @@ 
      */
     public function getPreviewWebPath($width = 0, $height = 0, $webp = false)
     {
-        if (!file_exists($this->getRootPath()))
-            return null;
+        if (!file_exists($this->getRootPath())) {
+                    return null;
+        }
 
-        if ($this->type != FileType::IMAGE)
-            throw new \ErrorException('Requiested file is not an image and its implsible to resize it.');
+        if ($this->type != FileType::IMAGE) {
+                    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]);
     }
@@ -381,8 +394,9 @@ 
     {
         $extension = pathinfo($this->rootPath, PATHINFO_EXTENSION);
         $rootPath = str_replace(".{$extension}", '', $name) . "_w" . $width . "h" . $height . ".{$extension}";
-        if ($webp)
-            $rootPath = str_replace($extension, 'webp', $rootPath);
+        if ($webp) {
+                    $rootPath = str_replace($extension, 'webp', $rootPath);
+        }
         return $rootPath;
     }
 
@@ -397,8 +411,9 @@ 
      */
     public function getPreviewRootPath($width = 0, $height = 0, $webp = false)
     {
-        if ($this->type != FileType::IMAGE)
-            throw new \ErrorException('Requiested file is not an image and its implsible to resize it.');
+        if ($this->type != FileType::IMAGE) {
+                    throw new \ErrorException('Requiested file is not an image and its implsible to resize it.');
+        }
         return $this->makeNameWithSize($this->rootPath, $width, $height, $webp);
     }
 

src/components/SimpleImage.php

Braces +3 added lines, -2 removed lines

@@ -118,8 +118,9 @@
     function rotate($direction)
     {
         $degrees = 90;
-        if ($direction == 2)
-            $degrees = 270;
+        if ($direction == 2) {
+                    $degrees = 270;
+        }
         $this->image = imagerotate($this->image, $degrees, 0);
     }
 

src/components/FileListWidget.php

Braces +6 added lines, -4 removed lines

@@ -44,11 +44,13 @@
 
         $this->getView()->registerJs("yiiDownloadAllLink = '" . Url::toRoute('files/default/zip') . "'", View::POS_BEGIN, 'yiiDownloadAllLink');
 
-        if ($this->passFirst && sizeof($this->files) > 0)
-            $this->files = array_slice($this->files, 1);
+        if ($this->passFirst && sizeof($this->files) > 0) {
+                    $this->files = array_slice($this->files, 1);
+        }
 
-        if (empty($this->files))
-            return null;
+        if (empty($this->files)) {
+                    return null;
+        }
 
         return $this->render('fileListWidget', [
             'files' => $this->files,

src/components/views/_fileListWidget.php

Braces +5 added lines, -2 removed lines

@@ -50,7 +50,8 @@ 
                 <?= $model->title ?>
             </div>
         </a>
-    <?php else: ?>
+    <?php else {
+    : ?>
 
 
         <div data-title="<?= $model->title ?>"
@@ -78,7 +79,9 @@ 
                         <?= Yii::t('files', 'View') ?>
                     </a>
                 </li>
-            <?php endif; ?>
+            <?php endif;
+}
+?>
         </ul>
 
     <?php endif; ?>

src/logic/FileRename.php

Braces +12 added lines, -8 removed lines

@@ -27,18 +27,21 @@ 
     public function __construct(array $data)
     {
 
-        if (!isset($data['id']))
-            throw new BadRequestHttpException('ID of file is not set.');
+        if (!isset($data['id'])) {
+                    throw new BadRequestHttpException('ID of file is not set.');
+        }
 
-        if (!isset($data['title']))
-            throw new BadRequestHttpException('Title of file is not set.');
+        if (!isset($data['title'])) {
+                    throw new BadRequestHttpException('Title of file is not set.');
+        }
 
         $this->_title = $data['title'];
 
         $this->_file = File::findOne($data['id']);
 
-        if (!$this->_file)
-            throw new NotFoundHttpException('File not found.');
+        if (!$this->_file) {
+                    throw new NotFoundHttpException('File not found.');
+        }
 
     }
 
@@ -50,8 +53,9 @@ 
     {
         $this->_file->title = $this->_title;
 
-        if (!$this->_file->save())
-            throw new BadRequestHttpException('Unable to save file.');
+        if (!$this->_file->save()) {
+                    throw new BadRequestHttpException('Unable to save file.');
+        }
 
         return $this->_title;
     }

src/logic/FileCreateFromPath.php

Braces +27 added lines, -18 removed lines

@@ -29,17 +29,21 @@ 
 
         $this->model = $model;
 
-        if (!$filePath || !$className || !$fieldName || !$storagePath)
-            throw new ErrorException("Empty params not allowed.");
+        if (!$filePath || !$className || !$fieldName || !$storagePath) {
+                    throw new ErrorException("Empty params not allowed.");
+        }
 
-        if (!file_exists($storagePath))
-            throw new ErrorException("File storage not found on disk.");
+        if (!file_exists($storagePath)) {
+                    throw new ErrorException("File storage not found on disk.");
+        }
 
-        if (!file_exists($filePath))
-            throw new ErrorException("File not found on disk.");
+        if (!file_exists($filePath)) {
+                    throw new ErrorException("File not found on disk.");
+        }
 
-        if (!is_writable($storagePath))
-            throw new ErrorException("File storage is not writable.");
+        if (!is_writable($storagePath)) {
+                    throw new ErrorException("File storage is not writable.");
+        }
         $this->filePath = $filePath;
         $this->fileName = $fileName;
         $this->fieldName = $fieldName;
@@ -65,16 +69,19 @@ 
         $this->model->field = $this->fieldName;
         $this->model->class = $this->className;
         $this->model->filename = $filename;
-        if ($this->model->filename)
-            $this->model->title = $this->model->filename;
-        else
-            $this->model->title = rand(0, 99999); #такой прикол )
+        if ($this->model->filename) {
+                    $this->model->title = $this->model->filename;
+        } else {
+                    $this->model->title = rand(0, 99999);
+        }
+        #такой прикол )
         $this->model->content_type = $this->model->mime_content_type($new_path);
         $this->model->type = $this->detectType();
         $this->model->size = filesize($new_path);
         $this->model->created = time();
-        if ($this->model->type == FileType::VIDEO)
-            $this->model->video_status = 0;
+        if ($this->model->type == FileType::VIDEO) {
+                    $this->model->video_status = 0;
+        }
 
         if ($this->model->save()) {
 
@@ -114,10 +121,12 @@ 
     private function detectType()
     {
         $contentTypeArray = explode('/', $this->model->content_type);
-        if ($contentTypeArray[0] == 'image')
-            return FileType::IMAGE;
-        if ($contentTypeArray[0] == 'video')
-            return FileType::VIDEO;
+        if ($contentTypeArray[0] == 'image') {
+                    return FileType::IMAGE;
+        }
+        if ($contentTypeArray[0] == 'video') {
+                    return FileType::VIDEO;
+        }
         return FileType::FILE;
     }
 }
\ No newline at end of file

src/logic/FileCropRotate.php

Braces +12 added lines, -8 removed lines

@@ -30,14 +30,17 @@ 
     {
         $this->_file = File::findOne($data['id']);
 
-        if (!$this->_file)
-            throw new NotFoundHttpException('File not found');
+        if (!$this->_file) {
+                    throw new NotFoundHttpException('File not found');
+        }
 
-        if ($this->_file->type != FileType::IMAGE)
-            throw new BadRequestHttpException('Requested file is not an image.');
+        if ($this->_file->type != FileType::IMAGE) {
+                    throw new BadRequestHttpException('Requested file is not an image.');
+        }
 
-        if (!file_exists($this->_file->rootPath))
-            throw new BadRequestHttpException('File not found in file storage.');
+        if (!file_exists($this->_file->rootPath)) {
+                    throw new BadRequestHttpException('File not found in file storage.');
+        }
 
         $this->_height = (int)$data['height'];
         $this->_width = (int)$data['width'];
@@ -79,8 +82,9 @@ 
         if ($this->_file->save()) {
             @unlink($oldPath);
             return $this->_file->href;
-        } else
-            throw new ErrorException("Error while saving file model.");
+        } else {
+                    throw new ErrorException("Error while saving file model.");
+        }
 
 
     }

src/logic/PathGenerator.php

Braces +15 added lines, -10 removed lines

@@ -20,14 +20,17 @@ 
     public function __construct($storagePath)
     {
 
-        if (!$storagePath)
-            throw new ErrorException('Storage path not set for path generator.');
+        if (!$storagePath) {
+                    throw new ErrorException('Storage path not set for path generator.');
+        }
 
-        if (!file_exists($storagePath))
-            mkdir($storagePath);
+        if (!file_exists($storagePath)) {
+                    mkdir($storagePath);
+        }
 
-        if (!file_exists($storagePath))
-            throw new ErrorException('Unable to create storage.');
+        if (!file_exists($storagePath)) {
+                    throw new ErrorException('Unable to create storage.');
+        }
 
         $folderName0 = rand(10, 99);
         $folderName1 = rand(10, 99);
@@ -38,10 +41,12 @@ 
         $fullPath0 = $storagePath . $path0;
         $fullPath1 = $storagePath . $path1;
 
-        if (!file_exists($fullPath0))
-            mkdir($fullPath0);
-        if (!file_exists($fullPath1))
-            mkdir($fullPath1);
+        if (!file_exists($fullPath0)) {
+                    mkdir($fullPath0);
+        }
+        if (!file_exists($fullPath1)) {
+                    mkdir($fullPath1);
+        }
 
         $this->path = $path1 . DIRECTORY_SEPARATOR . md5(rand(0, 1000) . time());
     }

src/controllers/DefaultController.php

Braces +36 added lines, -24 removed lines

@@ -73,8 +73,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.');
+        }
     }
 
     /**
@@ -87,12 +88,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");
@@ -164,8 +167,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,
@@ -182,11 +186,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));
@@ -216,14 +222,17 @@ 
     {
         $model = File::findOne(['hash' => $hash]);
 
-        if (!$model)
-            throw new NotFoundHttpException("Запрашиваемый файл не найден");
+        if (!$model) {
+                    throw new NotFoundHttpException("Запрашиваемый файл не найден");
+        }
 
-        if ($model->type != FileType::IMAGE)
-            throw new NotFoundHttpException("Запрашиваемый файл не является изображением");
+        if ($model->type != FileType::IMAGE) {
+                    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));
@@ -233,8 +242,9 @@ 
 
             $filename = Yii::createObject(ImagePreviewer::class, [$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;
@@ -275,8 +285,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;
@@ -285,8 +296,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');