@@ -58,6 +58,6 @@ |
||
| 58 | 58 | App::$Session->getFlashBag()->add('success', __('Feedback request is changed!')); |
| 59 | 59 | |
| 60 | 60 | // redirect to feedback post read |
| 61 | - $this->response->redirect('feedback/read/' . $id); |
|
| 61 | + $this->response->redirect('feedback/read/'.$id); |
|
| 62 | 62 | } |
| 63 | 63 | } |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | $rootSize = App::$Cache->getItem('root.size'); |
| 32 | 32 | $loadAvg = App::$Cache->getItem('load.avarage'); |
| 33 | 33 | if (!$rootSize->isHit()) { |
| 34 | - $calcSize = round(Directory::size('/') / (1024*1000), 2) . ' mb'; |
|
| 34 | + $calcSize = round(Directory::size('/') / (1024 * 1000), 2).' mb'; |
|
| 35 | 35 | $rootSize->set($calcSize); |
| 36 | 36 | $rootSize->expiresAfter(86400); |
| 37 | 37 | App::$Cache->save($rootSize); |
@@ -44,10 +44,10 @@ discard block |
||
| 44 | 44 | |
| 45 | 45 | // prepare system statistic |
| 46 | 46 | $stats = [ |
| 47 | - 'ff_version' => Version::VERSION . ' (' . Version::DATE . ')', |
|
| 48 | - 'php_version' => Environment::phpVersion() . ' (' . Environment::phpSAPI() . ')', |
|
| 47 | + 'ff_version' => Version::VERSION.' ('.Version::DATE.')', |
|
| 48 | + 'php_version' => Environment::phpVersion().' ('.Environment::phpSAPI().')', |
|
| 49 | 49 | 'os_name' => Environment::osName(), |
| 50 | - 'database_name' => App::$Database->connection()->getDatabaseName() . ' (' . App::$Database->connection()->getDriverName() . ')', |
|
| 50 | + 'database_name' => App::$Database->connection()->getDatabaseName().' ('.App::$Database->connection()->getDriverName().')', |
|
| 51 | 51 | 'file_size' => $rootSize->get(), |
| 52 | 52 | 'load_avg' => $loadAvg->get() |
| 53 | 53 | ]; |
@@ -41,12 +41,12 @@ |
||
| 41 | 41 | parent::before(); |
| 42 | 42 | $configs = AppRecord::getConfigs('app', 'Content'); |
| 43 | 43 | // prevent null-type config data |
| 44 | - if ((int)$configs['gallerySize'] > 0) { |
|
| 45 | - $this->maxSize = (int)$configs['gallerySize'] * 1024; |
|
| 44 | + if ((int) $configs['gallerySize'] > 0) { |
|
| 45 | + $this->maxSize = (int) $configs['gallerySize'] * 1024; |
|
| 46 | 46 | } |
| 47 | 47 | |
| 48 | - if ((int)$configs['galleryResize'] > 0) { |
|
| 49 | - $this->maxResize = (int)$configs['galleryResize']; |
|
| 48 | + if ((int) $configs['galleryResize'] > 0) { |
|
| 49 | + $this->maxResize = (int) $configs['galleryResize']; |
|
| 50 | 50 | } |
| 51 | 51 | } |
| 52 | 52 | } |
@@ -46,8 +46,8 @@ discard block |
||
| 46 | 46 | } |
| 47 | 47 | |
| 48 | 48 | // check if directory exist |
| 49 | - if (!Directory::exist('/upload/gallery/' . $id)) { |
|
| 50 | - Directory::create('/upload/gallery/' . $id); |
|
| 49 | + if (!Directory::exist('/upload/gallery/'.$id)) { |
|
| 50 | + Directory::create('/upload/gallery/'.$id); |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | // get file object |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | |
| 60 | 60 | // check file size |
| 61 | 61 | if ($file->getSize() < 1 || $file->getSize() > $this->maxSize) { |
| 62 | - throw new ForbiddenException(__('File size is too big. Max size: %size%kb', ['size' => (int)($this->maxSize/1024)])); |
|
| 62 | + throw new ForbiddenException(__('File size is too big. Max size: %size%kb', ['size' => (int) ($this->maxSize / 1024)])); |
|
| 63 | 63 | } |
| 64 | 64 | |
| 65 | 65 | // check file extension |
@@ -68,40 +68,40 @@ discard block |
||
| 68 | 68 | } |
| 69 | 69 | |
| 70 | 70 | // create origin directory |
| 71 | - $originPath = '/upload/gallery/' . $id . '/orig/'; |
|
| 71 | + $originPath = '/upload/gallery/'.$id.'/orig/'; |
|
| 72 | 72 | if (!Directory::exist($originPath)) { |
| 73 | 73 | Directory::create($originPath); |
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | // lets make a new file name |
| 77 | - $fileName = App::$Security->simpleHash($file->getClientOriginalName() . $file->getSize()); |
|
| 78 | - $fileNewName = $fileName . '.' . $file->guessExtension(); |
|
| 77 | + $fileName = App::$Security->simpleHash($file->getClientOriginalName().$file->getSize()); |
|
| 78 | + $fileNewName = $fileName.'.'.$file->guessExtension(); |
|
| 79 | 79 | // check if image is already loaded |
| 80 | - if (File::exist($originPath . $fileNewName)) { |
|
| 80 | + if (File::exist($originPath.$fileNewName)) { |
|
| 81 | 81 | throw new ForbiddenException(__('File is always exists!')); |
| 82 | 82 | } |
| 83 | 83 | // save file from tmp to gallery origin directory |
| 84 | 84 | $file->move(Normalize::diskFullPath($originPath), $fileNewName); |
| 85 | 85 | |
| 86 | 86 | // lets resize preview image for it |
| 87 | - $thumbPath = '/upload/gallery/' . $id . '/thumb/'; |
|
| 87 | + $thumbPath = '/upload/gallery/'.$id.'/thumb/'; |
|
| 88 | 88 | if (!Directory::exist($thumbPath)) { |
| 89 | 89 | Directory::create($thumbPath); |
| 90 | 90 | } |
| 91 | 91 | |
| 92 | 92 | $thumb = new Image(); |
| 93 | - $thumb->setCacheDir(root . '/Private/Cache/images'); |
|
| 93 | + $thumb->setCacheDir(root.'/Private/Cache/images'); |
|
| 94 | 94 | |
| 95 | 95 | // open original file, resize it and save |
| 96 | - $thumbSaveName = Normalize::diskFullPath($thumbPath) . '/' . $fileName . '.jpg'; |
|
| 97 | - $thumb->open(Normalize::diskFullPath($originPath) . DIRECTORY_SEPARATOR . $fileNewName) |
|
| 96 | + $thumbSaveName = Normalize::diskFullPath($thumbPath).'/'.$fileName.'.jpg'; |
|
| 97 | + $thumb->open(Normalize::diskFullPath($originPath).DIRECTORY_SEPARATOR.$fileNewName) |
|
| 98 | 98 | ->cropResize($this->maxResize) |
| 99 | 99 | ->save($thumbSaveName, 'jpg', 90); |
| 100 | 100 | $thumb = null; |
| 101 | 101 | |
| 102 | 102 | return json_encode(['status' => 1, 'file' => [ |
| 103 | - 'thumbnailUrl' => '/upload/gallery/' . $id . '/thumb/' . $fileName . '.jpg', |
|
| 104 | - 'url' => '/upload/gallery/' . $id . '/orig/' . $fileNewName, |
|
| 103 | + 'thumbnailUrl' => '/upload/gallery/'.$id.'/thumb/'.$fileName.'.jpg', |
|
| 104 | + 'url' => '/upload/gallery/'.$id.'/orig/'.$fileNewName, |
|
| 105 | 105 | 'name' => $fileNewName |
| 106 | 106 | ]]); |
| 107 | 107 | } |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | { |
| 33 | 33 | $this->setJsonHeader(); |
| 34 | 34 | if (!$file || Any::isEmpty($file)) { |
| 35 | - $file = (string)$this->request->query->get('file', null); |
|
| 35 | + $file = (string) $this->request->query->get('file', null); |
|
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | // check passed data |
@@ -48,8 +48,8 @@ discard block |
||
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | // generate path |
| 51 | - $thumb = '/upload/gallery/' . $id . '/thumb/' . $fileName . '.jpg'; |
|
| 52 | - $full = '/upload/gallery/' . $id . '/orig/' . $file; |
|
| 51 | + $thumb = '/upload/gallery/'.$id.'/thumb/'.$fileName.'.jpg'; |
|
| 52 | + $full = '/upload/gallery/'.$id.'/orig/'.$file; |
|
| 53 | 53 | |
| 54 | 54 | // check if file exists and remove |
| 55 | 55 | if (File::exist($thumb) || File::exist($full)) { |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | throw new NativeException('Permission denied'); |
| 39 | 39 | } |
| 40 | 40 | |
| 41 | - $thumbDir = Normalize::diskFullPath('/upload/gallery/' . $id . '/orig/'); |
|
| 41 | + $thumbDir = Normalize::diskFullPath('/upload/gallery/'.$id.'/orig/'); |
|
| 42 | 42 | if (!Directory::exist($thumbDir)) { |
| 43 | 43 | throw new NotFoundException('Nothing found'); |
| 44 | 44 | } |
@@ -53,10 +53,10 @@ discard block |
||
| 53 | 53 | $fileExt = Str::lastIn($file, '.'); |
| 54 | 54 | $fileName = Str::sub($file, 0, -Str::length($fileExt)); |
| 55 | 55 | $output[] = [ |
| 56 | - 'thumbnailUrl' => '/upload/gallery/' . $id . '/thumb/' . $fileName . '.jpg', |
|
| 57 | - 'url' => '/upload/gallery/' . $id . '/orig/' . $file, |
|
| 56 | + 'thumbnailUrl' => '/upload/gallery/'.$id.'/thumb/'.$fileName.'.jpg', |
|
| 57 | + 'url' => '/upload/gallery/'.$id.'/orig/'.$file, |
|
| 58 | 58 | 'name' => $file, |
| 59 | - 'size' => File::size('/upload/gallery/' . $id . '/orig/' . $file) |
|
| 59 | + 'size' => File::size('/upload/gallery/'.$id.'/orig/'.$file) |
|
| 60 | 60 | ]; |
| 61 | 61 | } |
| 62 | 62 | |
@@ -67,7 +67,7 @@ |
||
| 67 | 67 | /** |
| 68 | 68 | * Prepare model attributes from passed objects |
| 69 | 69 | * @throws ForbiddenException |
| 70 | - */ |
|
| 70 | + */ |
|
| 71 | 71 | public function before() |
| 72 | 72 | { |
| 73 | 73 | // set class attributes from ActiveRecord objects |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | $this->id = $this->_content->id; |
| 89 | 89 | $this->title = $this->_content->getLocaled('title'); |
| 90 | 90 | $this->text = $this->_content->getLocaled('text'); |
| 91 | - $this->display = (bool)$this->_content->display; |
|
| 91 | + $this->display = (bool) $this->_content->display; |
|
| 92 | 92 | |
| 93 | 93 | $this->metaTitle = $this->_content->getLocaled('meta_title'); |
| 94 | 94 | $this->metaDescription = $this->_content->getLocaled('meta_description'); |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | } |
| 108 | 108 | |
| 109 | 109 | $this->source = $this->_content->source; |
| 110 | - $this->views = $this->_content->views+1; |
|
| 110 | + $this->views = $this->_content->views + 1; |
|
| 111 | 111 | $this->rating = $this->_content->rating; |
| 112 | 112 | |
| 113 | 113 | // update views count |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | |
| 134 | 134 | $ignoredRate = App::$Session->get('content.rate.ignore'); |
| 135 | 135 | $this->canRate = true; |
| 136 | - if (Any::isArray($ignoredRate) && Arr::in((string)$this->id, $ignoredRate)) { |
|
| 136 | + if (Any::isArray($ignoredRate) && Arr::in((string) $this->id, $ignoredRate)) { |
|
| 137 | 137 | $this->canRate = false; |
| 138 | 138 | } |
| 139 | 139 | if (!App::$User->isAuth()) { |
@@ -149,15 +149,15 @@ discard block |
||
| 149 | 149 | private function prepareGallery() |
| 150 | 150 | { |
| 151 | 151 | // get gallery images and poster data |
| 152 | - $galleryPath = '/upload/gallery/' . $this->_content->id; |
|
| 152 | + $galleryPath = '/upload/gallery/'.$this->_content->id; |
|
| 153 | 153 | // check if gallery folder is exist |
| 154 | 154 | if (Directory::exist($galleryPath)) { |
| 155 | - $originImages = File::listFiles($galleryPath . '/orig/', ['.jpg', '.png', '.gif', '.jpeg', '.bmp', '.webp'], true); |
|
| 155 | + $originImages = File::listFiles($galleryPath.'/orig/', ['.jpg', '.png', '.gif', '.jpeg', '.bmp', '.webp'], true); |
|
| 156 | 156 | // generate poster data |
| 157 | 157 | if (Arr::in($this->_content->poster, $originImages)) { |
| 158 | 158 | // original poster |
| 159 | 159 | $posterName = $this->_content->poster; |
| 160 | - $this->posterFull = $galleryPath . '/orig/' . $posterName; |
|
| 160 | + $this->posterFull = $galleryPath.'/orig/'.$posterName; |
|
| 161 | 161 | if (!File::exist($this->posterFull)) { |
| 162 | 162 | $this->posterFull = null; |
| 163 | 163 | } |
@@ -166,7 +166,7 @@ discard block |
||
| 166 | 166 | $posterSplit = explode('.', $posterName); |
| 167 | 167 | array_pop($posterSplit); |
| 168 | 168 | $posterCleanName = implode('.', $posterSplit); |
| 169 | - $this->posterThumb = $galleryPath . '/thumb/' . $posterCleanName . '.jpg'; |
|
| 169 | + $this->posterThumb = $galleryPath.'/thumb/'.$posterCleanName.'.jpg'; |
|
| 170 | 170 | if (!File::exist($this->posterThumb)) { |
| 171 | 171 | $this->posterThumb = null; |
| 172 | 172 | } |
@@ -182,9 +182,9 @@ discard block |
||
| 182 | 182 | continue; |
| 183 | 183 | } |
| 184 | 184 | |
| 185 | - $thumbPath = $galleryPath . '/thumb/' . $imageClearName . '.jpg'; |
|
| 185 | + $thumbPath = $galleryPath.'/thumb/'.$imageClearName.'.jpg'; |
|
| 186 | 186 | if (File::exist($thumbPath)) { |
| 187 | - $this->galleryItems[$thumbPath] = $galleryPath . '/orig/' . $image; |
|
| 187 | + $this->galleryItems[$thumbPath] = $galleryPath.'/orig/'.$image; |
|
| 188 | 188 | } |
| 189 | 189 | } |
| 190 | 190 | } |
@@ -58,7 +58,8 @@ discard block |
||
| 58 | 58 | </button> |
| 59 | 59 | </div> |
| 60 | 60 | </div> |
| 61 | - <?php else: ?> |
|
| 61 | + <?php else { |
|
| 62 | + : ?> |
|
| 62 | 63 | <div class="row"> |
| 63 | 64 | <div class="col-md-8" style="padding-right: 0;"> |
| 64 | 65 | <a href="javascript:void(0);" class="btn btn-block <?= $rateClass ?>"> |
@@ -75,7 +76,9 @@ discard block |
||
| 75 | 76 | <button class="btn btn-block btn-danger" id="reduceRating">-</button> |
| 76 | 77 | </div> |
| 77 | 78 | </div> |
| 78 | - <?php endif; ?> |
|
| 79 | + <?php endif; |
|
| 80 | +} |
|
| 81 | +?> |
|
| 79 | 82 | <?php endif; ?> |
| 80 | 83 | <?php |
| 81 | 84 | $userMenu = $this->bootstrap()->nav('ul', ['class' => 'nav-tabs flex-column']); |
@@ -20,10 +20,10 @@ discard block |
||
| 20 | 20 | $name = $user->profile === null ? __('Unknown') : $user->profile->getNickname(); |
| 21 | 21 | |
| 22 | 22 | $this->layout('_layouts/default', [ |
| 23 | - 'title' => __('Profile') . ': ' . $name, |
|
| 23 | + 'title' => __('Profile').': '.$name, |
|
| 24 | 24 | 'breadcrumbs' => [ |
| 25 | 25 | Url::to('/') => __('Home'), |
| 26 | - __('Profile') . ': ' . $name |
|
| 26 | + __('Profile').': '.$name |
|
| 27 | 27 | ] |
| 28 | 28 | ]); |
| 29 | 29 | |
@@ -43,7 +43,7 @@ discard block |
||
| 43 | 43 | <img src="<?= $user->profile->getAvatarUrl('big') ?>" class="img-fluid img-thumbnail" /> |
| 44 | 44 | <?php if ($ratingOn): |
| 45 | 45 | $rateClass = 'btn-secondary'; |
| 46 | - $rateValue = (int)$user->profile->rating; |
|
| 46 | + $rateValue = (int) $user->profile->rating; |
|
| 47 | 47 | if ($user->profile->rating > 0) { |
| 48 | 48 | $rateClass = 'btn-info'; |
| 49 | 49 | } elseif ($user->profile->rating < 0) { |
@@ -80,11 +80,11 @@ discard block |
||
| 80 | 80 | <?php |
| 81 | 81 | $userMenu = $this->bootstrap()->nav('ul', ['class' => 'nav-tabs flex-column']); |
| 82 | 82 | if ($isSelf) { |
| 83 | - $userMenu->menu(['link' => ['profile/feed'], 'text' => '<i class="fa fa-rss-square"></i> ' . __('Feed'), 'html' => true]); |
|
| 84 | - $userMenu->menu(['link' => ['profile/avatar'], 'text' => '<i class="fa fa-camera"></i> ' . __('Avatar'), 'html' => true]); |
|
| 85 | - $userMenu->menu(['link' => ['profile/messages'], 'text' => '<i class="fa fa-envelope"></i> ' . __('Messages') . ' <span class="badge pm-count-block">0</span>', 'html' => true]); |
|
| 86 | - $userMenu->menu(['link' => ['profile/settings'], 'text' => '<i class="fa fa-cogs"></i> ' . __('Settings'), 'html' => true]); |
|
| 87 | - } else if(\App::$User->isAuth()) { |
|
| 83 | + $userMenu->menu(['link' => ['profile/feed'], 'text' => '<i class="fa fa-rss-square"></i> '.__('Feed'), 'html' => true]); |
|
| 84 | + $userMenu->menu(['link' => ['profile/avatar'], 'text' => '<i class="fa fa-camera"></i> '.__('Avatar'), 'html' => true]); |
|
| 85 | + $userMenu->menu(['link' => ['profile/messages'], 'text' => '<i class="fa fa-envelope"></i> '.__('Messages').' <span class="badge pm-count-block">0</span>', 'html' => true]); |
|
| 86 | + $userMenu->menu(['link' => ['profile/settings'], 'text' => '<i class="fa fa-cogs"></i> '.__('Settings'), 'html' => true]); |
|
| 87 | + } else if (\App::$User->isAuth()) { |
|
| 88 | 88 | $userMenu->menu(['link' => ['profile/messages', null, ['newdialog' => $user->id]], 'text' => __('Write message')]); |
| 89 | 89 | $userMenu->menu(['link' => ['profile/ignore', null, ['id' => $user->id]], 'text' => __('Block')]); |
| 90 | 90 | } |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | foreach ($hobbyArray as $item) { |
| 161 | 161 | $item = \App::$Security->strip_tags($item); |
| 162 | 162 | if (!Str::likeEmpty($item)) { |
| 163 | - echo Url::a(['profile/index', ['hobby', trim($item, ' ')]], $item, ['class' => 'badge badge-secondary']) . ' '; |
|
| 163 | + echo Url::a(['profile/index', ['hobby', trim($item, ' ')]], $item, ['class' => 'badge badge-secondary']).' '; |
|
| 164 | 164 | } |
| 165 | 165 | } |
| 166 | 166 | ?> |
@@ -213,7 +213,7 @@ discard block |
||
| 213 | 213 | <div class="col-xs-8 col-md-10"> |
| 214 | 214 | <div class="h5" style="margin-top: 0;margin-bottom: 5px;"> |
| 215 | 215 | <i class="glyphicon glyphicon-user"></i> |
| 216 | - <?= Url::a(['profile/show', [$post->sender_id]], $post->senderUser->profile->getNickname(), ['style' => 'color: ' . $post->senderUser->role->color]) ?> |
|
| 216 | + <?= Url::a(['profile/show', [$post->sender_id]], $post->senderUser->profile->getNickname(), ['style' => 'color: '.$post->senderUser->role->color]) ?> |
|
| 217 | 217 | <small class="float-right"><?= Date::humanize($post->updated_at); ?></small> |
| 218 | 218 | </div> |
| 219 | 219 | <div class="object-text"> |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | public function show(string $userId): ?string |
| 33 | 33 | { |
| 34 | 34 | $cfg = $this->application->configs; |
| 35 | - if (!(bool)$cfg['guestView'] && !App::$User->isAuth()) { |
|
| 35 | + if (!(bool) $cfg['guestView'] && !App::$User->isAuth()) { |
|
| 36 | 36 | throw new ForbiddenException(__('You must login to view other profile')); |
| 37 | 37 | } |
| 38 | 38 | |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | App::$Session->getFlashBag()->add('error', __('This user are in your black list or you are in blacklist!')); |
| 56 | 56 | } else { |
| 57 | 57 | // check if message added |
| 58 | - if ($wallModel->makePost($targetPersone, $viewerPersone, (int)$cfg['delayBetweenPost'])) { |
|
| 58 | + if ($wallModel->makePost($targetPersone, $viewerPersone, (int) $cfg['delayBetweenPost'])) { |
|
| 59 | 59 | App::$Session->getFlashBag()->add('success', __('The message was successful posted!')); |
| 60 | 60 | } else { |
| 61 | 61 | App::$Session->getFlashBag()->add('warning', __('Posting message was failed! Please, wait few seconds')); |
@@ -68,8 +68,8 @@ discard block |
||
| 68 | 68 | $wallQuery = WallPost::where('target_id', $targetPersone->getId()); |
| 69 | 69 | |
| 70 | 70 | // pagination and query params |
| 71 | - $wallPage = (int)$this->request->query->get('page'); |
|
| 72 | - $wallStep = (int)$cfg['wallPostOnPage']; |
|
| 71 | + $wallPage = (int) $this->request->query->get('page'); |
|
| 72 | + $wallStep = (int) $cfg['wallPostOnPage']; |
|
| 73 | 73 | $wallOffset = $wallPage * $wallStep; |
| 74 | 74 | $wallTotalCount = $wallQuery->count(); |
| 75 | 75 | |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | 'total' => $wallTotalCount, |
| 94 | 94 | 'page' => $wallPage |
| 95 | 95 | ], |
| 96 | - 'ratingOn' => (int)$cfg['rating'] === 1 |
|
| 96 | + 'ratingOn' => (int) $cfg['rating'] === 1 |
|
| 97 | 97 | ]); |
| 98 | 98 | } |
| 99 | 99 | } |