Revert "Minor improvements (#285)"

This reverts commit 3083bdea46.
This commit is contained in:
Roman Kelesidis 2023-10-02 11:56:25 +07:00
parent 3083bdea46
commit 67633b0d1e
3 changed files with 11 additions and 6 deletions

View File

@ -17,7 +17,7 @@
- Added missing translation in admin_ug_auth [\#254](https://github.com/torrentpier/torrentpier-lts/pull/254) ([belomaxorka](https://github.com/belomaxorka)) - Added missing translation in admin_ug_auth [\#254](https://github.com/torrentpier/torrentpier-lts/pull/254) ([belomaxorka](https://github.com/belomaxorka))
- Support for IDN domains [\#252](https://github.com/torrentpier/torrentpier-lts/pull/252) ([belomaxorka](https://github.com/belomaxorka), [kovalensky](https://github.com/kovalensky)) - Support for IDN domains [\#252](https://github.com/torrentpier/torrentpier-lts/pull/252) ([belomaxorka](https://github.com/belomaxorka), [kovalensky](https://github.com/kovalensky))
- Fixed cache directory auto-creating with SQLite [\#247](https://github.com/torrentpier/torrentpier-lts/pull/247) ([belomaxorka](https://github.com/belomaxorka)) - Fixed cache directory auto-creating with SQLite [\#247](https://github.com/torrentpier/torrentpier-lts/pull/247) ([belomaxorka](https://github.com/belomaxorka))
- Minor improvements [\#245](https://github.com/torrentpier/torrentpier-lts/pull/245), [\#246](https://github.com/torrentpier/torrentpier-lts/pull/246), [\#248](https://github.com/torrentpier/torrentpier-lts/pull/248), [\#249](https://github.com/torrentpier/torrentpier-lts/pull/249), [\#250](https://github.com/torrentpier/torrentpier-lts/pull/250), [\#251](https://github.com/torrentpier/torrentpier-lts/pull/251), [\#253](https://github.com/torrentpier/torrentpier-lts/pull/253), [\#255](https://github.com/torrentpier/torrentpier-lts/pull/255), [\#256](https://github.com/torrentpier/torrentpier-lts/pull/256), [\#257](https://github.com/torrentpier/torrentpier-lts/pull/257), [\#258](https://github.com/torrentpier/torrentpier-lts/pull/258), [\#259](https://github.com/torrentpier/torrentpier-lts/pull/259), [\#261](https://github.com/torrentpier/torrentpier-lts/pull/261), [\#262](https://github.com/torrentpier/torrentpier-lts/pull/262), [\#263](https://github.com/torrentpier/torrentpier-lts/pull/263), [\#264](https://github.com/torrentpier/torrentpier-lts/pull/264), [\#265](https://github.com/torrentpier/torrentpier-lts/pull/265), [\#266](https://github.com/torrentpier/torrentpier-lts/pull/266), [\#267](https://github.com/torrentpier/torrentpier-lts/pull/267), [\#268](https://github.com/torrentpier/torrentpier-lts/pull/268), [\#269](https://github.com/torrentpier/torrentpier-lts/pull/269), [\#270](https://github.com/torrentpier/torrentpier-lts/pull/270), [\#271](https://github.com/torrentpier/torrentpier-lts/pull/271), [\#273](https://github.com/torrentpier/torrentpier-lts/pull/273), [\#275](https://github.com/torrentpier/torrentpier-lts/pull/275), [\#280](https://github.com/torrentpier/torrentpier-lts/pull/280), [\#281](https://github.com/torrentpier/torrentpier-lts/pull/281), [\#285](https://github.com/torrentpier/torrentpier-lts/pull/285) ([belomaxorka](https://github.com/belomaxorka)) - Minor improvements [\#245](https://github.com/torrentpier/torrentpier-lts/pull/245), [\#246](https://github.com/torrentpier/torrentpier-lts/pull/246), [\#248](https://github.com/torrentpier/torrentpier-lts/pull/248), [\#249](https://github.com/torrentpier/torrentpier-lts/pull/249), [\#250](https://github.com/torrentpier/torrentpier-lts/pull/250), [\#251](https://github.com/torrentpier/torrentpier-lts/pull/251), [\#253](https://github.com/torrentpier/torrentpier-lts/pull/253), [\#255](https://github.com/torrentpier/torrentpier-lts/pull/255), [\#256](https://github.com/torrentpier/torrentpier-lts/pull/256), [\#257](https://github.com/torrentpier/torrentpier-lts/pull/257), [\#258](https://github.com/torrentpier/torrentpier-lts/pull/258), [\#259](https://github.com/torrentpier/torrentpier-lts/pull/259), [\#261](https://github.com/torrentpier/torrentpier-lts/pull/261), [\#262](https://github.com/torrentpier/torrentpier-lts/pull/262), [\#263](https://github.com/torrentpier/torrentpier-lts/pull/263), [\#264](https://github.com/torrentpier/torrentpier-lts/pull/264), [\#265](https://github.com/torrentpier/torrentpier-lts/pull/265), [\#266](https://github.com/torrentpier/torrentpier-lts/pull/266), [\#267](https://github.com/torrentpier/torrentpier-lts/pull/267), [\#268](https://github.com/torrentpier/torrentpier-lts/pull/268), [\#269](https://github.com/torrentpier/torrentpier-lts/pull/269), [\#270](https://github.com/torrentpier/torrentpier-lts/pull/270), [\#271](https://github.com/torrentpier/torrentpier-lts/pull/271), [\#273](https://github.com/torrentpier/torrentpier-lts/pull/273), [\#275](https://github.com/torrentpier/torrentpier-lts/pull/275), [\#280](https://github.com/torrentpier/torrentpier-lts/pull/280), [\#281](https://github.com/torrentpier/torrentpier-lts/pull/281) ([belomaxorka](https://github.com/belomaxorka))
## [v2.1.5-2023.08-HotFix](https://github.com/torrentpier/torrentpier-lts/tree/v2.1.5-2023.08-HotFix) (2023-09-17) ## [v2.1.5-2023.08-HotFix](https://github.com/torrentpier/torrentpier-lts/tree/v2.1.5-2023.08-HotFix) (2023-09-17)
[Full Changelog](https://github.com/torrentpier/torrentpier-lts/compare/v2.1.5-2023.08...v2.1.5-2023.08-HotFix) [Full Changelog](https://github.com/torrentpier/torrentpier-lts/compare/v2.1.5-2023.08...v2.1.5-2023.08-HotFix)

View File

@ -534,7 +534,6 @@ $bb_cfg['file_id_ext'] = array(
4 => 'png', 4 => 'png',
5 => 'bmp', 5 => 'bmp',
6 => 'tiff', 6 => 'tiff',
7 => 'webp',
// Внимание: Если вы дописали расширения в $bb_cfg['avatars']['allowed_ext'] или $bb_cfg['group_avatars']['allowed_ext'], // Внимание: Если вы дописали расширения в $bb_cfg['avatars']['allowed_ext'] или $bb_cfg['group_avatars']['allowed_ext'],
// то обязательно укажите их в этом массиве тоже. (Шаблон: порядковый номер => название расширения) // то обязательно укажите их в этом массиве тоже. (Шаблон: порядковый номер => название расширения)
); );
@ -550,7 +549,7 @@ $bb_cfg['gen_forums_allowed_ext'] = array('zip', 'rar'); // TODO: д
// Avatars // Avatars
$bb_cfg['avatars'] = array( $bb_cfg['avatars'] = array(
'allowed_ext' => array('gif','jpg','jpeg','png','bmp','tiff','webp'), // разрешенные форматы файлов (При добавлении нового расширения, продублируйте в $bb_cfg['file_id_ext']) 'allowed_ext' => array('gif','jpg','jpeg','png','bmp','tiff'), // разрешенные форматы файлов (При добавлении нового расширения, продублируйте в $bb_cfg['file_id_ext'])
'bot_avatar' => 'gallery/bot.gif', // аватара бота 'bot_avatar' => 'gallery/bot.gif', // аватара бота
'max_size' => 100*1024, // размер аватары в байтах 'max_size' => 100*1024, // размер аватары в байтах
'max_height' => 100, // высота аватара в px 'max_height' => 100, // высота аватара в px
@ -562,7 +561,7 @@ $bb_cfg['avatars'] = array(
// Group avatars // Group avatars
$bb_cfg['group_avatars'] = array( $bb_cfg['group_avatars'] = array(
'allowed_ext' => array('gif','jpg','jpeg','png','bmp','tiff','webp'), // разрешенные форматы файлов (При добавлении нового расширения, продублируйте в $bb_cfg['file_id_ext']) 'allowed_ext' => array('gif','jpg','jpeg','png','bmp','tiff'), // разрешенные форматы файлов (При добавлении нового расширения, продублируйте в $bb_cfg['file_id_ext'])
'max_size' => 300*1024, // размер аватары в байтах 'max_size' => 300*1024, // размер аватары в байтах
'max_height' => 300, // высота аватара в px 'max_height' => 300, // высота аватара в px
'max_width' => 300, // ширина аватара в px 'max_width' => 300, // ширина аватара в px

View File

@ -25,7 +25,14 @@ class upload_common
var $file_size = ''; var $file_size = '';
var $ext_ids = array(); // array_flip($bb_cfg['file_id_ext']) var $ext_ids = array(); // array_flip($bb_cfg['file_id_ext'])
var $errors = array(); var $errors = array();
var $img_types = array(); // $bb_cfg['file_id_ext'] var $img_types = array(
1 => 'gif',
2 => 'jpg',
3 => 'png',
6 => 'bmp',
7 => 'tiff',
9 => 'jpeg',
);
function init ($cfg = array(), $post_params = array(), $uploaded_only = true) function init ($cfg = array(), $post_params = array(), $uploaded_only = true)
{ {
@ -67,7 +74,6 @@ class upload_common
} }
// get ext // get ext
$this->ext_ids = array_flip($bb_cfg['file_id_ext']); $this->ext_ids = array_flip($bb_cfg['file_id_ext']);
$this->img_types = $bb_cfg['file_id_ext'];
$file_name_ary = explode('.', $this->file['name']); $file_name_ary = explode('.', $this->file['name']);
$this->file_ext = strtolower(end($file_name_ary)); $this->file_ext = strtolower(end($file_name_ary));