add Vitaliy's widgets

Administrator
1 parent 06d508f3
Showing 8 changed files with 53 additions and 235 deletions Show diff stats
common/config/bootstrap.php
common/config/main.php
common/modules/file/controller/DefaultController.php
frontend/controllers/FileController.php → common/modules/file/controllers/UploaderController.php
common/widgets/views/image_sizer.php
console/migrations/m160203_082111_jobs.php
console/migrations/m160203_133308_add_field_specialization.php
frontend/views/accounts/_form.php
@@ -4,3 +4,4 @@ Yii::setAlias(&#39;frontend&#39;, dirname(dirname(__DIR__)) . &#39;/frontend&#39;);
 Yii::setAlias('backend', dirname(dirname(__DIR__)) . '/backend');
 Yii::setAlias('console', dirname(dirname(__DIR__)) . '/console');
 Yii::setAlias('saveImageDir', '@frontend/web/images/upload/');
+Yii::setAlias('storage', dirname(dirname(__DIR__)) . '/storage');
@@ -34,6 +34,10 @@ return [
         'blog' => [
             'class' => 'common\modules\blog\Module',
         ],
+        'file' => [
+            'class' => 'common\modules\file\Module',
+        ],
+
     ],
     'bootstrap' => [
         'options'
-<?php
-/**
- * Created by PhpStorm.
- * User: Cibermag
- * Date: 31.08.2015
- * Time: 9:58
- */
-namespace common\modules\file\controllers;
-use Yii;
-use yii\web\UploadedFile;
-use common\models\ImageSizerForm;
-use yii\web\Controller;
-use Imagine\Gd\Imagine;
-use Imagine\Image\Box;
-use yii\imagine\Image;
-
-class DefaultController extends Controller {
-
-    public function isBigger($width,$height,$w,$h)
-    {
-        if($width>$w){
-            return true;
-        }else if($height >$h) {
-            return true;
-        }
-        return false;
-    }
-
-    public function actionIndex(){
-        die('hello');
-    }
-
-    private function resizeImg($w, $h, $imageAlias,$imageAliasSave){
-        $img = Image::getImagine()->open(Yii::getAlias($imageAlias));
-
-        $size = $img->getSize();
-
-        $width = $size->getWidth();
-        $height = $size->getHeight();
-
-        $e_width = $w/$h;
-        $e_height = $h/$w;
-
-        $e1_width = $width/$height;
-        $e1_height = $height/$width;
-
-
-        if($this->isBigger($width,$height,$w,$h)){
-            if($e_width<$e1_width){
-
-                $new_width = $width*($e_width/$e1_width);
-
-                $y = 0;
-                $x = $width/ 2-($new_width/2);
-                $width = $new_width;
-
-            }else {
-
-                $new_height = $height*($e_height/$e1_height);
-                $x = 0;
-                $y = $height/2-($new_height/2);
-                $height = $new_height;
-            }
-
-
-        } else {
-            $img->save($imageAliasSave, array('flatten' => false));
-            return true;
-        }
-
-
-        Image::crop($imageAlias, $width, $height,[$x,$y])
-            ->save(Yii::getAlias($imageAliasSave), ['quality' =>
-                100]);
-
-
-        $imagine = new Imagine();
-        $imagine->open($imageAliasSave)
-            ->resize(new Box($w, $h))
-            ->save($imageAliasSave, array('flatten' => false));
-
-
-
-    }
-
-    private function deleteImages($old_img){
-
-        if(!empty($old_img) && file_exists($_SERVER['DOCUMENT_ROOT'].$old_img)){
-
-//            $rootDir = explode("/", $old_img);
-//
-//            $row = $_SERVER['DOCUMENT_ROOT'].'/'.$rootDir[1].'/'.$rootDir[2].'/';
-//
-//            $allFiles = scandir($row);
-//
-//            $allFiles = array_slice($allFiles, 2);
-//
-//            foreach($allFiles as $oldFile){
-//
-//                unlink($row.$oldFile);
-//
-//            }
-
-        }
-    }
-
-    public function actionDeleteImage(){
-
-        $request = Yii::$app->request->post();
-
-        if($request){
-            if ($request['old_img']) {
-                $this->deleteImages($request['old_img']);
-            }
-            if(isset($request['action']) && $request['action']=='save'){
-                $object = str_replace('-', '\\',$request['model']);
-                $model = new $object;
-                $model = $model->findOne($request['id']);
-                $model->$request['field'] = $request['new_url'];
-//                print_r($model->validate());
-//                print_r($model->getErrors());
-//                die(var_dump($model->save()));
-                $model->save();
-            }
-        }
-
-    }
-
-
-    public function actionDownloadPhoto()
-    {
-
-        $model = new ImageSizerForm();
-
-        $request = Yii::$app->request->post();
-        if ($request) {
-
-            $model->file = UploadedFile::getInstance($model, 'file');
-
-            $md5_file = md5_file($model->file->tempName);
-
-            $imgDir = Yii::getAlias('@storage/'.$md5_file.'/');
-
-            $imageOrigAlias = Yii::getAlias($imgDir.'original'.'.'.$model->file->extension);
-
-            if(!is_dir($imgDir)) {
-                mkdir($imgDir, 0755, true);
-            }
-
-            $model->file->saveAs($imageOrigAlias);
-
-            if($request['width'] && $request['height']){
-
-                $imageAlias = Yii::getAlias($imgDir.$request['width'].'x'.$request['height'].'.'.$model->file->extension);
-
-                $imageLink = '/storage/'.$md5_file.'/'.$request['width'].'x'.$request['height'].'.'.$model->file->extension;
-
-                $this->resizeImg($request['width'], $request['height'], $imageOrigAlias,$imageAlias);
-
-            } else {
-
-                $imageLink = '/storage/'.$md5_file.'/'.'original'.'.'.$model->file->extension;
-
-            }
-
-
-            if($model->multi){
-                $view = $this->renderPartial('@app/components/views/_gallery_item', [
-                    'item' => ['image'=>$imageLink],
-                ]);
-
-                return json_encode(['link'=>$imageLink, 'view' =>$view]);
-
-
-            } else {
-                return json_encode(['link'=>$imageLink]);
-            }
-
-
-        }
-    }
-
-
-    public function getex($filename) {
-        return end(explode(".", $filename));
-    }
-
-
-    public function actionImagesUpload(){
-        if($_FILES['upload'])
-        {
-            if (($_FILES['upload'] == "none") OR (empty($_FILES['upload']['name'])) )
-            {
-                $message = "Вы не выбрали файл";
-            }
-            else if ($_FILES['upload']["size"] == 0 OR $_FILES['upload']["size"] > 2050000)
-            {
-                $message = "Размер файла не соответствует нормам";
-            }
-            else if (($_FILES['upload']["type"] != "image/jpeg") AND ($_FILES['upload']["type"] != "image/jpeg") AND ($_FILES['upload']["type"] != "image/png") AND ($_FILES['upload']['type'] != 'image/gif'))
-            {
-                $message = "Допускается загрузка только картинок JPG и PNG.";
-            }
-            else if (!is_uploaded_file($_FILES['upload']["tmp_name"]))
-            {
-                $message = "Что-то пошло не так. Попытайтесь загрузить файл ещё раз.";
-            }
-            else{
-                $name =rand(1, 1000).md5($_FILES['upload']['name']).'.'.$this->getex($_FILES['upload']['name']);
-                move_uploaded_file($_FILES['upload']['tmp_name'], "../../storage/images/".$name);
-                $full_path = '/storage/images/'.$name;
-                $message = "Файл ".$_FILES['upload']['name']." загружен";
-                $size=@getimagesize('images/'.$name);
-
-            }
-            $callback = $_REQUEST['CKEditorFuncNum'];
-            echo '<script type="text/javascript">window.parent.CKEDITOR.tools.callFunction("'.$callback.'", "'.$full_path.'", "'.$message.'" );</script>';
-        }
-    }
-
-
-}
 \ No newline at end of file
@@ -5,7 +5,7 @@
  * Date: 31.08.2015
  * Time: 9:58
  */
-namespace frontend\controllers;
+namespace common\modules\file\controllers;
 use Yii;
 use yii\web\UploadedFile;
 use common\models\ImageSizerForm;
@@ -14,7 +14,7 @@ use Imagine\Gd\Imagine;
 use Imagine\Image\Box;
 use yii\imagine\Image;
-class FileController extends Controller {
+class UploaderController extends Controller {
     public function isBigger($width,$height,$w,$h)
     {
@@ -27,6 +27,14 @@ class FileController extends Controller {
     }
+    private function getUserPath(){
+        if(isset(Yii::$app->user->id)){
+            return 'user_'.Yii::$app->user->id;
+        }else {
+            return 'guest';
+        }
+    }
+
     private function resizeImg($w, $h, $imageAlias,$imageAliasSave){
         $img = Image::getImagine()->open(Yii::getAlias($imageAlias));
@@ -134,9 +142,9 @@ class FileController extends Controller {
             $model->file = UploadedFile::getInstance($model, 'file');
-            $md5_file = md5_file($model->file->tempName);
+            $md5_file = md5_file($model->file->tempName).rand(1, 1000);
-            $imgDir = Yii::getAlias('@storage/'.$md5_file.'/');
+            $imgDir = Yii::getAlias('@storage/'.$this->getUserPath().'/'.$md5_file.'/');
             $imageOrigAlias = Yii::getAlias($imgDir.'original'.'.'.$model->file->extension);
@@ -150,13 +158,13 @@ class FileController extends Controller {
                 $imageAlias = Yii::getAlias($imgDir.$request['width'].'x'.$request['height'].'.'.$model->file->extension);
-                $imageLink = '/storage/'.$md5_file.'/'.$request['width'].'x'.$request['height'].'.'.$model->file->extension;
+                $imageLink = '/storage/'.$this->getUserPath().'/'.$md5_file.'/'.$request['width'].'x'.$request['height'].'.'.$model->file->extension;
                 $this->resizeImg($request['width'], $request['height'], $imageOrigAlias,$imageAlias);
             } else {
-                $imageLink = '/storage/'.$md5_file.'/'.'original'.'.'.$model->file->extension;
+                $imageLink = '/storage/'.$this->getUserPath().'/'.$md5_file.'/'.'original'.'.'.$model->file->extension;
             }
@@ -184,6 +192,7 @@ class FileController extends Controller {
     public function actionImagesUpload(){
+
         if($_FILES['upload'])
         {
             if (($_FILES['upload'] == "none") OR (empty($_FILES['upload']['name'])) )
@@ -203,11 +212,21 @@ class FileController extends Controller {
                 $message = "Что-то пошло не так. Попытайтесь загрузить файл ещё раз.";
             }
             else{
-                $name =rand(1, 1000).md5($_FILES['upload']['name']).'.'.$this->getex($_FILES['upload']['name']);
-                move_uploaded_file($_FILES['upload']['tmp_name'], "../../storage/images/".$name);
-                $full_path = '/storage/images/'.$name;
+                $name =$_FILES['upload']['name'].'.'.$this->getex($_FILES['upload']['name']);
+
+                $path = "../../storage/".$this->getUserPath()."/images/";
+                if(!is_dir($path)) {
+                    mkdir($path, 0755, true);
+                }
+
+
+
+                move_uploaded_file($_FILES['upload']['tmp_name'], $path.$name);
+
+                $full_path = '/storage/'.$this->getUserPath().'/images/'.$name;
+
                 $message = "Файл ".$_FILES['upload']['name']." загружен";
-                $size=@getimagesize('images/'.$name);
+
             }
             $callback = $_REQUEST['CKEditorFuncNum'];
@@ -16,7 +16,7 @@ $id = $model::tableName().&#39;_id&#39;;
         <i class="glyphicon glyphicon-plus"></i>
         <span><?=$name?></span>
-        <?=  Html::activeFileInput( new \common\models\ImageSizerForm(),'file',['id'=>$field, 'data-url'=>"/file/download-photo" ]);?>
+        <?=  Html::activeFileInput( new \common\models\ImageSizerForm(),'file',['id'=>$field, 'data-url'=>Yii::$app->getUrlManager()->createUrl('file/uploader/download-photo')]);?>
     </span>
         <?=  Html::activeHiddenInput( $model,$field,['id' => "{$field}_picture_link"]) ?>
@@ -83,7 +83,7 @@ $id = $model::tableName().&#39;_id&#39;;
     <i class="glyphicon glyphicon-plus"></i>
     <span><?=$name?></span>
-        <?=  Html::activeFileInput( new \common\models\ImageSizerForm(),'file',['id'=>$field, 'data-url'=>"/file/download-photo", 'multiple'=> 'multiple' ]);?>
+        <?=  Html::activeFileInput( new \common\models\ImageSizerForm(),'file',['id'=>$field, 'data-url'=>Yii::$app->getUrlManager()->createUrl('file/uploader/download-photo'), 'multiple'=> 'multiple' ]);?>
     </span>
     <?=  Html::activeHiddenInput( $model,$field,['id' => "{$field}_picture_link"]) ?>
+<?php
+
+use yii\db\Migration;
+
+class m160203_133308_add_field_specialization extends Migration
+{
+    public function up()
+    {
+        $this->addColumn('specialization', 'image', $this->string(255));
+    }
+
+    public function down()
+    {
+        $this->dropColumn('option', 'image');
+    }
+}
@@ -46,7 +46,7 @@ use mihaildev\elfinder\ElFinder;
     'editorOptions' => ElFinder::ckeditorOptions('elfinder',[
             'preset' => 'full', //разработанны стандартные настройки basic, standard, full данную возможность не обязательно использовать
             'inline' => false, //по умолчанию false]),
-            'filebrowserUploadUrl'=>Yii::$app->getUrlManager()->createUrl('file/images-upload')
+            'filebrowserUploadUrl'=>Yii::$app->getUrlManager()->createUrl('file/uploader/images-upload')
         ]
     )
 ]); ?>