mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-12 09:34:54 +02:00
Code Issues Releases Wiki Activity

Bugtracker #4766 - Correct 'new' icon of new forum threads; thanks MikeNL

Browse Source
This commit is contained in:
nlstart
2010-07-20 16:49:06 +00:00
parent 13e810c457
commit e7872767ff
2 changed files with 75 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
e107_plugins/newforumposts_main/languages/English.php
View File

@@ -24,6 +24,13 @@ define("NFPM_L13", "Update New Forum Posts Settings");
define("NFPM_L14", "New Forum Posts settings updated."); define("NFPM_L14", "New Forum Posts settings updated.");
define("NFPM_L15", "Check to display latest forum posts.<br />Default is latest topics."); define("NFPM_L15", "Check to display latest forum posts.<br />Default is latest topics.");
define('NFPM_L16', '[user deleted]'); define('NFPM_L16', '[user deleted]');
define('NFPM_L17', 'New Posts on Popular Thread');
define('NFPM_L18', 'New Posts');
define('NFPM_L19', 'No New Posts on Popular Thread');
define('NFPM_L20', 'No New Posts');
define('NFPM_L21', 'Sticky Thread');
define('NFPM_L22', 'Closed Sticky Thread');
define('NFPM_L23', 'Announcement');
define('NFPM_L24', 'Closed Thread');
?> ?>

72
e107_plugins/newforumposts_main/newforumposts_main.php
View File

@@ -66,7 +66,7 @@ elseif(!isset($NEWFORUMPOSTSTYLE_HEADER))
} }
$results = $sql->db_Select_gen(" $results = $sql->db_Select_gen("
SELECT t.thread_id, t.thread_name, t.thread_datestamp, t.thread_user, t.thread_views, t.thread_lastpost, t.thread_lastuser, t.thread_total_replies, f.forum_id, f.forum_name, f.forum_class, u.user_name, fp.forum_class, lp.user_name AS lp_name SELECT t.thread_id, t.thread_name, t.thread_datestamp, t.thread_user, t.thread_views, t.thread_lastpost, t.thread_lastuser, t.thread_total_replies, t.thread_active, t.thread_s, f.forum_id, f.forum_name, f.forum_class, u.user_name, fp.forum_class, lp.user_name AS lp_name
FROM #forum_t AS t FROM #forum_t AS t
LEFT JOIN #user AS u ON SUBSTRING_INDEX(t.thread_user,'.',1) = u.user_id LEFT JOIN #user AS u ON SUBSTRING_INDEX(t.thread_user,'.',1) = u.user_id
LEFT JOIN #user AS lp ON SUBSTRING_INDEX(t.thread_lastuser,'.',1) = lp.user_id LEFT JOIN #user AS lp ON SUBSTRING_INDEX(t.thread_lastuser,'.',1) = lp.user_id
@@ -83,6 +83,7 @@ if(!isset($gen) || !is_object($gen))
$gen = new convert; $gen = new convert;
} }
/* // Deprecated method to indicate new forum posts
if(is_readable(THEME."forum/new_small.png")) if(is_readable(THEME."forum/new_small.png"))
{ {
$ICON = "<img src='".THEME."forum/new_small.png' alt='' />"; $ICON = "<img src='".THEME."forum/new_small.png' alt='' />";
@@ -91,6 +92,7 @@ else
{ {
$ICON = "<img src='".e_PLUGIN_ABS."forum/images/".IMODE."/new_small.png' alt='' />"; $ICON = "<img src='".e_PLUGIN_ABS."forum/images/".IMODE."/new_small.png' alt='' />";
} }
*/
$TOTAL_TOPICS = $sql->db_Count("forum_t", "(*)", " WHERE thread_parent='0' "); $TOTAL_TOPICS = $sql->db_Count("forum_t", "(*)", " WHERE thread_parent='0' ");
$TOTAL_REPLIES = $sql->db_Count("forum_t", "(*)", " WHERE thread_parent!='0' "); $TOTAL_REPLIES = $sql->db_Count("forum_t", "(*)", " WHERE thread_parent!='0' ");
$sql->db_Select_gen("SELECT sum(thread_views) FROM ".MPREFIX."forum_t"); $sql->db_Select_gen("SELECT sum(thread_views) FROM ".MPREFIX."forum_t");
@@ -125,10 +127,71 @@ foreach ($forumArray as $forumInfo)
} }
else else
{ {
$LASTPOST = " - "; $LASTPOST = ' - ';
$LASTPOSTDATE = ""; $LASTPOSTDATE = '';
} }
$newflag = FALSE;
if (USER)
{
if ($forumInfo['thread_lastpost'] > USERLV && !preg_match("#\b".$forumInfo['thread_id']."\b#", USERVIEWED))
{
$newflag = TRUE;
}
}
if ($newflag)
{
if ($forumInfo['thread_total_replies'] >= $pref['forum_popular'])
{
$iconfile = 'new_popular.png';
$iconalt = NFPM_L17;
}
else
{
$iconfile = 'new.png';
$iconalt = NFPM_L18;
}
}
else
{
if ($forumInfo['thread_total_replies'] >= $pref['forum_popular'])
{
$iconfile = 'nonew_popular.png';
$iconalt = NFPM_L19;
}
else
{
$iconfile = 'nonew.png';
$iconalt = NFPM_L20;
}
if ($forumInfo['thread_s'] == 1)
{
if ($forumInfo['thread_active'])
{
$iconfile = 'sticky.png';
$iconalt = NFPM_L21;
}
else
{
$iconfile = 'sticky_closed.png';
$iconalt = NFPM_L22;
}
}
elseif($forumInfo['thread_s'] == 2)
{
$iconfile = 'announce.png';
$iconalt = NFPM_L23;
}
elseif(!$forumInfo['thread_active'])
{
$iconfile = 'closed.png';
$iconalt = NFPM_L24;
}
}
$ICON = "<img src='".e_PLUGIN_ABS."forum/images/".IMODE."/". $iconfile. "' alt='".$iconalt."' title='".$iconalt."' />";
$x = explode(chr(1), $thread_user); $x = explode(chr(1), $thread_user);
$tmp = explode(".", $x[0], 2); $tmp = explode(".", $x[0], 2);
if($user_name) if($user_name)
@@ -161,6 +224,5 @@ $text = ($pref['nfp_layer'] ? "<div style='border : 0; padding : 4px; width : au
if($results) if($results)
{ {
$ns->tablerender($pref["nfp_caption"], $text, "nfp"); $ns->tablerender($pref["nfp_caption"], $text, 'nfp');
} }