floor12 / yii2-module-files

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');
 

src/controllers/ConsoleController.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
         $commands[] = "find {$module->storageFullPath}  -regextype egrep -regex \".+/.{32}\..{3,4}\.jpg\" -exec rm -rf {} \;";
         $commands[] = "find {$module->cacheFullPath}  -regextype egrep -regex \".+/.{32}\..{3,4}\.jpg\" -exec rm -rf {} \;";
 
-        array_map(function ($command) {
+        array_map(function($command) {
             exec($command);
         }, $commands);
 

Braces +15 added lines, -9 removed lines

@@ -29,9 +29,11 @@ 
     {
         $time = strtotime('- 6 hours');
         $files = File::find()->where("`object_id`=0 AND `created`<'{$time}'")->all();
-        if ($files) foreach ($files as $file) {
+        if ($files) {
+            foreach ($files as $file) {
             $file->delete();
         }
+        }
     }
 
     /**
@@ -60,22 +62,26 @@ 
     {
         $ffmpeg = Yii::$app->getModule('files')->ffmpeg;
 
-        if (!file_exists($ffmpeg))
-            return $this->stdout("ffmpeg is not found: {$ffmpeg}" . PHP_EOL, Console::FG_RED);
+        if (!file_exists($ffmpeg)) {
+                    return $this->stdout("ffmpeg is not found: {$ffmpeg}" . PHP_EOL, Console::FG_RED);
+        }
 
-        if (!is_executable($ffmpeg))
-            return $this->stdout("ffmpeg is not executable: {$ffmpeg}" . PHP_EOL, Console::FG_RED);
+        if (!is_executable($ffmpeg)) {
+                    return $this->stdout("ffmpeg is not executable: {$ffmpeg}" . PHP_EOL, Console::FG_RED);
+        }
 
         $file = File::find()
             ->where(['type' => FileType::VIDEO, 'video_status' => VideoStatus::QUEUE])
             ->andWhere(['!=', 'object_id', 0])
             ->one();
 
-        if (!$file)
-            return $this->stdout("Convert queue is empty" . PHP_EOL, Console::FG_GREEN);
+        if (!$file) {
+                    return $this->stdout("Convert queue is empty" . PHP_EOL, Console::FG_GREEN);
+        }
 
-        if (!file_exists($file->rootPath))
-            return $this->stdout("Source file is not found: {$file->rootPath}" . PHP_EOL, Console::FG_RED);
+        if (!file_exists($file->rootPath)) {
+                    return $this->stdout("Source file is not found: {$file->rootPath}" . PHP_EOL, Console::FG_RED);
+        }
 
 
         $file->video_status = VideoStatus::CONVERTING;

src/views/default/_single.php

Braces +7 added lines, -3 removed lines

@@ -17,8 +17,9 @@ 
 use yii\helpers\Html;
 use yii\web\View;
 
-if (is_array($model))
+if (is_array($model)) {
     $model = $model[0];
+}
 
 $doc_contents = [
     'application/msword',
@@ -38,7 +39,8 @@ 
             <?= Html::hiddenInput((new ReflectionClass($model->class))->getShortName() . "[{$model->field}_ids][]", $model->id) ?>
         </div>
 
-    <?php else: ?>
+    <?php else {
+    : ?>
 
         <div data-title="<?= $model->title ?>"
              id="yii2-file-object-<?= $model->id ?>"
@@ -52,7 +54,9 @@ 
             <?php if ($model->type != FileType::IMAGE): ?>
                 <?= $model->icon ?>
                 <?= $model->title ?>
-            <?php endif; ?>
+            <?php endif;
+}
+?>
         </div>
     <?php endif; ?>
 

src/logic/FileCreateFromInstance.php

Braces +29 added lines, -20 removed lines

@@ -34,27 +34,31 @@ 
 
         $this->_onlyUploaded = $onlyUploaded;
 
-        if (!isset($data['attribute']) || !$data['attribute'] || !isset($data['modelClass']) || !$data['modelClass'])
-            throw new BadRequestHttpException("Attribute or class name not set.");
+        if (!isset($data['attribute']) || !$data['attribute'] || !isset($data['modelClass']) || !$data['modelClass']) {
+                    throw new BadRequestHttpException("Attribute or class name not set.");
+        }
 
         // Загружаем полученные данные
         $this->_instance = $file;
         $this->_attribute = $data['attribute'];
 
-        if (!file_exists($this->_instance->tempName))
-            throw new ErrorException("Tmp file not found on disk.");
+        if (!file_exists($this->_instance->tempName)) {
+                    throw new ErrorException("Tmp file not found on disk.");
+        }
 
         // Инициализируем класс владельца файла для валидаций и ставим сценарий
         $this->_owner = new $data['modelClass'];
 
-        if (isset($data['scenario']))
-            $this->_owner->setScenario($data['scenario']);
+        if (isset($data['scenario'])) {
+                    $this->_owner->setScenario($data['scenario']);
+        }
 
 
         if (isset($this->_owner->behaviors['files']->attributes[$this->_attribute]['validator'])) {
             foreach ($this->_owner->behaviors['files']->attributes[$this->_attribute]['validator'] as $validator) {
-                if (!$validator->validate($this->_instance, $error))
-                    throw new BadRequestHttpException($error);
+                if (!$validator->validate($this->_instance, $error)) {
+                                    throw new BadRequestHttpException($error);
+                }
             }
 
         }
@@ -70,10 +74,12 @@ 
         $this->_model->content_type = $this->_instance->type;
         $this->_model->size = $this->_instance->size;
         $this->_model->type = $this->detectType();
-        if ($identity)
-            $this->_model->user_id = $identity->id;
-        if ($this->_model->type == FileType::VIDEO)
-            $this->_model->video_status = 0;
+        if ($identity) {
+                    $this->_model->user_id = $identity->id;
+        }
+        if ($this->_model->type == FileType::VIDEO) {
+                    $this->_model->video_status = 0;
+        }
 
         //Генерируем полный новый адрес сохранения файла
         $this->_fullPath = Yii::$app->getModule('files')->storageFullPath . DIRECTORY_SEPARATOR . $this->_model->filename;
@@ -85,10 +91,12 @@ 
     public 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;
     }
 
@@ -101,10 +109,11 @@ 
         $path = Yii::$app->getModule('files')->storageFullPath . $this->_model->filename;
 
         if ($this->_model->save()) {
-            if (!$this->_onlyUploaded)
-                copy($this->_instance->tempName, $this->_fullPath);
-            else
-                $this->_instance->saveAs($this->_fullPath, false);
+            if (!$this->_onlyUploaded) {
+                            copy($this->_instance->tempName, $this->_fullPath);
+            } else {
+                            $this->_instance->saveAs($this->_fullPath, false);
+            }
         }
 
         if ($this->_model->type == FileType::IMAGE) {

src/logic/FileResize.php

Braces +12 added lines, -8 removed lines

@@ -33,11 +33,13 @@ 
     {
         $this->_file = $file;
 
-        if ($this->_file->type != FileType::IMAGE)
-            throw new ErrorException('This file is not an image.');
+        if ($this->_file->type != FileType::IMAGE) {
+                    throw new ErrorException('This file is not an image.');
+        }
 
-        if (!file_exists($this->_file->rootPath))
-            throw new ErrorException('File not found on disk');
+        if (!file_exists($this->_file->rootPath)) {
+                    throw new ErrorException('File not found on disk');
+        }
 
         $this->_maxHeight = $maxHeight;
         $this->_maxWidth = $maxWidth;
@@ -51,16 +53,18 @@ 
      */
     public function execute(): bool
     {
-        if ($this->_file->content_type == 'image/svg+xml')
-            return true;
+        if ($this->_file->content_type == 'image/svg+xml') {
+                    return true;
+        }
 
         $image = new SimpleImage();
         $image->load($this->_file->rootPath);
 
         if ($image->getWidth() > $this->_maxWidth || $image->getHeight() > $this->_maxHeight) {
             $image->resizeToWidth($this->_maxWidth);
-            if ($this->_file->content_type == 'image/png')
-                $this->_imageType = IMAGETYPE_PNG;
+            if ($this->_file->content_type == 'image/png') {
+                            $this->_imageType = IMAGETYPE_PNG;
+            }
             $image->save($this->_file->rootPath, $this->_imageType, $this->_compression);
             $this->_file->size = filesize($this->_file->rootPath);
             return $this->_file->save(false, ['size']);