Julian/phpbb_board3-portal_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

"No news" bug + cleaned up the code a bit

Browse Source
This commit is contained in:
Kevin
2008-04-25 09:16:31 +00:00
parent b595489424
commit 373e52ae39
6 changed files with 362 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
root/portal/block/announcements.php
View File

@@ -18,14 +18,36 @@ if (!defined('IN_PORTAL'))
exit;
}
$announcement = request_var('announcement', -1);
$template->assign_vars(array(
'NEWEST_POST_IMG' => $user->img('icon_topic_newest', 'VIEW_NEWEST_POST'),
'READ_POST_IMG' => $user->img('icon_topic_latest', 'VIEW_NEWEST_POST'),
'GOTO_PAGE_IMG' => $user->img('icon_post_target', 'GOTO_PAGE'),
'S_DISPLAY_ANNOUNCEMENTS' => true,
));
$announcement = request_var('announcement', -1);
$start = request_var('ap', 0);
$start = ($start < 0) ? 0 : $start;
// Pagnition
if ( $portal_config['portal_announcements_archive'] )
{
// Fetch announcements from portal/includes/functions.php with check if "read full" is requested.
$portal_announcement_length = ($announcement < 0) ? $portal_config['portal_announcements_length'] : 0;
$fetch_news = phpbb_fetch_posts($portal_config['portal_global_announcements_forum'], $portal_config['portal_announcements_permissions'], $portal_config['portal_number_of_announcements'], $portal_announcement_length, $portal_config['portal_announcements_day'], 'announcements', $start);
// Any announcements present? If not terminate it here.
if (count($fetch_news) == 0)
{
$template->assign_block_vars('announcements_row', array(
'S_NO_TOPICS' => true,
'S_NOT_LAST' => false
));
$template->assign_var('S_CAN_READ', false);
}
else
{
// Count number of posts for announcements archive, considering if permission check is dis- or enabled.
if ( $portal_config['portal_announcements_archive'] )
{
$permissions = $portal_config['portal_announcements_permissions'];
$forum_from = $portal_config['portal_global_announcements_forum'];
@@ -81,23 +103,11 @@ if ( $portal_config['portal_announcements_archive'] )
$result = $db->sql_query($sql);
$total_announcements = (int) $db->sql_fetchfield('num_topics');
$db->sql_freeresult($result);
}
if($announcement < 0)
{
$fetch_news = phpbb_fetch_posts($portal_config['portal_global_announcements_forum'], $portal_config['portal_announcements_permissions'], $portal_config['portal_number_of_announcements'], $portal_config['portal_announcements_length'], $portal_config['portal_announcements_day'], 'announcements', $start);
if (count($fetch_news) == 0)
{
$template->assign_block_vars('announcements_row', array(
'S_NO_TOPICS' => true,
'S_NOT_LAST' => false
));
$template->assign_var('S_CAN_READ', false);
}
else
if($announcement < 0)
// Show the announcements overview
{
$count = count($fetch_news)-1;
for ($i = 0; $i < $count; $i++)
@@ -166,11 +176,9 @@ if($announcement < 0)
}
}
}
}
else
{
$fetch_news = phpbb_fetch_posts($portal_config['portal_global_announcements_forum'], $portal_config['portal_announcements_permissions'], $portal_config['portal_number_of_announcements'], 0, $portal_config['portal_announcements_day'], 'announcements', $start);
else
// Show "read full" page
{
$i = $announcement;
$forum_id = $fetch_news[$i]['forum_id'];
$topic_id = $fetch_news[$i]['topic_id'];
@@ -219,13 +227,7 @@ else
'AP_PAGE_NUMBER' => on_page($total_announcements, $portal_config['portal_number_of_announcements'], $start))
);
}
}
$template->assign_vars(array(
'NEWEST_POST_IMG' => $user->img('icon_topic_newest', 'VIEW_NEWEST_POST'),
'READ_POST_IMG' => $user->img('icon_topic_latest', 'VIEW_NEWEST_POST'),
'GOTO_PAGE_IMG' => $user->img('icon_post_target', 'GOTO_PAGE'),
'S_DISPLAY_ANNOUNCEMENTS' => true,
));
}
}
?>

52
root/portal/block/news.php
View File

