From 472483d04925e217bf358a7db5bb84fbc6a392af Mon Sep 17 00:00:00 2001
From: Egorka <error-202@mail.ru>
Date: Thu, 13 Sep 2018 14:19:02 +0300
Subject: [PATCH] Modules fix

---
 backend/controllers/ModuleController.php |  6 +++---
 backend/messages/ru/main.php             |  1 +
 backend/views/module/remote-list.php     | 11 ++++++++---
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/backend/controllers/ModuleController.php b/backend/controllers/ModuleController.php
index a2699cc..7368d01 100644
--- a/backend/controllers/ModuleController.php
+++ b/backend/controllers/ModuleController.php
@@ -102,8 +102,8 @@ class ModuleController extends Controller
     {
         $needed_manifest = [];
         // check installed extension
-        if (class_exists('\ZipArchive')) {
-            \Yii::$app->session->setFlash('danger', \Yii::t('main', 'ZipArchive php extension not installed'));
+        if (!extension_loaded('zip')) {
+            \Yii::$app->session->setFlash('danger', \Yii::t('main', 'PHP extension "zip" not installed, Need ZipArchive class'));
             return $this->redirect(['search']);
         }
 
@@ -143,7 +143,7 @@ class ModuleController extends Controller
                 if (!file_exists($module_path)) {
                     mkdir($module_path);
                 }
-                FileHelper::copyDirectory(\Yii::getAlias('@runtime/_module'), $module_path);
+                FileHelper::copyDirectory(\Yii::getAlias('@runtime/_module/' . $needed_manifest['git_name'] . '-master'), $module_path);
             } else {
                 \Yii::$app->session->setFlash('danger', \Yii::t('main', 'Error module archive'));
                 return $this->redirect(['search']);
diff --git a/backend/messages/ru/main.php b/backend/messages/ru/main.php
index bd53ec0..c632ba5 100644
--- a/backend/messages/ru/main.php
+++ b/backend/messages/ru/main.php
@@ -78,4 +78,5 @@ return [
     'ZipArchive php extension not installed'                      => 'Расширение ZipArchive для PHP не установлено',
     'Error module archive'                                        => 'Ошибка архива модуля',
     'Module installed successful'                                 => 'Модуль успешно установлен',
+    'Install'                                                     => 'Установить',
 ];
diff --git a/backend/views/module/remote-list.php b/backend/views/module/remote-list.php
index e82e593..f2b6cfe 100644
--- a/backend/views/module/remote-list.php
+++ b/backend/views/module/remote-list.php
@@ -43,10 +43,15 @@ $this->params['breadcrumbs'][] = $this->title;
                 </div>
                 <div class="box-footer" style="text-align: right">
                     <?php if (Yii::$app->moduleManager->isExists($module['name'])) : ?>
-                        <span class="text-bold text-green"><?= Yii::t('main', 'Installed') ?></span>
+                        <?= Html::a(Yii::t('main', 'Installed'), '#', [
+                            'class' => 'btn btn-default btn-sm disabled',
+                            'data'  => [
+                                'method' => 'post',
+                            ],
+                        ]) ?>
                     <?php else : ?>
-                        <?= Html::a(Yii::t('main', 'Enable'), ['module/install', 'name' => $module['name']], [
-                            'class' => 'btn btn-default btn-sm',
+                        <?= Html::a(Yii::t('main', 'Install'), ['module/install', 'name' => $module['name']], [
+                            'class' => 'btn btn-success btn-sm',
                             'data'  => [
                                 'method' => 'post',
                             ],