@@ -14,8 +14,9 @@ |
||
14 | 14 | |
15 | 15 | public function init() |
16 | 16 | { |
17 | - if ($this->message === null) |
|
18 | - $this->message = 'Hello, world'; |
|
17 | + if ($this->message === null) { |
|
18 | + $this->message = 'Hello, world'; |
|
19 | + } |
|
19 | 20 | } |
20 | 21 | |
21 | 22 | public function display() |
@@ -9,4 +9,4 @@ |
||
9 | 9 | ['type' => 'link', 'text' => __('Group management'), 'link' => ['user/grouplist']], |
10 | 10 | ['type' => 'link', 'text' => __('Settings'), 'link' => ['user/settings']] |
11 | 11 | ] |
12 | -]);?> |
|
13 | 12 | \ No newline at end of file |
13 | +]); ?> |
|
14 | 14 | \ No newline at end of file |
@@ -9,4 +9,4 @@ |
||
9 | 9 | ['type' => 'link', 'text' => __('Group management'), 'link' => ['user/grouplist']], |
10 | 10 | ['type' => 'link', 'text' => __('Settings'), 'link' => ['user/settings']] |
11 | 11 | ] |
12 | -]);?> |
|
13 | 12 | \ No newline at end of file |
13 | +]); ?> |
|
14 | 14 | \ No newline at end of file |
@@ -59,7 +59,8 @@ discard block |
||
59 | 59 | </a> |
60 | 60 | </div> |
61 | 61 | </div> |
62 | - <?php else: ?> |
|
62 | + <?php else { |
|
63 | + : ?> |
|
63 | 64 | <div class="row"> |
64 | 65 | <div class="col-md-8" style="padding-right: 0;"> |
65 | 66 | <a href="javascript:void(0);" class="btn btn-block <?= $rateClass ?>"> |
@@ -76,7 +77,9 @@ discard block |
||
76 | 77 | <a href="javascript:void(0);" class="btn btn-block btn-danger" id="reduceRating">-</a> |
77 | 78 | </div> |
78 | 79 | </div> |
79 | - <?php endif; ?> |
|
80 | + <?php endif; |
|
81 | +} |
|
82 | +?> |
|
80 | 83 | <?php endif; ?> |
81 | 84 | <?php |
82 | 85 | $userMenu = null; |
@@ -100,12 +100,12 @@ |
||
100 | 100 | </div> |
101 | 101 | <div class="meta"> |
102 | 102 | <?php if ((int)$catConfigs['showRating'] === 1) { |
103 | - echo \App::$View->render('content/_rate', [ |
|
104 | - 'id' => $item['id'], |
|
105 | - 'canRate' => $item['canRate'], |
|
106 | - 'rating' => $item['rating'] |
|
107 | - ]); |
|
108 | - } ?> |
|
103 | + echo \App::$View->render('content/_rate', [ |
|
104 | + 'id' => $item['id'], |
|
105 | + 'canRate' => $item['canRate'], |
|
106 | + 'rating' => $item['rating'] |
|
107 | + ]); |
|
108 | + } ?> |
|
109 | 109 | |
110 | 110 | <span class="spaced hidden-xs"><i class="fa fa-comments"></i> |
111 | 111 | <a href="#"><?= __('Comments') ?>: <span itemprop="commentCount">0</span></a> |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | |
16 | 16 | $catConfigs = []; |
17 | 17 | foreach ($model->category['configs'] as $key=>$value) { |
18 | - $catConfigs[$key] = (int)$value === 1; |
|
18 | + $catConfigs[$key] = (int) $value === 1; |
|
19 | 19 | } |
20 | 20 | |
21 | 21 | $catMeta = [ |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | <?php foreach ($model->items as $item): ?> |
69 | 69 | <article class="article-item" itemscope="itemscope" itemtype="https://schema.org/NewsArticle"> |
70 | 70 | <h2 itemprop="name"> |
71 | - <a href="<?= \App::$Alias->baseUrl . $item['uri'] ?>"> |
|
71 | + <a href="<?= \App::$Alias->baseUrl.$item['uri'] ?>"> |
|
72 | 72 | <?= $item['title'] ?> |
73 | 73 | </a> |
74 | 74 | </h2> |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | <?php |
96 | 96 | $ownerNick = $item['author']->getProfile()->getNickname(); |
97 | 97 | if ($item['author']->getId() < 1) { |
98 | - echo '<s>' . $ownerNick . '</s>'; |
|
98 | + echo '<s>'.$ownerNick.'</s>'; |
|
99 | 99 | } else { |
100 | 100 | echo Url::link(['profile/show', $item['author']->getId()], $ownerNick, ['itemprop' => 'author']); |
101 | 101 | } |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | <div class="row"> |
113 | 113 | <div class="col-md-12"> |
114 | 114 | <?php if ($catConfigs['showPoster'] === true && $item['thumb'] !== null): ?> |
115 | - <img src="<?= \App::$Alias->scriptUrl . $item['thumb'] ?>" class="image_poster img-thumbnail hidden-xs" alt="<?= __('Poster for') ?>: <?= Str::lowerCase($item['title']) ?>" /> |
|
115 | + <img src="<?= \App::$Alias->scriptUrl.$item['thumb'] ?>" class="image_poster img-thumbnail hidden-xs" alt="<?= __('Poster for') ?>: <?= Str::lowerCase($item['title']) ?>" /> |
|
116 | 116 | <?php endif; ?> |
117 | 117 | <div itemprop="text articleBody"> |
118 | 118 | <?= $item['text'] ?> |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | </div> |
121 | 121 | </div> |
122 | 122 | <div class="meta"> |
123 | - <?php if ((int)$catConfigs['showRating'] === 1) { |
|
123 | + <?php if ((int) $catConfigs['showRating'] === 1) { |
|
124 | 124 | echo \App::$View->render('content/_rate', [ |
125 | 125 | 'id' => $item['id'], |
126 | 126 | 'canRate' => $item['canRate'], |
@@ -129,15 +129,15 @@ discard block |
||
129 | 129 | } ?> |
130 | 130 | |
131 | 131 | <span class="spaced hidden-xs"><i class="fa fa-comments"></i> |
132 | - <a href="<?= \App::$Alias->baseUrl . $item['uri'] ?>#comments-list"><?= __('Comments') ?>: <span itemprop="commentCount" id="comment-count-<?= $item['id'] ?>">0</span></a> |
|
132 | + <a href="<?= \App::$Alias->baseUrl.$item['uri'] ?>#comments-list"><?= __('Comments') ?>: <span itemprop="commentCount" id="comment-count-<?= $item['id'] ?>">0</span></a> |
|
133 | 133 | </span> |
134 | 134 | <span class="pull-right"> |
135 | - <?php if ((int)$catConfigs['showTags'] === 1 && $item['tags'] !== null && Obj::isArray($item['tags'])): ?> |
|
135 | + <?php if ((int) $catConfigs['showTags'] === 1 && $item['tags'] !== null && Obj::isArray($item['tags'])): ?> |
|
136 | 136 | <span class="spaced"><i class="fa fa-tags hidden-xs"></i> |
137 | 137 | <?php |
138 | 138 | foreach ($item['tags'] as $tag) { |
139 | 139 | $tag = \App::$Security->strip_tags(trim($tag)); |
140 | - echo Url::link(['content/tag', $tag], $tag, ['class' => 'label label-default']) . " "; |
|
140 | + echo Url::link(['content/tag', $tag], $tag, ['class' => 'label label-default'])." "; |
|
141 | 141 | } |
142 | 142 | ?> |
143 | 143 | </span> |
@@ -20,8 +20,8 @@ |
||
20 | 20 | public $chmodCheck = []; |
21 | 21 | |
22 | 22 | /** |
23 | - * Get default server information and prepare chmod info |
|
24 | - */ |
|
23 | + * Get default server information and prepare chmod info |
|
24 | + */ |
|
25 | 25 | public function before() |
26 | 26 | { |
27 | 27 | $this->phpVersion = phpversion(); |
@@ -54,7 +54,7 @@ |
||
54 | 54 | ]); |
55 | 55 | ?> |
56 | 56 | |
57 | -<?php if($model->checkAll()): ?> |
|
57 | +<?php if ($model->checkAll()): ?> |
|
58 | 58 | <?= \Ffcms\Core\Helper\Url::link('main/install', __('Start install'), ['class' => 'btn btn-success btn-block']) ?> |
59 | 59 | <?php else: ?> |
60 | 60 | <?= \Ffcms\Core\Helper\Url::link('main/index', __('Check again'), ['class' => 'btn btn-warning btn-block']) ?> |
@@ -56,7 +56,10 @@ |
||
56 | 56 | |
57 | 57 | <?php if($model->checkAll()): ?> |
58 | 58 | <?= \Ffcms\Core\Helper\Url::link('main/install', __('Start install'), ['class' => 'btn btn-success btn-block']) ?> |
59 | -<?php else: ?> |
|
59 | +<?php else { |
|
60 | + : ?> |
|
60 | 61 | <?= \Ffcms\Core\Helper\Url::link('main/index', __('Check again'), ['class' => 'btn btn-warning btn-block']) ?> |
61 | -<?php endif; ?> |
|
62 | +<?php endif; |
|
63 | +} |
|
64 | +?> |
|
62 | 65 |
@@ -1,7 +1,7 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | Illuminate\Database\Capsule\Manager::schema($connectName)->create('sessions', function($table) { |
4 | - $table->string('sess_id', 128)->index()->primary() ; |
|
4 | + $table->string('sess_id', 128)->index()->primary(); |
|
5 | 5 | $table->binary('sess_data'); |
6 | 6 | $table->string('sess_lifetime', 16); // shutout to laravel, if i make it like "integer" it automaticlly add "primary" key for it, hate this!!! |
7 | 7 | $table->string('sess_time', 16); |
@@ -67,17 +67,23 @@ |
||
67 | 67 | <?php if ($properties['author'] === true): ?> |
68 | 68 | <?php if ($model->authorId !== null && $model->authorId > 0): ?> |
69 | 69 | <span><i class="fa fa-user"></i><?= Url::link(['profile/show', $model->authorId], $model->authorName, ['itemprop' => 'author']) ?></span> |
70 | - <?php else: ?> |
|
70 | + <?php else { |
|
71 | + : ?> |
|
71 | 72 | <span><i class="fa fa-user"></i><s><?= $model->authorName ?></s></span> |
72 | - <?php endif; ?> |
|
73 | + <?php endif; |
|
74 | +} |
|
75 | +?> |
|
73 | 76 | <?php endif; ?> |
74 | 77 | <?php if ($properties['views'] === true): ?> |
75 | 78 | <span><i class="fa fa-eye"></i><?= $model->views ?></span> |
76 | 79 | <?php endif ?> |
77 | 80 | </div> |
78 | - <?php else: ?> |
|
81 | + <?php else { |
|
82 | + : ?> |
|
79 | 83 | <hr /> |
80 | - <?php endif; ?> |
|
84 | + <?php endif; |
|
85 | +} |
|
86 | +?> |
|
81 | 87 | <?php if ($trash): ?> |
82 | 88 | <p class="alert alert-danger"><i class="fa fa-trash-o"></i> <?= __('This content is placed in trash') ?></p> |
83 | 89 | <?php endif; ?> |
@@ -159,12 +159,12 @@ |
||
159 | 159 | <div class="col-md-12"> |
160 | 160 | <div class="pull-left"> |
161 | 161 | <?php if ($properties['rating']) { |
162 | - echo \App::$View->render('content/_rate', [ |
|
163 | - 'id' => $model->id, |
|
164 | - 'rating' => $model->rating, |
|
165 | - 'canRate' => $model->canRate |
|
166 | - ]); |
|
167 | - } ?> |
|
162 | + echo \App::$View->render('content/_rate', [ |
|
163 | + 'id' => $model->id, |
|
164 | + 'rating' => $model->rating, |
|
165 | + 'canRate' => $model->canRate |
|
166 | + ]); |
|
167 | + } ?> |
|
168 | 168 | <?= \App::$View->render('content/_rateJs') ?> |
169 | 169 | </div> |
170 | 170 | <div class="pull-right"> |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | } |
24 | 24 | |
25 | 25 | // don't use breadcrumbs on injected pathway rule |
26 | -if (!\App::$Request->isPathInjected() && (bool)$model->getCategory()->getProperty('showCategory')) { |
|
26 | +if (!\App::$Request->isPathInjected() && (bool) $model->getCategory()->getProperty('showCategory')) { |
|
27 | 27 | $breadcrumbs = [ |
28 | 28 | Url::to('/') => __('Home') |
29 | 29 | ]; |
@@ -35,22 +35,22 @@ discard block |
||
35 | 35 | $breadcrumbs[Url::to('content/list', $cat['path'], null, [], false)] = $cat['name']; |
36 | 36 | } |
37 | 37 | } |
38 | - $breadcrumbs[] = __('Content') . ': ' . Str::sub($this->title, 0, 40); |
|
38 | + $breadcrumbs[] = __('Content').': '.Str::sub($this->title, 0, 40); |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | $this->breadcrumbs = $breadcrumbs; |
42 | 42 | } |
43 | 43 | |
44 | 44 | $properties = [ |
45 | - 'date' => (bool)$model->getCategory()->getProperty('showDate'), |
|
46 | - 'author' => (bool)$model->getCategory()->getProperty('showAuthor'), |
|
47 | - 'views' => (bool)$model->getCategory()->getProperty('showViews'), |
|
48 | - 'category' => (bool)$model->getCategory()->getProperty('showCategory'), |
|
49 | - 'rating' => (bool)$model->getCategory()->getProperty('showRating'), |
|
50 | - 'tags' => (bool)$model->getCategory()->getProperty('showTags') |
|
45 | + 'date' => (bool) $model->getCategory()->getProperty('showDate'), |
|
46 | + 'author' => (bool) $model->getCategory()->getProperty('showAuthor'), |
|
47 | + 'views' => (bool) $model->getCategory()->getProperty('showViews'), |
|
48 | + 'category' => (bool) $model->getCategory()->getProperty('showCategory'), |
|
49 | + 'rating' => (bool) $model->getCategory()->getProperty('showRating'), |
|
50 | + 'tags' => (bool) $model->getCategory()->getProperty('showTags') |
|
51 | 51 | ]; |
52 | -$showComments = (bool)$model->getCategory()->getProperty('showComments'); |
|
53 | -$showPoster = (bool)$model->getCategory()->getProperty('showPoster'); |
|
52 | +$showComments = (bool) $model->getCategory()->getProperty('showComments'); |
|
53 | +$showPoster = (bool) $model->getCategory()->getProperty('showPoster'); |
|
54 | 54 | |
55 | 55 | ?> |
56 | 56 | |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | <span class="spaced"><i class="fa fa-eye"></i> <?= $model->views ?></span> |
76 | 76 | <?php endif ?> |
77 | 77 | <?php if (\App::$User->isAuth() && \App::$User->identity()->getRole()->can('Admin/Content/Update')): ?> |
78 | - <span class="pull-right"><a href="<?= \App::$Alias->scriptUrl . '/admin/content/update/' . $model->id ?>" target="_blank"><i class="fa fa-pencil" style="color: #ff0000;"></i></a></span> |
|
78 | + <span class="pull-right"><a href="<?= \App::$Alias->scriptUrl.'/admin/content/update/'.$model->id ?>" target="_blank"><i class="fa fa-pencil" style="color: #ff0000;"></i></a></span> |
|
79 | 79 | <?php endif; ?> |
80 | 80 | </div> |
81 | 81 | <?php else: ?> |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | <div id="content-text"> |
88 | 88 | <?php if ($showPoster === true && $model->posterFull !== null && $model->posterThumb !== null): ?> |
89 | 89 | <a href="#showPoster" data-toggle="modal" data-target="#showPoster"> |
90 | - <img alt="<?= __('Poster for') ?>: <?= Str::lowerCase($model->title) ?>" src="<?= \App::$Alias->scriptUrl . $model->posterThumb ?>" class="image_poster img-thumbnail" /> |
|
90 | + <img alt="<?= __('Poster for') ?>: <?= Str::lowerCase($model->title) ?>" src="<?= \App::$Alias->scriptUrl.$model->posterThumb ?>" class="image_poster img-thumbnail" /> |
|
91 | 91 | </a> |
92 | 92 | |
93 | 93 | <!-- Modal poster pop-up --> |
@@ -99,19 +99,19 @@ discard block |
||
99 | 99 | <h4 class="modal-title" id="myModalLabel"><?= __('View poster') ?></h4> |
100 | 100 | </div> |
101 | 101 | <div class="modal-body"> |
102 | - <img class="img-responsive" src="<?= \App::$Alias->scriptUrl . $model->posterFull ?>" alt="<?= __('Poster image') ?>" style="margin: 0 auto;" /> |
|
102 | + <img class="img-responsive" src="<?= \App::$Alias->scriptUrl.$model->posterFull ?>" alt="<?= __('Poster image') ?>" style="margin: 0 auto;" /> |
|
103 | 103 | </div> |
104 | 104 | </div> |
105 | 105 | </div> |
106 | 106 | </div> |
107 | - <?php endif ;?> |
|
107 | + <?php endif; ?> |
|
108 | 108 | <?= $model->text ?> |
109 | 109 | </div> |
110 | 110 | <?php if ($model->galleryItems !== null && Obj::isArray($model->galleryItems)): ?> |
111 | 111 | <div class="row"> |
112 | 112 | <?php foreach ($model->galleryItems as $thumbPic => $fullPic): ?> |
113 | 113 | <div class="col-md-2 well"> |
114 | - <a href="#showGallery" class="modalGallery" content="<?= \App::$Alias->scriptUrl . $fullPic ?>"><img src="<?= \App::$Alias->scriptUrl . $thumbPic ?>" class="img-responsive image-item" /></a> |
|
114 | + <a href="#showGallery" class="modalGallery" content="<?= \App::$Alias->scriptUrl.$fullPic ?>"><img src="<?= \App::$Alias->scriptUrl.$thumbPic ?>" class="img-responsive image-item" /></a> |
|
115 | 115 | </div> |
116 | 116 | <?php endforeach; ?> |
117 | 117 | </div> |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | <h4 class="modal-title" id="showModalLabel"><?= __('View picture') ?></h4> |
124 | 124 | </div> |
125 | 125 | <div class="modal-body" id="modal-gallery-body"> |
126 | - <img class="img-responsive" src="<?= \App::$Alias->scriptUrl . $model->posterFull ?>" alt="<?= __('Gallery picture') ?>" style="margin: 0 auto;" /> |
|
126 | + <img class="img-responsive" src="<?= \App::$Alias->scriptUrl.$model->posterFull ?>" alt="<?= __('Gallery picture') ?>" style="margin: 0 auto;" /> |
|
127 | 127 | </div> |
128 | 128 | </div> |
129 | 129 | </div> |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | </div> |
145 | 145 | <div id="similar<?= $idx ?>" class="panel-collapse collapse"> |
146 | 146 | <div class="panel-body"> |
147 | - <a href="<?= \App::$Alias->baseUrl . $item['uri'] ?>"> |
|
147 | + <a href="<?= \App::$Alias->baseUrl.$item['uri'] ?>"> |
|
148 | 148 | <?= $item['snippet'] ?> |
149 | 149 | </a> |
150 | 150 | </div> |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | if (Obj::isArray($model->metaKeywords) && count($model->metaKeywords) > 0 && Str::length($model->metaKeywords[0]) > 0) { |
175 | 175 | echo '<i class="fa fa-tags hidden-xs"></i> '; |
176 | 176 | foreach ($model->metaKeywords as $tag) { |
177 | - echo Url::link(['content/tag', $tag], $tag, ['class' => 'label label-default']) . " "; |
|
177 | + echo Url::link(['content/tag', $tag], $tag, ['class' => 'label label-default'])." "; |
|
178 | 178 | } |
179 | 179 | } |
180 | 180 | ?> |
@@ -123,7 +123,7 @@ |
||
123 | 123 | /** |
124 | 124 | * Get current extension active record |
125 | 125 | * @param string|null $type |
126 | - * @return mixed |
|
126 | + * @return AppRecord |
|
127 | 127 | */ |
128 | 128 | public function getTypeItem($type = null) |
129 | 129 | { |
@@ -12,7 +12,6 @@ |
||
12 | 12 | use Ffcms\Core\Exception\NotFoundException; |
13 | 13 | use Apps\Model\Front\Content\EntityContentRead; |
14 | 14 | use Ffcms\Core\Helper\HTML\SimplePagination; |
15 | -use Ffcms\Core\Helper\Serialize; |
|
16 | 15 | use Ffcms\Core\Helper\Type\Str; |
17 | 16 | use Suin\RSSWriter\Channel; |
18 | 17 | use Suin\RSSWriter\Feed; |
@@ -86,18 +86,18 @@ discard block |
||
86 | 86 | $user = App::$User->identity(); |
87 | 87 | // user is not authed ? |
88 | 88 | if ($user === null || !App::$User->isAuth()) { |
89 | - $redirectUrl = App::$Alias->scriptUrl . '/user/login'; |
|
89 | + $redirectUrl = App::$Alias->scriptUrl.'/user/login'; |
|
90 | 90 | App::$Response->redirect($redirectUrl, true); |
91 | 91 | exit(); |
92 | 92 | } |
93 | 93 | |
94 | - $permission = env_name . '/' . App::$Request->getController() . '/' . App::$Request->getAction(); |
|
94 | + $permission = env_name.'/'.App::$Request->getController().'/'.App::$Request->getAction(); |
|
95 | 95 | |
96 | 96 | // doesn't have permission? get the f*ck out |
97 | 97 | if (!$user->getRole()->can($permission)) { |
98 | 98 | App::$Session->invalidate(); |
99 | 99 | |
100 | - $redirectUrl = App::$Alias->scriptUrl . '/user/login'; |
|
100 | + $redirectUrl = App::$Alias->scriptUrl.'/user/login'; |
|
101 | 101 | App::$Response->redirect($redirectUrl, true); |
102 | 102 | exit(); |
103 | 103 | } |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | */ |
145 | 145 | public function getConfigs() |
146 | 146 | { |
147 | - return $this->type === 'widget' ? (array)$this->widget->configs : (array)$this->application->configs; |
|
147 | + return $this->type === 'widget' ? (array) $this->widget->configs : (array) $this->application->configs; |
|
148 | 148 | } |
149 | 149 | |
150 | 150 | /** |