injitools / cms-Inji

system/modules/Files/Files.php

Braces +24 added lines, -16 removed lines

@@ -22,16 +22,19 @@ 
 
         $sitePath = App::$primary->path;
 
-        if (!is_uploaded_file($file['tmp_name']))
-            return 0;
+        if (!is_uploaded_file($file['tmp_name'])) {
+                    return 0;
+        }
 
         $fileinfo = pathinfo($file['name']);
-        if (empty($fileinfo['extension']))
-            return 0;
+        if (empty($fileinfo['extension'])) {
+                    return 0;
+        }
 
         $type = Files\Type::get($fileinfo['extension'], 'ext');
-        if (!$type)
-            return 0;
+        if (!$type) {
+                    return 0;
+        }
 
         if (!empty($options['accept_group']) && $options['accept_group'] != $type->group) {
             return 0;
@@ -47,13 +50,15 @@ 
         }
         $fileObject->name = $fileinfo['filename'];
         $fileObject->path = $type->type_dir . date('Y-m-d') . '/' . microtime(true) . '.' . $fileinfo['extension'];
-        if ($fileObject->id && file_exists($sitePath . $fileObject->path))
-            unlink($sitePath . $fileObject->path);
+        if ($fileObject->id && file_exists($sitePath . $fileObject->path)) {
+                    unlink($sitePath . $fileObject->path);
+        }
 
         Tools::createDir($sitePath . $type->type_dir . date('Y-m-d') . '/');
 
-        if (!move_uploaded_file($file['tmp_name'], $sitePath . $fileObject->path))
-            return false;
+        if (!move_uploaded_file($file['tmp_name'], $sitePath . $fileObject->path)) {
+                    return false;
+        }
 
         $fileObject->type_id = $type->pk();
         $fileObject->original_name = $file['name'];
@@ -76,12 +81,14 @@ 
         $sitePath = App::$primary->path;
 
         $fileinfo = pathinfo($url);
-        if (empty($fileinfo['extension']))
-            return 0;
+        if (empty($fileinfo['extension'])) {
+                    return 0;
+        }
 
         $type = Files\Type::get($fileinfo['extension'], 'ext');
-        if (!$type)
-            return 0;
+        if (!$type) {
+                    return 0;
+        }
 
         if (!empty($options['accept_group']) && $options['accept_group'] != $type->group) {
             return 0;
@@ -97,8 +104,9 @@ 
         }
         $fileObject->name = $fileinfo['filename'];
         $fileObject->path = $type->type_dir . date('Y-m-d') . '/' . microtime(true) . '.' . $fileinfo['extension'];
-        if ($fileObject->id && file_exists($sitePath . $fileObject->path))
-            unlink($sitePath . $fileObject->path);
+        if ($fileObject->id && file_exists($sitePath . $fileObject->path)) {
+                    unlink($sitePath . $fileObject->path);
+        }
 
         Tools::createDir($sitePath . $type->type_dir . date('Y-m-d') . '/');
 

Spacing +10 added lines, -10 removed lines

@@ -46,13 +46,13 @@ 
             }
         }
         $fileObject->name = $fileinfo['filename'];
-        $fileObject->path = $type->type_dir . date('Y-m-d') . '/' . microtime(true) . '.' . $fileinfo['extension'];
-        if ($fileObject->id && file_exists($sitePath . $fileObject->path))
-            unlink($sitePath . $fileObject->path);
+        $fileObject->path = $type->type_dir.date('Y-m-d').'/'.microtime(true).'.'.$fileinfo['extension'];
+        if ($fileObject->id && file_exists($sitePath.$fileObject->path))
+            unlink($sitePath.$fileObject->path);
 
-        Tools::createDir($sitePath . $type->type_dir . date('Y-m-d') . '/');
+        Tools::createDir($sitePath.$type->type_dir.date('Y-m-d').'/');
 
