injitools / cms-Inji

system/modules/Users/Users.php

Doc Comments +9 added lines

@@ -92,6 +92,9 @@ 
         }
     }
 
+    /**
+     * @param string $user_mail
+     */
     public function passre($user_mail)
     {
         $user = $this->get($user_mail, 'mail');
@@ -322,6 +325,9 @@ 
         return $user->id;
     }
 
+    /**
+     * @param string $pass
+     */
     public function hashpass($pass)
     {
         return password_hash($pass, PASSWORD_DEFAULT);
@@ -359,6 +365,9 @@ 
         return $return;
     }
 
+    /**
+     * @param integer $cat_id
+     */
     public function addUserActivity($user_id, $cat_id , $text = '')
     {
         $ua = new Users\Activity([

Spacing +1 added lines, -1 removed lines

@@ -307,7 +307,7 @@
             $to = $user_mail;

             $subject = 'Регистрация на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME);

             $text = 'Вы были зарегистрированы на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME) . '<br />для входа используйте ваш почтовый ящик в качестве логина и пароль: ' . $pass;

-            $text .='<br />';

+            $text .= '<br />';

             $text .= '<br />';

             $text .= 'Для активации вашего аккаунта перейдите по ссылке <a href = "http://' . INJI_DOMAIN_NAME . '/users/activation/' . $user->id . '/' . $user->activation . '">http://' . idn_to_utf8(INJI_DOMAIN_NAME) . '/users/activation/' . $user->id . '/' . $user->activation . '</a>';

             Tools::sendMail($from, $to, $subject, $text);

Braces +13 added lines, -10 removed lines

@@ -196,17 +196,20 @@
      */

     public function get($idn, $ltype = 'id')

     {

-        if (!$idn)

-            return false;

+        if (!$idn) {
+                    return false;
+        }
 

-        if (is_numeric($idn) && $ltype != 'login')

-            $user = Users\User::get($idn, 'id');

-        elseif ($ltype == 'login')

-            $user = Users\User::get($idn, 'login');

-        else

-            $user = Users\User::get($idn, 'mail');

-        if (!$user)

-            return [];

+        if (is_numeric($idn) && $ltype != 'login') {
+                    $user = Users\User::get($idn, 'id');
+        } elseif ($ltype == 'login') {
+                    $user = Users\User::get($idn, 'login');
+        } else {
+                    $user = Users\User::get($idn, 'mail');
+        }
+        if (!$user) {
+                    return [];
+        }
 

         return $user;

     }

system/modules/Money/Money.php

Spacing +3 added lines, -3 removed lines

@@ -102,7 +102,7 @@ 
             if (empty($blocks[$block->wallet->currency_id])) {
                 $blocks[$block->wallet->currency_id] = $block->amount;
             } else {
-                $blocks[$block->wallet->currency_id]+= $block->amount;
+                $blocks[$block->wallet->currency_id] += $block->amount;
             }
         }
         return $blocks;
@@ -166,7 +166,7 @@ 
         $rootUser = $rootUser ? $rootUser : \Users\User::$cur;
         $reward = \Money\Reward::get($reward_id);
         $reward->checkBlocked();
-        $reward_count = \Money\Reward\Recive::getCount([ 'where' => [ 'reward_id', $reward_id ]]);
+        $reward_count = \Money\Reward\Recive::getCount(['where' => ['reward_id', $reward_id]]);
         if ($reward_count >= $reward->quantity && $reward->quantity)
             return false;
         $types = $this->getSnippets('rewardType');
@@ -187,7 +187,7 @@ 
                 $recives = \Money\Reward\Recive::getList(['where' => [['user_id', $user->id], ['reward_id', $reward->id]]]);
                 $amount = 0;
                 foreach ($recives as $recive) {
-                    $amount+=$recive->amount;
+                    $amount += $recive->amount;
                 }
                 if ($amount >= $reward->peruser) {
                     continue;

Braces +3 added lines, -2 removed lines

@@ -167,8 +167,9 @@
         $reward = \Money\Reward::get($reward_id);
         $reward->checkBlocked();
         $reward_count = \Money\Reward\Recive::getCount([ 'where' => [ 'reward_id', $reward_id ]]);
-        if ($reward_count >= $reward->quantity && $reward->quantity)
-            return false;
+        if ($reward_count >= $reward->quantity && $reward->quantity) {
+                    return false;
+        }
         $types = $this->getSnippets('rewardType');
         foreach ($reward->levels(['order' => ['level', 'asc']]) as $level) {
             $user = $rootUser;

system/modules/UserForms/widgets/userForm.php

Indentation +12 added lines, -12 removed lines

@@ -14,29 +14,29 @@
 ?>

 <form method = "POST" action = "">

   <?php

-  if ($form->description) {

-      echo "<p class = 'text-center'>{$form->description}</p>";

-  }

-  foreach ($form->inputs(['order' => ['weight']]) as $input) {

-      switch ($input->type) {

-          case 'text':

+    if ($form->description) {

+        echo "<p class = 'text-center'>{$form->description}</p>";

+    }

+    foreach ($form->inputs(['order' => ['weight']]) as $input) {

+        switch ($input->type) {

+            case 'text':

               ?>

               <div class ='form-group'>

                 <label><?= $input->label; ?></label>

                 <input class ='form-control' type ='text' name ='UserForms[<?= (int) $form_id; ?>][input<?= $input->id; ?>]' <?= $input->required ? 'required' : ''; ?> />

               </div>

               <?php

-              break;

-          case 'textarea':

+                break;

+            case 'textarea':

               ?>

               <div class ='form-group'>

                 <label><?= $input->label; ?></label>

                 <textarea class ='form-control' name ='UserForms[<?= (int) $form_id; ?>][input<?= $input->id; ?>]' <?= $input->required ? 'required' : ''; ?> /></textarea>

               </div>

               <?php

-              break;

-      }

-  }

-  ?>

+                break;

+        }

+    }

+    ?>

   <button class = 'btn btn-success btn-block'>Отправить</button>

 </form>
\ No newline at end of file

system/modules/Ecommerce/models/UserAdds/Field.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
             'map' => [
                 ['name', 'type'],
                 ['required', 'save'],
-                [ 'userfield']
+                ['userfield']
             ]
         ]
     ];

system/modules/Ui/objects/Tree.php

Indentation +11 added lines, -11 removed lines

@@ -23,17 +23,17 @@
         ?>
         <ul class="treeview" data-col='tree_path'>
           <?php
-          if (is_string($objectRoot)) {
-              $items = $objectRoot::getList(['where' => ['parent_id', 0]]);
-          } else {
-              $class = get_class($objectRoot);
-              $items = $class::getList(['where' => ['parent_id', $objectRoot->pk()]]);
-          }
-          $count += count($items);
-          foreach ($items as $objectChild) {
-              $count+=static::showLi($objectChild, 1, $maxDeep, $hrefFunc);
-          }
-          ?>
+            if (is_string($objectRoot)) {
+                $items = $objectRoot::getList(['where' => ['parent_id', 0]]);
+            } else {
+                $class = get_class($objectRoot);
+                $items = $class::getList(['where' => ['parent_id', $objectRoot->pk()]]);
+            }
+            $count += count($items);
+            foreach ($items as $objectChild) {
+                $count+=static::showLi($objectChild, 1, $maxDeep, $hrefFunc);
+            }
+            ?>
         </ul>
         <?php
         return $count;

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
           }
           $count += count($items);
           foreach ($items as $objectChild) {
-              $count+=static::showLi($objectChild, 1, $maxDeep, $hrefFunc);
+              $count += static::showLi($objectChild, 1, $maxDeep, $hrefFunc);
           }
           ?>
         </ul>
@@ -63,7 +63,7 @@ 
                     echo \Html::el('li', $attributes, $item, true);
                     echo '<ul>';
                 }
