injitools / cms-Inji

system/modules/UserForms/models/Form.php

Spacing +2 added lines, -2 removed lines

@@ -24,10 +24,10 @@
     public static $cols = [
         'name' => ['type' => 'text'],
         'description' => ['type' => 'html'],
-        'user_id' => [ 'type' => 'select', 'source' => 'relation', 'relation' => 'user'],
+        'user_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'user'],
         'date_create' => ['type' => 'dateTime'],
         //Менеджеры
-        'inputs' => [ 'type' => 'dataManager', 'relation' => 'inputs'],
+        'inputs' => ['type' => 'dataManager', 'relation' => 'inputs'],
     ];
     public static $dataManagers = [
         'manager' => [

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;
@@ -168,7 +168,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');
@@ -189,7 +189,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 +6 added lines, -3 removed lines

@@ -49,7 +49,8 @@ 
     public function reciver($data, $system, $status, $mr) {
         if ($system) {
             $merchant = \Money\Merchant::get($system, 'object_name');
-        } else {
+        }
+        else {
             $merchant = false;
         }
         if ($merchant) {
@@ -96,7 +97,8 @@ 
         foreach ($blocked as $block) {
             if (empty($blocks[$block->wallet->currency_id])) {
                 $blocks[$block->wallet->currency_id] = $block->amount;
-            } else {
+            }
+            else {
                 $blocks[$block->wallet->currency_id]+= $block->amount;
             }
         }
@@ -123,7 +125,8 @@ 
                 $wallet->currency_id = $currency->id;
                 $wallet->save();
                 $result[$walletIdasKey ? $wallet->id : $currency->id] = $forSelect ? $wallet->name() : $wallet;
-            } else {
+            }
+            else {
                 $result[$walletIdasKey ? $wallets[$currency->id]->id : $currency->id] = $forSelect ? $wallets[$currency->id]->name() : $wallets[$currency->id];
             }
         }

system/modules/Money/objects/Sums.php

Spacing +7 added lines, -7 removed lines

@@ -61,21 +61,21 @@
             if ($first) {
                 $first = false;
             } else {
-                $string.= '<br />';
+                $string .= '<br />';
             }
-            $string.= '<span style="white-space:nowrap;">';
-            $string.= number_format($sum, 2, '.', ' ');
+            $string .= '<span style="white-space:nowrap;">';
+            $string .= number_format($sum, 2, '.', ' ');
             if (\App::$cur->money) {
                 $currency = \Money\Currency::get($currency_id);
                 if ($currency) {
-                    $string.= ' ' . $currency->acronym();
+                    $string .= ' ' . $currency->acronym();
                 } else {
-                    $string.= ' руб.';
+                    $string .= ' руб.';
                 }
             } else {
-                $string.= ' руб.';
+                $string .= ' руб.';
             }
-            $string.= '</span>';
+            $string .= '</span>';
         }
         return $string;
     }

Braces +6 added lines, -3 removed lines

@@ -54,7 +54,8 @@ 
         foreach ($this->sums as $currency_id => $sum) {
             if ($first) {
                 $first = false;
-            } else {
+            }
+            else {
                 $string.= '<br />';
             }
             $string.= '<span style="white-space:nowrap;">';
@@ -63,10 +64,12 @@ 
                 $currency = \Money\Currency::get($currency_id);
                 if ($currency) {
                     $string.= ' ' . $currency->acronym();
-                } else {
+                }
+                else {
                     $string.= ' руб.';
                 }
-            } else {
+            }
+            else {
                 $string.= ' руб.';
             }
             $string.= '</span>';

