injitools / cms-Inji

system/modules/Ui/widgets/Form/text.php

Indentation +4 added lines, -4 removed lines

@@ -9,16 +9,16 @@
     'value' => !empty($options['value']) ? addcslashes($options['value'], "'") : (!empty($form->userDataTree[$name]) ? addcslashes($form->userDataTree[$name], "'") : '')
 ];
 if (!empty($options['disabled'])) {
-  $attributes['disabled'] = 'disabled';
+    $attributes['disabled'] = 'disabled';
 }
 if (!empty($options['placeholder'])) {
-  $attributes['placeholder'] = $options['placeholder'];
+    $attributes['placeholder'] = $options['placeholder'];
 }
 if (!empty($options['checked'])) {
-  $attributes['checked'] = 'checked';
+    $attributes['checked'] = 'checked';
 }
 if (!empty($options['attributes'])) {
-  $attributes = array_merge($attributes, $options['attributes']);
+    $attributes = array_merge($attributes, $options['attributes']);
 }
 echo Html::el('input', $attributes, '', null);
 echo!empty($options['helpText']) ? "<div class='help-block'>{$options['helpText']}</div>" : '';

system/modules/Ui/widgets/Form/dynamicList.php

Indentation +31 added lines, -31 removed lines

@@ -6,10 +6,10 @@ 
     <?= $label; ?>
   </h3>
   <?php
-  if ($options['source'] == 'relation' && empty($options['modelPk'])) {
+    if ($options['source'] == 'relation' && empty($options['modelPk'])) {
     echo '<h4 class=" text-muted">Чтобы добавить связи, сначала создайте объект</h4>';
     echo '<p class=" text-muted">Просто заполните доступные поля и нажмите кнопку внизу формы. После этого дополнительные поля разблокируются</p>';
-  } else {
+    } else {
     ?>
     <div class="table-responsive">
       <table class ='table table-striped'>
@@ -17,18 +17,18 @@ 
           <tr>
             <?php
             foreach ($options['cols'] as $colName => $col) {
-              if (!empty($col['hidden'])) {
+                if (!empty($col['hidden'])) {
                 continue;
-              }
-              echo "<th>";
-              echo $col['col']['label'];
-              if (!empty($col['col']['model'])) {
+                }
+                echo "<th>";
+                echo $col['col']['label'];
+                if (!empty($col['col']['model'])) {
                 $modelName = $col['col']['model'];
                 $onclick = 'inji.Ui.forms.popUp(\'' . addslashes($modelName) . '\',{},function(elem){'
                         . 'return function(data,modal){inji.Ui.forms.submitAjax($(elem).closest(\'form\')[0], {notSave: true});}}(this));return false;';
                 echo ' (<a href="" onclick="' . $onclick . ';this.disabled=true;return false;">Создать</a>)';
-              }
-              echo "</th>";
+                }
+                echo "</th>";
             }
             ?>
             <td>&nbsp;</td>
@@ -36,14 +36,14 @@ 
         </thead>
         <tbody class="listBody">
           <?php
-          $i = 0;
-          if (!empty($options['values'])) {
+            $i = 0;
+            if (!empty($options['values'])) {
             foreach ($options['values'] as $row) {
-              echo '<tr>';
-              foreach ($options['cols'] as $colName => $col) {
+                echo '<tr>';
+                foreach ($options['cols'] as $colName => $col) {
                 $input = clone $col['input'];
                 if (empty($col['hidden'])) {
-                  echo '<td>';
+                    echo '<td>';
                 }
                 $input->options['noContainer'] = true;
                 $input->colParams['label'] = false;
@@ -51,24 +51,24 @@ 
                 $input->colName .= '[' . $colName . '][' . ($i) . ']';
                 $input->draw();
                 if (empty($col['hidden'])) {
-                  echo '</td>';
+                    echo '</td>';
+                }
                 }
-              }
-              $i++;
-              echo '<td class="actionTd"><a class="btn btn-danger btn-xs" onclick="inji.Ui.forms.delRowFromList(this);"><i class="glyphicon glyphicon-remove"></i></a></td>';
-              echo '</tr>';
+                $i++;
+                echo '<td class="actionTd"><a class="btn btn-danger btn-xs" onclick="inji.Ui.forms.delRowFromList(this);"><i class="glyphicon glyphicon-remove"></i></a></td>';
+                echo '</tr>';
             }
-          }
-          ?>
+            }
+            ?>
         </tbody>
         <tfoot>
           <tr>
             <?php
             foreach ($options['cols'] as $colName => $col) {
-              if (!empty($col['hidden'])) {
+                if (!empty($col['hidden'])) {
                 continue;
-              }
-              echo "<th>{$col['col']['label']}</th>";
+                }
+                echo "<th>{$col['col']['label']}</th>";
             }
             ?>
             <td>&nbsp;</td>
@@ -81,26 +81,26 @@ 
       <script>/*
        <tr>
   <?php
-  foreach ($options['cols'] as $colName => $col) {
+    foreach ($options['cols'] as $colName => $col) {
     if (empty($col['hidden'])) {
-      echo '<td>';
+        echo '<td>';
     }
     $col['input']->options['noContainer'] = true;
     $col['input']->colParams['label'] = false;
     $col['input']->colName.="[{$colName}][]";
     $col['input']->draw();
     if (empty($col['hidden'])) {
-      echo '</td>';
+        echo '</td>';
+    }
     }
-  }
-  ?>
+    ?>
        <td class="actionTd"><a class="btn btn-danger btn-xs" onclick="inji.Ui.forms.delRowFromList(this);"><i class="glyphicon glyphicon-remove"></i></a></td>
        </tr>
        */</script>
     </div>
     <?php
-  }
-  ?>
+    }
+    ?>
 </div>
 <?php
 //exit();

Spacing +4 added lines, -4 removed lines

@@ -24,9 +24,9 @@ 
               echo $col['col']['label'];
               if (!empty($col['col']['model'])) {
                 $modelName = $col['col']['model'];
-                $onclick = 'inji.Ui.forms.popUp(\'' . addslashes($modelName) . '\',{},function(elem){'
+                $onclick = 'inji.Ui.forms.popUp(\''.addslashes($modelName).'\',{},function(elem){'
                         . 'return function(data,modal){inji.Ui.forms.submitAjax($(elem).closest(\'form\')[0], {notSave: true});}}(this));return false;';
-                echo ' (<a href="" onclick="' . $onclick . ';this.disabled=true;return false;">Создать</a>)';
+                echo ' (<a href="" onclick="'.$onclick.';this.disabled=true;return false;">Создать</a>)';
               }
               echo "</th>";
             }
@@ -48,7 +48,7 @@ 
                 $input->options['noContainer'] = true;
                 $input->colParams['label'] = false;
                 $input->colParams['value'] = $row[$colName];
-                $input->colName .= '[' . $colName . '][' . ($i) . ']';
+                $input->colName .= '['.$colName.']['.($i).']';
                 $input->draw();
                 if (empty($col['hidden'])) {
                   echo '</td>';
@@ -87,7 +87,7 @@ 
     }
     $col['input']->options['noContainer'] = true;
     $col['input']->colParams['label'] = false;
