Added Hdomain alias create form

hiqdev · Sep 8, 2015 · 3e28409 · 3e28409
1 parent 65ea654
commit 3e28409
Show file tree

Hide file tree

Showing 13 changed files with 456 additions and 52 deletions.
diff --git a/src/controllers/HdomainController.php b/src/controllers/HdomainController.php
@@ -17,7 +17,11 @@ public function actions()
         return [
             'index' => [
                 'class' => 'hipanel\actions\IndexAction',
-                'findOptions' => ['with_aliases' => true, 'with_vhosts' => true, 'with_request' => true],
+                'findOptions' => [
+                    'with_vhosts' => true,
+                    'with_aliases' => true,
+                    'with_request' => true,
+                ],
                 'data' => function ($action) {
                     return [
                         'stateData' => $action->controller->getStateData(),
@@ -27,17 +31,28 @@ public function actions()
             ],
             'view' => [
                 'class' => 'hipanel\actions\ViewAction',
-                'findOptions' => ['with_aliases' => true, 'with_vhosts' => true, 'with_request' => true, 'show_deleted' => true, 'show_aliases' => true],
+                'findOptions' => [
+                    'with_vhosts' => true,
+                    'with_aliases' => true,
+                    'with_request' => true,
+                    'show_deleted' => true,
+                    'show_aliases' => true,
+                ],
             ],
             'create' => [
                 'class' => 'hipanel\actions\SmartCreateAction',
-                'success' => Yii::t('app', 'Account create task has been created successfully'),
-                'error' => Yii::t('app', 'Error while creating account'),
+                'success' => Yii::t('app', 'Domain create task has been created successfully'),
+                'error' => Yii::t('app', 'Error while creating domain'),
+            ],
+            'create-alias' => [
+                'class' => 'hipanel\actions\SmartCreateAction',
+                'view' => 'create-alias',
+                'success' => Yii::t('app', 'Domain alias create task has been created successfully'),
+                'error' => Yii::t('app', 'Error while creating domain'),
             ],
             'validate-form' => [
                 'class' => 'hipanel\actions\ValidateFormAction',
             ],
-            // Premium Autorenewal
             'enable-paid-feature-autorenewal' => [
                 'class' => 'hipanel\actions\SmartPerformAction',
                 'success' => Yii::t('app', 'Premium autorenewal has been enabled'),

diff --git a/src/controllers/ServiceController.php b/src/controllers/ServiceController.php
@@ -9,5 +9,12 @@
 
 class ServiceController extends \hipanel\base\CrudController
 {
-
+    public function actions()
+    {
+        return [
+            'index' => [
+                'class' => 'hipanel\actions\IndexAction',
+            ],
+        ];
+    }
 }
diff --git a/src/controllers/VhostController.php b/src/controllers/VhostController.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * @link    http://hiqdev.com/hipanel-module-hosting
+ * @license http://hiqdev.com/hipanel-module-hosting/license
+ * @copyright Copyright (c) 2015 HiQDev
+ */
+
+namespace hipanel\modules\hosting\controllers;
+
+use Yii;
+
+class VhostController extends \hipanel\base\CrudController
+{
+    public function actions()
+    {
+        return [
+            'index' => [
+                'class' => 'hipanel\actions\IndexAction',
+            ],
+        ];
+    }
+}
diff --git a/src/models/Db.php b/src/models/Db.php
@@ -24,26 +24,17 @@ public function rules () {
             [['service_ip', 'description'], 'safe'],
             [['type', 'state', 'backuping_type', 'type_label', 'state_label', 'backuping_type_label'], 'safe'],
             /// Create
-            [['server', 'account', 'service_id', 'name', 'password'], 'required', 'on' => 'create'],
-            [['name'], DbNameValidator::className(), 'on' => 'create'],
+            [['server', 'account', 'service_id', 'name', 'password'], 'required', 'on' => ['create']],
+            [['name'], DbNameValidator::className(), 'on' => ['create']],
             [
                 ['password'],
                 'match',
                 'pattern' => '/^[\x20-\x7f]+$/',
                 'message' => \Yii::t('app', '{attribute} should not contain non-latin characters'),
                 'on'      => ['create', 'set-password']
             ],
-            [['password'], 'required', 'on' => ['set-password']]
-        ];
-    }
-
-    public function scenarios () {
-        return [
-            'create'          => ['client', 'server', 'account', 'service_id', 'name', 'password', 'description'],
-            'truncate'        => ['id'],
-            'set-description' => ['id', 'description'],
-            'set-password'    => ['id', 'password'],
-            'delete'          => ['id'],
+            [['password'], 'required', 'on' => ['set-password']],
+            [['id'], 'required', 'on' => ['delete', 'set-password', 'set-description', 'truncate']]
         ];
     }
 

diff --git a/src/models/Hdomain.php b/src/models/Hdomain.php
@@ -10,6 +10,7 @@
 use hipanel\modules\client\validators\LoginValidator as ClientLoginValidator;
 use hipanel\modules\domain\validators\DomainValidator;
 use hipanel\modules\hosting\validators\LoginValidator as AccountLoginValidator;
+use hipanel\validators\IpValidator;
 use Yii;
 
 class Hdomain extends \hipanel\base\Model
@@ -22,7 +23,7 @@ class Hdomain extends \hipanel\base\Model
     public $vhost;
 
     /**
-     * @var array Stores array of aliases of hdomain 
+     * @var array Stores array of aliases of hdomain
      */
     public $aliases;
 
@@ -42,7 +43,8 @@ public function rules()
                     'state_id',
                     'type_id',
                     'vhost_id',
-                    'device_id'
+                    'device_id',
+                    'dns_hdomain_id',
                 ],
                 'integer'
             ],
@@ -57,6 +59,12 @@ public function rules()
                 ],
                 'safe'
             ],