@@ -20,9 +20,7 @@ if (!defined('IN_PORTAL'))
exit;
}
//
// Fetch Posts for news from portal/includes/functions.php
//
$template->assign_vars(array(
'NEWEST_POST_IMG' => $user->img('icon_topic_newest', 'VIEW_NEWEST_POST'),
'READ_POST_IMG' => $user->img('icon_topic_latest', 'VIEW_NEWEST_POST'),
@@ -31,14 +29,27 @@ $template->assign_vars(array(
));
$news = request_var('news', -1);
$user->add_lang('viewforum');
$start = request_var('np', 0);
$start = ($start < 0) ? 0 : $start;
// Pagnition
if ( $portal_config['portal_news_archive'] )
{
// Fetch news from portal/includes/functions.php with check if "read full" is requested.
$portal_news_length = ($news < 0) ? $portal_config['portal_news_length'] : 0;
$fetch_news = phpbb_fetch_posts($portal_config['portal_news_forum'], $portal_config['portal_news_permissions'], $portal_config['portal_number_of_news'], $portal_news_length, 0, ($portal_config['portal_show_all_news']) ? 'news_all' : 'news', $start);
// Any news present? If not terminate it here.
if (count($fetch_news) == 0)
{
$template->assign_block_vars('news_row', array(
'S_NO_TOPICS' => true,
'S_NOT_LAST' => false
));
}
else
{
// Count number of posts for news archive, considering if permission check is dis- or enabled.
if ( $portal_config['portal_news_archive'] )
{
$permissions = $portal_config['portal_news_permissions'];
$forum_from = $portal_config['portal_news_forum'];
@@ -89,20 +100,10 @@ if ( $portal_config['portal_news_archive'] )
$result = $db->sql_query($sql);
$total_news = (int) $db->sql_fetchfield('num_topics');
$db->sql_freeresult($result);
}
if($news < 0)
{
$fetch_news = phpbb_fetch_posts($portal_config['portal_news_forum'], $portal_config['portal_news_permissions'], $portal_config['portal_number_of_news'], $portal_config['portal_news_length'], 0, ($portal_config['portal_show_all_news']) ? 'news_all' : 'news', $start);
if (count($fetch_news) == 0)
{
$template->assign_block_vars('news_row', array(
'S_NO_TOPICS' => true,
'S_NOT_LAST' => false
));
}
else
if($news < 0)
// Show the news overview
{
$count = count($fetch_news)-1;
for ($i = 0; $i < $count; $i++)
@@ -169,11 +170,9 @@ if($news < 0)
}
}
}
}
else
{
$fetch_news = phpbb_fetch_posts($portal_config['portal_news_forum'], $portal_config['portal_news_permissions'], $portal_config['portal_number_of_news'], 0, 0, ($portal_config['portal_show_all_news']) ? 'news_all' : 'news', $start);
else
// Show "read full" page
{
$i = $news;
$forum_id = $fetch_news[$i]['forum_id'];
$topic_id = $fetch_news[$i]['topic_id'];
@@ -222,6 +221,7 @@ else
'NP_PAGE_NUMBER' => on_page($total_news, $portal_config['portal_number_of_news'], $start))
);
}
}
}
}
?>

14
root/styles/prosilver/template/portal/block/announcements.html
View File

@@ -6,7 +6,13 @@
</ul>
<div class="postbody" style="width: 100%">
<!-- BEGIN announcements_row -->
<!-- IF not announcements_row.S_NO_TOPICS -->
<!-- IF announcements_row.S_NO_TOPICS -->
<div class="post bg2">
<div class="inner"><span class="corners-top"><span></span></span>
<span style="text-align: center;"><strong>{L_NO_ANNOUNCEMENTS}</strong></span>
<span class="corners-bottom"><span></span></span></div>
</div>
<!-- ELSE -->
<div class="post <!-- IF announcements_row.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
<div class="inner"><span class="corners-top"><span></span></span>
<h4 class="first"><a name="a{announcements_row.A_ID}"></a><!-- IF announcements_row.S_UNREAD_INFO -->{NEWEST_POST_IMG}<!-- ELSE -->{READ_POST_IMG}<!-- ENDIF --> {announcements_row.ATTACH_ICON_IMG} <!-- IF announcements_row.S_POLL --> <strong>{L_POLL}: </strong><!-- ENDIF --><a href="{announcements_row.U_VIEW_COMMENTS}"><strong>{announcements_row.TITLE}</strong></a></h4>
@@ -43,12 +49,6 @@
<!-- ENDIF -->
<span class="corners-bottom"><span></span></span></div>
</div>
<!-- ELSE -->
<div class="post bg2">
<div class="inner"><span class="corners-top"><span></span></span>
<span style="text-align: center;"><strong>{L_NO_ANNOUNCEMENTS}</strong></span>
<span class="corners-bottom"><span></span></span></div>
</div>
<!-- ENDIF -->
<!-- END announcements_row -->
</div>

40
root/styles/prosilver/template/portal/block/announcements_compact.html
View File

