mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-17 20:01:47 +02:00
Code Issues Releases Wiki Activity

Fixes #4669 - Forum print issue.

Browse Source
This commit is contained in:
Cameron
2022-03-10 12:54:22 -08:00
parent 9c6a5e96fe
commit 743edf8917
3 changed files with 11 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
e107_plugins/forum/e_emailprint.php
View File

@@ -6,28 +6,7 @@ function print_item($thread_id)
// moved to e_print.php
}
function email_item($thread_id)
{
global $tp;
$gen = new convert;
include_once(e_PLUGIN.'forum/forum_class.php');
$forum = new e107forum;
$thread_info = $forum->threadGet($thread_id,0,999);
$thread_name = $tp->toHTML($thread_info[0]['thread_name'], TRUE);
$text = "<b>".$thread_name."</b><br />
".$thread_info[0]['user_name'].", ".$gen->convert_date($thread_info[0]['thread_datestamp'], "forum")."<br /><br />
".$tp->toHTML($thread_info[0]['thread_thread'], TRUE);
$count = 1;
unset($thread_info[0], $thread_info['head']);
foreach($thread_info as $reply)
{
$text .= "<br /><br />Re: <b>".$thread_name."</b><br />
".$reply['user_name'].", ".$gen->convert_date($reply['thread_datestamp'], "forum")."<br /><br />
".$tp->toHTML($reply['thread_thread'], TRUE);
}
return $text;
return e107::getAddon('forum','e_print')->render($thread_id); // Quick Fix
}

15
e107_plugins/forum/e_print.php
View File

@@ -15,7 +15,7 @@ class forum_print // plugin-folder + '_print'
//print_a($thread_info);
// Check if user is allowed to view this forum topic
if(!$forum->checkPerm($thread_info['thread_forum_id'], 'view'))
if(!$forum->checkPerm($thread_info['thread_forum_id']))
{
return LAN_FORUM_0008;
}
@@ -28,12 +28,12 @@ class forum_print // plugin-folder + '_print'
$topic_name = e107::getParser()->toHTML($thread_info['thread_name'], true);
// Display topic name
$text .= "<strong>".$topic_name."</strong><br />";
$text .= "<h3>".$topic_name."</h3>";
// Display initial (first) post in topic
$text .= "
$text .= "<em>
".$post_list[0]['user_name'].", ".e107::getDate()->convert_date($post_list[0]['post_datestamp'], "forum")."
<br /><br />
</em><br /><br />
".$tp->toHTML($post_list[0]['post_entry'], true);
// Remove original post from $post_list array, so only replies are left
@@ -42,9 +42,10 @@ class forum_print // plugin-folder + '_print'
// Loop through each reply
foreach($post_list as $reply)
{
$text .= "<br /><br />Re: <strong>".$topic_name."</strong><br />
".$reply['user_name'].", ".e107::getDate()->convert_date($reply['post_datestamp'], "forum")."<br /><br />
".$tp->toHTML($reply['post_entry'], TRUE);
$text .= "<div style='padding:10px 0px; border-top:1px dashed #cccccc'>Re: <strong>".$topic_name."</strong><br />
<em>".$reply['user_name'].", ".e107::getDate()->convert_date($reply['post_datestamp'], "forum")."</em><br /><br />
".$tp->toHTML($reply['post_entry'], true).
"</div>\n\n";
}
return $text;

4
email.php
View File

@@ -177,11 +177,11 @@ if (isset($_POST['emailsubmit']))
if (sendemail($email_send, LAN_EMAIL_3.SITENAME,$email_body))
{
$text = "<div style='text-align:center'>".LAN_EMAIL_10." ".$email_send."</div>";
$text = "<div class='alert alert-success alert-block' style='text-align:center'>".LAN_EMAIL_10." ".$email_send."</div>";
}
else
{
$text = "<div style='text-align:center'>".LAN_EMAIL_9."</div>";
$text = "<div class='alert alert-dangere alert-block' style='text-align:center'>".LAN_EMAIL_9."</div>";
}
$ns->tablerender(LAN_EMAIL_11, $text);
}