TonisOrmisson / yii2-emails-validator

models/EmailAddress.php

Spacing +12 added lines, -12 removed lines

@@ -62,13 +62,13 @@ 
     public function attributeLabels()
     {
         return [
-            'address'=>Yii::t('app','E-mail address'),
-            'isValid'=>Yii::t('app','Is valid?'),
-            'isValidRFC'=>Yii::t('app','In line with RFC standard?'),
-            'isNoRFCWarnings'=>Yii::t('app','No RFC warnings?'),
-            'isValidDNS'=>Yii::t('app','DNS check passed?'),
-            'needsTrimming'=>Yii::t('app','Has spaces to be trimmed?'),
-            'isValidSpoofCheck'=>Yii::t('app','Spoof check OK?'),
+            'address'=>Yii::t('app', 'E-mail address'),
+            'isValid'=>Yii::t('app', 'Is valid?'),
+            'isValidRFC'=>Yii::t('app', 'In line with RFC standard?'),
+            'isNoRFCWarnings'=>Yii::t('app', 'No RFC warnings?'),
+            'isValidDNS'=>Yii::t('app', 'DNS check passed?'),
+            'needsTrimming'=>Yii::t('app', 'Has spaces to be trimmed?'),
+            'isValidSpoofCheck'=>Yii::t('app', 'Spoof check OK?'),
 
         ];
     }
@@ -78,23 +78,23 @@ 
      * run the different validators
      * @return void
      */