@@ -1,5 +1,24 @@
<!-- BEGIN announcements_row -->
<!-- IF not announcements_row.S_NO_TOPICS -->
<!-- IF announcements_row.S_NO_TOPICS -->
<div class="forabg">
<div class="inner">
<span class="corners-top"><span></span></span>
<ul class="topiclist">
<li class="header"><dl><dt>{L_LATEST_ANNOUNCEMENTS}</dt></dl></li>
</ul>
<ul class="topiclist topics">
<li class="bg2">
<dl>
<dt style="border-left:0px; width: 99%">
<span class="gensmall" style="font-weight: bold;">{L_NO_ANNOUNCEMENTS}</span>
</dt>
</dl>
</li>
</ul>
<span class="corners-bottom"><span></span></span>
</div>
</div>
<!-- ELSE -->
<!-- IF announcements_row.S_FIRST_ROW -->
<div class="forabg">
<div class="inner">
@@ -46,25 +65,6 @@
</div>
</div>
<!-- ENDIF -->
<!-- ELSE -->
<div class="forabg">
<div class="inner">
<span class="corners-top"><span></span></span>
<ul class="topiclist">
<li class="header"><dl><dt>{L_LATEST_ANNOUNCEMENTS}</dt></dl></li>
</ul>
<ul class="topiclist topics">
<li class="bg2">
<dl>
<dt style="border-left:0px; width: 99%">
<span class="gensmall" style="font-weight: bold;">{L_NO_ANNOUNCEMENTS}</span>
</dt>
</dl>
</li>
</ul>
<span class="corners-bottom"><span></span></span>
</div>
</div>
<!-- ENDIF -->
<!-- END announcements_row -->
<br style="clear:both" />

16
root/styles/prosilver/template/portal/block/news.html
View File

@@ -6,7 +6,13 @@
</ul>
<div class="postbody" style="width: 100%">
<!-- BEGIN news_row -->
<!-- IF not news_row.S_NO_TOPICS -->
<!-- IF news_row.S_NO_TOPICS -->
<div class="post bg2">
<div class="inner"><span class="corners-top"><span></span></span>
<span style="text-align: center;"><strong>{L_NO_NEWS}</strong></span>
<span class="corners-bottom"><span></span></span></div>
</div>
<!-- ELSE -->
<div class="post <!-- IF news_row.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
<div class="inner"><span class="corners-top"><span></span></span>
<h4 class="first"><a name="n{news_row.N_ID}"></a><!-- IF news_row.S_UNREAD_INFO -->{NEWEST_POST_IMG}<!-- ELSE -->{READ_POST_IMG}<!-- ENDIF --> {news_row.ATTACH_ICON_IMG} <!-- IF news_row.S_POLL --><strong>{L_POLL}: </strong><!-- ENDIF --><a href="{news_row.U_LAST_COMMENTS}"><strong>{news_row.TITLE}</strong></a></h4>
@@ -27,6 +33,7 @@
<div class="back2top"><a href="#wrap" class="top" title="{L_BACK_TO_TOP}">{L_BACK_TO_TOP}</a></div>
<!-- IF news_row.S_NOT_LAST --><br style="clear:both" /><!-- ENDIF -->
<!-- IF news_row.S_LAST_ROW -->
<!-- IF not news_row.S_NO_TOPICS -->
<!-- IF NP_PAGINATION or TOTAL_NEWS -->
<hr class="dashed" />
<div class="pagination">
@@ -35,12 +42,7 @@
</div>
<!-- ENDIF -->
<!-- ENDIF -->
<span class="corners-bottom"><span></span></span></div>
</div>
<!-- ELSE -->
<div class="post bg2">
<div class="inner"><span class="corners-top"><span></span></span>
<span style="text-align: center;"><strong>{L_NO_NEWS}</strong></span>
<!-- ENDIF -->
<span class="corners-bottom"><span></span></span></div>
</div>
<!-- ENDIF -->

40
root/styles/prosilver/template/portal/block/news_compact.html
View File

@@ -1,5 +1,24 @@
<!-- BEGIN news_row -->
<!-- IF not news_row.S_NO_TOPICS -->
<!-- IF news_row.S_NO_TOPICS -->
<div class="forabg">
<div class="inner">
<span class="corners-top"><span></span></span>
<ul class="topiclist">
<li class="header"><dl><dt>{L_LATEST_NEWS}</dt></dl></li>
</ul>
<ul class="topiclist topics">
<li class="bg2">
<dl>
<dt style="border-left:0px; width: 99%">
<span class="gensmall" style="font-weight: bold;">{L_NO_NEWS}</span>
</dt>
</dl>
</li>
</ul>
<span class="corners-bottom"><span></span></span>
</div>
</div>
<!-- ELSE -->
<!-- IF news_row.S_FIRST_ROW -->
<div class="forabg">
<div class="inner">
@@ -43,25 +62,6 @@
</div>
</div>
<!-- ENDIF -->
<!-- ELSE -->
<div class="forabg">
<div class="inner">
<span class="corners-top"><span></span></span>
<ul class="topiclist">
<li class="header"><dl><dt>{L_LATEST_NEWS}</dt></dl></li>
</ul>
<ul class="topiclist topics">
<li class="bg2">
<dl>
<dt style="border-left:0px; width: 99%">
<span class="gensmall" style="font-weight: bold;">{L_NO_NEWS}</span>
</dt>
</dl>
</li>
</ul>
<span class="corners-bottom"><span></span></span>
</div>
</div>
<!-- ENDIF -->
<!-- END news_row -->