mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-29 02:40:25 +02:00
Code Issues Releases Wiki Activity

Forum: "Maximum width of uploaded image" setting is now respected. When set to 0 the size is determined by the forum/theme template.

Browse Source
This commit is contained in:
Cameron
2016-03-24 17:44:03 -07:00
parent 6ab9f32f07
commit 36cabf1330
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_plugins/forum/languages/English/English_admin.php
View File

@@ -153,7 +153,7 @@ define("FORLAN_131", "to set max file size, allowed types etc");
define("FORLAN_132", "Emphasize Sticky Threads"); define("FORLAN_132", "Emphasize Sticky Threads");
define("FORLAN_133", "Give extra emphasis to sticky threads (separate thread sections and headers)"); define("FORLAN_133", "Give extra emphasis to sticky threads (separate thread sections and headers)");
define("FORLAN_134", "Maximum width of uploaded image"); define("FORLAN_134", "Maximum width of uploaded image");
define("FORLAN_135", "Leave blank to disable auto resizing of images"); define("FORLAN_135", "Leave blank to let the theme template decide.");
define("FORLAN_136", "Create link to full size image"); define("FORLAN_136", "Create link to full size image");
define("FORLAN_137", "Enabling this will resize larger images and also create a link to the original full size image. If disabled, original image will be discarded"); define("FORLAN_137", "Enabling this will resize larger images and also create a link to the original full size image. If disabled, original image will be discarded");
define("FORLAN_138", "Prune these forums"); define("FORLAN_138", "Prune these forums");

9
e107_plugins/forum/shortcodes/batch/view_shortcodes.php
View File

@@ -11,12 +11,15 @@ if (!defined('e107_INIT')) { exit; }
class plugin_forum_view_shortcodes extends e_shortcode class plugin_forum_view_shortcodes extends e_shortcode
{ {
protected $e107; protected $e107;
protected $defaultImgAttachSize = false;
function __construct() function __construct()
{ {
parent::__construct(); parent::__construct();
$this->e107 = e107::getInstance(); $this->e107 = e107::getInstance();
$this->forum = new e107forum(); $this->forum = new e107forum();
$this->defaultImgAttachSize = e107::pref('forum','maxwidth',false); // don't resize here if set to 0.
} }
function sc_top($parm='') function sc_top($parm='')
@@ -105,6 +108,12 @@ class plugin_forum_view_shortcodes extends e_shortcode
$txt = ''; $txt = '';
$attachArray = e107::unserialize($this->postInfo['post_attachments']); $attachArray = e107::unserialize($this->postInfo['post_attachments']);
if(!empty($this->defaultImgAttachSize))
{
$tp->thumbWidth($this->defaultImgAttachSize); // set the attachment size.
}
//print_a($attachArray); //print_a($attachArray);
foreach($attachArray as $type=>$vals) foreach($attachArray as $type=>$vals)

2
e107_plugins/forum/templates/forum_viewtopic_template.php
View File

@@ -331,7 +331,7 @@ $FORUM_VIEWTOPIC_TEMPLATE['thread'] = "
<li id='post-{POSTID}' class='forum-viewtopic-post'> <li id='post-{POSTID}' class='forum-viewtopic-post'>
<div class='hidden-xs row row-fluid btn-navbar navbar-btn'> <div class='hidden-xs row row-fluid btn-navbar navbar-btn'>
{SETIMAGE: w=100&h=0&crop=0}
<div class='col-xs-2 span2 left text-left'> <div class='col-xs-2 span2 left text-left'>
<div class='row'> <div class='row'>
<div class='col-xs-12 col-md-12 forum-user-combo'>{USERCOMBO}<br />{CUSTOMTITLE}</div> <div class='col-xs-12 col-md-12 forum-user-combo'>{USERCOMBO}<br />{CUSTOMTITLE}</div>