@@ -16,9 +16,9 @@ |
||
16 | 16 | $app = new App(); |
17 | 17 | $app->name = $appOptions->name; |
18 | 18 | $app->system = true; |
19 | - $app->staticPath = "/" . $appOptions->dir . "/static"; |
|
20 | - $app->templatesPath = "/" . $appOptions->dir . "/static/templates"; |
|
21 | - $app->path = INJI_PROGRAM_DIR . '/' . $appOptions->dir; |
|
19 | + $app->staticPath = "/".$appOptions->dir."/static"; |
|
20 | + $app->templatesPath = "/".$appOptions->dir."/static/templates"; |
|
21 | + $app->path = INJI_PROGRAM_DIR.'/'.$appOptions->dir; |
|
22 | 22 | $app->type = 'app'; |
23 | 23 | $app->installed = true; |
24 | 24 | $app->params = []; |
@@ -58,7 +58,7 @@ |
||
58 | 58 | foreach ($inputs[$inputName]['cols'] as $col) { |
59 | 59 | $part = trim($part); |
60 | 60 | if ($part && strlen($part) > 2) { |
61 | - $colWhere[] = [$col, '%' . $part . '%', 'LIKE', $first ? 'AND' : 'OR']; |
|
61 | + $colWhere[] = [$col, '%'.$part.'%', 'LIKE', $first ? 'AND' : 'OR']; |
|
62 | 62 | $first = false; |
63 | 63 | } |
64 | 64 | } |
@@ -24,14 +24,14 @@ discard block |
||
24 | 24 | case 'relation': |
25 | 25 | $relations = $colInfo['modelName']::relations(); |
26 | 26 | $relValue = $relations[$colInfo['colParams']['relation']]['model']::get($item->$colName); |
27 | - $value = $relValue ? "<a href='/admin/" . str_replace('\\', '/view/', $relations[$colInfo['colParams']['relation']]['model']) . "/" . $relValue->pk() . "'>" . $relValue->name() . "</a>" : 'Не задано'; |
|
27 | + $value = $relValue ? "<a href='/admin/".str_replace('\\', '/view/', $relations[$colInfo['colParams']['relation']]['model'])."/".$relValue->pk()."'>".$relValue->name()."</a>" : 'Не задано'; |
|
28 | 28 | break; |
29 | 29 | } |
30 | 30 | break; |
31 | 31 | case 'image': |
32 | 32 | $file = Files\File::get($item->$colName); |
33 | 33 | if ($file) { |
34 | - $value = '<img src="' . $file->path . '?resize=60x120" />'; |
|
34 | + $value = '<img src="'.$file->path.'?resize=60x120" />'; |
|
35 | 35 | } else { |
36 | 36 | $value = '<img src="/static/system/images/no-image.png?resize=60x120" />'; |
37 | 37 | } |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | ]]); |
59 | 59 | ?>)</h3> |
60 | 60 | <?php |
61 | - foreach (\Dashboard\Comment::getList([ 'where' => [ |
|
61 | + foreach (\Dashboard\Comment::getList(['where' => [ |
|
62 | 62 | ['item_id', $item->id], |
63 | 63 | ['model', $modelName], |
64 | 64 | ], 'order' => ['date_create', 'desc']]) as $comment) { |
@@ -13,7 +13,7 @@ |
||
13 | 13 | } else { |
14 | 14 | $dataManager = new \Ui\DataManager($options['relation']['type'] == 'relModel' ? $options['relation']['relModel'] : $options['relation']['model'], 'manager'); |
15 | 15 | $dataManager->predraw(); |
16 | - echo '<h3>' . $dataManager->table->name . '</h3>'; |
|
16 | + echo '<h3>'.$dataManager->table->name.'</h3>'; |
|
17 | 17 | echo '<h4 class=" text-muted">Чтобы добавить связи, сначала создайте объект</h4>'; |
18 | 18 | echo '<p class=" text-muted">Просто заполните доступные поля и нажмите кнопку внизу формы. После этого дополнительные поля разблокируются</p>'; |
19 | 19 | } |
@@ -1,7 +1,7 @@ |
||
1 | 1 | |
2 | 2 | <?php |
3 | 3 | echo empty($options['noContainer']) ? '<div class="form-group">' : ''; |
4 | -echo $label !== false ? "<label>{$label}" . (!empty($options['required']) ? ' <span class="required-star">*</span>' : '') . "</label>" : ''; |
|
4 | +echo $label !== false ? "<label>{$label}".(!empty($options['required']) ? ' <span class="required-star">*</span>' : '')."</label>" : ''; |
|
5 | 5 | ?> |
6 | 6 | <div class="row"> |
7 | 7 | <div class="col-xs-6"> |
@@ -1,5 +1,5 @@ |
||
1 | 1 | <?php |
2 | -$id = 'activeForm-' . Tools::randomString(); |
|
2 | +$id = 'activeForm-'.Tools::randomString(); |
|
3 | 3 | $formInputs = $activeForm->inputs; |
4 | 4 | foreach ($formInputs as $inputName => $inputParams) { |
5 | 5 | if (is_object($inputParams)) { |
@@ -3,7 +3,7 @@ |
||
3 | 3 | $html = ''; |
4 | 4 | foreach ($buttons as $button) { |
5 | 5 | if (!empty($button['class'])) { |
6 | - $button['class'] = 'btn btn-primary btn-sm ' . $button['class']; |
|
6 | + $button['class'] = 'btn btn-primary btn-sm '.$button['class']; |
|
7 | 7 | } else { |
8 | 8 | $button['class'] = 'btn btn-primary btn-sm'; |
9 | 9 | } |
@@ -1,28 +1,28 @@ |
||
1 | 1 | <ul class="<?= $class; ?>"><?php |
2 | 2 | if ($pagesInstance->params['page'] > 1) { |
3 | 3 | $getArr['page'] = $pagesInstance->params['page'] - 1; |
4 | - echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>←</a></li>"; |
|
4 | + echo "<li><a href = '{$pagesInstance->options['url']}?".http_build_query($getArr)."'>←</a></li>"; |
|
5 | 5 | } |
6 | 6 | |
7 | 7 | for ($i = 1; $i <= $pagesInstance->params['pages']; $i++) { |
8 | - if (( $i >= $pagesInstance->params['page'] - 3 && $i <= $pagesInstance->params['page'] + 3) || $i == 1 || $i == $pagesInstance->params['pages']) { |
|
8 | + if (($i >= $pagesInstance->params['page'] - 3 && $i <= $pagesInstance->params['page'] + 3) || $i == 1 || $i == $pagesInstance->params['pages']) { |
|
9 | 9 | echo '<li '; |
10 | 10 | if ($pagesInstance->params['page'] == $i) |
11 | 11 | echo 'class = "active"'; |
12 | 12 | echo ">"; |
13 | 13 | $getArr['page'] = $i; |
14 | - echo "<a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>{$i}</a></li>"; |
|
14 | + echo "<a href = '{$pagesInstance->options['url']}?".http_build_query($getArr)."'>{$i}</a></li>"; |
|
15 | 15 | } |
16 | 16 | elseif ($i == $pagesInstance->params['page'] - 7 && $i > 1) { |
17 | 17 | $getArr['page'] = round($pagesInstance->params['page'] / 2); |
18 | - echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>...</a></li>"; |
|
18 | + echo "<li><a href = '{$pagesInstance->options['url']}?".http_build_query($getArr)."'>...</a></li>"; |
|
19 | 19 | } elseif ($i == $pagesInstance->params['page'] + 7 && $i < $pagesInstance->params['pages']) { |
20 | 20 | $getArr['page'] = round(($pagesInstance->params['pages'] - $pagesInstance->params['page']) / 2) + $pagesInstance->params['page']; |
21 | - echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>...</a></li>"; |
|
21 | + echo "<li><a href = '{$pagesInstance->options['url']}?".http_build_query($getArr)."'>...</a></li>"; |
|
22 | 22 | } |
23 | 23 | } |
24 | 24 | if ($pagesInstance->params['page'] < $pagesInstance->params['pages']) { |
25 | 25 | $getArr['page'] = $pagesInstance->params['page'] + 1; |
26 | - echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>→</a></li>"; |
|
26 | + echo "<li><a href = '{$pagesInstance->options['url']}?".http_build_query($getArr)."'>→</a></li>"; |
|
27 | 27 | } |
28 | 28 | ?></ul> |
29 | 29 | \ No newline at end of file |
@@ -4,7 +4,7 @@ |
||
4 | 4 | if (is_array($html)) { |
5 | 5 | extract($html); |
6 | 6 | } |
7 | - echo "<td " . (!empty($class) ? "class='{$class}'" : '') . ">{$html}</td>"; |
|
7 | + echo "<td ".(!empty($class) ? "class='{$class}'" : '').">{$html}</td>"; |
|
8 | 8 | } |
9 | 9 | ?> |
10 | 10 | </tr> |
11 | 11 | \ No newline at end of file |