@@ -168,20 +168,20 @@ |
||
| 168 | 168 | <h5 class="<?= $complete ? 'text-success' : 'text-danger'; ?>"><?= $condition->name(); ?></h5> |
| 169 | 169 | <ul> |
| 170 | 170 | <?php |
| 171 | - foreach ($condition->items as $item) { |
|
| 172 | - $itemComplete = $item->checkComplete($userId); |
|
| 173 | - switch ($item->type) { |
|
| 174 | - case 'event': |
|
| 171 | + foreach ($condition->items as $item) { |
|
| 172 | + $itemComplete = $item->checkComplete($userId); |
|
| 173 | + switch ($item->type) { |
|
| 174 | + case 'event': |
|
| 175 | 175 | $name = \Events\Event::get($item->value, 'event')->name(); |
| 176 | - break; |
|
| 177 | - } |
|
| 178 | - ?> |
|
| 176 | + break; |
|
| 177 | + } |
|
| 178 | + ?> |
|
| 179 | 179 | <li> |
| 180 | 180 | <b class="<?= $itemComplete ? 'text-success' : 'text-danger'; ?>"><?= $name; ?> <?= $item->recivedCount($userId); ?></b>/<?= $item->count; ?> <br /> |
| 181 | 181 | </li> |
| 182 | 182 | <?php |
| 183 | - } |
|
| 184 | - ?> |
|
| 183 | + } |
|
| 184 | + ?> |
|
| 185 | 185 | </ul> |
| 186 | 186 | <?php |
| 187 | 187 | } |
@@ -24,20 +24,20 @@ |
||
| 24 | 24 | </div> |
| 25 | 25 | <div class="col-sm-9"> |
| 26 | 26 | <?php |
| 27 | - if (empty($activeSection) || empty($sections[$activeSection]['fullWidget'])) { |
|
| 28 | - foreach ($sections as $section) { |
|
| 29 | - if (!empty($section['smallWidget'])) { |
|
| 30 | - $widgetName = is_array($section['smallWidget']) ? $section['smallWidget']['widget'] : $section['smallWidget']; |
|
| 31 | - $widgetSize = !empty($section['smallWidget']['size']) ? $section['smallWidget']['size'] : 1; |
|
| 32 | - ?> |
|
| 27 | + if (empty($activeSection) || empty($sections[$activeSection]['fullWidget'])) { |
|
| 28 | + foreach ($sections as $section) { |
|
| 29 | + if (!empty($section['smallWidget'])) { |
|
| 30 | + $widgetName = is_array($section['smallWidget']) ? $section['smallWidget']['widget'] : $section['smallWidget']; |
|
| 31 | + $widgetSize = !empty($section['smallWidget']['size']) ? $section['smallWidget']['size'] : 1; |
|
| 32 | + ?> |
|
| 33 | 33 | <div class="col-sm-<?= $widgetSize * 4; ?>" style="margin-bottom: 10px;"><?= $this->widget($widgetName); ?></div> |
| 34 | 34 | <?php |
| 35 | - } |
|
| 36 | - } |
|
| 37 | - } else { |
|
| 38 | - $this->widget($sections[$activeSection]['fullWidget']); |
|
| 39 | - } |
|
| 40 | - ?> |
|
| 35 | + } |
|
| 36 | + } |
|
| 37 | + } else { |
|
| 38 | + $this->widget($sections[$activeSection]['fullWidget']); |
|
| 39 | + } |
|
| 40 | + ?> |
|
| 41 | 41 | </div> |
| 42 | 42 | </div> |
| 43 | 43 | </div> |
| 44 | 44 | \ No newline at end of file |
@@ -8,10 +8,10 @@ discard block |
||
| 8 | 8 | <div class="form-group"> |
| 9 | 9 | <label>Регистрация через соц.сети</label><br /> |
| 10 | 10 | <?php |
| 11 | - foreach (Users\Social::getList(['where' => ['active', 1]]) as $social) { |
|
| 12 | - echo "<a href = '/users/social/auth/{$social->code}'>{$social->name()}</a> "; |
|
| 13 | - } |
|
| 14 | - ?> |
|
| 11 | + foreach (Users\Social::getList(['where' => ['active', 1]]) as $social) { |
|
| 12 | + echo "<a href = '/users/social/auth/{$social->code}'>{$social->name()}</a> "; |
|
| 13 | + } |
|
| 14 | + ?> |
|
| 15 | 15 | </div> |
| 16 | 16 | <?php |
| 17 | 17 | } |
@@ -27,15 +27,15 @@ discard block |
||
| 27 | 27 | <?php $form->input('date', 'user_birthday', 'Дата рождения'); ?> |
| 28 | 28 | <?php $form->input('text', 'user_city', 'Город'); ?> |
| 29 | 29 | <?php |
| 30 | - if (!empty(App::$cur->users->config['invites'])) { |
|
| 31 | - ?> |
|
| 30 | + if (!empty(App::$cur->users->config['invites'])) { |
|
| 31 | + ?> |
|
| 32 | 32 | <div class ='form-group'> |
| 33 | 33 | <label><?= !empty(App::$cur->users->config['invitesName']) ? App::$cur->users->config['invitesName'] : 'Код приглашения'; ?></label> |
| 34 | 34 | <input type ='text' name ='invite_code' class ='form-control' value ="<?= (isset($_POST['invite_code']) ? $_POST['invite_code'] : ((!empty($_COOKIE['invite_code']) ? $_COOKIE['invite_code'] : ((!empty($_GET['invite_code']) ? $_GET['invite_code'] : ''))))); ?>" /> |
| 35 | 35 | </div> |
| 36 | 36 | <?php |
| 37 | - } |
|
| 38 | - ?> |
|
| 37 | + } |
|
| 38 | + ?> |
|
| 39 | 39 | </div> |
| 40 | 40 | <div class="col-sm-6"> |
| 41 | 41 | <div class ='form-group'> |
@@ -1,12 +1,12 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * Group |
|
| 4 | - * |
|
| 5 | - * @author Alexey Krupskiy <[email protected]> |
|
| 6 | - * @link http://inji.ru/ |
|
| 7 | - * @copyright 2015 Alexey Krupskiy |
|
| 8 | - * @license https://github.com/injitools/cms-Inji/blob/master/LICENSE |
|
| 9 | - */ |
|
| 3 | + * Group |
|
| 4 | + * |
|
| 5 | + * @author Alexey Krupskiy <[email protected]> |
|
| 6 | + * @link http://inji.ru/ |
|
| 7 | + * @copyright 2015 Alexey Krupskiy |
|
| 8 | + * @license https://github.com/injitools/cms-Inji/blob/master/LICENSE |
|
| 9 | + */ |
|
| 10 | 10 | namespace Users; |
| 11 | 11 | |
| 12 | 12 | class Group extends \Model |
@@ -260,7 +260,7 @@ discard block |
||
| 260 | 260 | break; |
| 261 | 261 | case 'ucs4_string': |
| 262 | 262 | return $this->_ucs4_to_ucs4_string($this->_utf8_to_ucs4($return)); |
| 263 | - break; |
|
| 263 | + break; |
|
| 264 | 264 | case 'ucs4_array': |
| 265 | 265 | return $this->_utf8_to_ucs4($return); |
| 266 | 266 | break; |
@@ -316,8 +316,8 @@ discard block |
||
| 316 | 316 | case 0x40: |
| 317 | 317 | // Neither email addresses nor URLs allowed in strict mode |
| 318 | 318 | if ($this->_strict_mode) { |
| 319 | - $this->_error('Neither email addresses nor URLs are allowed in strict mode.'); |
|
| 320 | - return false; |
|
| 319 | + $this->_error('Neither email addresses nor URLs are allowed in strict mode.'); |
|
| 320 | + return false; |
|
| 321 | 321 | } else { |
| 322 | 322 | // Skip first char |
| 323 | 323 | if ($k) { |