Account adopted for IpValidator

hiqdev · Jun 2, 2015 · 95e5af1 · 95e5af1
1 parent 8798333
commit 95e5af1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/models/Account.php b/models/Account.php
@@ -9,7 +9,7 @@
 
 use hipanel\helpers\ArrayHelper;
 use hipanel\modules\client\validators\LoginValidator;
-use hipanel\validators\IpAddressValidator;
+use hipanel\validators\IpValidator;
 use Yii;
 
 class Account extends \hipanel\base\Model
@@ -89,10 +89,7 @@ public function rules()
             [
                 'sshftp_ips',
                 'each',
-                'rule' => [
-                    IpAddressValidator::className(),
-                    'exclusion' => true
-                ],
+                'rule' => [IpValidator::className(), 'negationChar' => true, 'subnet' => null],
                 'on'   => ['create-user', 'create-ftponly', 'update', 'set-allowed-ips']
             ]
         ];

diff --git a/views/account/_form.php b/views/account/_form.php
@@ -49,7 +49,8 @@
                                'data' => [
                                    'title'   => Yii::t('app', 'IP restrictions'),
                                    'content' => Yii::t('app', 'Text about IP restrictions'),
-                               ]
+                               ],
+                               'value' => $model->getSshFtpIpsList()
                             ]);
                         ?>