-                $count+=static::showLi($objectChild, $deep + 1, $maxDeep, $hrefFunc);
+                $count += static::showLi($objectChild, $deep + 1, $maxDeep, $hrefFunc);
             }
         }
         if ($isset) {

system/modules/Ecommerce/models/Delivery/Field.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
             'map' => [
                 ['name', 'type'],
                 ['required', 'save'],
-                [ 'userfield']
+                ['userfield']
             ]
         ]
     ];

system/modules/Ecommerce/widgets/cart/delivery.php

Indentation +18 added lines, -18 removed lines

@@ -2,24 +2,24 @@
   <div class="col-md-4">

     <ul class="nav nav-pills nav-stacked">

       <?php

-      $hiddenId = Tools::randomString();

-      foreach ($deliverys as $delivery) {

-          if ((!empty($_POST['delivery']) && $_POST['delivery'] == $delivery->id) || $delivery->id == $cartDelivery->id) {

-              $checked = 'checked';

-          } else {

-              $checked = '';

-          }

-          echo '<li' . ($checked ? ' class="active"' : '') . '><a href = "#" onclick = "document.getElementById(\'' . $hiddenId . '\').value=\'' . $delivery->id . '\';inji.Ecommerce.Cart.calcSum();return false;">';

-          echo $delivery->name;

-          echo '</a></li>';

-      }

-      $form->input('hidden', "delivery", '', [

-          'value' => $cartDelivery->id,

-          'attributes' => [

-              'id' => $hiddenId

-          ],

-      ]);

-      ?>

+        $hiddenId = Tools::randomString();

