@@ -52,7 +52,7 @@ |
||
| 52 | 52 | public function save() |
| 53 | 53 | { |
| 54 | 54 | // check if target is myself or always exist in block list |
| 55 | - if ($this->_user->getId() === (int)$this->id || Blacklist::have($this->_user->getId(), $this->id)) { |
|
| 55 | + if ($this->_user->getId() === (int) $this->id || Blacklist::have($this->_user->getId(), $this->id)) { |
|
| 56 | 56 | return false; |
| 57 | 57 | } |
| 58 | 58 | |
@@ -10,4 +10,4 @@ |
||
| 10 | 10 | ['type' => 'link', 'text' => __('Settings'), 'link' => ['content/settings']] |
| 11 | 11 | ], |
| 12 | 12 | 'activeOrder' => 'action' |
| 13 | -]);?> |
|
| 14 | 13 | \ No newline at end of file |
| 14 | +]); ?> |
|
| 15 | 15 | \ No newline at end of file |
@@ -9,4 +9,4 @@ |
||
| 9 | 9 | ['type' => 'link', 'text' => __('Profile fields'), 'link' => ['profile/fieldlist']], |
| 10 | 10 | ['type' => 'link', 'text' => __('Settings'), 'link' => ['profile/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 |
@@ -1,6 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -return array ( |
|
| 3 | +return array( |
|
| 4 | 4 | 0 => 'global/write', |
| 5 | 5 | 1 => 'global/modify', |
| 6 | 6 | 2 => 'global/file', |
@@ -1,69 +1,69 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | return array ( |
| 4 | - 0 => 'global/write', |
|
| 5 | - 1 => 'global/modify', |
|
| 6 | - 2 => 'global/file', |
|
| 7 | - 3 => 'global/all', |
|
| 8 | - 4 => 'Admin/Application/Index', |
|
| 9 | - 5 => 'Admin/Application/Install', |
|
| 10 | - 6 => 'Admin/Application/Update', |
|
| 11 | - 7 => 'Admin/Application/Turn', |
|
| 12 | - 8 => 'Admin/Comments/Index', |
|
| 13 | - 9 => 'Admin/Comments/Read', |
|
| 14 | - 10 => 'Admin/Comments/Edit', |
|
| 15 | - 11 => 'Admin/Comments/Delete', |
|
| 16 | - 12 => 'Admin/Comments/Publish', |
|
| 17 | - 13 => 'Admin/Comments/Answerlist', |
|
| 18 | - 14 => 'Admin/Comments/Settings', |
|
| 19 | - 15 => 'Admin/Content/Index', |
|
| 20 | - 16 => 'Admin/Content/Update', |
|
| 21 | - 17 => 'Admin/Content/Delete', |
|
| 22 | - 18 => 'Admin/Content/Restore', |
|
| 23 | - 19 => 'Admin/Content/Clear', |
|
| 24 | - 20 => 'Admin/Content/Categories', |
|
| 25 | - 21 => 'Admin/Content/Categorydelete', |
|
| 26 | - 22 => 'Admin/Content/Categoryupdate', |
|
| 27 | - 23 => 'Admin/Content/Globdelete', |
|
| 28 | - 24 => 'Admin/Content/Publish', |
|
| 29 | - 25 => 'Admin/Content/Settings', |
|
| 30 | - 26 => 'Admin/Contenttag/Index', |
|
| 31 | - 27 => 'Admin/Feedback/Index', |
|
| 32 | - 28 => 'Admin/Feedback/Read', |
|
| 33 | - 29 => 'Admin/Feedback/Update', |
|
| 34 | - 30 => 'Admin/Feedback/Turn', |
|
| 35 | - 31 => 'Admin/Feedback/Delete', |
|
| 36 | - 32 => 'Admin/Feedback/Settings', |
|
| 37 | - 33 => 'Admin/Main/Index', |
|
| 38 | - 34 => 'Admin/Main/Settings', |
|
| 39 | - 35 => 'Admin/Main/Files', |
|
| 40 | - 36 => 'Admin/Main/Antivirus', |
|
| 41 | - 37 => 'Admin/Main/Debugcookie', |
|
| 42 | - 38 => 'Admin/Main/Routing', |
|
| 43 | - 39 => 'Admin/Main/Addroute', |
|
| 44 | - 40 => 'Admin/Main/Deleteroute', |
|
| 45 | - 41 => 'Admin/Main/Cache', |
|
| 46 | - 42 => 'Admin/Main/Sessions', |
|
| 47 | - 43 => 'Admin/Newcomment/Index', |
|
| 48 | - 44 => 'Admin/Newcontent/Index', |
|
| 49 | - 45 => 'Admin/Profile/Index', |
|
| 50 | - 46 => 'Admin/Profile/Delete', |
|
| 51 | - 47 => 'Admin/Profile/Update', |
|
| 52 | - 48 => 'Admin/Profile/Fieldlist', |
|
| 53 | - 49 => 'Admin/Profile/Fieldupdate', |
|
| 54 | - 50 => 'Admin/Profile/Fielddelete', |
|
| 55 | - 51 => 'Admin/Profile/Settings', |
|
| 56 | - 52 => 'Admin/Search/Index', |
|
| 57 | - 53 => 'Admin/Sitemap/Index', |
|
| 58 | - 54 => 'Admin/User/Index', |
|
| 59 | - 55 => 'Admin/User/Update', |
|
| 60 | - 56 => 'Admin/User/Delete', |
|
| 61 | - 57 => 'Admin/User/Grouplist', |
|
| 62 | - 58 => 'Admin/User/GroupUpdate', |
|
| 63 | - 59 => 'Admin/User/Settings', |
|
| 64 | - 60 => 'Admin/User/Invite', |
|
| 65 | - 61 => 'Admin/Widget/Index', |
|
| 66 | - 62 => 'Admin/Widget/Install', |
|
| 67 | - 63 => 'Admin/Widget/Update', |
|
| 68 | - 64 => 'Admin/Widget/Turn', |
|
| 4 | + 0 => 'global/write', |
|
| 5 | + 1 => 'global/modify', |
|
| 6 | + 2 => 'global/file', |
|
| 7 | + 3 => 'global/all', |
|
| 8 | + 4 => 'Admin/Application/Index', |
|
| 9 | + 5 => 'Admin/Application/Install', |
|
| 10 | + 6 => 'Admin/Application/Update', |
|
| 11 | + 7 => 'Admin/Application/Turn', |
|
| 12 | + 8 => 'Admin/Comments/Index', |
|
| 13 | + 9 => 'Admin/Comments/Read', |
|
| 14 | + 10 => 'Admin/Comments/Edit', |
|
| 15 | + 11 => 'Admin/Comments/Delete', |
|
| 16 | + 12 => 'Admin/Comments/Publish', |
|
| 17 | + 13 => 'Admin/Comments/Answerlist', |
|
| 18 | + 14 => 'Admin/Comments/Settings', |
|
| 19 | + 15 => 'Admin/Content/Index', |
|
| 20 | + 16 => 'Admin/Content/Update', |
|
| 21 | + 17 => 'Admin/Content/Delete', |
|
| 22 | + 18 => 'Admin/Content/Restore', |
|
| 23 | + 19 => 'Admin/Content/Clear', |
|
| 24 | + 20 => 'Admin/Content/Categories', |
|
| 25 | + 21 => 'Admin/Content/Categorydelete', |
|
| 26 | + 22 => 'Admin/Content/Categoryupdate', |
|
| 27 | + 23 => 'Admin/Content/Globdelete', |
|
| 28 | + 24 => 'Admin/Content/Publish', |
|
| 29 | + 25 => 'Admin/Content/Settings', |
|
| 30 | + 26 => 'Admin/Contenttag/Index', |
|
| 31 | + 27 => 'Admin/Feedback/Index', |
|
| 32 | + 28 => 'Admin/Feedback/Read', |
|
| 33 | + 29 => 'Admin/Feedback/Update', |
|
| 34 | + 30 => 'Admin/Feedback/Turn', |
|
| 35 | + 31 => 'Admin/Feedback/Delete', |
|
| 36 | + 32 => 'Admin/Feedback/Settings', |
|
| 37 | + 33 => 'Admin/Main/Index', |
|
| 38 | + 34 => 'Admin/Main/Settings', |
|
| 39 | + 35 => 'Admin/Main/Files', |
|
| 40 | + 36 => 'Admin/Main/Antivirus', |
|
| 41 | + 37 => 'Admin/Main/Debugcookie', |
|
| 42 | + 38 => 'Admin/Main/Routing', |
|
| 43 | + 39 => 'Admin/Main/Addroute', |
|
| 44 | + 40 => 'Admin/Main/Deleteroute', |
|
| 45 | + 41 => 'Admin/Main/Cache', |
|
| 46 | + 42 => 'Admin/Main/Sessions', |
|
| 47 | + 43 => 'Admin/Newcomment/Index', |
|
| 48 | + 44 => 'Admin/Newcontent/Index', |
|
| 49 | + 45 => 'Admin/Profile/Index', |
|
| 50 | + 46 => 'Admin/Profile/Delete', |
|
| 51 | + 47 => 'Admin/Profile/Update', |
|
| 52 | + 48 => 'Admin/Profile/Fieldlist', |
|
| 53 | + 49 => 'Admin/Profile/Fieldupdate', |
|
| 54 | + 50 => 'Admin/Profile/Fielddelete', |
|
| 55 | + 51 => 'Admin/Profile/Settings', |
|
| 56 | + 52 => 'Admin/Search/Index', |
|
| 57 | + 53 => 'Admin/Sitemap/Index', |
|
| 58 | + 54 => 'Admin/User/Index', |
|
| 59 | + 55 => 'Admin/User/Update', |
|
| 60 | + 56 => 'Admin/User/Delete', |
|
| 61 | + 57 => 'Admin/User/Grouplist', |
|
| 62 | + 58 => 'Admin/User/GroupUpdate', |
|
| 63 | + 59 => 'Admin/User/Settings', |
|
| 64 | + 60 => 'Admin/User/Invite', |
|
| 65 | + 61 => 'Admin/Widget/Index', |
|
| 66 | + 62 => 'Admin/Widget/Install', |
|
| 67 | + 63 => 'Admin/Widget/Update', |
|
| 68 | + 64 => 'Admin/Widget/Turn', |
|
| 69 | 69 | ); |
| 70 | 70 | \ No newline at end of file |
@@ -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(); |
@@ -31,7 +31,7 @@ |
||
| 31 | 31 | [['text' => __('Name')], ['text' => $widget->getLocaleName()]], |
| 32 | 32 | [['text' => __('System name')], ['text' => $widget->sys_name]], |
| 33 | 33 | [['text' => __('Last update')], ['text' => Date::convertToDatetime($widget->updated_at, DATE::FORMAT_TO_SECONDS)]], |
| 34 | - [['text' => __('Status')], ['text' => ((int)$widget->disabled === 0) ? 'On' : 'Off'], 'property' => ['class' => ((int)$widget->disabled === 0) ? 'alert-success' : 'alert-danger']] |
|
| 34 | + [['text' => __('Status')], ['text' => ((int) $widget->disabled === 0) ? 'On' : 'Off'], 'property' => ['class' => ((int) $widget->disabled === 0) ? 'alert-success' : 'alert-danger']] |
|
| 35 | 35 | ] |
| 36 | 36 | ] |
| 37 | 37 | ]); ?> |
@@ -32,8 +32,8 @@ |
||
| 32 | 32 | foreach ($records as $item) { |
| 33 | 33 | $message = Str::sub(\App::$Security->strip_tags($item->message), 0, 50); |
| 34 | 34 | $author = Simplify::parseUserNick($item->user_id, $item->guest_name); |
| 35 | - if ((int)$item->user_id > 0) { |
|
| 36 | - $author = Url::link(['user/update', (int)$item->user_id], $author); |
|
| 35 | + if ((int) $item->user_id > 0) { |
|
| 36 | + $author = Url::link(['user/update', (int) $item->user_id], $author); |
|
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | |
@@ -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"> |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | // don't use breadcrumbs on injected pathway rule |
| 33 | -if (!\App::$Request->isPathInjected() && (bool)$model->getCategory()->getProperty('showCategory')) { |
|
| 33 | +if (!\App::$Request->isPathInjected() && (bool) $model->getCategory()->getProperty('showCategory')) { |
|
| 34 | 34 | $breadcrumbs = [ |
| 35 | 35 | Url::to('/') => __('Home') |
| 36 | 36 | ]; |
@@ -42,22 +42,22 @@ discard block |
||
| 42 | 42 | $breadcrumbs[Url::to('content/list', $cat['path'], null, [], false)] = $cat['name']; |
| 43 | 43 | } |
| 44 | 44 | } |
| 45 | - $breadcrumbs[] = __('Content') . ': ' . Str::sub($this->title, 0, 40); |
|
| 45 | + $breadcrumbs[] = __('Content').': '.Str::sub($this->title, 0, 40); |
|
| 46 | 46 | } |
| 47 | 47 | |
| 48 | 48 | $this->breadcrumbs = $breadcrumbs; |
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | $properties = [ |
| 52 | - 'date' => (bool)$model->getCategory()->getProperty('showDate'), |
|
| 53 | - 'author' => (bool)$model->getCategory()->getProperty('showAuthor'), |
|
| 54 | - 'views' => (bool)$model->getCategory()->getProperty('showViews'), |
|
| 55 | - 'category' => (bool)$model->getCategory()->getProperty('showCategory'), |
|
| 56 | - 'rating' => (bool)$model->getCategory()->getProperty('showRating'), |
|
| 57 | - 'tags' => (bool)$model->getCategory()->getProperty('showTags') |
|
| 52 | + 'date' => (bool) $model->getCategory()->getProperty('showDate'), |
|
| 53 | + 'author' => (bool) $model->getCategory()->getProperty('showAuthor'), |
|
| 54 | + 'views' => (bool) $model->getCategory()->getProperty('showViews'), |
|
| 55 | + 'category' => (bool) $model->getCategory()->getProperty('showCategory'), |
|
| 56 | + 'rating' => (bool) $model->getCategory()->getProperty('showRating'), |
|
| 57 | + 'tags' => (bool) $model->getCategory()->getProperty('showTags') |
|
| 58 | 58 | ]; |
| 59 | -$showComments = (bool)$model->getCategory()->getProperty('showComments'); |
|
| 60 | -$showPoster = (bool)$model->getCategory()->getProperty('showPoster'); |
|
| 59 | +$showComments = (bool) $model->getCategory()->getProperty('showComments'); |
|
| 60 | +$showPoster = (bool) $model->getCategory()->getProperty('showPoster'); |
|
| 61 | 61 | |
| 62 | 62 | ?> |
| 63 | 63 | |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | <span class="spaced"><i class="glyphicon glyphicon-eye-open"></i> <?= $model->views ?></span> |
| 83 | 83 | <?php endif ?> |
| 84 | 84 | <?php if (\App::$User->isAuth() && \App::$User->identity()->role->can('Admin/Content/Update')): ?> |
| 85 | - <span class="pull-right"><a href="<?= \App::$Alias->scriptUrl . '/admin/content/update/' . $model->id ?>" target="_blank"><i class="glyphicon glyphicon-pencil" style="color: #ff0000;"></i></a></span> |
|
| 85 | + <span class="pull-right"><a href="<?= \App::$Alias->scriptUrl.'/admin/content/update/'.$model->id ?>" target="_blank"><i class="glyphicon glyphicon-pencil" style="color: #ff0000;"></i></a></span> |
|
| 86 | 86 | <?php endif; ?> |
| 87 | 87 | </div> |
| 88 | 88 | <?php else: ?> |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | <div id="content-text"> |
| 98 | 98 | <?php if ($showPoster === true && $model->posterFull !== null && $model->posterThumb !== null): ?> |
| 99 | 99 | <a href="#showPoster" data-toggle="modal" data-target="#showPoster"> |
| 100 | - <img alt="<?= __('Poster for') ?>: <?= Str::lowerCase($model->title) ?>" src="<?= \App::$Alias->scriptUrl . $model->posterThumb ?>" class="image_poster img-thumbnail" /> |
|
| 100 | + <img alt="<?= __('Poster for') ?>: <?= Str::lowerCase($model->title) ?>" src="<?= \App::$Alias->scriptUrl.$model->posterThumb ?>" class="image_poster img-thumbnail" /> |
|
| 101 | 101 | </a> |
| 102 | 102 | |
| 103 | 103 | <!-- Modal poster pop-up --> |
@@ -109,12 +109,12 @@ discard block |
||
| 109 | 109 | <h4 class="modal-title" id="myModalLabel"><?= __('View poster') ?></h4> |
| 110 | 110 | </div> |
| 111 | 111 | <div class="modal-body"> |
| 112 | - <img class="img-responsive" src="<?= \App::$Alias->scriptUrl . $model->posterFull ?>" alt="<?= __('Poster image') ?>" style="margin: 0 auto;" /> |
|
| 112 | + <img class="img-responsive" src="<?= \App::$Alias->scriptUrl.$model->posterFull ?>" alt="<?= __('Poster image') ?>" style="margin: 0 auto;" /> |
|
| 113 | 113 | </div> |
| 114 | 114 | </div> |
| 115 | 115 | </div> |
| 116 | 116 | </div> |
| 117 | - <?php endif ;?> |
|
| 117 | + <?php endif; ?> |
|
| 118 | 118 | <?= $model->text ?> |
| 119 | 119 | </div> |
| 120 | 120 | <?php if ($model->galleryItems !== null && Any::isArray($model->galleryItems)): ?> |
@@ -122,8 +122,8 @@ discard block |
||
| 122 | 122 | <?php $i = 1; ?> |
| 123 | 123 | <?php foreach ($model->galleryItems as $thumbPic => $fullPic): ?> |
| 124 | 124 | <div class="col-md-2 well"> |
| 125 | - <a href="#showGallery" class="modalGallery" content="<?= \App::$Alias->scriptUrl . $fullPic ?>" id="gallery-<?= $i ?>"> |
|
| 126 | - <img src="<?= \App::$Alias->scriptUrl . $thumbPic ?>" class="img-responsive image-item" /> |
|
| 125 | + <a href="#showGallery" class="modalGallery" content="<?= \App::$Alias->scriptUrl.$fullPic ?>" id="gallery-<?= $i ?>"> |
|
| 126 | + <img src="<?= \App::$Alias->scriptUrl.$thumbPic ?>" class="img-responsive image-item" /> |
|
| 127 | 127 | </a> |
| 128 | 128 | </div> |
| 129 | 129 | <?php $i++ ?> |
@@ -137,7 +137,7 @@ discard block |
||
| 137 | 137 | <h4 class="modal-title" id="showModalLabel"><?= __('View picture') ?></h4> |
| 138 | 138 | </div> |
| 139 | 139 | <div class="modal-body" id="modal-gallery-body"> |
| 140 | - <img class="img-responsive" src="<?= \App::$Alias->scriptUrl . $model->posterFull ?>" alt="<?= __('Gallery picture') ?>" style="margin: 0 auto;" /> |
|
| 140 | + <img class="img-responsive" src="<?= \App::$Alias->scriptUrl.$model->posterFull ?>" alt="<?= __('Gallery picture') ?>" style="margin: 0 auto;" /> |
|
| 141 | 141 | </div> |
| 142 | 142 | </div> |
| 143 | 143 | </div> |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | </div> |
| 159 | 159 | <div id="similar<?= $idx ?>" class="panel-collapse collapse"> |
| 160 | 160 | <div class="panel-body"> |
| 161 | - <a href="<?= \App::$Alias->baseUrl . $item['uri'] ?>"> |
|
| 161 | + <a href="<?= \App::$Alias->baseUrl.$item['uri'] ?>"> |
|
| 162 | 162 | <?= $item['snippet'] ?> |
| 163 | 163 | </a> |
| 164 | 164 | </div> |
@@ -189,7 +189,7 @@ discard block |
||
| 189 | 189 | echo '<i class="glyphicon glyphicon-tags hidden-xs"></i> '; |
| 190 | 190 | foreach ($model->metaKeywords as $tag) { |
| 191 | 191 | $tag = trim($tag); |
| 192 | - echo Url::link(['content/tag', $tag], $tag, ['class' => 'label label-default']) . " "; |
|
| 192 | + echo Url::link(['content/tag', $tag], $tag, ['class' => 'label label-default'])." "; |
|
| 193 | 193 | } |
| 194 | 194 | } |
| 195 | 195 | ?> |