-        if (!move_uploaded_file($file['tmp_name'], $sitePath . $fileObject->path))
+        if (!move_uploaded_file($file['tmp_name'], $sitePath.$fileObject->path))
             return false;
 
         $fileObject->type_id = $type->pk();
@@ -96,17 +96,17 @@ 
             }
         }
         $fileObject->name = $fileinfo['filename'];
-        $fileObject->path = $type->type_dir . date('Y-m-d') . '/' . microtime(true) . '.' . $fileinfo['extension'];
-        if ($fileObject->id && file_exists($sitePath . $fileObject->path))
-            unlink($sitePath . $fileObject->path);
+        $fileObject->path = $type->type_dir.date('Y-m-d').'/'.microtime(true).'.'.$fileinfo['extension'];
+        if ($fileObject->id && file_exists($sitePath.$fileObject->path))
+            unlink($sitePath.$fileObject->path);
 
-        Tools::createDir($sitePath . $type->type_dir . date('Y-m-d') . '/');
+        Tools::createDir($sitePath.$type->type_dir.date('Y-m-d').'/');
 
         $file = @file_get_contents($url);
         if ($file === false) {
             return 0;
         }
-        file_put_contents($sitePath . $fileObject->path, $file);
+        file_put_contents($sitePath.$fileObject->path, $file);
 
         $fileObject->type_id = $type->pk();
         $fileObject->original_name = $fileinfo['basename'];

system/modules/Libs/Controllers/LibsController.php

Indentation +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
         $args = func_get_args();
         $path = $this->module->getPath($args);
         if($path){
-             $this->StaticLoader->giveFile($path);
+                $this->StaticLoader->giveFile($path);
         }
     }
 

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
     {
         $args = func_get_args();
         $path = $this->module->getPath($args);
-        if($path){
+        if ($path) {
              $this->StaticLoader->giveFile($path);
         }
     }

system/modules/Materials/appControllers/content/default.php

Indentation +13 added lines, -13 removed lines

@@ -4,17 +4,17 @@
     <?= Ui\FastEdit::block($material, 'text', null, true); ?>
   </div>
   <?php
-  if ($material->links) {
-      echo '<ul class = "material-links">';
-      foreach ($material->links as $materialLink) {
-          $href = $materialLink->linkedMaterial->alias;
-          if ($href == '') {
-              $href = '/';
-          }
-          $name = $materialLink->name ? $materialLink->name : $materialLink->linkedMaterial->name;
-          echo "<li><a href = '{$href}'>{$name}</a></li>";
-      }
-      echo '</ul>';
-  }
-  ?>
+    if ($material->links) {
+        echo '<ul class = "material-links">';
+        foreach ($material->links as $materialLink) {
+            $href = $materialLink->linkedMaterial->alias;
+            if ($href == '') {
+                $href = '/';
+            }
+            $name = $materialLink->name ? $materialLink->name : $materialLink->linkedMaterial->name;
+            echo "<li><a href = '{$href}'>{$name}</a></li>";
+        }
+        echo '</ul>';
+    }
+    ?>
 </div>
\ No newline at end of file

system/modules/Modules/appAdminControllers/content/install.php

Braces +3 added lines, -2 removed lines

@@ -6,8 +6,9 @@
     $systemModules = array_slice(scandir(INJI_SYSTEM_DIR . '/modules'), 2);
     foreach ($systemModules as $module) {
         $info = Module::getInfo($module);
-        if (!$info || isset($modules[$module]))
-            continue;
+        if (!$info || isset($modules[$module])) {
+                    continue;
+        }
         ?>
         <div class ="form-group">
             <div class="checkbox">

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
     <?php
     $config = Config::app(App::$primary ? App::$primary : App::$cur);
     $modules = array_flip(Module::getInstalled(App::$cur));
-    $systemModules = array_slice(scandir(INJI_SYSTEM_DIR . '/modules'), 2);
+    $systemModules = array_slice(scandir(INJI_SYSTEM_DIR.'/modules'), 2);
     foreach ($systemModules as $module) {
         $info = Module::getInfo($module);
         if (!$info || isset($modules[$module]))

system/modules/Money/objects/MerchantHelper/Robokassa.php

Braces +3 added lines, -2 removed lines

@@ -25,8 +25,9 @@
 
         $result['payId'] = $data["InvId"];
 
-        if (strtolower($data['SignatureValue']) == $hashGenerated)
-            $result['status'] = 'success';
+        if (strtolower($data['SignatureValue']) == $hashGenerated) {
+                    $result['status'] = 'success';
+        }
 
         return $result;
     }

Spacing +2 added lines, -2 removed lines

@@ -44,9 +44,9 @@
             'SignatureValue' => $hash
         ];
         if (empty($config['test'])) {
-            \Tools::redirect('https://auth.robokassa.ru/Merchant/Index.aspx?' . http_build_query($data));
+            \Tools::redirect('https://auth.robokassa.ru/Merchant/Index.aspx?'.http_build_query($data));
         } else {
-            \Tools::redirect('http://test.robokassa.ru/Index.aspx?' . http_build_query($data));
+            \Tools::redirect('http://test.robokassa.ru/Index.aspx?'.http_build_query($data));
         }
     }
 

