From 9ec0d1d44649aa563e642a8475304bc0fb996a2d Mon Sep 17 00:00:00 2001 From: Evg Date: Fri, 27 Oct 2023 04:16:03 +0300 Subject: [PATCH] =?UTF-8?q?FIX:=20favicons=20=D0=B2=20=D1=80=D0=B5=D0=B7?= =?UTF-8?q?=D1=83=D0=BB=D1=8C=D1=82=D0=B0=D1=82=D0=B0=D1=85=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=B8=D1=81=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Answer/AddAnswerController.php | 8 ++--- app/Controllers/Comment/CommentController.php | 2 +- .../Facets/TopicFacetController.php | 1 - app/Controllers/Item/AdminController.php | 20 +++++------ app/Controllers/Item/ImgController.php | 16 ++++----- app/Controllers/Post/AddPostController.php | 16 ++++----- app/Controllers/User/ProfileController.php | 4 +-- app/Controllers/User/SettingController.php | 35 +++++++++---------- .../views/default/content/search/search.php | 2 +- 9 files changed, 51 insertions(+), 53 deletions(-) diff --git a/app/Controllers/Answer/AddAnswerController.php b/app/Controllers/Answer/AddAnswerController.php index 98638614..88281c09 100644 --- a/app/Controllers/Answer/AddAnswerController.php +++ b/app/Controllers/Answer/AddAnswerController.php @@ -22,9 +22,9 @@ class AddAnswerController extends Controller // Let's check the stop words, url // Проверим стоп слова и url $trigger = (new \App\Services\Audit())->prohibitedContent($content); - + $this->union($post, $url_post, $content); - + $last_id = AnswerModel::add($post['post_id'], $content, $trigger); // Add an audit entry and an alert to the admin @@ -64,11 +64,11 @@ class AddAnswerController extends Controller // If there are no replies to the post and the author of the post = the author of the answer, then add the answer to the end of the post // Если ответов на пост нет и автор поста = автора ответа, то дописываем ответ в конец поста if ((AnswerModel::getNumberAnswers($post['post_id']) == null) && ($post['post_user_id'] == $this->user['id'])) { - + AnswerModel::mergePost($post['post_id'], $content); redirect($url_post); - } + } return true; } diff --git a/app/Controllers/Comment/CommentController.php b/app/Controllers/Comment/CommentController.php index 709509bf..3a4c71ad 100644 --- a/app/Controllers/Comment/CommentController.php +++ b/app/Controllers/Comment/CommentController.php @@ -44,7 +44,7 @@ class CommentController extends Controller ] ); } - + // On the home page // На главной странице public function lastComment() diff --git a/app/Controllers/Facets/TopicFacetController.php b/app/Controllers/Facets/TopicFacetController.php index d1f50255..b1664185 100644 --- a/app/Controllers/Facets/TopicFacetController.php +++ b/app/Controllers/Facets/TopicFacetController.php @@ -6,7 +6,6 @@ use Hleb\Constructor\Handlers\Request; use App\Controllers\Controller; use App\Services\Сheck\FacetPresence; use App\Services\Meta\Facet; -use App\Models\User\UserModel; use App\Models\{FeedModel, SubscriptionModel, FacetModel, PostModel}; class TopicFacetController extends Controller diff --git a/app/Controllers/Item/AdminController.php b/app/Controllers/Item/AdminController.php index d04c2c5c..c1065d56 100644 --- a/app/Controllers/Item/AdminController.php +++ b/app/Controllers/Item/AdminController.php @@ -28,7 +28,7 @@ class AdminController extends Controller 'item', ); } - + public function deleted() { return $this->render( @@ -40,7 +40,7 @@ class AdminController extends Controller 'item', ); } - + public function comments() { return $this->render( @@ -52,15 +52,15 @@ class AdminController extends Controller 'item', ); } - + public function status() { Request::getResources()->addBottomScript('/assets/js/catalog.js'); - + $code = Request::get('code'); - + $pagesCount = 0; // TODO - + return $this->render( '/item/admin/status', [ @@ -68,14 +68,14 @@ class AdminController extends Controller 'data' => [ 'pagesCount' => ceil($pagesCount / $this->limit), 'pNum' => $this->pageNumber, - 'status' => WebModel::getStatus($this->pageNumber, $code), + 'status' => WebModel::getStatus($this->pageNumber, $code), 'code' => $code ] ], 'item', ); } - + public static function httpCode($url) { stream_context_set_default([ @@ -84,12 +84,12 @@ class AdminController extends Controller 'verify_peer_name' => false, ], ]); - + $headers = get_headers($url); return (empty($headers[0])) ? 404 : substr($headers[0], 9, 3); } - + // Once a month public static function updateStatus() { diff --git a/app/Controllers/Item/ImgController.php b/app/Controllers/Item/ImgController.php index 7c3dfdbe..6cb2b818 100644 --- a/app/Controllers/Item/ImgController.php +++ b/app/Controllers/Item/ImgController.php @@ -14,7 +14,7 @@ class ImgController extends Controller if (!UserData::checkAdmin()) { return false; } - + $item_id = Request::getPostInt('id'); $item = WebModel::getItemId($item_id); notEmptyOrView404($item); @@ -36,17 +36,17 @@ class ImgController extends Controller // "https://www.google.com/s2/favicons?domain=" . $url; return "https://favicon.yandex.net/favicon/" . $url; } - + public function screenshot() { if (!UserData::checkAdmin()) { return false; } - + $item_id = Request::getPostInt('id'); $item = WebModel::getItemId($item_id); notEmptyOrView404($item); - + $puth = HLEB_PUBLIC_DIR . Img::PATH['thumbs'] . host($item['item_url']) . '.png'; if (!file_exists($puth)) { @@ -56,10 +56,10 @@ class ImgController extends Controller return true; } - - + + public static function getScreenshot($url) - { - return "https://api.screenshotone.com/take?image_width=880&url=" . $url ."&access_key=" . config('integration.sc_access_key'); + { + return "https://api.screenshotone.com/take?image_width=880&url=" . $url . "&access_key=" . config('integration.sc_access_key'); } } diff --git a/app/Controllers/Post/AddPostController.php b/app/Controllers/Post/AddPostController.php index 4630cc0e..ffcdcdb2 100644 --- a/app/Controllers/Post/AddPostController.php +++ b/app/Controllers/Post/AddPostController.php @@ -29,15 +29,15 @@ class AddPostController extends Controller // Adding from page topic / blog // Добавление со странице темы / блога $facet_id = Request::getInt('facet_id'); - + if ($facet_id) { - $facet = FacetPresence::all($facet_id); - - if ($facet['facet_type'] == 'topic') { - $topic = FacetPresence::index($facet_id, 'id', 'topic'); - } elseif ($facet['facet_type'] == 'blog' && $facet['facet_user_id'] == $this->user['id']) { - $blog = FacetPresence::index($facet_id, 'id', 'blog'); - } + $facet = FacetPresence::all($facet_id); + + if ($facet['facet_type'] == 'topic') { + $topic = FacetPresence::index($facet_id, 'id', 'topic'); + } elseif ($facet['facet_type'] == 'blog' && $facet['facet_user_id'] == $this->user['id']) { + $blog = FacetPresence::index($facet_id, 'id', 'blog'); + } } return $this->render( diff --git a/app/Controllers/User/ProfileController.php b/app/Controllers/User/ProfileController.php index 9dc54137..c7a2321b 100644 --- a/app/Controllers/User/ProfileController.php +++ b/app/Controllers/User/ProfileController.php @@ -146,7 +146,7 @@ class ProfileController extends Controller return true; } - + // Index profile or not public function indexing($profile_id) { @@ -154,7 +154,7 @@ class ProfileController extends Controller if (($amount['count_answers'] + $amount['count_comments']) < 3) { Request::getHead()->addMeta('robots', 'noindex'); } - + if (UserModel::isDeleted($profile_id)) { Request::getHead()->addMeta('robots', 'noindex'); } diff --git a/app/Controllers/User/SettingController.php b/app/Controllers/User/SettingController.php index bcb713d0..2617f4da 100644 --- a/app/Controllers/User/SettingController.php +++ b/app/Controllers/User/SettingController.php @@ -64,18 +64,18 @@ class SettingController extends Controller function settingForm() { Request::getResources()->addBottomScript('/assets/js/dialog/dialog.js'); - + $new = SettingModel::getNewEmail(); $email = $new['email'] ?? null; - - if($code = Request::getGet('newemail')) { - if (SettingModel::available($code)) { - SettingModel::editEmail($email); - is_return(__('msg.change_saved'), 'success', url('setting')); - } + if ($code = Request::getGet('newemail')) { + if (SettingModel::available($code)) { + SettingModel::editEmail($email); + + is_return(__('msg.change_saved'), 'success', url('setting')); + } } - + return $this->render( '/user/setting/setting', [ @@ -229,7 +229,7 @@ class SettingController extends Controller ] ); } - + function deletion() { return $this->render( @@ -239,7 +239,7 @@ class SettingController extends Controller 'data' => [] ] ); - } + } function notificationEdit() { @@ -256,24 +256,24 @@ class SettingController extends Controller is_return(__('msg.change_saved'), 'success', '/setting/notifications'); } - + function newEmail() { $email = Request::getPost('email'); - + if (RulesUserSetting::rulesNewEmail($email) === false) { return json_encode('error'); - } - + } + if (is_array(AuthModel::checkRepetitions($email, 'email'))) { return json_encode('repeat'); } - + $code = Html::randomString('crypto', 20); - + SettingModel::setNewEmail($email, $code); - SendEmail::mailText($this->user['id'], 'new.email', ['link' => '/setting?newemail=' . $code, 'new_email' =>$email]); + SendEmail::mailText($this->user['id'], 'new.email', ['link' => '/setting?newemail=' . $code, 'new_email' => $email]); return json_encode('success'); } @@ -293,5 +293,4 @@ class SettingController extends Controller Session::logout(); } - } diff --git a/resources/views/default/content/search/search.php b/resources/views/default/content/search/search.php index 856218a9..d142c180 100644 --- a/resources/views/default/content/search/search.php +++ b/resources/views/default/content/search/search.php @@ -43,7 +43,7 @@ $sw = $sw ?? '?';
- +