From 384ff1240173e74f5caf78a2dc26445ee6bab048 Mon Sep 17 00:00:00 2001 From: Roman Kelesidis Date: Fri, 29 Nov 2024 20:23:16 +0700 Subject: [PATCH] Updated --- admin/admin_ranks.php | 6 +++--- install/php-fpm+nginx/nginx.conf | 2 +- library/includes/bbcode.php | 2 +- styles/templates/posting_tpl.tpl | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/admin/admin_ranks.php b/admin/admin_ranks.php index 41297fa6..4701d259 100644 --- a/admin/admin_ranks.php +++ b/admin/admin_ranks.php @@ -74,7 +74,7 @@ if ($mode != '') // поддержка изображений в ссылках $is_rank_image_link = false; - if (!empty($rank_info['rank_image']) && preg_match('#(https?:)?//[^\s\?&;=\#\"<>]+?\.(jpg|jpeg|gif|png|webp|bmp)([a-z0-9/?&%;][^\[\]]*)?#', $rank_info['rank_image'])) { + if (!empty($rank_info['rank_image']) && preg_match('#(https?:)?//[^\s\?&;=\#\"<>]+?\.(jpg|jpeg|gif|png|webp|bmp|avif)([a-z0-9/?&%;][^\[\]]*)?#', $rank_info['rank_image'])) { $is_rank_image_link = true; } @@ -123,7 +123,7 @@ if ($mode != '') // if ($rank_image != '') { - if (!preg_match('/(\.gif|\.png|\.jpg|\.jpeg|\.bmp|\.webp|\.ico)$/is', $rank_image)) + if (!preg_match('/(\.gif|\.png|\.jpg|\.jpeg|\.bmp|\.webp|\.avif|\.ico)$/is', $rank_image)) { $rank_image = ''; } @@ -238,7 +238,7 @@ else $rank_min = $rank_rows[$i]['rank_min']; // поддержка изображений в ссылках $is_rank_image_link = false; - if ($rank_rows[$i]['rank_image'] && preg_match('#(https?:)?//[^\s\?&;=\#\"<>]+?\.(jpg|jpeg|gif|png|webp|bmp)([a-z0-9/?&%;][^\[\]]*)?#', $rank_rows[$i]['rank_image'])) { + if ($rank_rows[$i]['rank_image'] && preg_match('#(https?:)?//[^\s\?&;=\#\"<>]+?\.(jpg|jpeg|gif|png|webp|bmp|avif)([a-z0-9/?&%;][^\[\]]*)?#', $rank_rows[$i]['rank_image'])) { $is_rank_image_link = true; } diff --git a/install/php-fpm+nginx/nginx.conf b/install/php-fpm+nginx/nginx.conf index 5ec95103..f1cfdbdb 100644 --- a/install/php-fpm+nginx/nginx.conf +++ b/install/php-fpm+nginx/nginx.conf @@ -115,7 +115,7 @@ http { # } # cache static files - location ~* \.(jpg|jpeg|gif|png|webp|bmp|css|js|ico)$ { + location ~* \.(jpg|jpeg|gif|png|webp|bmp|avif|css|js|ico)$ { root /var/www; access_log off; expires 30d; diff --git a/library/includes/bbcode.php b/library/includes/bbcode.php index cbea0b83..94b173fc 100644 --- a/library/includes/bbcode.php +++ b/library/includes/bbcode.php @@ -496,7 +496,7 @@ class bbcode function init_replacements () { $tpl = $this->tpl; - $img_exp = '(https?:)?//[^\s\?&;=\#\"<>]+?\.(jpg|jpeg|gif|png|webp|bmp)([a-z0-9/?&%;][^\[\]]*)?'; + $img_exp = '(https?:)?//[^\s\?&;=\#\"<>]+?\.(jpg|jpeg|gif|png|webp|bmp|avif)([a-z0-9/?&%;][^\[\]]*)?'; $email_exp = '[a-z0-9&\-_.]+?@[\w\-]+\.([\w\-\.]+\.)?[\w]+'; $this->preg = array( diff --git a/styles/templates/posting_tpl.tpl b/styles/templates/posting_tpl.tpl index 0e19dfd0..bf0c5ce8 100644 --- a/styles/templates/posting_tpl.tpl +++ b/styles/templates/posting_tpl.tpl @@ -374,8 +374,8 @@ var TPL = { reg: { num : /^\d+$/, URL : /^https?:\/\/[\w\#$%&~/.\-;:=?@\[\]+]+$/i, - img : /^https?:\/\/[^\s\?&;:=\#\"<>]+\.(jpg|jpeg|gif|png|webp|bmp)$/i, - img_tag : /(https?:\/\/[^\s\?&;:=\#\"<>]+\.(jpg|jpeg|gif|png|webp|bmp)(?!\[|\]|\.))/ig + img : /^https?:\/\/[^\s\?&;:=\#\"<>]+\.(jpg|jpeg|gif|png|webp|bmp|avif)$/i, + img_tag : /(https?:\/\/[^\s\?&;:=\#\"<>]+\.(jpg|jpeg|gif|png|webp|bmp|avif)(?!\[|\]|\.))/ig }, // построение сообщения на основе данных из формы