system/modules/Money/objects/MerchantHelper/WalletOne.php

Braces +18 added lines, -12 removed lines

@@ -28,20 +28,24 @@ 
 
         // Проверка наличия необходимых параметров в POST-запросе
 
-        if (!isset($data["WMI_SIGNATURE"]))
-            $result['callback'] = print_answer("Retry", "Отсутствует параметр WMI_SIGNATURE");
+        if (!isset($data["WMI_SIGNATURE"])) {
+                    $result['callback'] = print_answer("Retry", "Отсутствует параметр WMI_SIGNATURE");
+        }
 
-        if (!isset($data["WMI_PAYMENT_NO"]))
-            $result['callback'] = print_answer("Retry", "Отсутствует параметр WMI_PAYMENT_NO");
+        if (!isset($data["WMI_PAYMENT_NO"])) {
+                    $result['callback'] = print_answer("Retry", "Отсутствует параметр WMI_PAYMENT_NO");
+        }
 
-        if (!isset($data["WMI_ORDER_STATE"]))
-            $result['callback'] = print_answer("Retry", "Отсутствует параметр WMI_ORDER_STATE");
+        if (!isset($data["WMI_ORDER_STATE"])) {
+                    $result['callback'] = print_answer("Retry", "Отсутствует параметр WMI_ORDER_STATE");
+        }
 
         // Извлечение всех параметров POST-запроса, кроме WMI_SIGNATURE
         $params = [];
         foreach ($data as $name => $value) {
-            if ($name !== "WMI_SIGNATURE")
-                $params[$name] = $value;
+            if ($name !== "WMI_SIGNATURE") {
+                            $params[$name] = $value;
+            }
         }
 
         // Сортировка массива по именам ключей в порядке возрастания
@@ -86,8 +90,9 @@ 
         $config = static::getConfig();
         $merchantCurrency = static::getMerchantCurrency($currency);
         
-        if (!$description)
-            $description = "Оплата заказа на сайте " . idn_to_utf8(INJI_DOMAIN_NAME);
+        if (!$description) {
+                    $description = "Оплата заказа на сайте " . idn_to_utf8(INJI_DOMAIN_NAME);
+        }
 
         //Секретный ключ интернет-магазина
         $key = $config['secret'];
