From 033f93316b467afbe51d78091db14c550b17d781 Mon Sep 17 00:00:00 2001
From: Vitaliy <dockdep@gmail.com>
Date: Wed, 10 Feb 2016 09:48:58 +0200
Subject: [PATCH] 09.02.16

---
 common/models/User.php                                 |  5 +++++
 common/models/UserInfo.php                             |  2 +-
 common/modules/file/controllers/UploaderController.php |  2 +-
 frontend/components/UserInfo.php                       | 22 ++++++++++++++++++++++
 frontend/config/main.php                               |  5 +++++
 frontend/controllers/PerformerController.php           |  4 +---
 frontend/views/layouts/performer.php                   |  3 ++-
 7 files changed, 37 insertions(+), 6 deletions(-)
 create mode 100644 frontend/components/UserInfo.php

diff --git a/common/models/User.php b/common/models/User.php
index 19a92e7..3f2fa82 100755
--- a/common/models/User.php
+++ b/common/models/User.php
@@ -271,6 +271,11 @@ class User extends ActiveRecord implements IdentityInterface, UserRbacInterface
         return $this->hasOne(UserInfo::className(), ['user_id' => 'id']);
     }
 
+    public function getCompanyInfo(){
+        return $this->hasOne(CompanyInfo::className(), ['user_id' => 'id']);
+    }
+
+
     public function getIsPerformer()
     {
         return true;
diff --git a/common/models/UserInfo.php b/common/models/UserInfo.php
index df09162..8cb25aa 100755
--- a/common/models/UserInfo.php
+++ b/common/models/UserInfo.php
@@ -67,7 +67,7 @@ class UserInfo extends \yii\db\ActiveRecord
             [['prepayment'], 'number'],
 
             [['rank', 'location'], 'string', 'max' => 50],
-            [['salary', 'job','firstname','lastname'], 'string', 'max' => 255],
+            [['salary', 'job'], 'string', 'max' => 255],
             [['busy', 'member'], 'boolean'],
         ];
     }
diff --git a/common/modules/file/controllers/UploaderController.php b/common/modules/file/controllers/UploaderController.php
index 8e06bd7..4ec2ce0 100755
--- a/common/modules/file/controllers/UploaderController.php
+++ b/common/modules/file/controllers/UploaderController.php
@@ -140,7 +140,7 @@ class UploaderController extends Controller {
 
         if ($request) {
 
-            $model->multi = $request['multi'];
+            $model->multi = isset($request['multi'])? 1 : 0;
 
             $model->file = UploadedFile::getInstance($model, 'file');
 
diff --git a/frontend/components/UserInfo.php b/frontend/components/UserInfo.php
new file mode 100644
index 0000000..37ce593
--- /dev/null
+++ b/frontend/components/UserInfo.php
@@ -0,0 +1,22 @@
+<?php
+namespace frontend\components;
+
+
+use Yii;
+use yii\base\Component;
+use yii\base\InvalidConfigException;
+use common\models\User;
+
+class UserInfo extends Component
+{
+    public function getUser()
+    {
+        if(\Yii::$app->user->isGuest){
+            die('guest');
+        } else {
+            return User::findOne(\Yii::$app->user->id);
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/frontend/config/main.php b/frontend/config/main.php
index bb12a84..131b192 100755
--- a/frontend/config/main.php
+++ b/frontend/config/main.php
@@ -29,6 +29,11 @@ return [
             'identityClass' => 'common\models\User',
             'enableAutoLogin' => true,
         ],
+        'userinfo' => [
+
+            'class' => 'frontend\components\UserInfo',
+
+        ],
         'log' => [
             'traceLevel' => YII_DEBUG ? 3 : 0,
             'targets' => [
diff --git a/frontend/controllers/PerformerController.php b/frontend/controllers/PerformerController.php
index b8418ba..38e3259 100755
--- a/frontend/controllers/PerformerController.php
+++ b/frontend/controllers/PerformerController.php
@@ -30,8 +30,6 @@ class PerformerController extends Controller
 {
     public $layout = 'performer';
 
-    public $defaultAction = 'common';
-
     /**
      * @inheritdoc
      */
@@ -50,7 +48,7 @@ class PerformerController extends Controller
 
     public function actionIndex()
     {
-        $this->redirect(['site/index']);
+        return $this->render('common');
     }
 
     public function actionCommon(/*$performer_id*/)
diff --git a/frontend/views/layouts/performer.php b/frontend/views/layouts/performer.php
index 91a21ff..17b66cc 100755
--- a/frontend/views/layouts/performer.php
+++ b/frontend/views/layouts/performer.php
@@ -6,9 +6,10 @@ use yii\widgets\Menu;
 \frontend\assets\AppAsset::register($this);
 /* @var $content string */
 $this->beginContent('@app/views/layouts/main.php');
+
 ?>
     <div class="section-box content">
-        <div class="section-box-16" style="background: url('/images/blog/box-16.jpg') no-repeat">
+        <div class="section-box-16" style="background: url('<?= Yii::$app->user->identity->userInfo->poster;?>') no-repeat">
             <div class="box-wr">
                 <div class="box-all">
                     <div class="blog-buttons-wr style">
--
libgit2 0.21.4