floor12 / yii2-module-files

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

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) {