+        foreach ($deliverys as $delivery) {

+            if ((!empty($_POST['delivery']) && $_POST['delivery'] == $delivery->id) || $delivery->id == $cartDelivery->id) {

+                $checked = 'checked';

+            } else {

+                $checked = '';

+            }

+            echo '<li' . ($checked ? ' class="active"' : '') . '><a href = "#" onclick = "document.getElementById(\'' . $hiddenId . '\').value=\'' . $delivery->id . '\';inji.Ecommerce.Cart.calcSum();return false;">';

+            echo $delivery->name;

+            echo '</a></li>';

+        }

+        $form->input('hidden', "delivery", '', [

+            'value' => $cartDelivery->id,

+            'attributes' => [

+                'id' => $hiddenId

+            ],

+        ]);

+        ?>

     </ul>

   </div>

   <div class="col-md-8">

Spacing +2 added lines, -2 removed lines

@@ -27,13 +27,13 @@
     <?php

     $delivery = $cartDelivery;

     if ($delivery->price_text || $delivery->price) {

-        echo "<div>Стоимость доставки: <b>" . ($delivery->price_text ? $delivery->price_text : ( $delivery->price . ' ' . ($delivery->currency ? $delivery->currency->acronym() : 'руб.') )) . '</b></div>';

+        echo "<div>Стоимость доставки: <b>" . ($delivery->price_text ? $delivery->price_text : ($delivery->price . ' ' . ($delivery->currency ? $delivery->currency->acronym() : 'руб.'))) . '</b></div>';

     }

     if ((float) $delivery->max_cart_price) {

         echo '<div>При заказе товаров на сумму от ' . $delivery->max_cart_price . ' руб - бесплатно</div>';

     }

     echo $delivery->info;

-    if($delivery->fields) {

+    if ($delivery->fields) {

         echo '<hr \>';

         foreach ($delivery->fields as $field) {

             $form->input($field->type, "deliveryFields[{$field->id}]", $field->name, ['required' => $field->required]);

system/modules/Ecommerce/widgets/cart/fields.php

Indentation +16 added lines, -16 removed lines

@@ -1,16 +1,16 @@ 
 <fieldset>
   <?php
-  if (\Users\User::$cur->id) {
-      $userAdds = Ecommerce\UserAdds::getList(['where' => ['user_id', \Users\User::$cur->id]]);
-      $values = [];
-      foreach ($userAdds as $userAdd) {
-          $values[$userAdd->id] = $userAdd->values(['array' => true]);
-      }
-      if ($userAdds) {
-          $form->input('select', 'userAddsId', 'Ваши контакты', ['values' => ['' => 'Выберите'] + Ecommerce\UserAdds::getList(['where' => ['user_id', \Users\User::$cur->id], 'forSelect' => true])]);
-          echo '<hr />';
-      }
-      ?>
+    if (\Users\User::$cur->id) {
+        $userAdds = Ecommerce\UserAdds::getList(['where' => ['user_id', \Users\User::$cur->id]]);
+        $values = [];
+        foreach ($userAdds as $userAdd) {
+            $values[$userAdd->id] = $userAdd->values(['array' => true]);
+        }
+        if ($userAdds) {
+            $form->input('select', 'userAddsId', 'Ваши контакты', ['values' => ['' => 'Выберите'] + Ecommerce\UserAdds::getList(['where' => ['user_id', \Users\User::$cur->id], 'forSelect' => true])]);
+            echo '<hr />';
+        }
+        ?>
       <script>
           var userAddsValues = <?= json_encode($values); ?>;
           inji.onLoad(function () {
@@ -24,9 +24,9 @@ 
           })
       </script>
       <?php
-  }
-  foreach (Ecommerce\UserAdds\Field::getList(['order' => ['weight', 'asc']]) as $field) {
-      $form->input($field->type, "userAdds[fields][{$field->id}]", $field->name, ['required' => $field->required]);
-  }
-  ?>
+    }
+    foreach (Ecommerce\UserAdds\Field::getList(['order' => ['weight', 'asc']]) as $field) {
+        $form->input($field->type, "userAdds[fields][{$field->id}]", $field->name, ['required' => $field->required]);
+    }
+    ?>
 </fieldset>
\ No newline at end of file

system/modules/Recaptcha/appAdminControllers/RecaptchaController.php

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * Recaptcha admin controller
- *
- * @author Alexey Krupskiy <admin@inji.ru>
- * @link http://inji.ru/
- * @copyright 2015 Alexey Krupskiy
- * @license https://github.com/injitools/cms-Inji/blob/master/LICENSE
- */
+     * Recaptcha admin controller
+     *
+     * @author Alexey Krupskiy <admin@inji.ru>
+     * @link http://inji.ru/
+     * @copyright 2015 Alexey Krupskiy
+     * @license https://github.com/injitools/cms-Inji/blob/master/LICENSE
+     */
 class RecaptchaController extends Controller
 {
     public function indexAction()