From 1e640e6578c37be14aa0d2692eb036a63e1eec05 Mon Sep 17 00:00:00 2001 From: Kevin Date: Wed, 30 Apr 2008 21:43:03 +0000 Subject: [PATCH] Pre-release: switch for news link description (newest / first), hide attachments when disabled - http://www.board3.de/viewtopic.php?f=14&t=482 http://www.board3.de/viewtopic.php?f=14&t=481 --- root/portal.php | 2 +- root/portal/block/announcements.php | 4 ++-- root/portal/block/news.php | 7 ++++--- root/portal/block/statistics.php | 2 +- .../prosilver/template/portal/block/news_compact.html | 2 +- .../subsilver2/template/portal/block/news_compact.html | 2 +- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/root/portal.php b/root/portal.php index 869c7236..133b4d97 100644 --- a/root/portal.php +++ b/root/portal.php @@ -163,7 +163,7 @@ if ($portal_config['portal_search']) include($phpbb_root_path . 'portal/block/search.'.$phpEx); } -if ($portal_config['portal_attachments']) +if ($portal_config['portal_attachments'] && $config['allow_attachments']) { include($phpbb_root_path . 'portal/block/attachments.'.$phpEx); } diff --git a/root/portal/block/announcements.php b/root/portal/block/announcements.php index b6281c99..cc82e577 100644 --- a/root/portal/block/announcements.php +++ b/root/portal/block/announcements.php @@ -141,7 +141,7 @@ $fetch_news = phpbb_fetch_posts($portal_config['portal_global_announcements_foru } $template->assign_block_vars('announcements_row', array( - 'ATTACH_ICON_IMG' => ($fetch_news[$i]['attachment']) ? $user->img('icon_topic_attach', $user->lang['TOTAL_ATTACHMENTS']) : '', + 'ATTACH_ICON_IMG' => ($fetch_news[$i]['attachment'] && $config['allow_attachments']) ? $user->img('icon_topic_attach', $user->lang['TOTAL_ATTACHMENTS']) : '', 'FORUM_NAME' => ( $forum_id ) ? $fetch_news[$i]['forum_name'] : '', 'TITLE' => $fetch_news[$i]['topic_title'], 'POSTER' => $fetch_news[$i]['username'], @@ -196,7 +196,7 @@ $fetch_news = phpbb_fetch_posts($portal_config['portal_global_announcements_foru } $template->assign_block_vars('announcements_row', array( - 'ATTACH_ICON_IMG' => ($fetch_news[$i]['attachment']) ? $user->img('icon_topic_attach', $user->lang['TOTAL_ATTACHMENTS']) : '', + 'ATTACH_ICON_IMG' => ($fetch_news[$i]['attachment'] && $config['allow_attachments']) ? $user->img('icon_topic_attach', $user->lang['TOTAL_ATTACHMENTS']) : '', 'FORUM_NAME' => ( $forum_id ) ? $fetch_news[$i]['forum_name'] : '', 'TITLE' => $fetch_news[$i]['topic_title'], 'POSTER' => $fetch_news[$i]['username'], diff --git a/root/portal/block/news.php b/root/portal/block/news.php index 1063eb15..054a38b5 100644 --- a/root/portal/block/news.php +++ b/root/portal/block/news.php @@ -25,6 +25,8 @@ $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_NEWEST_OR_FIRST' => ( $portal_config['portal_news_show_last'] ) ? $user->lang['JUMP_NEWEST'] : $user->lang['JUMP_FIRST'], + 'POSTED_BY_TEXT' => ( $portal_config['portal_news_show_last'] ) ? $user->lang['LAST_POST'] : $user->lang['POSTED'], 'S_DISPLAY_NEWS' => true, )); @@ -134,7 +136,7 @@ $fetch_news = phpbb_fetch_posts($portal_config['portal_news_forum'], $portal_con } $template->assign_block_vars('news_row', array( - 'ATTACH_ICON_IMG' => ($fetch_news[$i]['attachment']) ? $user->img('icon_topic_attach', $user->lang['TOTAL_ATTACHMENTS']) : '', + 'ATTACH_ICON_IMG' => ($fetch_news[$i]['attachment'] && $config['allow_attachments']) ? $user->img('icon_topic_attach', $user->lang['TOTAL_ATTACHMENTS']) : '', 'FORUM_NAME' => ( $forum_id ) ? $fetch_news[$i]['forum_name'] : '', 'TITLE' => $fetch_news[$i]['topic_title'], 'POSTER' => $fetch_news[$i]['username'], @@ -162,7 +164,6 @@ $fetch_news = phpbb_fetch_posts($portal_config['portal_news_forum'], $portal_con if ($portal_config['portal_number_of_news'] <> 0 && $portal_config['portal_news_archive']) { $template->assign_vars(array( - 'POSTED_BY_TEXT' => ( $portal_config['portal_news_show_last'] ) ? $user->lang['LAST_POST'] : $user->lang['POSTED'], 'NP_PAGINATION' => $pagination, 'TOTAL_NEWS' => ($total_news == 1) ? $user->lang['VIEW_FORUM_TOPIC'] : sprintf($user->lang['VIEW_FORUM_TOPICS'], $total_news), 'NP_PAGE_NUMBER' => on_page($total_news, $portal_config['portal_number_of_news'], $start)) @@ -190,7 +191,7 @@ $fetch_news = phpbb_fetch_posts($portal_config['portal_news_forum'], $portal_con } $template->assign_block_vars('news_row', array( - 'ATTACH_ICON_IMG' => ($fetch_news[$i]['attachment']) ? $user->img('icon_topic_attach', $user->lang['TOTAL_ATTACHMENTS']) : '', + 'ATTACH_ICON_IMG' => ($fetch_news[$i]['attachment'] && $config['allow_attachments']) ? $user->img('icon_topic_attach', $user->lang['TOTAL_ATTACHMENTS']) : '', 'FORUM_NAME' => ( $forum_id ) ? $fetch_news[$i]['forum_name'] : '', 'TITLE' => $fetch_news[$i]['topic_title'], 'POSTER' => $fetch_news[$i]['username'], diff --git a/root/portal/block/statistics.php b/root/portal/block/statistics.php index a8385d6f..c0f0d1fe 100644 --- a/root/portal/block/statistics.php +++ b/root/portal/block/statistics.php @@ -132,7 +132,7 @@ $template->assign_vars(array( 'NEWEST_USER' => sprintf($user->lang['NEWEST_USER'], get_username_string('full', $config['newest_user_id'], $config['newest_username'], $config['newest_user_colour'])), 'S_ANN' => get_db_stat('announcmenttotal'), 'S_SCT' => get_db_stat('stickytotal'), - 'S_TOT_ATTACH' => get_db_stat('attachmentstotal'), + 'S_TOT_ATTACH' => ($config['allow_attachments']) ? get_db_stat('attachmentstotal') : 0, // avarage stat 'TOPICS_PER_DAY' => sprintf($user->lang[$l_topics_per_day_s], $topics_per_day), diff --git a/root/styles/prosilver/template/portal/block/news_compact.html b/root/styles/prosilver/template/portal/block/news_compact.html index c73bcd53..50256bc1 100644 --- a/root/styles/prosilver/template/portal/block/news_compact.html +++ b/root/styles/prosilver/template/portal/block/news_compact.html @@ -33,7 +33,7 @@
- {NEWEST_POST_IMG}{READ_POST_IMG} {news_row.ATTACH_ICON_IMG} {L_POLL}: {news_row.TITLE} + {NEWEST_POST_IMG}{READ_POST_IMG} {news_row.ATTACH_ICON_IMG} {L_POLL}: {news_row.TITLE}
{news_row.PAGINATION} {POSTED_BY_TEXT} {L_POST_BY_AUTHOR}: {news_row.POSTER_FULL} {L_POSTED_ON_DATE} {news_row.TIME} diff --git a/templates/subsilver2/template/portal/block/news_compact.html b/templates/subsilver2/template/portal/block/news_compact.html index 15da2ec6..a672c569 100644 --- a/templates/subsilver2/template/portal/block/news_compact.html +++ b/templates/subsilver2/template/portal/block/news_compact.html @@ -14,7 +14,7 @@ {NEWEST_POST_IMG}{READ_POST_IMG} {news_row.ATTACH_ICON_IMG} {L_POLL}: - {news_row.TITLE} + {news_row.TITLE}
{POSTED_BY_TEXT} {L_POST_BY_AUTHOR}: {news_row.POSTER_FULL} {L_POSTED_ON_DATE} {news_row.TIME} [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}: {news_row.PAGINATION} ]