-    $col['input']->colName.="[{$colName}][]";
+    $col['input']->colName .= "[{$colName}][]";
     $col['input']->draw();
     if (empty($col['hidden'])) {
       echo '</td>';

system/modules/Ui/objects/FastEdit.php

Indentation +5 added lines, -5 removed lines

@@ -13,22 +13,22 @@
 
 class FastEdit extends \Object {
 
-  public static function block($object, $col, $value = null, $parse = false) {
+    public static function block($object, $col, $value = null, $parse = false) {
 
     $str = "<div class = 'fastEdit' ";
     if ($object) {
-      $str .= "data-model='" . get_class($object) . "' data-col='{$col}' data-key='" . $object->pk() . "'";
+        $str .= "data-model='" . get_class($object) . "' data-col='{$col}' data-key='" . $object->pk() . "'";
     }
     $str .= ">";
     $value = $value !== null ? $value : ($object ? $object->$col : '');
     if ($parse) {
-      \App::$cur->view->parseSource($value);
+        \App::$cur->view->parseSource($value);
     } else {
-      $str .= $value;
+        $str .= $value;
     }
 
     $str .= "</div>";
     return $str;
-  }
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 
     $str = "<div class = 'fastEdit' ";
     if ($object) {
-      $str .= "data-model='" . get_class($object) . "' data-col='{$col}' data-key='" . $object->pk() . "'";
+      $str .= "data-model='".get_class($object)."' data-col='{$col}' data-key='".$object->pk()."'";
     }
     $str .= ">";
     $value = $value !== null ? $value : ($object ? $object->$col : '');

system/modules/Ui/objects/ActiveForm/Input/DynamicList.php

Spacing +2 added lines, -2 removed lines

@@ -122,7 +122,7 @@ 
     switch ($this->colParams['source']) {
       case'options':
         foreach ($this->colParams['options']['inputs'] as $colName => $col) {
-          $inputClassName = '\Ui\ActiveForm\Input\\' . ucfirst($col['type']);
+          $inputClassName = '\Ui\ActiveForm\Input\\'.ucfirst($col['type']);
           $input = new $inputClassName();
           $input->form = $this->form;
           $input->activeForm = $this->activeForm;
@@ -161,7 +161,7 @@ 
             $cols['id'] = ['input' => $input, 'hidden' => true];
             foreach ($this->colParams['options']['cols'] as $colName) {
               $col = $relation['model']::getColInfo($colName);
-              $inputClassName = '\Ui\ActiveForm\Input\\' . ucfirst($col['colParams']['type']);
+              $inputClassName = '\Ui\ActiveForm\Input\\'.ucfirst($col['colParams']['type']);
               $input = new $inputClassName();
               $input->form = $this->form;
               $input->activeForm = $this->activeForm;

Indentation +69 added lines, -69 removed lines

@@ -13,7 +13,7 @@ 
 
 class DynamicList extends \Ui\ActiveForm\Input {
 
-  public function draw() {
+    public function draw() {
     $inputName = $this->colName();
     $inputLabel = $this->colLabel();
     $inputOptions = [
@@ -25,119 +25,119 @@ 
     ];
     $this->form->input('dynamicList', $inputName, $inputLabel, $inputOptions);
     return true;
-  }
+    }
 
-  public function parseRequest($request) {
+    public function parseRequest($request) {
     $modelName = $this->modelName;
     switch ($this->colParams['source']) {
-      case'options':
+        case'options':
 
         break;
-      default:
+        default:
         $rels = [];
         $relation = $modelName::getRelation($this->colParams['relation']);
         if ($this->activeForm->model->pk()) {
-          switch ($relation['type']) {
+            switch ($relation['type']) {
             case 'relModel':
               foreach ($request[$this->colName] as $row) {
                 $rels[$row['relItem']] = true;
-              }
-              $relModels = $relation['relModel']::getList(['where' => [$modelName::index(), $this->activeForm->model->pk()], 'key' => $relation['model']::index()]);
-              foreach ($relModels as $model) {
+                }
+                $relModels = $relation['relModel']::getList(['where' => [$modelName::index(), $this->activeForm->model->pk()], 'key' => $relation['model']::index()]);
+                foreach ($relModels as $model) {
                 if (empty($rels[$model->{$relation['model']::index()}])) {
-                  $model->delete();
+                    $model->delete();
                 } else {
-                  unset($rels[$model->{$relation['model']::index()}]);
+                    unset($rels[$model->{$relation['model']::index()}]);
+                }
                 }
-              }
-              foreach ($rels as $relId => $trash) {
+                foreach ($rels as $relId => $trash) {
                 $model = new $relation['relModel']([
                     $modelName::index() => $this->activeForm->model->pk(),
                     $relation['model']::index() => $relId
                 ]);
                 $model->save();
-              }
-              break;
+                }
+                break;
 
             case 'many':
               $requestData = [];
-              if (!empty($request[$this->colName])) {
+                if (!empty($request[$this->colName])) {
                 foreach ($request[$this->colName] as $colName => $items) {
-                  foreach ($request[$this->colName][$colName] as $key => $data) {
+                    foreach ($request[$this->colName][$colName] as $key => $data) {
                     $requestData[$key][$colName] = $data;
-                  }
+                    }
+                }
                 }
-              }
-              foreach ($requestData as $key => $row) {
+                foreach ($requestData as $key => $row) {
                 if (!empty($row['id'])) {
-                  $rels[$row['id']] = $row;
-                  unset($requestData[$key]);
+                    $rels[$row['id']] = $row;
+                    unset($requestData[$key]);
                 }
-              }
-              $relModels = $this->activeForm->model->{$this->colParams['relation']};
-              foreach ($relModels as $model) {
+                }
+                $relModels = $this->activeForm->model->{$this->colParams['relation']};
+                foreach ($relModels as $model) {
                 if (empty($rels[$model->pk()])) {
-                  $model->delete();
+                    $model->delete();
                 } else {
-                  $model->setParams($rels[$model->pk()]);
-                  $model->save();
+                    $model->setParams($rels[$model->pk()]);
+                    $model->save();
+                }
                 }
-              }
-              foreach ($requestData as $row) {
+                foreach ($requestData as $row) {
                 $row[$relation['col']] = $this->activeForm->model->pk();
                 $model = new $relation['model']($row);
                 $model->save();
-              }
-              $this->activeForm->model->loadRelation($this->colParams['relation']);
-          }
+                }
+                $this->activeForm->model->loadRelation($this->colParams['relation']);
+            }
         }
     }
-  }
+    }
 
-  public function value() {
+    public function value() {
     $values = [];
     switch ($this->colParams['source']) {
-      case'options':
+        case'options':
 
         break;
-      default:
+        default:
         if ($this->activeForm->model) {
-          $items = $this->activeForm->model->{$this->colParams['relation']};
-          foreach ($items as $key => $item) {
+            $items = $this->activeForm->model->{$this->colParams['relation']};
+            foreach ($items as $key => $item) {
             $value = ['id' => $item->id];
             foreach ($this->colParams['options']['cols'] as $colName) {
-              $value[$colName] = $item->$colName;
+                $value[$colName] = $item->$colName;
             }
             $values[] = $value;
-          }
+            }
         }
     }
 
     return $values;
-  }
+    }
 
-  public function getCols() {
+    public function getCols() {
     $modelName = $this->modelName;
     $cols = [];
     switch ($this->colParams['source']) {
-      case'options':
+        case'options':
         foreach ($this->colParams['options']['inputs'] as $colName => $col) {
-          $inputClassName = '\Ui\ActiveForm\Input\\' . ucfirst($col['type']);
-          $input = new $inputClassName();
-          $input->form = $this->form;
-          $input->activeForm = $this->activeForm;
-          $input->activeFormParams = $this->activeFormParams;
-          $input->modelName = $this->modelName;
-          $input->colName = "[{$this->colName}]";
-          $input->colParams = $col;
-          $input->options = !empty($col['options']) ? $col['options'] : [];
-          $cols[$colName] = ['input' => $input, 'col' => $col];
+            $inputClassName = '\Ui\ActiveForm\Input\\' . ucfirst($col['type']);
+            $input = new $inputClassName();
+            $input->form = $this->form;
+            $input->activeForm = $this->activeForm;
+            $input->activeFormParams = $this->activeFormParams;
+            $input->modelName = $this->modelName;
+            $input->colName = "[{$this->colName}]";
+            $input->colParams = $col;
+            $input->options = !empty($col['options']) ? $col['options'] : [];
+            $cols[$colName] = ['input' => $input, 'col' => $col];
         }
         break;
-      default:
+        default:
         $relation = $modelName::getRelation($this->colParams['relation']);
         switch ($relation['type']) {
-          case 'relModel':
+            case 'relModel':
             $cols['relItem'] = [
                 'col' => [
                     'label' => $relation['model']::objectName(),
@@ -148,7 +148,7 @@ 
                 ]
             ];
             break;
-          case 'many':
+            case 'many':
             $inputClassName = '\Ui\ActiveForm\Input\Hidden';
             $input = new $inputClassName();
             $input->form = $this->form;
@@ -160,22 +160,22 @@ 
             $input->options = [];
             $cols['id'] = ['input' => $input, 'hidden' => true];
             foreach ($this->colParams['options']['cols'] as $colName) {
-              $col = $relation['model']::getColInfo($colName);
-              $inputClassName = '\Ui\ActiveForm\Input\\' . ucfirst($col['colParams']['type']);
-              $input = new $inputClassName();
-              $input->form = $this->form;
-              $input->activeForm = $this->activeForm;
-              $input->activeFormParams = $this->activeFormParams;
-              $input->modelName = $relation['model'];
-              $input->colName = "[{$this->colName}]";
-              $input->colParams = $col;
-              $input->options = !empty($col['options']) ? $col['options'] : [];
-              $cols[$colName] = ['input' => $input, 'col' => $col];
+                $col = $relation['model']::getColInfo($colName);
+                $inputClassName = '\Ui\ActiveForm\Input\\' . ucfirst($col['colParams']['type']);
+                $input = new $inputClassName();
+                $input->form = $this->form;
+                $input->activeForm = $this->activeForm;
+                $input->activeFormParams = $this->activeFormParams;
+                $input->modelName = $relation['model'];
+                $input->colName = "[{$this->colName}]";
+                $input->colParams = $col;
+                $input->options = !empty($col['options']) ? $col['options'] : [];
+                $cols[$colName] = ['input' => $input, 'col' => $col];
             }
             break;
         }
     }
     return $cols;
-  }
+    }
 
 }

system/modules/Users/appControllers/content/login.php

Indentation +6 added lines, -6 removed lines

@@ -5,15 +5,15 @@
         <h3>Вход</h3>
         <div class="form-group">
           <?php
-          $socials = Users\Social::getList(['where' => ['active', 1]]);
-          if ($socials) {
+            $socials = Users\Social::getList(['where' => ['active', 1]]);
+            if ($socials) {
             echo 'Войти через: ';
             foreach (Users\Social::getList(['where' => ['active', 1]]) as $social) {
-              $text = $social->image ? '<img src ="' . Statics::file($social->image->path) . '">' : $social->name();
-              echo "<a href = '/users/social/auth/{$social->code}'>{$text}</a> ";
+                $text = $social->image ? '<img src ="' . Statics::file($social->image->path) . '">' : $social->name();
+                echo "<a href = '/users/social/auth/{$social->code}'>{$text}</a> ";
             }
-          }
-          ?>
+            }
+            ?>
         </div>
         <form action = '' method = 'POST' >
           <div class ='row'>

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
           if ($socials) {
             echo 'Войти через: ';
             foreach (Users\Social::getList(['where' => ['active', 1]]) as $social) {
-              $text = $social->image ? '<img src ="' . Statics::file($social->image->path) . '">' : $social->name();
+              $text = $social->image ? '<img src ="'.Statics::file($social->image->path).'">' : $social->name();
               echo "<a href = '/users/social/auth/{$social->code}'>{$text}</a> ";
             }
           }

system/modules/Users/appControllers/UsersController.php

Indentation +61 added lines, -61 removed lines

@@ -10,96 +10,96 @@ 
  */
 class UsersController extends Controller {
 
-  public function indexAction() {
+    public function indexAction() {
     Tools::redirect('/users/cabinet/profile');
-  }
+    }
 
-  public function cabinetAction($activeSection = '') {
+    public function cabinetAction($activeSection = '') {
     $bread = [];
 
     $sections = $this->module->getSnippets('cabinetSection');
     if (!empty($sections[$activeSection]['name'])) {
-      $this->view->setTitle($sections[$activeSection]['name'] . ' - Личный кабинет');
-      $bread[] = ['text' => 'Личный кабинет', 'href' => '/users/cabinet'];
-      $bread[] = ['text' => $sections[$activeSection]['name']];
+        $this->view->setTitle($sections[$activeSection]['name'] . ' - Личный кабинет');
+        $bread[] = ['text' => 'Личный кабинет', 'href' => '/users/cabinet'];
+        $bread[] = ['text' => $sections[$activeSection]['name']];
     } else {
-      $this->view->setTitle('Личный кабинет');
-      $bread[] = ['text' => 'Личный кабинет'];
+        $this->view->setTitle('Личный кабинет');
+        $bread[] = ['text' => 'Личный кабинет'];
     }
     $this->view->page(['data' => compact('widgets', 'sections', 'activeSection', 'bread')]);
-  }
+    }
 
-  public function loginAction() {
+    public function loginAction() {
     $this->view->setTitle('Авторизация');
     $bread = [];
     $bread[] = ['text' => 'Авторизация'];
     $this->view->page(['data' => compact('bread')]);
-  }
+    }
 
-  public function passreAction() {
+    public function passreAction() {
     $this->view->setTitle('Восстановление пароля');
     $bread = [];
     $bread[] = ['text' => 'Восстановление пароля'];
     $this->view->page(['data' => compact('bread')]);
-  }
+    }
 
-  public function registrationAction() {
+    public function registrationAction() {
     $this->view->setTitle('Регистрация');
     if (Users\User::$cur->user_id) {
-      Tools::redirect('/', 'Вы уже зарегистрированы');
+        Tools::redirect('/', 'Вы уже зарегистрированы');
     }
     if (!empty($_POST)) {
-      $error = false;
-      if ($this->Recaptcha) {
+        $error = false;
+        if ($this->Recaptcha) {
         $response = $this->Recaptcha->check($_POST['g-recaptcha-response']);
         if ($response) {
-          if (!$response->success) {
+            if (!$response->success) {
             Msg::add('Вы не прошли проверку на робота', 'danger');
             $error = true;
-          }
+            }
         } else {
-          Msg::add('Произошла ошибка, попробуйте ещё раз');
-          $error = true;
+            Msg::add('Произошла ошибка, попробуйте ещё раз');
+            $error = true;
+        }
         }
-      }
-      if (!$error) {
+        if (!$error) {
         if ($this->Users->registration($_POST)) {
-          Tools::redirect('/');
+            Tools::redirect('/');
+        }
         }
-      }
     }
     $this->view->setTitle('Регистрация');
     $bread = [];
     $bread[] = ['text' => 'Регистрация'];
     $this->view->page(['data' => compact('bread')]);
-  }
+    }
 
-  public function activationAction($userId = 0, $hash = '') {
+    public function activationAction($userId = 0, $hash = '') {
     $user = \Users\User::get((int) $userId);
     if (!$user || !$hash || $user->activation !== (string) $hash) {
-      Tools::redirect('/', 'Во время активации произошли ошибки', 'danger');
+        Tools::redirect('/', 'Во время активации произошли ошибки', 'danger');
     }
     $user->activation = '';
     $user->save();
     Inji::$inst->event('Users-completeActivation', $user);
     Tools::redirect('/', 'Вы успешно активировали ваш аккаунт', 'success');
-  }
+    }
 
-  public function attachEmailAction() {
+    public function attachEmailAction() {
     if (Users\User::$cur->mail) {
-      Tools::redirect('/', 'К вашему аккаунту уже привязан E-Mail');
+        Tools::redirect('/', 'К вашему аккаунту уже привязан E-Mail');
     }
     if (!empty($_POST['mail'])) {
-      $user_mail = trim($_POST['mail']);
-      if (!filter_var($user_mail, FILTER_VALIDATE_EMAIL)) {
+        $user_mail = trim($_POST['mail']);
+        if (!filter_var($user_mail, FILTER_VALIDATE_EMAIL)) {
         Msg::add('Вы ввели не корректный E-mail', 'danger');
-      } else {
+        } else {
         $user = Users\User::get($user_mail, 'mail');
         if ($user && $user->id != Users\User::$cur->id) {
-          Msg::add('Данный E-mail уже привязан к другому аккаунту', 'danger');
+            Msg::add('Данный E-mail уже привязан к другому аккаунту', 'danger');
         } else {
-          Users\User::$cur->mail = $user_mail;
-          if (!empty($this->module->config['needActivation'])) {
+            Users\User::$cur->mail = $user_mail;
+            if (!empty($this->module->config['needActivation'])) {
             Users\User::$cur->activation = Tools::randomString();
             $from = 'noreply@' . INJI_DOMAIN_NAME;
             $to = $user_mail;
@@ -107,24 +107,24 @@ 
             $text = 'Для активации вашего аккаунта перейдите по ссылке <a href = "http://' . INJI_DOMAIN_NAME . '/users/activation/' . Users\User::$cur->id . '/' . Users\User::$cur->activation . '">http://' . idn_to_utf8(INJI_DOMAIN_NAME) . '/users/activation/' . Users\User::$cur->id . '/' . Users\User::$cur->activation . '</a>';
             Tools::sendMail($from, $to, $subject, $text);
             Msg::add('На указанный почтовый ящик была выслана ваша ссылка для подтверждения E-Mail', 'success');
-          } else {
+            } else {
             Msg::add('Вы успешно привязали E-Mail к своему аккаунту', 'success');
-          }
-          Users\User::$cur->save();
-          Tools::redirect('/');
+            }
+            Users\User::$cur->save();
+            Tools::redirect('/');
+        }
         }
-      }
     }
     $this->view->page();
-  }
+    }
 
-  public function resendActivationAction($userId = 0) {
+    public function resendActivationAction($userId = 0) {
     $user = \Users\User::get((int) $userId);
     if (!$user) {
-      Tools::redirect('/', 'Не указан пользователь', 'danger');
+        Tools::redirect('/', 'Не указан пользователь', 'danger');
     }
     if (!$user->activation) {
-      Tools::redirect('/', 'Пользователь уже активирован');
+        Tools::redirect('/', 'Пользователь уже активирован');
     }
     $from = 'noreply@' . INJI_DOMAIN_NAME;
     $to = $user->mail;
@@ -132,21 +132,21 @@ 
     $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);
     Tools::redirect('/', 'На указанный почтовый ящик была выслана ваша ссылка для подтверждения E-Mail', 'success');
-  }
+    }
 
-  public function getPartnerInfoAction($userId = 0) {
+    public function getPartnerInfoAction($userId = 0) {
     $userId = (int) $userId;
     $result = new \Server\Result();
     if (!$userId) {
-      $result->success = FALSE;
-      $result->content = 'Не указан пользователь';
-      $result->send();
+        $result->success = FALSE;
+        $result->content = 'Не указан пользователь';
+        $result->send();
     }
     $partners = App::$cur->users->getUserPartners(Users\User::$cur, 8);
     if (empty($partners['users'][$userId])) {
-      $result->success = FALSE;
-      $result->content = 'Этот пользователь не находится в вашей структуре';
-      $result->send();
+        $result->success = FALSE;
+        $result->content = 'Этот пользователь не находится в вашей структуре';
+        $result->send();
     }
     $user = $partners['users'][$userId];
     ob_start();
@@ -161,16 +161,16 @@ 
         'event' => 'Событие'
     ];
     foreach ($rewards as $reward) {
-      foreach ($reward->conditions as $condition) {
+        foreach ($reward->conditions as $condition) {
         $complete = $condition->checkComplete($userId);
         ?>
         <h5 class="<?= $complete ? 'text-success' : 'text-danger'; ?>"><?= $condition->name(); ?></h5>
         <ul>
           <?php
-          foreach ($condition->items as $item) {
+            foreach ($condition->items as $item) {
             $itemComplete = $item->checkComplete($userId);
             switch ($item->type) {
-              case 'event':
+                case 'event':
                 $name = \Events\Event::get($item->value, 'event')->name();
                 break;
             }
@@ -179,15 +179,15 @@ 
               <b class="<?= $itemComplete ? 'text-success' : 'text-danger'; ?>"><?= $name; ?> <?= $item->recivedCount($userId); ?></b>/<?= $item->count; ?> <br />
             </li>
             <?php
-          }
-          ?>
+            }
+            ?>
         </ul>
         <?php
-      }
+        }
     }
     $result->content = ob_get_contents();
     ob_end_clean();
     $result->send();
-  }
+    }
 
 }

Spacing +7 added lines, -7 removed lines

@@ -19,7 +19,7 @@ 
 
     $sections = $this->module->getSnippets('cabinetSection');
     if (!empty($sections[$activeSection]['name'])) {
-      $this->view->setTitle($sections[$activeSection]['name'] . ' - Личный кабинет');
+      $this->view->setTitle($sections[$activeSection]['name'].' - Личный кабинет');
       $bread[] = ['text' => 'Личный кабинет', 'href' => '/users/cabinet'];
       $bread[] = ['text' => $sections[$activeSection]['name']];
     } else {
@@ -101,10 +101,10 @@ 
           Users\User::$cur->mail = $user_mail;
           if (!empty($this->module->config['needActivation'])) {
             Users\User::$cur->activation = Tools::randomString();
-            $from = 'noreply@' . INJI_DOMAIN_NAME;
+            $from = 'noreply@'.INJI_DOMAIN_NAME;
             $to = $user_mail;
-            $subject = 'Активация аккаунта на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME);
-            $text = 'Для активации вашего аккаунта перейдите по ссылке <a href = "http://' . INJI_DOMAIN_NAME . '/users/activation/' . Users\User::$cur->id . '/' . Users\User::$cur->activation . '">http://' . idn_to_utf8(INJI_DOMAIN_NAME) . '/users/activation/' . Users\User::$cur->id . '/' . Users\User::$cur->activation . '</a>';
+            $subject = 'Активация аккаунта на сайте '.idn_to_utf8(INJI_DOMAIN_NAME);
+            $text = 'Для активации вашего аккаунта перейдите по ссылке <a href = "http://'.INJI_DOMAIN_NAME.'/users/activation/'.Users\User::$cur->id.'/'.Users\User::$cur->activation.'">http://'.idn_to_utf8(INJI_DOMAIN_NAME).'/users/activation/'.Users\User::$cur->id.'/'.Users\User::$cur->activation.'</a>';
             Tools::sendMail($from, $to, $subject, $text);
             Msg::add('На указанный почтовый ящик была выслана ваша ссылка для подтверждения E-Mail', 'success');
           } else {
@@ -126,10 +126,10 @@ 
     if (!$user->activation) {
       Tools::redirect('/', 'Пользователь уже активирован');
     }
-    $from = 'noreply@' . INJI_DOMAIN_NAME;
+    $from = 'noreply@'.INJI_DOMAIN_NAME;
     $to = $user->mail;
-    $subject = 'Активация аккаунта на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME);
-    $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>';
+    $subject = 'Активация аккаунта на сайте '.idn_to_utf8(INJI_DOMAIN_NAME);
+    $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);
     Tools::redirect('/', 'На указанный почтовый ящик была выслана ваша ссылка для подтверждения E-Mail', 'success');
   }

system/modules/Users/objects/SocialHelper/Vk.php

Indentation +84 added lines, -84 removed lines

@@ -13,20 +13,20 @@ 
 
 class Vk extends \Users\SocialHelper {
 
-  public static function auth() {
+    public static function auth() {
     $config = static::getConfig();
     if (empty($_GET['code']) && empty($_GET['error'])) {
-      $query = [
-          'client_id' => $config['appId'],
-          'scope' => 'email',
-          'response_type' => 'code',
-          'display' => 'page',
-          'redirect_uri' => 'http://' . INJI_DOMAIN_NAME . '/users/social/auth/vk'
-      ];
-      \Tools::redirect("https://oauth.vk.com/authorize?" . http_build_query($query));
+        $query = [
+            'client_id' => $config['appId'],
+            'scope' => 'email',
+            'response_type' => 'code',
+            'display' => 'page',
+            'redirect_uri' => 'http://' . INJI_DOMAIN_NAME . '/users/social/auth/vk'
+        ];
+        \Tools::redirect("https://oauth.vk.com/authorize?" . http_build_query($query));
     }
     if (empty($_GET['code']) && !empty($_GET['error'])) {
-      \Tools::redirect('/', 'Произошла ошибка во время авторизации через соц. сеть: ' . $_GET['error_description']);
+        \Tools::redirect('/', 'Произошла ошибка во время авторизации через соц. сеть: ' . $_GET['error_description']);
     }
     $query = [
         'client_id' => $config['appId'],
@@ -36,11 +36,11 @@ 
     ];
     $result = @file_get_contents("https://oauth.vk.com/access_token?" . http_build_query($query));
     if ($result === false) {
-      \Tools::redirect('/', 'Во время авторизации произошли ошибки', 'danger');
+        \Tools::redirect('/', 'Во время авторизации произошли ошибки', 'danger');
     }
     $result = json_decode($result, true);
     if (empty($result['user_id'])) {
-      \Tools::redirect('/', 'Во время авторизации произошли ошибки', 'danger');
+        \Tools::redirect('/', 'Во время авторизации произошли ошибки', 'danger');
     }
     $userQuery = [
         'user_id' => $result['user_id'],
@@ -49,94 +49,94 @@ 
     ];
     $userResult = @file_get_contents("https://api.vk.com/method/users.get?" . http_build_query($userQuery));
     if (!$userResult) {
-      \Tools::redirect('/', 'Во время авторизации произошли ошибки', 'danger');
+        \Tools::redirect('/', 'Во время авторизации произошли ошибки', 'danger');
     }
     $userDetail = json_decode($userResult, true);
     if (empty($userDetail['response'][0])) {
-      \Tools::redirect('/', 'Во время авторизации произошли ошибки', 'danger');
+        \Tools::redirect('/', 'Во время авторизации произошли ошибки', 'danger');
     }
     $social = static::getObject();
     $userSocial = \Users\User\Social::get([['uid', $result['user_id']], ['social_id', $social->id]]);
     if ($userSocial && $userSocial->user) {
-      \App::$cur->users->newSession($userSocial->user);
-      if (!empty(\App::$cur->users->config['loginUrl'][\App::$cur->type])) {
+        \App::$cur->users->newSession($userSocial->user);
+        if (!empty(\App::$cur->users->config['loginUrl'][\App::$cur->type])) {
         \Tools::redirect(\App::$cur->users->config['loginUrl'][\App::$cur->type]);
-      }
+        }
     } else {
-      if ($userSocial && !$userSocial->user) {
+        if ($userSocial && !$userSocial->user) {
         $userSocial->delete();
-      }
-      if (!\Users\User::$cur->id) {
+        }
+        if (!\Users\User::$cur->id) {
         $user = false;
         if (!empty($result['email'])) {
-          $user = \Users\User::get($result['email'], 'mail');
+            $user = \Users\User::get($result['email'], 'mail');
         }
         if (!$user) {
-          $user = new \Users\User();
-          $user->group_id = 2;
-          $user->role_id = 2;
-          if (!empty($result['email'])) {
+            $user = new \Users\User();
+            $user->group_id = 2;
+            $user->role_id = 2;
+            if (!empty($result['email'])) {
             $user->login = $user->mail = $result['email'];
-          }
-          $invite_code = (!empty($_POST['invite_code']) ? $_POST['invite_code'] : ((!empty($_COOKIE['invite_code']) ? $_COOKIE['invite_code'] : ((!empty($_GET['invite_code']) ? $_GET['invite_code'] : '')))));
-          if (!empty($invite_code)) {
+            }
+            $invite_code = (!empty($_POST['invite_code']) ? $_POST['invite_code'] : ((!empty($_COOKIE['invite_code']) ? $_COOKIE['invite_code'] : ((!empty($_GET['invite_code']) ? $_GET['invite_code'] : '')))));
+            if (!empty($invite_code)) {
             $invite = \Users\User\Invite::get($invite_code, 'code');
             $inveiteError = false;
             if (!$invite) {
-              Msg::add('Такой код пришлашения не найден', 'danger');
-              $inveiteError = true;
+                Msg::add('Такой код пришлашения не найден', 'danger');
+                $inveiteError = true;
             }
             if ($invite->limit && !($invite->limit - $invite->count)) {
-              Msg::add('Лимит приглашений для данного кода исчерпан', 'danger');
-              $inveiteError = true;
+                Msg::add('Лимит приглашений для данного кода исчерпан', 'danger');
+                $inveiteError = true;
             }
             if (!$inveiteError) {
-              $user->parent_id = $invite->user_id;
-              $invite->count++;
-              $invite->save();
+                $user->parent_id = $invite->user_id;
+                $invite->count++;
+                $invite->save();
+            }
             }
-          }
-          if (!$user->parent_id && !empty(\App::$cur->Users->config['defaultPartner'])) {
+            if (!$user->parent_id && !empty(\App::$cur->Users->config['defaultPartner'])) {
             $user->parent_id = \App::$cur->Users->config['defaultPartner'];
-          }
-          $user->save();
-          $userInfo = new \Users\User\Info();
-          $userInfo->user_id = $user->id;
-          $userInfo->save();
+            }
+            $user->save();
+            $userInfo = new \Users\User\Info();
+            $userInfo->user_id = $user->id;
+            $userInfo->save();
         }
-      } else {
+        } else {
         $user = \Users\User::$cur;
-      }
-      if (!$user->info->photo_file_id && !empty($userDetail['response'][0]['photo_max_orig'])) {
+        }
+        if (!$user->info->photo_file_id && !empty($userDetail['response'][0]['photo_max_orig'])) {
         $user->info->photo_file_id = \App::$cur->files->uploadFromUrl($userDetail['response'][0]['photo_max_orig']);
-      }
-      if (!$user->info->first_name && !empty($userDetail['response'][0]['first_name'])) {
+        }
+        if (!$user->info->first_name && !empty($userDetail['response'][0]['first_name'])) {
         $user->info->first_name = $userDetail['response'][0]['first_name'];
-      }
-      if (!$user->info->last_name && !empty($userDetail['response'][0]['last_name'])) {
+        }
+        if (!$user->info->last_name && !empty($userDetail['response'][0]['last_name'])) {
         $user->info->last_name = $userDetail['response'][0]['last_name'];
-      }
-      if (!$user->info->city && !empty($userDetail['response'][0]['home_town'])) {
+        }
+        if (!$user->info->city && !empty($userDetail['response'][0]['home_town'])) {
         $user->info->city = $userDetail['response'][0]['home_town'];
-      }
-      if (!$user->info->sex && !empty($userDetail['response'][0]['sex'])) {
+        }
+        if (!$user->info->sex && !empty($userDetail['response'][0]['sex'])) {
         $user->info->sex = $userDetail['response'][0]['sex'] == 2 ? 1 : ($userDetail['response'][0]['sex'] == 1 ? 2 : 0);
-      }
-      if ($user->info->bday == '0000-00-00' && !empty($userDetail['response'][0]['bdate'])) {
+        }
+        if ($user->info->bday == '0000-00-00' && !empty($userDetail['response'][0]['bdate'])) {
         $user->info->bday = substr_count($userDetail['response'][0]['bdate'], '.') == 2 ? \DateTime::createFromFormat('d.m.Y', $userDetail['response'][0]['bdate'])->format('Y-m-d') : (substr_count($userDetail['response'][0]['bdate'], '.') == 1 ? \DateTime::createFromFormat('d.m', $userDetail['response'][0]['bdate'])->format('Y-m-1') : '0000-00-00');
-      }
-      $user->info->save();
-      $userSocial = new \Users\User\Social();
-      $userSocial->uid = $result['user_id'];
-      $userSocial->social_id = $social->id;
-      $userSocial->user_id = $user->id;
-      $userSocial->save();
-      \App::$cur->users->newSession($user);
-      \Tools::redirect(\App::$cur->users->config['loginUrl'][\App::$cur->type], 'Вы успешно зарегистрировались через ВКонтакте', 'success');
+        }
+        $user->info->save();
+        $userSocial = new \Users\User\Social();
+        $userSocial->uid = $result['user_id'];
+        $userSocial->social_id = $social->id;
+        $userSocial->user_id = $user->id;
+        $userSocial->save();
+        \App::$cur->users->newSession($user);
+        \Tools::redirect(\App::$cur->users->config['loginUrl'][\App::$cur->type], 'Вы успешно зарегистрировались через ВКонтакте', 'success');
+    }
     }
-  }
 
-  public static function checkAppAccess() {
+    public static function checkAppAccess() {
     $viewer_id = filter_input(INPUT_GET, 'viewer_id', FILTER_SANITIZE_NUMBER_INT);
     $get_auth_key = filter_input(INPUT_GET, 'auth_key', FILTER_SANITIZE_STRING);
 
@@ -145,7 +145,7 @@ 
     $auth_key = md5($config['appId'] . '_' . $viewer_id . '_' . $config['secret']);
 
     if ($auth_key !== $get_auth_key) {
-      return FALSE;
+        return FALSE;
     }
     $userQuery = [
         'user_id' => $viewer_id,
@@ -157,25 +157,25 @@ 
 
     $socUser = \Users\User\Social::get([['social_id', $object->pk()], ['uid', $viewer_id]]);
     if (!$socUser) {
-      $user = new \Users\User();
-      $user->login = $userResult['response'][0]['domain'];
-      $user->save();
-      $info = new \Users\User\Info();
-      $info->user_id = $user->id;
-      $info->sex = $userResult['response'][0]['sex'] == 2 ? 1 : ($userResult['response'][0]['sex'] == 1 ? 2 : 0);
-      $info->first_name = $userResult['response'][0]['first_name'];
-      $info->last_name = $userResult['response'][0]['last_name'];
-      $info->photo_file_id = \App::$cur->files->uploadFromUrl($userResult['response'][0]['photo_200_orig'], ['accept_group' => 'image']);
-      $info->save();
-      $social = new \Users\User\Social();
-      $social->user_id = $user->id;
-      $social->social_id = 1;
-      $social->uid = $userResult['response'][0]['uid'];
-      $social->save();
+        $user = new \Users\User();
+        $user->login = $userResult['response'][0]['domain'];
+        $user->save();
+        $info = new \Users\User\Info();
+        $info->user_id = $user->id;
+        $info->sex = $userResult['response'][0]['sex'] == 2 ? 1 : ($userResult['response'][0]['sex'] == 1 ? 2 : 0);
+        $info->first_name = $userResult['response'][0]['first_name'];
+        $info->last_name = $userResult['response'][0]['last_name'];
+        $info->photo_file_id = \App::$cur->files->uploadFromUrl($userResult['response'][0]['photo_200_orig'], ['accept_group' => 'image']);
+        $info->save();
+        $social = new \Users\User\Social();
+        $social->user_id = $user->id;
+        $social->social_id = 1;
+        $social->uid = $userResult['response'][0]['uid'];
+        $social->save();
     } else {
-      $user = $socUser->user;
+        $user = $socUser->user;
     }
     return $user;
-  }
+    }
 
 }

Spacing +8 added lines, -8 removed lines

@@ -21,20 +21,20 @@ 
           'scope' => 'email',
           'response_type' => 'code',
           'display' => 'page',
-          'redirect_uri' => 'http://' . INJI_DOMAIN_NAME . '/users/social/auth/vk'
+          'redirect_uri' => 'http://'.INJI_DOMAIN_NAME.'/users/social/auth/vk'
       ];
-      \Tools::redirect("https://oauth.vk.com/authorize?" . http_build_query($query));
+      \Tools::redirect("https://oauth.vk.com/authorize?".http_build_query($query));
     }
     if (empty($_GET['code']) && !empty($_GET['error'])) {
-      \Tools::redirect('/', 'Произошла ошибка во время авторизации через соц. сеть: ' . $_GET['error_description']);
+      \Tools::redirect('/', 'Произошла ошибка во время авторизации через соц. сеть: '.$_GET['error_description']);
     }
     $query = [
         'client_id' => $config['appId'],
         'client_secret' => $config['secret'],
         'code' => $_GET['code'],
-        'redirect_uri' => 'http://' . INJI_DOMAIN_NAME . '/users/social/auth/vk'
+        'redirect_uri' => 'http://'.INJI_DOMAIN_NAME.'/users/social/auth/vk'
     ];
-    $result = @file_get_contents("https://oauth.vk.com/access_token?" . http_build_query($query));
+    $result = @file_get_contents("https://oauth.vk.com/access_token?".http_build_query($query));
     if ($result === false) {
       \Tools::redirect('/', 'Во время авторизации произошли ошибки', 'danger');
     }
@@ -47,7 +47,7 @@ 
         'fields' => 'sex, bdate, photo_max_orig, home_town',
         'access_token' => $result['access_token']
     ];
-    $userResult = @file_get_contents("https://api.vk.com/method/users.get?" . http_build_query($userQuery));
+    $userResult = @file_get_contents("https://api.vk.com/method/users.get?".http_build_query($userQuery));
     if (!$userResult) {
       \Tools::redirect('/', 'Во время авторизации произошли ошибки', 'danger');
     }
@@ -142,7 +142,7 @@ 
 
     $config = static::getConfig();
 
-    $auth_key = md5($config['appId'] . '_' . $viewer_id . '_' . $config['secret']);
+    $auth_key = md5($config['appId'].'_'.$viewer_id.'_'.$config['secret']);
 
     if ($auth_key !== $get_auth_key) {
       return FALSE;
@@ -152,7 +152,7 @@ 
         'fields' => 'photo_medium,nickname, domain, sex, bdate, city, country, timezone, photo_50, photo_100, photo_200_orig, has_mobile, contacts, education, online, relation, last_seen, status, can_write_private_message, can_see_all_posts, can_post, universities',
         'access_token' => filter_input(INPUT_GET, 'access_token', FILTER_SANITIZE_STRING)
     ];
-    $userResult = json_decode(@file_get_contents("https://api.vk.com/method/users.get?" . http_build_query($userQuery)), true);
+    $userResult = json_decode(@file_get_contents("https://api.vk.com/method/users.get?".http_build_query($userQuery)), true);
     $object = static::getObject();
 
     $socUser = \Users\User\Social::get([['social_id', $object->pk()], ['uid', $viewer_id]]);

system/modules/Users/objects/SocialHelper/Twitter.php

Indentation +43 added lines, -43 removed lines

@@ -13,7 +13,7 @@ 
 
 class Twitter extends \Users\SocialHelper {
 
-  private static function requestToken() {
+    private static function requestToken() {
     $config = static::getConfig();
     $oauthNonce = md5(uniqid(rand(), true));
     $oauthTimestamp = time();
@@ -39,9 +39,9 @@ 
     $response = file_get_contents($url);
     parse_str($response, $result);
     return $result;
-  }
+    }
 
-  private static function verify() {
+    private static function verify() {
     $config = static::getConfig();
     $oauthNonce = md5(uniqid(rand(), true));
     $oauthTimestamp = time();
@@ -76,9 +76,9 @@ 
     $response = file_get_contents($url);
     parse_str($response, $result);
     return $result;
-  }
+    }
 
-  private static function getInfo($result) {
+    private static function getInfo($result) {
     $config = static::getConfig();
     $oauth_nonce = md5(uniqid(rand(), true));
     $oauth_timestamp = time();
@@ -114,82 +114,82 @@ 
     $response = file_get_contents($url);
 
     return json_decode($response, true);
-  }
+    }
 
-  public static function auth() {
+    public static function auth() {
     $config = static::getConfig();
     if (empty($_GET['oauth_verifier']) || empty($_SESSION['oauth_token_secret'])) {
-      $tokens = self::requestToken();
-      $_SESSION['oauth_token_secret'] = $tokens['oauth_token_secret'];
-      \Tools::redirect("https://api.twitter.com/oauth/authorize?oauth_token={$tokens['oauth_token']}");
+        $tokens = self::requestToken();
+        $_SESSION['oauth_token_secret'] = $tokens['oauth_token_secret'];
+        \Tools::redirect("https://api.twitter.com/oauth/authorize?oauth_token={$tokens['oauth_token']}");
     }
     $verify = static::verify();
 
     if (!$verify['user_id']) {
-      \Tools::redirect('/', 'Не удалось авторизоваться через twitter');
+        \Tools::redirect('/', 'Не удалось авторизоваться через twitter');
     }
     $userDetail = static::getInfo($verify);
 
     $social = static::getObject();
     $userSocial = \Users\User\Social::get([['uid', $userDetail['id']], ['social_id', $social->id]]);
     if ($userSocial && $userSocial->user) {
-      \App::$cur->users->newSession($userSocial->user);
-      if (!empty(\App::$cur->users->config['loginUrl'][\App::$cur->type])) {
+        \App::$cur->users->newSession($userSocial->user);
+        if (!empty(\App::$cur->users->config['loginUrl'][\App::$cur->type])) {
         \Tools::redirect(\App::$cur->users->config['loginUrl'][\App::$cur->type]);
-      }
+        }
     } else {
-      if ($userSocial && !$userSocial->user) {
+        if ($userSocial && !$userSocial->user) {
         $userSocial->delete();
-      }
-      if (!\Users\User::$cur->id) {
+        }
+        if (!\Users\User::$cur->id) {
         $user = new \Users\User();
         $user->group_id = 2;
         $user->role_id = 2;
         $invite_code = (!empty($_POST['invite_code']) ? $_POST['invite_code'] : ((!empty($_COOKIE['invite_code']) ? $_COOKIE['invite_code'] : ((!empty($_GET['invite_code']) ? $_GET['invite_code'] : '')))));
         if (!empty($invite_code)) {
-          $invite = \Users\User\Invite::get($invite_code, 'code');
-          $inveiteError = false;
-          if (!$invite) {
+            $invite = \Users\User\Invite::get($invite_code, 'code');
+            $inveiteError = false;
+            if (!$invite) {
             Msg::add('Такой код пришлашения не найден', 'danger');
             $inveiteError = true;
-          }
-          if ($invite->limit && !($invite->limit - $invite->count)) {
+            }
+            if ($invite->limit && !($invite->limit - $invite->count)) {
             Msg::add('Лимит приглашений для данного кода исчерпан', 'danger');
             $inveiteError = true;
-          }
-          if (!$inveiteError) {
+            }
+            if (!$inveiteError) {
             $user->parent_id = $invite->user_id;
             $invite->count++;
             $invite->save();
-          }
+            }
         }
         if (!$user->parent_id && !empty(\App::$cur->Users->config['defaultPartner'])) {
-          $user->parent_id = \App::$cur->Users->config['defaultPartner'];
+            $user->parent_id = \App::$cur->Users->config['defaultPartner'];
         }
         $user->save();
         $userInfo = new \Users\User\Info();
         $userInfo->user_id = $user->id;
         $userInfo->save();
-      } else {
+        } else {
         $user = \Users\User::$cur;
-      }
-      $name = explode(' ', $userDetail['name']);
-      $user->info->first_name = $name[0];
-      $user->info->last_name = $name[1];
-      $user->info->city = $userDetail['location'];
-      $user->info->save();
-      $userSocial = new \Users\User\Social();
-      $userSocial->uid = $userDetail['id'];
-      $userSocial->social_id = $social->id;
-      $userSocial->user_id = $user->id;
-      $userSocial->save();
-      \App::$cur->users->newSession($user);
-      if (!empty(\App::$cur->users->config['loginUrl'][\App::$cur->type])) {
+        }
+        $name = explode(' ', $userDetail['name']);
+        $user->info->first_name = $name[0];
+        $user->info->last_name = $name[1];
+        $user->info->city = $userDetail['location'];
+        $user->info->save();
+        $userSocial = new \Users\User\Social();
+        $userSocial->uid = $userDetail['id'];
+        $userSocial->social_id = $social->id;
+        $userSocial->user_id = $user->id;
+        $userSocial->save();
+        \App::$cur->users->newSession($user);
+        if (!empty(\App::$cur->users->config['loginUrl'][\App::$cur->type])) {
         \Tools::redirect(\App::$cur->users->config['loginUrl'][\App::$cur->type], 'Вы успешно зарегистрировались через Twitter', 'success');
-      } else {
+        } else {
         \Tools::redirect('/users/cabinet/profile', 'Вы успешно зарегистрировались через Twitter', 'success');
-      }
+        }
+    }
     }
-  }
 
 }

Spacing +37 added lines, -37 removed lines

@@ -19,22 +19,22 @@ 
     $oauthTimestamp = time();
     //string
     $oauth_base_text = "GET&";
-    $oauth_base_text .= urlencode('https://api.twitter.com/oauth/request_token') . "&";
-    $oauth_base_text .= urlencode("oauth_callback=" . urlencode('http://' . INJI_DOMAIN_NAME . '/users/social/auth/twitter') . "&");
-    $oauth_base_text .= urlencode("oauth_consumer_key=" . $config['consumer_key'] . "&");
-    $oauth_base_text .= urlencode("oauth_nonce=" . $oauthNonce . "&");
+    $oauth_base_text .= urlencode('https://api.twitter.com/oauth/request_token')."&";
+    $oauth_base_text .= urlencode("oauth_callback=".urlencode('http://'.INJI_DOMAIN_NAME.'/users/social/auth/twitter')."&");
+    $oauth_base_text .= urlencode("oauth_consumer_key=".$config['consumer_key']."&");
+    $oauth_base_text .= urlencode("oauth_nonce=".$oauthNonce."&");
     $oauth_base_text .= urlencode("oauth_signature_method=HMAC-SHA1&");
-    $oauth_base_text .= urlencode("oauth_timestamp=" . $oauthTimestamp . "&");
+    $oauth_base_text .= urlencode("oauth_timestamp=".$oauthTimestamp."&");
     $oauth_base_text .= urlencode("oauth_version=1.0");
-    $oauthSignature = base64_encode(hash_hmac("sha1", $oauth_base_text, $config['consumer_secret'] . "&", true));
+    $oauthSignature = base64_encode(hash_hmac("sha1", $oauth_base_text, $config['consumer_secret']."&", true));
     //request
     $url = 'https://api.twitter.com/oauth/request_token';
-    $url .= '?oauth_callback=' . urlencode('http://' . INJI_DOMAIN_NAME . '/users/social/auth/twitter');
-    $url .= '&oauth_consumer_key=' . $config['consumer_key'];
-    $url .= '&oauth_nonce=' . $oauthNonce;
-    $url .= '&oauth_signature=' . urlencode($oauthSignature);
+    $url .= '?oauth_callback='.urlencode('http://'.INJI_DOMAIN_NAME.'/users/social/auth/twitter');
+    $url .= '&oauth_consumer_key='.$config['consumer_key'];
+    $url .= '&oauth_nonce='.$oauthNonce;
+    $url .= '&oauth_signature='.urlencode($oauthSignature);
     $url .= '&oauth_signature_method=HMAC-SHA1';
-    $url .= '&oauth_timestamp=' . $oauthTimestamp;
+    $url .= '&oauth_timestamp='.$oauthTimestamp;
     $url .= '&oauth_version=1.0';
     $response = file_get_contents($url);
     parse_str($response, $result);
@@ -50,26 +50,26 @@ 
     $oauth_token_secret = $_SESSION['oauth_token_secret'];
     //string
     $oauth_base_text = "GET&";
-    $oauth_base_text .= urlencode('https://api.twitter.com/oauth/access_token') . "&";
-    $oauth_base_text .= urlencode("oauth_consumer_key=" . $config['consumer_key'] . "&");
-    $oauth_base_text .= urlencode("oauth_nonce=" . $oauthNonce . "&");
+    $oauth_base_text .= urlencode('https://api.twitter.com/oauth/access_token')."&";
+    $oauth_base_text .= urlencode("oauth_consumer_key=".$config['consumer_key']."&");
+    $oauth_base_text .= urlencode("oauth_nonce=".$oauthNonce."&");
     $oauth_base_text .= urlencode("oauth_signature_method=HMAC-SHA1&");
-    $oauth_base_text .= urlencode("oauth_token=" . $oauth_token . "&");
-    $oauth_base_text .= urlencode("oauth_timestamp=" . $oauthTimestamp . "&");
-    $oauth_base_text .= urlencode("oauth_verifier=" . $oauth_verifier . "&");
+    $oauth_base_text .= urlencode("oauth_token=".$oauth_token."&");
+    $oauth_base_text .= urlencode("oauth_timestamp=".$oauthTimestamp."&");
+    $oauth_base_text .= urlencode("oauth_verifier=".$oauth_verifier."&");
     $oauth_base_text .= urlencode("oauth_version=1.0");
 
-    $key = $config['consumer_secret'] . "&" . $oauth_token_secret;
+    $key = $config['consumer_secret']."&".$oauth_token_secret;
     //request
     $oauth_signature = base64_encode(hash_hmac("sha1", $oauth_base_text, $key, true));
     $url = 'https://api.twitter.com/oauth/access_token';
-    $url .= '?oauth_nonce=' . $oauthNonce;
+    $url .= '?oauth_nonce='.$oauthNonce;
     $url .= '&oauth_signature_method=HMAC-SHA1';
-    $url .= '&oauth_timestamp=' . $oauthTimestamp;
-    $url .= '&oauth_consumer_key=' . $config['consumer_key'];
-    $url .= '&oauth_token=' . urlencode($oauth_token);
-    $url .= '&oauth_verifier=' . urlencode($oauth_verifier);
-    $url .= '&oauth_signature=' . urlencode($oauth_signature);
+    $url .= '&oauth_timestamp='.$oauthTimestamp;
+    $url .= '&oauth_consumer_key='.$config['consumer_key'];
+    $url .= '&oauth_token='.urlencode($oauth_token);
+    $url .= '&oauth_verifier='.urlencode($oauth_verifier);
+    $url .= '&oauth_signature='.urlencode($oauth_signature);
     $url .= '&oauth_version=1.0';
 
 
@@ -88,28 +88,28 @@ 
     $screen_name = $result['screen_name'];
 
     $oauth_base_text = "GET&";
-    $oauth_base_text .= urlencode('https://api.twitter.com/1.1/users/show.json') . '&';
-    $oauth_base_text .= urlencode('oauth_consumer_key=' . $config['consumer_key'] . '&');
-    $oauth_base_text .= urlencode('oauth_nonce=' . $oauth_nonce . '&');
+    $oauth_base_text .= urlencode('https://api.twitter.com/1.1/users/show.json').'&';
+    $oauth_base_text .= urlencode('oauth_consumer_key='.$config['consumer_key'].'&');
+    $oauth_base_text .= urlencode('oauth_nonce='.$oauth_nonce.'&');
     $oauth_base_text .= urlencode('oauth_signature_method=HMAC-SHA1&');
-    $oauth_base_text .= urlencode('oauth_timestamp=' . $oauth_timestamp . "&");
-    $oauth_base_text .= urlencode('oauth_token=' . $oauth_token . "&");
+    $oauth_base_text .= urlencode('oauth_timestamp='.$oauth_timestamp."&");
+    $oauth_base_text .= urlencode('oauth_token='.$oauth_token."&");
     $oauth_base_text .= urlencode('oauth_version=1.0&');
-    $oauth_base_text .= urlencode('screen_name=' . $screen_name);
+    $oauth_base_text .= urlencode('screen_name='.$screen_name);
 
-    $key = $config['consumer_secret'] . '&' . $oauth_token_secret;
+    $key = $config['consumer_secret'].'&'.$oauth_token_secret;
     $signature = base64_encode(hash_hmac("sha1", $oauth_base_text, $key, true));
 
 
     $url = 'https://api.twitter.com/1.1/users/show.json';
-    $url .= '?oauth_consumer_key=' . $config['consumer_key'];
-    $url .= '&oauth_nonce=' . $oauth_nonce;
-    $url .= '&oauth_signature=' . urlencode($signature);
+    $url .= '?oauth_consumer_key='.$config['consumer_key'];
+    $url .= '&oauth_nonce='.$oauth_nonce;
+    $url .= '&oauth_signature='.urlencode($signature);
     $url .= '&oauth_signature_method=HMAC-SHA1';
-    $url .= '&oauth_timestamp=' . $oauth_timestamp;
-    $url .= '&oauth_token=' . urlencode($oauth_token);
+    $url .= '&oauth_timestamp='.$oauth_timestamp;
+    $url .= '&oauth_token='.urlencode($oauth_token);
     $url .= '&oauth_version=1.0';
-    $url .= '&screen_name=' . $screen_name;
+    $url .= '&screen_name='.$screen_name;
 
     $response = file_get_contents($url);
 

system/modules/Ui/widgets/Form/date.php

Indentation +4 added lines, -4 removed lines

@@ -9,16 +9,16 @@
     'value' => !empty($options['value']) ? addcslashes($options['value'], "'") : (!empty($form->userDataTree[$name]) ? addcslashes($form->userDataTree[$name], "'") : '')
 ];
 if (!empty($options['disabled'])) {
-  $attributes['disabled'] = 'disabled';
+    $attributes['disabled'] = 'disabled';
 }
 if (!empty($options['placeholder'])) {
-  $attributes['placeholder'] = $options['placeholder'];
+    $attributes['placeholder'] = $options['placeholder'];
 }
 if (!empty($options['checked'])) {
-  $attributes['checked'] = 'checked';
+    $attributes['checked'] = 'checked';
 }
 if (!empty($options['attributes'])) {
-  $attributes = array_merge($attributes, $options['attributes']);
+    $attributes = array_merge($attributes, $options['attributes']);
 }
 echo Html::el('input', $attributes, '', null);
 echo!empty($options['helpText']) ? "<div class='help-block'>{$options['helpText']}</div>" : '';