From dd4712974395043b8295c6f14ab992a731ea0730 Mon Sep 17 00:00:00 2001
From: Kevin <kevin@breest.info>
Date: Thu, 14 Feb 2008 23:05:08 +0000
Subject: [PATCH] Unreported: Attachments from specific forum(s) (block and
 installer) - Part II: language files, ACP and get rid of only for registered
 users restriction.

---
 languages/de/mods/lang_portal_acp.php                  | 2 ++
 root/includes/acp/acp_portal.php                       | 3 ++-
 root/language/en/mods/lang_portal_acp.php              | 2 ++
 root/styles/prosilver/template/portal/portal_body.html | 5 +----
 templates/subsilver2/template/portal/portal_body.html  | 3 ---
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/languages/de/mods/lang_portal_acp.php b/languages/de/mods/lang_portal_acp.php
index 677ba561..743bfb0b 100644
--- a/languages/de/mods/lang_portal_acp.php
+++ b/languages/de/mods/lang_portal_acp.php
@@ -189,6 +189,8 @@ $lang = array_merge($lang, array(
 	'PORTAL_ATTACHMENTS_EXPLAIN'                  				=> 'Diesen Block auf dem Portal anzeigen.',
 	'PORTAL_ATTACHMENTS_NUMBER'								=> 'Anzahl der anzuzeigenden Dateianhänge',
 	'PORTAL_ATTACHMENTS_NUMBER_EXPLAIN'					=> '0 bedeutet unbegrenzt',
+	'PORTAL_ATTACHMENTS_FORUM_IDS'							=> 'Dateianhänge Foren ID(s)',
+	'PORTAL_ATTACHMENTS_FORUM_IDS_EXPLAIN'				=> 'Die Nummer des Forums, aus dem die Dateianhänge angezeigt werden sollen. Frei lassen um aus allen Foren anzeigen zu lassen. Mit Komma trennen wenn mehrere, ausgewählte Foren angezeigt werden soll, z.B. 1,2,5',
 	
 	// friends
 	'ACP_PORTAL_FRIENDS_INFO'							=> 'Freunde',
diff --git a/root/includes/acp/acp_portal.php b/root/includes/acp/acp_portal.php
index d34bceba..3f79d1e7 100644
--- a/root/includes/acp/acp_portal.php
+++ b/root/includes/acp/acp_portal.php
@@ -135,7 +135,8 @@ class acp_portal
 					'vars'	=> array(
 						'legend1'							=> 'ACP_PORTAL_ATTACHMENTS_NUMBER_SETTINGS',
 						'portal_attachments'				=> array('lang' => 'PORTAL_ATTACHMENTS'				  ,	'validate' => 'bool',		'type' => 'radio:yes_no',	'explain' => true),
-						'portal_attachments_number'			=> array('lang' => 'PORTAL_ATTACHMENTS_NUMBER'		 ,	'validate' => 'int',		'type' => 'text:3:3',		 'explain' => true),
+						'portal_attachments_number'	=> array('lang' => 'PORTAL_ATTACHMENTS_NUMBER'		 ,	'validate' => 'int',		'type' => 'text:3:3',		 'explain' => true),
+						'portal_attachments_forum_ids'	=> array('lang' => 'PORTAL_ATTACHMENTS_FORUM_IDS',	'validate' => 'string',		'type' => 'text:10:200',	 'explain' => true),
 					)
 				);
 			break;
diff --git a/root/language/en/mods/lang_portal_acp.php b/root/language/en/mods/lang_portal_acp.php
index 6ba0aa3c..edd739d7 100644
--- a/root/language/en/mods/lang_portal_acp.php
+++ b/root/language/en/mods/lang_portal_acp.php
@@ -194,6 +194,8 @@ $lang = array_merge($lang, array(
 	'PORTAL_ATTACHMENTS_EXPLAIN'						=> 'Display this block on portal.',
 	'PORTAL_ATTACHMENTS_NUMBER'							=> 'Limit of displayed attachments',
 	'PORTAL_ATTACHMENTS_NUMBER_EXPLAIN'					=> '0 means infinite',
+	'PORTAL_ATTACHMENTS_FORUM_IDS'							=> 'Attachments forum id(s)',
+	'PORTAL_ATTACHMENTS_FORUM_IDS_EXPLAIN'				=> 'The id(s) of the forums from which the attachments should be displayed. Use a comma to separate multiple forums, or leave blank to use all available forums.',
 	
 	// friends
 	'ACP_PORTAL_FRIENDS_INFO'				=> 'Friends',
diff --git a/root/styles/prosilver/template/portal/portal_body.html b/root/styles/prosilver/template/portal/portal_body.html
index 7e4c8870..f196de44 100644
--- a/root/styles/prosilver/template/portal/portal_body.html
+++ b/root/styles/prosilver/template/portal/portal_body.html
@@ -26,13 +26,10 @@
 		<!-- IF S_DISPLAY_RANDOM_MEMBER -->
 			<!-- INCLUDE portal/block/random_member.html -->
 		<!-- ENDIF -->
-		
-		
-<!-- IF not S_IS_BOT and S_USER_LOGGED_IN -->
+
 		<!-- IF S_DISPLAY_ATTACHMENTS -->
 			<!-- INCLUDE portal/block/attachments.html -->
 		<!-- ENDIF -->
-<!-- ENDIF -->		
 
 		<!-- IF S_ADS_SMALL -->
 			<!-- INCLUDE portal/block/ads_small.html -->
diff --git a/templates/subsilver2/template/portal/portal_body.html b/templates/subsilver2/template/portal/portal_body.html
index 398a4ff9..3c744e21 100644
--- a/templates/subsilver2/template/portal/portal_body.html
+++ b/templates/subsilver2/template/portal/portal_body.html
@@ -60,12 +60,9 @@ small, .small {
 			<!-- INCLUDE portal/block/random_member.html -->
 		<!-- ENDIF -->
 
-		
-<!-- IF not S_IS_BOT and S_USER_LOGGED_IN -->
 		<!-- IF S_DISPLAY_ATTACHMENTS -->
 			<!-- INCLUDE portal/block/attachments.html -->
 		<!-- ENDIF -->
-<!-- ENDIF -->
 
 		<!-- IF S_ADS_SMALL -->
 			<!-- INCLUDE portal/block/ads_small.html -->