system/modules/Sitemap/install_script.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-return function ($step = NULL, $params = []) {
+return function($step = NULL, $params = []) {
 
     $groups = [
         [

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-return function ($step = NULL, $params = []) {
+return function ($step = null, $params = []) {
     \App::$primary->config['moduleRouter']['sitemap.xml'] = 'Sitemap';
     \Config::save('app', App::$primary->config);
 };

system/Inji/Module.php

Doc Comments +1 added lines, -1 removed lines

@@ -132,7 +132,7 @@
      * Get installed modules for app
      * 
      * @param \App $app
-     * @param boolean|\App $primary
+     * @param App $primary
      * @return array
      */
     public static function getInstalled($app, $primary = false)

Braces +6 added lines, -3 removed lines

@@ -246,7 +246,8 @@ 
                 if (strpos($pathName, 'slice')) {
                     $controllerName = ucfirst($this->params[0]);
                     $params = array_slice($this->params, 1);
-                } else {
+                }
+                else {
                     $controllerName = $this->moduleName;
                     $params = $this->params;
                 }
@@ -270,7 +271,8 @@ 
     public static function getInfo($moduleName = '') {
         if (!$moduleName && get_called_class()) {
             $moduleName = get_called_class();
-        } elseif (!$moduleName) {
+        }
+        elseif (!$moduleName) {
             return [];
         }
         $paths = Module::getModulePaths($moduleName);
@@ -303,7 +305,8 @@ 
                 foreach ($snippetsPaths as $snippetPath) {
                     if (is_dir($path . $dir . '/' . $snippetsPath . '/' . $snippetPath)) {
                         $snippets[$snippetPath] = include $path . $dir . '/' . $snippetsPath . '/' . $snippetPath . '/info.php';
-                    } else {
+                    }
+                    else {
                         $snippets[pathinfo($snippetPath, PATHINFO_FILENAME)] = include $path . $dir . '/' . $snippetsPath . '/' . $snippetPath;
                     }
                 }

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
         if (in_array($moduleName, self::getInstalled($app))) {
             return true;
         }
-        return FALSE;
+        return false;
     }
 
     /**

system/modules/YandexExport/appControllers/YandexExportController.php

Doc Comments +4 added lines

@@ -11,6 +11,10 @@
 
     function indexAction() {
 
+        /**
+         * @param DOMDocument $xml
+         * @param string $nodeName
+         */
         function addToXml($xml, $parent, $nodeName, $text) {
             $node = $parent->appendChild($xml->createElement($nodeName));
             $node->appendChild($xml->createTextNode($text));

system/modules/Files/Files.php

Spacing +2 added lines, -2 removed lines

@@ -58,7 +58,7 @@ 
 
         if ($type->allow_resize && $type->options && json_decode($type->options, true)) {
             $typeOptions = json_decode($type->options, true);
-            list( $img_width, $img_height, $img_type, $img_tag ) = getimagesize($sitePath . $fileObject->path);
+            list($img_width, $img_height, $img_type, $img_tag) = getimagesize($sitePath . $fileObject->path);
             if ($img_height > $typeOptions['max_height'] || $img_width > $typeOptions['max_width']) {
                 Tools::resizeImage($sitePath . $fileObject->path, $typeOptions['max_width'], $typeOptions['max_height']);
             }
@@ -120,7 +120,7 @@ 
 
         if ($type->allow_resize && $type->options && json_decode($type->options, true)) {
             $typeOptions = json_decode($type->options, true);
-            list( $img_width, $img_height, $img_type, $img_tag ) = getimagesize($sitePath . $fileObject->path);
+            list($img_width, $img_height, $img_type, $img_tag) = getimagesize($sitePath . $fileObject->path);
             if ($img_height > $typeOptions['max_height'] || $img_width > $typeOptions['max_width']) {
                 Tools::resizeImage($sitePath . $fileObject->path, $typeOptions['max_width'], $typeOptions['max_height']);
             }

Braces +21 added lines, -14 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,8 +50,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') . '/');
 
@@ -84,12 +88,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;
@@ -105,8 +111,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') . '/');
 

system/modules/Files/appAdminControllers/content/managerForEditor.php

Indentation +19 added lines, -19 removed lines

@@ -1,33 +1,33 @@
 <div class="container-fluid">
     <div class="row panel">
       <?php
-      if (!empty($_FILES['file'])) {
-          App::$cur->files->upload($_FILES['file'], ['upload_code' => 'editorManager']);
-      }
-      $form = new Ui\Form();
-      $form->begin();
-      $form->input('file', 'file', 'Загрузить файл');
-      echo '<div class="form-group"><button class ="btn btn-primary btn-sm">Загузить</button></div>';
-      $form->end(false);
-      ?>
+        if (!empty($_FILES['file'])) {
+            App::$cur->files->upload($_FILES['file'], ['upload_code' => 'editorManager']);
+        }
+        $form = new Ui\Form();
+        $form->begin();
+        $form->input('file', 'file', 'Загрузить файл');
+        echo '<div class="form-group"><button class ="btn btn-primary btn-sm">Загузить</button></div>';
+        $form->end(false);
+        ?>
     </div>
     <h2>Последние файлы</h2>
     <div class="row">
       <?php
-      $files = Files\File::getList(['where' => ['upload_code', 'editorManager'], 'limit' => 12, 'order' => ['date_create', 'DESC']]);
-      $i = 0;
-      foreach ($files as $file) {
-          ?>
+        $files = Files\File::getList(['where' => ['upload_code', 'editorManager'], 'limit' => 12, 'order' => ['date_create', 'DESC']]);
+        $i = 0;
+        foreach ($files as $file) {
+            ?>
             <div class="col-xs-6 col-sm-2 fileChooser" onclick="OpenFile('<?= $file->path; ?>');
                       return false;">
                 <div class="thumbnail">
                   <?php
-                  if ($file->type->group == 'image') {
-                      echo "<img class='img-responsive' src ='{$file->path}?resize=200x200' />";
-                  } else {
-                      echo "<img class='img-responsive' src ='/static/moduleAsset/Files/images/formats/" . pathinfo($file->path, PATHINFO_EXTENSION) . ".png' />";
-                  }
-                  ?>
+                    if ($file->type->group == 'image') {
+                        echo "<img class='img-responsive' src ='{$file->path}?resize=200x200' />";
+                    } else {
+                        echo "<img class='img-responsive' src ='/static/moduleAsset/Files/images/formats/" . pathinfo($file->path, PATHINFO_EXTENSION) . ".png' />";
+                    }
+                    ?>
 
                     <?= $file->name; ?><br />
                     <small class="text-muted">

Braces +2 added lines, -1 removed lines

@@ -24,7 +24,8 @@
                   <?php
                   if ($file->type->group == 'image') {
                       echo "<img class='img-responsive' src ='{$file->path}?resize=200x200' />";
-                  } else {
+                  }
+                  else {
                       echo "<img class='img-responsive' src ='/static/moduleAsset/Files/images/formats/" . pathinfo($file->path, PATHINFO_EXTENSION) . ".png' />";
                   }
                   ?>

system/modules/Files/install_script.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-return function($step = NULL, $params = []) {
+return function($step = null, $params = []) {
     $options = ['max_height' => 1200, 'max_width' => 1200];
     $types = [
         [