+            [['client', 'seller'], ClientLoginValidator::className()],
+            [['account'], AccountLoginValidator::className()],
+            [['dns_on', 'with_www', 'proxy_enable'], 'boolean'],
+            [['domain', 'alias'], DomainValidator::className()],
+            [['ip', 'backend_ip'], IpValidator::className()], /// TODO: replace with IP validator
+            [['domain', 'id'], 'safe', 'on' => ['enable-paid-feature-autorenewal', 'disable-paid-feature-autorenewal']],
             [
                 [
                     'server',
@@ -67,15 +75,27 @@ public function rules()
                     'ip',
                 ],
                 'required',
-                'on' => 'create'
+                'on' => ['create']
+            ],
+            [
+                ['sub'],
+                'match',
+                'pattern' => '/^(\*|[a-z0-9][a-z0-9-]*)$/i',
+                'message' => \Yii::t('app', '{attribute} does not look like a domain part'),
+                'on' => ['create-alias']
             ],
-            [['client','seller'], ClientLoginValidator::className()],
-            [['account'], AccountLoginValidator::className()],
-            [['dns_on', 'with_www', 'proxy_enable'], 'boolean'],
-            [['domain', 'alias'], DomainValidator::className()],
-            [['ip', 'backend_ip'], 'safe'], /// TODO: replace with IP validator
 
-            [['domain', 'id'], 'safe', 'on' => ['enable-paid-feature-autorenewal', 'disable-paid-feature-autorenewal']],
+            [
+                [
+                    'server',
+                    'account',
+                    'vhost_id',
+                    'domain',
+                    'with_www',
+                ],
+                'required',
+                'on' => ['create-alias']
+            ],
         ];
     }
 
@@ -88,12 +108,13 @@ function getIsProxied()
     public function attributeLabels()
     {
         return $this->mergeAttributeLabels([
-            'domain'         => Yii::t('app', 'Domain Name'),
-            'backend_ip'     => Yii::t('app', 'Backend IP'),
-            'with_www'       => Yii::t('app', 'Create www alias'),
-            'proxy_enable'   => Yii::t('app', 'Enable proxy (NEED MANUAL)'),
+            'domain' => Yii::t('app', 'Domain Name'),
+            'backend_ip' => Yii::t('app', 'Backend IP'),
+            'with_www' => Yii::t('app', 'Create www alias'),
+            'proxy_enable' => Yii::t('app', 'Enable proxy (NEED MANUAL)'),
             'backuping_type' => Yii::t('app', 'Backup periodicity'),
-            'dns_on'         => Yii::t('app', 'DNS'),
+            'dns_on' => Yii::t('app', 'DNS'),
+            'vhost_id' => Yii::t('app', 'Alias for')
         ]);
     }
 
@@ -104,6 +125,7 @@ public function scenarioCommands()
         if (in_array($this->scenario, ['create', 'update'])) {
             $result['create'] = ['vhosts', ucfirst($this->scenario)]; // Create should be send to vhost module
         }
+        $result['create-alias'] = 'create';
         return $result;
     }
 }
diff --git a/src/models/Vhost.php b/src/models/Vhost.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * @link    http://hiqdev.com/hipanel-module-hosting
+ * @license http://hiqdev.com/hipanel-module-hosting/license
+ * @copyright Copyright (c) 2015 HiQDev
+ */
+
+namespace hipanel\modules\hosting\models;
+
+use hipanel\helpers\StringHelper;
+use hipanel\modules\client\validators\LoginValidator;
+use hipanel\validators\IpValidator;
+use Yii;
+
+class Vhost extends \hipanel\base\Model
+{
+
+    use \hipanel\base\ModelTrait;
+
+
+    public function rules()
+    {
+        return [
+            [
+                [
+                    'domain',
+                    'ip',
+                    'port',
+                    'path',
+                    'client',
+                    'device',
+                    'account',
+                    'service',
+                    'server',
+                    'soft',
+                    'type',
+                    'state',
+                    'state_label',
+                    'backuping_type',
+                    'backuping_type_label',
+                    'cgibin_postfix',
+                    'domain_prefix',
+                    'docroot_postfix',
+                    'apache_conf',
+                    'nginx_conf',
+                    'docroot',
+                    'cgibin',
+                    'fullpath',
+                ],
+                'safe'
+            ],
+            [
+                [
+                    'id',
+                    'ip_id',
+                    'frontend_id',
+                    'client_id',
+                    'device_id',
+                    'server_id',
+                    'account_id',
+                    'soft_id',
+                    'service_id',
+                ],
+                'integer'
+            ],
+            [
+                [
+                    'enable_ssi',
+                    'enable_suexec',
+                    'enable_accesslog',
+                    'enable_errorslog',
+                    'enable_scripts',
+                    'dns_on',
+
+                ],
+                'boolean'
+            ],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return $this->mergeAttributeLabels([
+
+        ]);
+    }
+}
diff --git a/src/models/VhostSearch.php b/src/models/VhostSearch.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @link    http://hiqdev.com/hipanel-module-hosting
+ * @license http://hiqdev.com/hipanel-module-hosting/license
+ * @copyright Copyright (c) 2015 HiQDev
+ */
+
+namespace hipanel\modules\hosting\models;
+
+use hipanel\base\SearchModelTrait;
+
+class VhostSearch extends Vhost {
+    use SearchModelTrait;
+}