@@ -117,11 +122,12 @@ 
         $fieldValues = "";
 
         foreach ($fields as $value) {
-            if (is_array($value))
-                foreach ($value as $v) {
+            if (is_array($value)) {
+                            foreach ($value as $v) {
                     //Конвертация из текущей кодировки (UTF-8)
                     //необходима только если кодировка магазина отлична от Windows-1251
                     $v = iconv("utf-8", "windows-1251", $v);
+            }
                     $fieldValues .= $v;
                 } else {
                 //Конвертация из текущей кодировки (UTF-8)

Spacing +10 added lines, -10 removed lines

@@ -21,8 +21,8 @@ 
 
         function print_answer($result, $description)
         {
-            $print = "WMI_RESULT=" . strtoupper($result) . "&";
-            $print .= "WMI_DESCRIPTION=" . urlencode($description);
+            $print = "WMI_RESULT=".strtoupper($result)."&";
+            $print .= "WMI_DESCRIPTION=".urlencode($description);
             return $print;
         }
 
@@ -59,24 +59,24 @@ 
 
         // Формирование подписи для сравнения ее с параметром WMI_SIGNATURE
 
-        $signature = base64_encode(pack("H*", md5($values . $skey)));
+        $signature = base64_encode(pack("H*", md5($values.$skey)));
 
         //Сравнение полученной подписи с подписью W1
 
         if (!empty($data["WMI_SIGNATURE"]) && $signature == $data["WMI_SIGNATURE"]) {
             if (strtoupper($data["WMI_ORDER_STATE"]) == "ACCEPTED") {
                 // вызываем функцию обработки в случае успеха
-                $result['callback'] = print_answer("Ok", "Заказ #" . $data["WMI_PAYMENT_NO"] . " оплачен!");
+                $result['callback'] = print_answer("Ok", "Заказ #".$data["WMI_PAYMENT_NO"]." оплачен!");
                 $result['payId'] = $data["WMI_PAYMENT_NO"];
                 $result['status'] = 'success';
                 return $result;
             } else {
                 // Случилось что-то странное, пришло неизвестное состояние заказа
-                $result['callback'] = print_answer("Retry", "Неверное состояние " . $data["WMI_ORDER_STATE"]);
+                $result['callback'] = print_answer("Retry", "Неверное состояние ".$data["WMI_ORDER_STATE"]);
             }
         } else {
             // Подпись не совпадает, возможно вы поменяли настройки интернет-магазина
-            $result['callback'] = print_answer("Retry", "Неверная подпись " . (!empty($data["WMI_SIGNATURE"]) ? $data["WMI_SIGNATURE"] : 'empty'));
+            $result['callback'] = print_answer("Retry", "Неверная подпись ".(!empty($data["WMI_SIGNATURE"]) ? $data["WMI_SIGNATURE"] : 'empty'));
         }
         return $result;
     }
@@ -87,7 +87,7 @@ 
         $merchantCurrency = static::getMerchantCurrency($currency);
         
         if (!$description)
-            $description = "Оплата заказа на сайте " . idn_to_utf8(INJI_DOMAIN_NAME);
+            $description = "Оплата заказа на сайте ".idn_to_utf8(INJI_DOMAIN_NAME);
 
         //Секретный ключ интернет-магазина
         $key = $config['secret'];
@@ -99,7 +99,7 @@ 
         $fields["WMI_PAYMENT_AMOUNT"] = number_format($amount, 0, '.', '');
         $fields["WMI_CURRENCY_ID"] = $merchantCurrency->code;
         $fields["WMI_PAYMENT_NO"] = $payId;
-        $fields["WMI_DESCRIPTION"] = "BASE64:" . base64_encode($description);
+        $fields["WMI_DESCRIPTION"] = "BASE64:".base64_encode($description);
         $fields["WMI_EXPIRED_DATE"] = "2019-12-31T23:59:59";
         $fields["WMI_SUCCESS_URL"] = $success;
         $fields["WMI_FAIL_URL"] = $false;
@@ -135,7 +135,7 @@ 
         // вычисления отпечатка, сформированного выше сообщения,
         // по алгоритму MD5 и представление его в Base64
 
-        $signature = base64_encode(pack("H*", md5($fieldValues . $key)));
+        $signature = base64_encode(pack("H*", md5($fieldValues.$key)));
 
         //Добавление параметра WMI_SIGNATURE в словарь параметров формы
 
@@ -155,7 +155,7 @@ 
 
           print "<input type=\"submit\"/></form>";
          */
-        \Tools::redirect('https://www.walletone.com/checkout/default.aspx?' . http_build_query($fields));
+        \Tools::redirect('https://www.walletone.com/checkout/default.aspx?'.http_build_query($fields));
     }
 
 }