-    private function runValidator(){
+    private function runValidator() {
         $this->isValidRFC = $this->validator->isValid($this->address, new RFCValidation());
         $this->isNoRFCWarnings = $this->validator->isValid($this->address, new NoRFCWarningsValidation());
 
-        if($this->checkDNS){
+        if ($this->checkDNS) {
             $this->isValidDNS = $this->validator->isValid($this->address, new DNSCheckValidation());
         }
 
-        if($this->checkSpoof) {
+        if ($this->checkSpoof) {
             $this->isValidSpoofCheck = $this->validator->isValid($this->address, new SpoofCheckValidation());
         }
 
         $this->setNeedsTrimming();
-        $this->isValid = ($this->isValidRFC && $this->isNoRFCWarnings && $this->isValidDNS && $this->isValidSpoofCheck );
+        $this->isValid = ($this->isValidRFC && $this->isNoRFCWarnings && $this->isValidDNS && $this->isValidSpoofCheck);
     }
 
-    private function setNeedsTrimming(){
+    private function setNeedsTrimming() {
         $this->needsTrimming = ($this->address !== trim($this->address));
     }
 

models/EmailsValidationForm.php

Spacing +15 added lines, -15 removed lines

@@ -44,40 +44,40 @@ 
         return [
             [['textInput'], 'required'],
             [['textInput'], 'string', 'max' => 1024 * $this->module->maxInputKB],
-            [['checkDNS','checkSpoof','displayOnlyProblems'],'boolean'],
+            [['checkDNS', 'checkSpoof', 'displayOnlyProblems'], 'boolean'],
         ];
     }
 
     public function attributeLabels()
     {
         return [
-            'textInput'=>Yii::t('app','E-mail addresses'),
-            'checkDNS'=>Yii::t('app','Perform DNS check'),
-            'checkSpoof'=>Yii::t('app','Perform spoofing check'),
-            'displayOnlyProblems'=>Yii::t('app','Display only e-mails with problems in results'),
+            'textInput'=>Yii::t('app', 'E-mail addresses'),
+            'checkDNS'=>Yii::t('app', 'Perform DNS check'),
+            'checkSpoof'=>Yii::t('app', 'Perform spoofing check'),
+            'displayOnlyProblems'=>Yii::t('app', 'Display only e-mails with problems in results'),
         ];
     }
 
     public function attributeHints()
     {
         return [
-            'textInput'=>Yii::t('app','One e-mail address per line'),
-            'checkDNS'=>Yii::t('app','Checking DNS will increase processing time'),
+            'textInput'=>Yii::t('app', 'One e-mail address per line'),
+            'checkDNS'=>Yii::t('app', 'Checking DNS will increase processing time'),
         ];
     }
 
-    public function process(){
+    public function process() {
         $this->loadEmailAddresses();
         return true;
     }
 
-    private function loadEmailAddresses(){
-        if($this->textInput){
+    private function loadEmailAddresses() {
+        if ($this->textInput) {
             $pattern = '/\r\n|[\r\n]/';
-            $array = preg_split( $pattern, $this->textInput );
-            if(!empty($array)){
-                foreach ($array as $address){
-                    if($address){
+            $array = preg_split($pattern, $this->textInput);
+            if (!empty($array)) {
+                foreach ($array as $address) {
+                    if ($address) {
                         $model = new EmailAddress([
                             'address'=>$address,
                             'checkDNS'=>$this->checkDNS,
@@ -85,7 +85,7 @@ 
                         ]);
 
                         $this->emailAddresses[] = $model;
-                        if(!$model->isValid){
+                        if (!$model->isValid) {
                             $this->failingEmailAddresses[] = $model;
                         }
 

controllers/SiteController.php

Spacing +5 added lines, -5 removed lines

@@ -48,21 +48,21 @@
         $model = new EmailsValidationForm();
         $dataProvider = null;
 
-        if($model->load(Yii::$app->request->post()) && $model->process()){
+        if ($model->load(Yii::$app->request->post()) && $model->process()) {
             $dataProvider = new ArrayDataProvider([
-                'allModels'=>($model->displayOnlyProblems ? $model->failingEmailAddresses:$model->emailAddresses),
+                'allModels'=>($model->displayOnlyProblems ? $model->failingEmailAddresses : $model->emailAddresses),
                 'pagination' => [
                     'pageSize' => count($model->emailAddresses),
                 ],
             ]);
             $formatter = new Formatter();
 
-            if(!empty($model->failingEmailAddresses)){
-                Yii::$app->session->addFlash('danger',Yii::t('app','There were {count} e-mail addresses that failed validation!',[
+            if (!empty($model->failingEmailAddresses)) {
+                Yii::$app->session->addFlash('danger', Yii::t('app', 'There were {count} e-mail addresses that failed validation!', [
                     'count'=>count($model->failingEmailAddresses)
                 ]));
             }
-            Yii::$app->session->addFlash('success',Yii::t('app','Checked {count} e-mails in {duration}!',[
+            Yii::$app->session->addFlash('success', Yii::t('app', 'Checked {count} e-mails in {duration}!', [
                 'count'=>count($model->emailAddresses),
                 'duration'=>$formatter->asDuration(Yii::getLogger()->getElapsedTime())
             ]));

views/site/index.php

Spacing +5 added lines, -5 removed lines

@@ -13,7 +13,7 @@ 
 $this->params['breadcrumbs'][] = Yii::t('app', 'E-mail validation');
 ?>
 <div id="bulk-email-validation">
-    <?php if($model->module->displayFlashMessages):?>
+    <?php if ($model->module->displayFlashMessages):?>
     <div class="row">
         <div class="col-xs-12">
             <?php foreach (Yii::$app->session->allFlashes as $type => $message): ?>
@@ -26,13 +26,13 @@ 
             <?php endforeach ?>
         </div>
     </div>
-    <?php endif;?>
+    <?php endif; ?>
 
 
     <div class="panel panel-default email-validation-results" id="email-validation-results">
         <div class="panel-heading">
-            <?= Yii::t('app','Input')?>
-            <a class="pull-right btn btn-default btn-xs" data-toggle="collapse" href="#emails-validation-input"><?=Yii::t('app','Show/hide')?></a>
+            <?= Yii::t('app', 'Input')?>
+            <a class="pull-right btn btn-default btn-xs" data-toggle="collapse" href="#emails-validation-input"><?=Yii::t('app', 'Show/hide')?></a>
         </div>
 
         <div id="emails-validation-input" class="panel-collapse collapse <?=(count($model->emailAddresses)>0 ? null:'in')?>">
@@ -63,5 +63,5 @@ 
 
     <?php $form = ActiveForm::end() ?>
 
-    <?= $this->render('_validation-list',['model'=>$model,'dataProvider'=>$dataProvider])?>
+    <?= $this->render('_validation-list', ['model'=>$model, 'dataProvider'=>$dataProvider])?>
 </div>
\ No newline at end of file

views/site/_validation-list.php

Indentation +8 added lines, -8 removed lines

@@ -74,14 +74,14 @@
 }
 
 if($model->checkSpoof){
-   $columns[] =[
-       'attribute'=> 'isValidSpoofCheck',
-       'format'=>'boolean',
-       'contentOptions' => function ($model) {
-           /** @var EmailAddress $model */
-           return ['class' => (!$model->isValidSpoofCheck ? 'danger text-danger': 'text-success')];
-       },
-   ];
+    $columns[] =[
+        'attribute'=> 'isValidSpoofCheck',
+        'format'=>'boolean',
+        'contentOptions' => function ($model) {
+            /** @var EmailAddress $model */
+            return ['class' => (!$model->isValidSpoofCheck ? 'danger text-danger': 'text-success')];
+        },
+    ];
 }
 
 ?>

Spacing +23 added lines, -23 removed lines

@@ -13,81 +13,81 @@ 
     [
         'attribute'=> 'address',
         'format'=>'raw',
-        'value'=>function($model){
+        'value'=>function($model) {
             /** @var EmailAddress $model */
             // hilight spaces
             $word = " ";
-            $text = preg_replace ("/" . preg_quote($word, '/') . "/",
+            $text = preg_replace("/" . preg_quote($word, '/') . "/",
                 "<span class='bg-primary'>&nbsp;</span>",
                 $model->address);
             return $text;
 
         },
-        'contentOptions' => function ($model) {
+        'contentOptions' => function($model) {
             /** @var EmailAddress $model */
-            return ['class' => (!$model->isValid ? 'danger text-danger': 'text-success')];
+            return ['class' => (!$model->isValid ? 'danger text-danger' : 'text-success')];
         },
     ],
     [
         'attribute'=> 'needsTrimming',
         'format'=>'boolean',
-        'contentOptions' => function ($model) {
+        'contentOptions' => function($model) {
             /** @var EmailAddress $model */
-            return ['class' => ($model->needsTrimming ? 'warning text-warning': 'text-success')];
+            return ['class' => ($model->needsTrimming ? 'warning text-warning' : 'text-success')];
         },
     ],
     [
         'attribute'=> 'isValid',
         'format'=>'boolean',
-        'contentOptions' => function ($model) {
+        'contentOptions' => function($model) {
             /** @var EmailAddress $model */
-            return ['class' => (!$model->isValid ? 'danger text-danger': 'text-success')];
+            return ['class' => (!$model->isValid ? 'danger text-danger' : 'text-success')];
         },
     ],
     [
         'attribute'=> 'isValidRFC',
         'format'=>'boolean',
-        'contentOptions' => function ($model) {
+        'contentOptions' => function($model) {
             /** @var EmailAddress $model */
-            return ['class' => (!$model->isValidRFC ? 'danger text-danger': 'text-success')];
+            return ['class' => (!$model->isValidRFC ? 'danger text-danger' : 'text-success')];
         },
     ],
     [
         'attribute'=> 'isNoRFCWarnings',
         'format'=>'boolean',
-        'contentOptions' => function ($model) {
+        'contentOptions' => function($model) {
             /** @var EmailAddress $model */
-            return ['class' => (!$model->isNoRFCWarnings ? 'danger text-danger': 'text-success')];
+            return ['class' => (!$model->isNoRFCWarnings ? 'danger text-danger' : 'text-success')];
         },
     ],
 ];
 
-if($model->checkDNS){
-    $columns[] =[
+if ($model->checkDNS) {
+    $columns[] = [
         'attribute'=> 'isValidDNS',
         'format'=>'boolean',
-        'contentOptions' => function ($model) {
+        'contentOptions' => function($model) {
             /** @var EmailAddress $model */
-            return ['class' => (!$model->isValidDNS ? 'danger text-danger': 'text-success')];
+            return ['class' => (!$model->isValidDNS ? 'danger text-danger' : 'text-success')];
         },
     ];
 }
 
-if($model->checkSpoof){
-   $columns[] =[
+if ($model->checkSpoof) {
+   $columns[] = [
        'attribute'=> 'isValidSpoofCheck',
        'format'=>'boolean',
-       'contentOptions' => function ($model) {
+       'contentOptions' => function($model) {
            /** @var EmailAddress $model */
-           return ['class' => (!$model->isValidSpoofCheck ? 'danger text-danger': 'text-success')];
+           return ['class' => (!$model->isValidSpoofCheck ? 'danger text-danger' : 'text-success')];
        },
    ];
 }
 
 ?>
-<?php if($model->emailAddresses):?>
+<?php if ($model->emailAddresses):?>
     <div class="panel panel-primary email-validation-results" id="email-validation-results">
-        <div class="panel-heading"><?= Yii::t('app','Results')?></div>
+        <div class="panel-heading"><?= Yii::t('app', 'Results')?></div>
 
         <div class="panel-body">
             <?= \yii\grid\GridView::widget([
@@ -97,4 +97,4 @@ 
 
         </div>
     </div>
-<?php endif;?>
+<?php endif; ?>