system/modules/Money/snippets/expiredDateGenerator/dayStart.php

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 
 return function($reward, $user) {
     return [
-        'date' => date('Y-m-d H:i:s',mktime(0, 0, 0, date('n'), date("j") + 1, date("Y"))),
+        'date' => date('Y-m-d H:i:s', mktime(0, 0, 0, date('n'), date("j") + 1, date("Y"))),
         'type' => 'burn'
     ];
 };

system/modules/Money/widgets/cabinet/rewards.php

Indentation +13 added lines, -13 removed lines

@@ -12,13 +12,13 @@ 
         <h3>Уровни начислений</h3>
         <ul>
           <?php
-          foreach ($reward->levels(['order' => ['level', 'asc']]) as $level) {
-              ?>
+            foreach ($reward->levels(['order' => ['level', 'asc']]) as $level) {
+                ?>
 
               <li><?= !$level->level ? 'Личный' : $level->level; ?>. <?= $types[$level->type]['viewer']($level); ?></li>
               <?php
-          }
-          ?>
+            }
+            ?>
 
         </ul>
       </div>
@@ -34,20 +34,20 @@ 
             <h4 class="<?= $complete ? 'text-success' : 'text-danger'; ?>"><?= $condition->name(); ?></h4>
             <ul>
               <?php
-              foreach ($condition->items as $item) {
-                  $itemComplete = $item->checkComplete();
-                  switch ($item->type) {
-                      case 'event':
+                foreach ($condition->items as $item) {
+                    $itemComplete = $item->checkComplete();
+                    switch ($item->type) {
+                        case 'event':
                           $name = \Events\Event::get($item->value, 'event')->name();
-                          break;
-                  }
-                  ?>
+                            break;
+                    }
+                    ?>
                   <li> 
                     <b class="<?= $itemComplete ? 'text-success' : 'text-danger'; ?>"><?= $name; ?> <?= $item->recivedCount(); ?></b>/<?= $item->count; ?> <br />
                   </li>
                   <?php
-              }
-              ?>
+                }
+                ?>
             </ul>
             <?php
         }

system/modules/Money/widgets/cabinet/wallets.php

Indentation +7 added lines, -7 removed lines

@@ -1,11 +1,11 @@ 
 <h3>Мои кошельки</h3>

 <div class="row">

   <?php

-  $blocked = App::$cur->money->getUserBlocks();

-  $wallets = App::$cur->money->getUserWallets();

-  $rates = Money\Currency\ExchangeRate::getList();

-  foreach ($wallets as $wallet) {

-      ?>

+    $blocked = App::$cur->money->getUserBlocks();

+    $wallets = App::$cur->money->getUserWallets();

+    $rates = Money\Currency\ExchangeRate::getList();

+    foreach ($wallets as $wallet) {

+        ?>

       <div class="col-sm-4">

         <h4><?= $wallet->currency->name(); ?></h4>

         <b><?= $wallet->showAmount(); ?></b> <?= $wallet->currency->acronym(); ?><br />

@@ -30,8 +30,8 @@ 
         ?>

       </div>

       <?php

-  }

-  ?>

+    }

+    ?>

 </div>

 <?php

 $transfers = Money\Transfer::getList(['where' => [

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
         <b><?= $wallet->showAmount(); ?></b> <?= $wallet->currency->acronym(); ?><br />

         <?php

         if (!empty($blocked[$wallet->currency_id])) {

-            echo "Заблокировано: {$blocked[$wallet->currency_id]} " . $wallet->currency->acronym() . "<br />";

+            echo "Заблокировано: {$blocked[$wallet->currency_id]} ".$wallet->currency->acronym()."<br />";

         }

         if ($wallet->currency->refill) {

             echo "<a href = '/money/refill?currency_id={$wallet->currency_id}'>Пополнить</a> ";